OSDN Git Service

QmlJS: Merge parser updates from Qt5.
authorChristian Kamm <christian.d.kamm@nokia.com>
Tue, 13 Sep 2011 06:42:52 +0000 (08:42 +0200)
committerChristian Kamm <christian.d.kamm@nokia.com>
Wed, 14 Sep 2011 09:48:11 +0000 (11:48 +0200)
commitb5312090028a338ac3f945f8692cadde7eb2172b
treed5bc33e28336f9d3f340a49d7536ba7baee0cb20
parentc0c9312495cab51c753298c02d1f6d57d1daed9e
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>
19 files changed:
src/libs/qmljs/parser/cmd.sed
src/libs/qmljs/parser/gen-parser.sh
src/libs/qmljs/parser/parser.pri
src/libs/qmljs/parser/qmldirparser.cpp
src/libs/qmljs/parser/qmldirparser_p.h
src/libs/qmljs/parser/qmljs.g
src/libs/qmljs/parser/qmljsast_p.h
src/libs/qmljs/parser/qmljsengine_p.cpp
src/libs/qmljs/parser/qmljsengine_p.h
src/libs/qmljs/parser/qmljsgrammar.cpp
src/libs/qmljs/parser/qmljsgrammar_p.h
src/libs/qmljs/parser/qmljskeywords_p.h [new file with mode: 0644]
src/libs/qmljs/parser/qmljslexer.cpp
src/libs/qmljs/parser/qmljslexer_p.h
src/libs/qmljs/parser/qmljsmemorypool_p.h
src/libs/qmljs/parser/qmljsnodepool_p.h [deleted file]
src/libs/qmljs/parser/qmljsparser.cpp
src/libs/qmljs/parser/qmljsparser_p.h
src/libs/qmljs/parser/qmlutils_p.h [new file with mode: 0644]