diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-05-02 14:29:54 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-05-03 08:12:39 +0000 |
| commit | 32a7fdd578e1d83d101ed2979a52b17381531126 (patch) | |
| tree | 949f2a5d64240e62e0be3376ba283e8076374d51 /src/qml/parser | |
| parent | 7dd53d0e9ba96ef09290e368c4e0cbd55d0bf165 (diff) | |
Fix some parse errors
The parser was throwing a syntax error on 'function* X() {}' because
of a shift-reduce conflict that wasn't properly reported by qlalr.
Change-Id: Ifa55a569178e347346d49acd08c702f692e327dd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljs.g | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index 4acddc78b6..20c9b5720a 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -3439,7 +3439,7 @@ FunctionDeclaration: Function BindingIdentifier T_LPAREN FormalParameters T_RPAR FunctionDeclaration_Default: FunctionDeclaration; -FunctionDeclaration_Default: T_FUNCTION T_LPAREN FormalParameters T_RPAREN FunctionLBrace FunctionBody FunctionRBrace; +FunctionDeclaration_Default: Function T_LPAREN FormalParameters T_RPAREN FunctionLBrace FunctionBody FunctionRBrace; /. case $rule_number: { AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(1), sym(3).FormalParameterList, sym(6).StatementList); @@ -3696,7 +3696,7 @@ GeneratorRBrace: T_RBRACE; } break; ./ -GeneratorDeclaration: T_FUNCTION T_STAR BindingIdentifier T_LPAREN FormalParameters T_RPAREN GeneratorLBrace GeneratorBody GeneratorRBrace; +GeneratorDeclaration: Function T_STAR BindingIdentifier T_LPAREN FormalParameters T_RPAREN GeneratorLBrace GeneratorBody GeneratorRBrace; /. case $rule_number: { AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(3), sym(5).FormalParameterList, sym(8).StatementList); @@ -3712,7 +3712,7 @@ GeneratorDeclaration: T_FUNCTION T_STAR BindingIdentifier T_LPAREN FormalParamet ./ GeneratorDeclaration_Default: GeneratorDeclaration; -GeneratorDeclaration_Default: T_FUNCTION T_STAR T_LPAREN FormalParameters T_RPAREN GeneratorLBrace GeneratorBody GeneratorRBrace; +GeneratorDeclaration_Default: Function T_STAR T_LPAREN FormalParameters T_RPAREN GeneratorLBrace GeneratorBody GeneratorRBrace; /. case $rule_number: { AST::FunctionDeclaration *node = new (pool) AST::FunctionDeclaration(stringRef(1), sym(4).FormalParameterList, sym(7).StatementList); |