Changes in src/Parser/parser.yy [948fdef:d912bed]

File:

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

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb  1 10:04:40 2020
-// Update Count     : 4440
+// Last Modified On : Mon Dec 16 15:32:58 2019
+// Update Count     : 4409
 //
 
@@ -323 +323 @@
 %type<op> ptrref_operator                               unary_operator                          assignment_operator
 %type<en> primary_expression                    postfix_expression                      unary_expression
-%type<en> cast_expression_list                  cast_expression                         exponential_expression          multiplicative_expression       additive_expression
+%type<en> cast_expression                               exponential_expression          multiplicative_expression       additive_expression
 %type<en> shift_expression                              relational_expression           equality_expression
 %type<en> AND_expression                                exclusive_OR_expression         inclusive_OR_expression
@@ -579 +579 @@
         | '(' compound_statement ')'                                            // GCC, lambda expression
                 { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
+        | constant '`' IDENTIFIER                                                       // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
+        | string_literal '`' IDENTIFIER                                         // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( $1 ) ) ); }
+        | IDENTIFIER '`' IDENTIFIER                                                     // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( build_varref( $1 ) ) ) ); }
+        | tuple '`' IDENTIFIER                                                          // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
+        | '(' comma_expression ')' '`' IDENTIFIER                       // CFA, postfix call
+                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $5 ) ), $2 ) ); }
         | type_name '.' identifier                                                      // CFA, nested type
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
@@ -632 +642 @@
         | postfix_expression '(' argument_expression_list ')'
                 { $$ = new ExpressionNode( build_func( $1, $3 ) ); }
-        | postfix_expression '`' identifier                                     // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | constant '`' identifier                                                       // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), $1 ) ); }
-        | string_literal '`' identifier                                         // CFA, postfix call
-                { $$ = new ExpressionNode( build_func( new ExpressionNode( build_postfix_name( $3 ) ), new ExpressionNode( $1 ) ) ); }
         | postfix_expression '.' identifier
                 { $$ = new ExpressionNode( build_fieldSel( $1, build_varref( $3 ) ) ); }
@@ -662 +666 @@
         | '(' type_no_function ')' '@' '{' initializer_list_opt comma_opt '}' // CFA, explicit C compound-literal
                 { $$ = new ExpressionNode( build_compoundLiteral( $2, (new InitializerNode( $6, true ))->set_maybeConstructed( false ) ) ); }
-        | '^' primary_expression '{' argument_expression_list '}' // CFA, destructor call
+        | '^' primary_expression '{' argument_expression_list '}' // CFA
                 {
                         Token fn;
@@ -675 +679 @@
         | argument_expression
         | argument_expression_list ',' argument_expression
-                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+                { $$ = (ExpressionNode *)( $1->set_last( $3 )); }
         ;
 
@@ -687 +691 @@
 field_name_list:                                                                                // CFA, tuple field selector
         field
-        | field_name_list ',' field                                     { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+        | field_name_list ',' field                                     { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
@@ -956 +960 @@
                 { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)(new ExpressionNode( nullptr ) )->set_last( $3 ) ) ); }
         | '[' push assignment_expression pop ',' tuple_expression_list ']'
-                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)($3->set_last( $6 ) ) )); }
+                { $$ = new ExpressionNode( build_tuple( (ExpressionNode *)$3->set_last( $6 ) ) ); }
         ;
 
@@ -962 +966 @@
         assignment_expression_opt
         | tuple_expression_list ',' assignment_expression_opt
-                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+                { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
@@ -1303 +1307 @@
         WAITFOR '(' cast_expression ')'
                 { $$ = $3; }
-//      | WAITFOR '(' cast_expression ',' argument_expression_list ')'
-//              { $$ = (ExpressionNode *)$3->set_last( $5 ); }
-        | WAITFOR '(' cast_expression_list ':' argument_expression_list ')'
-                { $$ = (ExpressionNode *)($3->set_last( $5 )); }
-        ;
-
-cast_expression_list:
-        cast_expression
-        | cast_expression_list ',' cast_expression
-                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+        | WAITFOR '(' cast_expression ',' argument_expression_list ')'
+                { $$ = (ExpressionNode *)$3->set_last( $5 ); }
         ;
 
@@ -1423 +1419 @@
         asm_operand
         | asm_operands_list ',' asm_operand
-                { $$ = (ExpressionNode *)($1->set_last( $3 )); }
+                { $$ = (ExpressionNode *)$1->set_last( $3 ); }
         ;
 
@@ -1439 +1435 @@
                 { $$ = new ExpressionNode( $1 ); }
         | asm_clobbers_list_opt ',' string_literal
-                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( $3 ) )); }
+                // set_last returns ParseNode *
+                { $$ = (ExpressionNode *)$1->set_last( new ExpressionNode( $3 ) ); }
         ;
 
@@ -2362 +2359 @@
         | initializer_list_opt ',' initializer          { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
         | initializer_list_opt ',' designation initializer
-                { $$ = (InitializerNode *)($1->set_last( $4->set_designators( $3 ) )); }
+                { $$ = (InitializerNode *)( $1->set_last( $4->set_designators( $3 ) ) ); }
         ;
 
@@ -2384 +2381 @@
         designator
         | designator_list designator
-                { $$ = (ExpressionNode *)($1->set_last( $2 )); }
+                { $$ = (ExpressionNode *)( $1->set_last( $2 ) ); }
         //| designator_list designator                                          { $$ = new ExpressionNode( $1, $2 ); }
         ;
@@ -2481 +2478 @@
                 { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $1->build()) ); $$ = nullptr; }
         | type_list ',' type
-                { $$ = (ExpressionNode *)($1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) )); }
+                { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) ) ); }
         | type_list ',' assignment_expression
                 { SemanticError( yylloc, toString("Expression generic parameters are currently unimplemented: ", $3->build()) ); $$ = nullptr; }