diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-07-31 20:20:50 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-08-02 08:51:55 +0000 |
| commit | ca1f69757421845f563ebe90a5880509839efb31 (patch) | |
| tree | 435be52048f38ff90f895bbacce02727795a0397 /src/qml/parser | |
| parent | eefa21a18223595acd350aff3db0ed23f4d1a002 (diff) | |
Fix grammar for ES modules
* Always parse 'import' as a keyword, as it is now one in Qml and ES.
* Always parse 'as' as keyword but allow it as identifier using the same
trick as for the other keywords.
This fixes basic import statements such as import "foo.mjs" as bar but
still allows funny variations such as import "foo.mjs" as as.
Change-Id: I76a600aab90c1b5c07d079bf11b0a78742d44c53
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljs.g | 4 | ||||
| -rw-r--r-- | src/qml/parser/qqmljskeywords_p.h | 4 | ||||
| -rw-r--r-- | src/qml/parser/qqmljslexer.cpp | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index c5aabeaa01..4c5748f818 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -119,7 +119,7 @@ %token T_FOR_LOOKAHEAD_OK "(for lookahead ok)" --%left T_PLUS T_MINUS -%nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY T_ON T_SET T_GET T_OF T_STATIC T_FROM +%nonassoc T_IDENTIFIER T_COLON T_SIGNAL T_PROPERTY T_READONLY T_ON T_SET T_GET T_OF T_STATIC T_FROM T_AS %nonassoc REDUCE_HERE %start TopLevel @@ -1366,6 +1366,7 @@ JsIdentifier: T_SET; JsIdentifier: T_FROM; JsIdentifier: T_STATIC; JsIdentifier: T_OF; +JsIdentifier: T_AS; IdentifierReference: JsIdentifier; BindingIdentifier: IdentifierReference; @@ -1848,6 +1849,7 @@ ReservedIdentifier: T_WITH; ReservedIdentifier: T_CLASS; ReservedIdentifier: T_EXTENDS; ReservedIdentifier: T_EXPORT; +ReservedIdentifier: T_IMPORT; ComputedPropertyName: T_LBRACKET AssignmentExpression_In T_RBRACKET; /. diff --git a/src/qml/parser/qqmljskeywords_p.h b/src/qml/parser/qqmljskeywords_p.h index 40094ecdf8..b0a4951ece 100644 --- a/src/qml/parser/qqmljskeywords_p.h +++ b/src/qml/parser/qqmljskeywords_p.h @@ -60,7 +60,7 @@ namespace QQmlJS { static inline int classify2(const QChar *s, int parseModeFlags) { if (s[0].unicode() == 'a') { if (s[1].unicode() == 's') { - return (parseModeFlags & Lexer::QmlMode) ? Lexer::T_AS : Lexer::T_IDENTIFIER; + return Lexer::T_AS; } } else if (s[0].unicode() == 'd') { @@ -432,7 +432,7 @@ static inline int classify6(const QChar *s, int parseModeFlags) { if (s[3].unicode() == 'o') { if (s[4].unicode() == 'r') { if (s[5].unicode() == 't') { - return (parseModeFlags & Lexer::QmlMode) ? int(Lexer::T_IMPORT) : int(Lexer::T_RESERVED_WORD); + return Lexer::T_IMPORT; } } } diff --git a/src/qml/parser/qqmljslexer.cpp b/src/qml/parser/qqmljslexer.cpp index ae016076b8..86c8ac714c 100644 --- a/src/qml/parser/qqmljslexer.cpp +++ b/src/qml/parser/qqmljslexer.cpp @@ -1390,7 +1390,7 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error) lex(); // skip T_DOT - if (! (_tokenKind == T_IDENTIFIER || _tokenKind == T_RESERVED_WORD)) + if (! (_tokenKind == T_IDENTIFIER || _tokenKind == T_IMPORT)) return true; // expected a valid QML/JS directive const QString directiveName = tokenText(); @@ -1484,7 +1484,7 @@ bool Lexer::scanDirectives(Directives *directives, DiagnosticMessage *error) // // recognize the mandatory `as' followed by the module name // - if (! (lex() == T_IDENTIFIER && tokenText() == QLatin1String("as") && tokenStartLine() == lineNumber)) { + if (! (lex() == T_AS && tokenStartLine() == lineNumber)) { if (fileImport) error->message = QCoreApplication::translate("QQmlParser", "File import requires a qualifier"); else |