Changes in src/Parser/parser.yy [51b1202:097e2b0]

File:

• src/Parser/parser.yy (modified) (14 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 : Tue Aug 11 16:01:49 2015
-// Update Count     : 1350
+// Last Modified On : Thu Oct  8 17:17:54 2015
+// Update Count     : 1473
 // 
 
@@ -81 +81 @@
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
-%token CHOOSE FALLTHRU TRY CATCH FINALLY THROW                  // CFA
+%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT        // CFA
 %token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
 %token ALIGNAS ALIGNOF ATOMIC GENERIC NORETURN STATICASSERT THREADLOCAL // C11
@@ -103 +103 @@
 %token LSassign         RSassign                                                        // <<=  >>=
 %token ANDassign        ERassign        ORassign                                // &=   ^=      |=
+
+%token ATassign                                                                                 // @=
 
 // Types declaration
@@ -120 +122 @@
 }
 
-%type<tok> zero_one  identifier  no_attr_identifier  no_01_identifier
+%type<tok> identifier  no_01_identifier  no_attr_identifier zero_one
 %type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  no_01_identifier_or_type_name
 %type<constant> string_literal_list
@@ -317 +319 @@
         ;
 
+// no zero_one because ambiguity with 0.0 : double constant or field selection
 no_attr_identifier:
         IDENTIFIER
@@ -364 +367 @@
         | postfix_expression DECR
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::DecrPost ), $1 ); }
-                // GCC has priority: cast_expression
         | '(' type_name_no_function ')' '{' initializer_list comma_opt '}' // C99
                 { $$ = 0; }
+        | postfix_expression '{' argument_expression_list '}' // CFA
+                {
+                        Token fn; fn.str = new std::string( "?{}" ); // location undefined
+                        $$ = new CompositeExprNode( new VarRefNode( fn ), (ExpressionNode *)( $1 )->set_link( $3 ) );
+                }
         ;
 
@@ -445 +452 @@
                 { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), $2 ); }
         | ALIGNOF '(' type_name_no_function ')'                         // GCC, type alignment
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( $3 )); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::AlignOf ), new TypeValueNode( $3 ) ); }
         | ANDAND no_attr_identifier                                                     // GCC, address of label
-                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::LabelAddress ), new VarRefNode( $2, true )); }
+                { $$ = new CompositeExprNode( new OperatorNode( OperatorNode::LabelAddress ), new VarRefNode( $2, true ) ); }
         ;
 
@@ -627 +634 @@
         | exception_statement
         | asm_statement
+        | '^' postfix_expression '{' argument_expression_list '}' ';' // CFA
+                {
+                        Token fn; fn.str = new std::string( "^?{}" ); // location undefined
+                        $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
+                                (ExpressionNode *)(new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), $2 ))->set_link( $4 ) ), 0 );
+                }
         ;
 
@@ -805 +818 @@
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( StatementNode::Return, $2, 0 ); }
-        | THROW assignment_expression ';'
+        | THROW assignment_expression_opt ';'
                 { $$ = new StatementNode( StatementNode::Throw, $2, 0 ); }
-        | THROW ';'
-                { $$ = new StatementNode( StatementNode::Throw ); }
+//      | THROW ';'
+//              { $$ = new StatementNode( StatementNode::Throw ); }
+        | THROWRESUME assignment_expression_opt ';'
+                { $$ = new StatementNode( StatementNode::Throw, $2, 0 ); }
+        | THROWRESUME assignment_expression_opt AT assignment_expression ';'
+                { $$ = new StatementNode( StatementNode::Throw, $2, 0 ); }
+//      | THROWRESUME ';'
+//              { $$ = new StatementNode( StatementNode::Throw ); }
         ;
 
@@ -831 +850 @@
         | handler_clause CATCH '(' ELLIPSIS ')' compound_statement
                 { $$ = $1->set_link( StatementNode::newCatchStmt( 0, $6, true ) ); }
+        | CATCHRESUME '(' ELLIPSIS ')' compound_statement
+                { $$ = StatementNode::newCatchStmt( 0, $5, true ); }
+        | handler_clause CATCHRESUME '(' ELLIPSIS ')' compound_statement
+                { $$ = $1->set_link( StatementNode::newCatchStmt( 0, $6, true ) ); }
         ;
 
@@ -837 +860 @@
                 { $$ = StatementNode::newCatchStmt( $5, $8 ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = $1->set_link( StatementNode::newCatchStmt( $6, $9 ) ); }
+        | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = StatementNode::newCatchStmt( $5, $8 ); }
+        | handler_clause CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = $1->set_link( StatementNode::newCatchStmt( $6, $9 ) ); }
         ;
@@ -1654 +1681 @@
         | '=' initializer
                 { $$ = $2; }
+        | ATassign initializer
+                { $$ = $2; }
         ;
 
@@ -1662 +1691 @@
 
 initializer_list:
-        initializer
+        // empty
+                { $$ = 0; }
+        | initializer
         | designation initializer                                       { $$ = $2->set_designators( $1 ); }
         | initializer_list ',' initializer                      { $$ = (InitializerNode *)( $1->set_link( $3 ) ); }
@@ -1693 +1724 @@
 
 designator:
+        // lexer ambiguity: designator ".0" is floating-point constant or designator for name 0
         // only ".0" and ".1" allowed => semantic check
         FLOATINGconstant