diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-01-24 16:28:02 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-07-09 16:52:44 +0200 |
| commit | f2cb10ebc4946b10526fa22581913ccc04cea164 (patch) | |
| tree | e53dc58d3e7d11e179494f58a55ce731eddc5ff3 /src/qml/parser | |
| parent | 2377a02afe8d8b4237b703e88ef3423242ec7cf8 (diff) | |
Allow all basic QML types for type annotations
In particular this permits the JS reserved keywords such as "int" or
"double".
Change-Id: Ice29e3696d8cba2121ef487cd0b099dd8b082022
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/parser')
| -rw-r--r-- | src/qml/parser/qqmljs.g | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g index 28566e21ea..b10063c7a5 100644 --- a/src/qml/parser/qqmljs.g +++ b/src/qml/parser/qqmljs.g @@ -1515,6 +1515,15 @@ Type: UiQualifiedId T_LT TypeArguments T_GT; } break; ./ +Type: T_RESERVED_WORD; +/. + case $rule_number: { + AST::UiQualifiedId *id = new (pool) AST::UiQualifiedId(stringRef(1)); + id->identifierToken = loc(1); + sym(1).Type = new (pool) AST::Type(id->finish()); + } break; +./ + Type: UiQualifiedId; /. case $rule_number: { |