QmlJS: Merge parser updates from Qt5.
Change-Id: Ibed38abca8f7e7bae7d424751a18c83f4c9e9bc5 Reviewed-on: http://codereview.qt-project.org/4732 Reviewed-by:Roberto Raggi <roberto.raggi@nokia.com>
Showing
- src/libs/qmljs/parser/cmd.sed 1 addition, 0 deletionssrc/libs/qmljs/parser/cmd.sed
- src/libs/qmljs/parser/gen-parser.sh 6 additions, 0 deletionssrc/libs/qmljs/parser/gen-parser.sh
- src/libs/qmljs/parser/parser.pri 3 additions, 2 deletionssrc/libs/qmljs/parser/parser.pri
- src/libs/qmljs/parser/qmldirparser.cpp 45 additions, 8 deletionssrc/libs/qmljs/parser/qmldirparser.cpp
- src/libs/qmljs/parser/qmldirparser_p.h 7 additions, 3 deletionssrc/libs/qmljs/parser/qmldirparser_p.h
- src/libs/qmljs/parser/qmljs.g 221 additions, 340 deletionssrc/libs/qmljs/parser/qmljs.g
- src/libs/qmljs/parser/qmljsast_p.h 55 additions, 54 deletionssrc/libs/qmljs/parser/qmljsast_p.h
- src/libs/qmljs/parser/qmljsengine_p.cpp 14 additions, 65 deletionssrc/libs/qmljs/parser/qmljsengine_p.cpp
- src/libs/qmljs/parser/qmljsengine_p.h 16 additions, 57 deletionssrc/libs/qmljs/parser/qmljsengine_p.h
- src/libs/qmljs/parser/qmljsgrammar.cpp 533 additions, 527 deletionssrc/libs/qmljs/parser/qmljsgrammar.cpp
- src/libs/qmljs/parser/qmljsgrammar_p.h 12 additions, 11 deletionssrc/libs/qmljs/parser/qmljsgrammar_p.h
- src/libs/qmljs/parser/qmljskeywords_p.h 851 additions, 0 deletionssrc/libs/qmljs/parser/qmljskeywords_p.h
- src/libs/qmljs/parser/qmljslexer.cpp 869 additions, 1067 deletionssrc/libs/qmljs/parser/qmljslexer.cpp
- src/libs/qmljs/parser/qmljslexer_p.h 106 additions, 143 deletionssrc/libs/qmljs/parser/qmljslexer_p.h
- src/libs/qmljs/parser/qmljsmemorypool_p.h 82 additions, 42 deletionssrc/libs/qmljs/parser/qmljsmemorypool_p.h
- src/libs/qmljs/parser/qmljsparser.cpp 210 additions, 295 deletionssrc/libs/qmljs/parser/qmljsparser.cpp
- src/libs/qmljs/parser/qmljsparser_p.h 7 additions, 2 deletionssrc/libs/qmljs/parser/qmljsparser_p.h
- src/libs/qmljs/parser/qmlutils_p.h 82 additions, 0 deletionssrc/libs/qmljs/parser/qmlutils_p.h
Loading
Please register or sign in to comment