Evaluate type assertions in QML

Type assertions actually check whether the expression matches the type,
and return null if it doesn't.

[ChangeLog][QtQml] You can use TypeScript-like type assertions using
"as" now. In contrast to TypeScript, QML's type assertions are enforced
at runtime. If the type doesn't match, null is returned for object
types. Also, type assertions can only cast to object types. There is no
way to create a value type or primitive type reference. As value types
and primitives cannot be polymorphic, this doesn't matter, though.
There are other ways of converting those.

Task-number: QTBUG-93662
Change-Id: I00fce3d4ea7a8c6b4631c580eaf6c113ac485813
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>

1 files changed, 4 insertions, 20 deletions

diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index 2716983f42..eb082b77c2 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -1730,14 +1730,6 @@ TypeAnnotation: T_COLON Type;
     } break;
 ./
 
-
-TypeExpression: Type;
-/.
-    case $rule_number: {
-        sym(1).Expression = new (pool) AST::TypeExpression(sym(1).Type);
-    } break;
-./
-
 TypeAnnotationOpt: TypeAnnotation;
 TypeAnnotationOpt: ;
 /.
@@ -2763,30 +2755,22 @@ RelationalOperator: T_INSTANCEOF;
         sym(1).ival = QSOperator::InstanceOf;
     } break;
 ./
-
-RelationalExpression_In: RelationalExpression_In T_IN ShiftExpression;
+RelationalOperator: T_AS;
 /.
     case $rule_number: {
-        AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, QSOperator::In, sym(3).Expression);
-        node->operatorToken = loc(2);
-        sym(1).Node = node;
+        sym(1).ival = QSOperator::As;
     } break;
 ./
 
-TypeAssertExpression_In: RelationalExpression_In T_AS TypeExpression;
-/.  case $rule_number: Q_FALLTHROUGH(); ./
-TypeAssertExpression: RelationalExpression T_AS TypeExpression;
+RelationalExpression_In: RelationalExpression_In T_IN ShiftExpression;
 /.
     case $rule_number: {
-        AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, QSOperator::As, sym(3).Expression);
+        AST::BinaryExpression *node = new (pool) AST::BinaryExpression(sym(1).Expression, QSOperator::In, sym(3).Expression);
         node->operatorToken = loc(2);
         sym(1).Node = node;
     } break;
 ./
 
-RelationalExpression_In: TypeAssertExpression_In;
-RelationalExpression: TypeAssertExpression;
-
 EqualityExpression_In: RelationalExpression_In;
 EqualityExpression: RelationalExpression;