diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-07-28 16:00:38 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-07-28 16:00:38 (GMT) |
| commit | 8c9179e96ac6332389fca56bdd1a2b520eb305cb (patch) | |
| tree | cc45fe3068797bdf8075f2b4b4a59941630de52c /src/3rdparty | |
| parent | 478470548c454a9aa563a44078f0504ac508e5f1 (diff) | |
| parent | fecd70784dfb2ae9159c1ed40840bbb09dd218f0 (diff) | |
| download | Qt-8c9179e96ac6332389fca56bdd1a2b520eb305cb.zip Qt-8c9179e96ac6332389fca56bdd1a2b520eb305cb.tar.gz Qt-8c9179e96ac6332389fca56bdd1a2b520eb305cb.tar.bz2 | |
Merge branch 'qtscript-jsc-backend' of git@scm.dev.nokia.troll.no:qt/qt-webkit into qtscript-jsc-backend
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp index 8e89c18..b22832f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.cpp @@ -293,11 +293,15 @@ start: int startOffset = currentOffset(); if (m_current == -1) { +#ifndef QT_BUILD_SCRIPT_LIB /* the parser takes cate about automatic semicolon. + this might add incorrect semicolons */ + //m_delimited and m_isReparsing are now useless if (!m_terminator && !m_delimited && !m_isReparsing) { // automatic semicolon insertion if program incomplete token = ';'; goto doneSemicolon; } +#endif return 0; } |