Changes in / [9f4af04:e72fc60]

File:

• src/Parser/parser.yy (modified) (18 diffs)

src/Parser/parser.yy

@@ -763 +763 @@
                 // Switching to this behaviour may help check if a C compatibilty case uses comma-exprs in subscripts.
                 // Current: Commas in subscripts make tuples.
-                { $$ = new ExpressionNode( build_binary_val( yylloc, OperKinds::Index, $1, new ExpressionNode( build_tuple( yylloc, $3->set_last( $5 ) ) ) ) ); }
+                { $$ = new ExpressionNode( build_binary_val( yylloc, OperKinds::Index, $1, new ExpressionNode( build_tuple( yylloc, (ExpressionNode *)($3->set_last( $5 ) ) )) ) ); }
         | postfix_expression '[' assignment_expression ']'
                 // CFA, comma_expression disallowed in this context because it results in a common user error: subscripting a
@@ -778 +778 @@
                         Token fn;
                         fn.str = new std::string( "?{}" );                      // location undefined - use location of '{'?
-                        $$ = new ExpressionNode( new ast::ConstructorExpr( yylloc, build_func( yylloc, new ExpressionNode( build_varref( yylloc, fn ) ), $1->set_last( $3 ) ) ) );
+                        $$ = new ExpressionNode( new ast::ConstructorExpr( yylloc, build_func( yylloc, new ExpressionNode( build_varref( yylloc, fn ) ), (ExpressionNode *)( $1 )->set_last( $3 ) ) ) );
                 }
         | postfix_expression '(' argument_expression_list_opt ')'
@@ -784 +784 @@
         | VA_ARG '(' primary_expression ',' declaration_specifier_nobody abstract_parameter_declarator_opt ')'
                 // { SemanticError( yylloc, "va_arg is currently unimplemented." ); $$ = nullptr; }
-                { $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, new string( "__builtin_va_arg" ) ) ),
-                                                                                           $3->set_last( (ExpressionNode *)($6 ? $6->addType( $5 ) : $5) ) ) ); }
+                { $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, new string( "__builtin_va_arg") ) ),
+                                                                                           (ExpressionNode *)($3->set_last( (ExpressionNode *)($6 ? $6->addType( $5 ) : $5) )) ) ); }
         | postfix_expression '`' identifier                                     // CFA, postfix call
                 { $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, build_postfix_name( $3 ) ) ), $1 ) ); }
@@ -843 +843 @@
                         Token fn;
                         fn.str = new string( "^?{}" );                          // location undefined
-                        $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, fn ) ), $2->set_last( $4 ) ) );
+                        $$ = new ExpressionNode( build_func( yylloc, new ExpressionNode( build_varref( yylloc, fn ) ), (ExpressionNode *)( $2 )->set_last( $4 ) ) );
                 }
         ;
@@ -856 +856 @@
         argument_expression
         | argument_expression_list_opt ',' argument_expression
-                { $$ = $1->set_last( $3 ); }
+                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -868 +868 @@
 field_name_list:                                                                                // CFA, tuple field selector
         field
