Changeset 02e5ab6 for src/Parser/parser.yy

Timestamp:

Sep 28, 2015, 6:25:43 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

097e2b0, 1cbca6e

Parents:

20e409e

Message:

add preprocessor flag -DCFORALL=1, add syntax for constructor/destructor

File:

• src/Parser/parser.yy (modified) (12 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 : Mon Sep 28 18:18:32 2015
+// Update Count     : 1402
 // 
 
@@ -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
@@ -120 +120 @@
 }
 
-%type<tok> zero_one  identifier  no_attr_identifier  no_01_identifier
+%type<tok> identifier  no_01_identifier  no_attr_identifier no_attr_identifier_01  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
@@ -143 +143 @@
 // statements
 %type<sn> labeled_statement                             compound_statement                      expression_statement            selection_statement
-%type<sn> iteration_statement                   jump_statement                          exception_statement                     asm_statement
+%type<sn> iteration_statement                   jump_statement                          exception_statement                     asm_statement                   ctor_dtor
 %type<sn> fall_through_opt                              fall_through
 %type<sn> statement                                             statement_list
@@ -319 +319 @@
 no_attr_identifier:
         IDENTIFIER
+        ;
+
+no_attr_identifier_01:
+        IDENTIFIER
+        | zero_one
         ;
 
@@ -445 +450 @@
                 { $$ = 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 +632 @@
         | exception_statement
         | asm_statement
+        | ctor_dtor
         ;
 
@@ -805 +811 @@
         | 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 +843 @@
         | 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 +853 @@
                 { $$ = 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 ) ); }
         ;
@@ -923 +943 @@
         | label_list ',' no_attr_identifier
                 { $$ = $1; $1->append_label( $3 ); }
+        ;
+
+ctor_dtor:                                                                                              // CFA, constructor/destructor
+        no_attr_identifier_01 '{' argument_expression_list '}' ';'
+                {
+                        Token fn; fn.str = new std::string( "?{}" ); fn.loc = $1.loc;
+                        $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
+                                   (ExpressionNode *)((new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), new VarRefNode( $1 ) ))->set_link( $3 )) ), 0 );
+                }
+        | '^' no_attr_identifier_01 '{' '}' ';'
+                {
+                        Token fn; fn.str = new std::string( "^?{}" ); fn.loc = $2.loc;
+                        $$ = new StatementNode( StatementNode::Exp, new CompositeExprNode( new VarRefNode( fn ),
+                                   new CompositeExprNode( new OperatorNode( OperatorNode::AddressOf ), new VarRefNode( $2 ) ) ), 0 );
+                }
         ;
 
@@ -1693 +1728 @@
 
 designator:
+        // lexer ambiguity: designator ".0" is floating-point constant or designator for name 0
         // only ".0" and ".1" allowed => semantic check
         FLOATINGconstant