-        | field_name_list ',' field                                     { $$ = $1->set_last( $3 ); }
+        | field_name_list ',' field                                     { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -1162 +1162 @@
 //              { $$ = new ExpressionNode( build_tuple( $3 ) ); }
         '[' ',' tuple_expression_list ']'
-                { $$ = new ExpressionNode( build_tuple( yylloc, (new ExpressionNode( nullptr ))->set_last( $3 ) ) ); }
+                { $$ = new ExpressionNode( build_tuple( yylloc, (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $3 ) ) ); }
         | '[' push assignment_expression pop ',' tuple_expression_list ']'
-                { $$ = new ExpressionNode( build_tuple( yylloc, $3->set_last( $6 ) ) ); }
+                { $$ = new ExpressionNode( build_tuple( yylloc, (ExpressionNode *)($3->set_last( $6 ) ) )); }
         ;
 
@@ -1172 +1172 @@
                 { SemanticError( yylloc, "Eliding tuple element with '@' is currently unimplemented." ); $$ = nullptr; }
         | tuple_expression_list ',' assignment_expression
-                { $$ = $1->set_last( $3 ); }
+                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         | tuple_expression_list ',' '@'
                 { SemanticError( yylloc, "Eliding tuple element with '@' is currently unimplemented." ); $$ = nullptr; }
@@ -1307 +1307 @@
                         // therefore, are removed from the grammar even though C allows it. The change also applies to choose
                         // statement.
-                        $$ = $7 ? new StatementNode( build_compound( yylloc, (new StatementNode( $7 ))->set_last( sw ) ) ) : sw;
+                        $$ = $7 ? new StatementNode( build_compound( yylloc, (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
         | SWITCH '(' comma_expression ')' '{' error '}'         // CFA, invalid syntax rule error
@@ -1316 +1316 @@
                 {
                         StatementNode *sw = new StatementNode( build_switch( yylloc, false, $3, $8 ) );
-                        $$ = $7 ? new StatementNode( build_compound( yylloc, (new StatementNode( $7 ))->set_last( sw ) ) ) : sw;
+                        $$ = $7 ? new StatementNode( build_compound( yylloc, (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
         | CHOOSE '(' comma_expression ')' '{' error '}'         // CFA, invalid syntax rule
@@ -1718 +1718 @@
         cast_expression
         | cast_expression_list ',' cast_expression
+                // { $$ = (ExpressionNode *)($1->set_last( $3 )); }
                 { SemanticError( yylloc, "List of mutex member is currently unimplemented." ); $$ = nullptr; }
         ;
@@ -1733 +1734 @@
                 { $$ = $3; }
         | WAITFOR '(' cast_expression_list ':' argument_expression_list_opt ')'
-                { $$ = $3->set_last( $5 ); }
+                { $$ = (ExpressionNode *)($3->set_last( $5 )); }
         ;
 
@@ -1889 +1890 @@
         asm_operand
         | asm_operands_list ',' asm_operand
-                { $$ = $1->set_last( $3 ); }
+                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
         ;
 
@@ -1908 +1909 @@
                 { $$ = $1; }
         | asm_clobbers_list_opt ',' string_literal
-                { $$ = $1->set_last( $3 ); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 ) ); }
         ;
 
@@ -2974 +2975 @@
         | initializer
         | designation initializer                                       { $$ = $2->set_designators( $1 ); }
-        | initializer_list_opt ',' initializer          { $$ = $1->set_last( $3 ); }
-        | initializer_list_opt ',' designation initializer { $$ = $1->set_last( $4->set_designators( $3 ) ); }
+        | initializer_list_opt ',' initializer          { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
+        | initializer_list_opt ',' designation initializer { $$ = (InitializerNode *)($1->set_last( $4->set_designators( $3 ) )); }
         ;
 
@@ -2997 +2998 @@
         designator
         | designator_list designator
-                { $$ = $1->set_last( $2 ); }
+                { $$ = (ExpressionNode *)($1->set_last( $2 )); }
         //| designator_list designator                                          { $$ = new ExpressionNode( $1, $2 ); }
         ;
@@ -3126 +3127 @@
         | assignment_expression
         | type_list ',' type
-                { $$ = $1->set_last( new ExpressionNode( new ast::TypeExpr( yylloc, maybeMoveBuildType( $3 ) ) ) ); }
+                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new ast::TypeExpr( yylloc, maybeMoveBuildType( $3 ) ) ) )); }
         | type_list ',' assignment_expression
-                { $$ = $1->set_last( $3 ); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;
 
@@ -3965 +3966 @@
         | assignment_expression upupeq assignment_expression
         | array_type_list ',' basic_type_name
-                { $$ = $1->set_last( new ExpressionNode( new ast::TypeExpr( yylloc, maybeMoveBuildType( $3 ) ) ) ); }
+                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new ast::TypeExpr( yylloc, maybeMoveBuildType( $3 ) ) ) )); }
         | array_type_list ',' type_name
-                { $$ = $1->set_last( new ExpressionNode( new ast::TypeExpr( yylloc, maybeMoveBuildType( $3 ) ) ) ); }
+                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new ast::TypeExpr( yylloc, maybeMoveBuildType( $3 ) ) ) )); }
         | array_type_list ',' assignment_expression upupeq assignment_expression
         ;