Changeset cd7ef0b for src/Parser/parser.yy

Timestamp:

Aug 10, 2017, 3:39:11 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

38d70ab

Parents:

275f4b4 (diff), e1780a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 25 10:07:00 2017
-// Update Count     : 2464
+// Last Modified On : Wed Aug  4 13:33:00 2017
+// Update Count     : 2475
 //
 
@@ -142 +142 @@
 // converted into the tuple index (.)(1). e.g., 3.x
 %token<tok>     REALDECIMALconstant     REALFRACTIONconstant    FLOATINGconstant
-%token<tok> ZERO                                ONE                                             // CFA
 
 // multi-character operators
@@ -159 +158 @@
 %token ATassign                                                                                 // @=
 
-%type<tok> identifier  no_attr_identifier  zero_one
+%type<tok> identifier  no_attr_identifier
 %type<tok> identifier_or_type_name  no_attr_identifier_or_type_name  attr_name
 %type<constant> string_literal
@@ -183 +182 @@
 %type<en> asm_clobbers_list_opt
 %type<flag> asm_volatile_opt
+%type<en> handler_predicate_opt
 
 // statements
@@ -360 +360 @@
         ;
 
-zero_one:                                                                                               // CFA
-        ZERO
-        | ONE
-        ;
-
 string_literal:
         string_literal_list                                                     { $$ = build_constantStr( *$1 ); }
@@ -384 +379 @@
         IDENTIFIER                                                                                      // typedef name cannot be used as a variable name
                 { $$ = new ExpressionNode( build_varref( $1 ) ); }
-        | zero_one
-                { $$ = new ExpressionNode( build_constantZeroOne( *$1 ) ); }
         | tuple
         | '(' comma_expression ')'
@@ -485 +478 @@
                         $$ = new ExpressionNode( build_field_name_fraction_constants( build_varref( $1 ), $2 ) );
                 }
-        | zero_one fraction_constants
-                {
-                        $$ = new ExpressionNode( build_field_name_fraction_constants( build_constantZeroOne( *$1 ), $2 ) );
-                }
         ;
 
@@ -539 +528 @@
         | ALIGNOF unary_expression                                                      // GCC, variable alignment
                 { $$ = new ExpressionNode( build_alignOfexpr( $2 ) ); }
-        | ALIGNOF '(' type_no_function ')'                              // GCC, type alignment
+        | ALIGNOF '(' type_no_function ')'                                      // GCC, type alignment
                 { $$ = new ExpressionNode( build_alignOftype( $3 ) ); }
         | OFFSETOF '(' type_no_function ',' no_attr_identifier ')'
@@ -980 +969 @@
 
 handler_clause:
-        // TEMPORARY, TEST EXCEPTIONS
-        handler_key '(' push push INTEGERconstant pop ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( $1, nullptr, new ExpressionNode( build_constantInteger( *$5 ) ), $8 ) ); }
-        | handler_clause handler_key '(' push push INTEGERconstant pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); }
-
-        | handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( $1, $5, nullptr, $9 ) ); }
+        handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( $1, $5, $7, $9 ) ); }
         | handler_clause handler_key '(' push push exception_declaration pop handler_predicate_opt ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, nullptr, $10 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, $8, $10 ) ) ); }
         ;
 
 handler_predicate_opt:
         //empty
+                { $$ = nullptr; }
         | ';' conditional_expression
+                { $$ = $2; }
         ;
 
@@ -1686 +1671 @@
         | aggregate_key attribute_list_opt typegen_name         // CFA
                 { $$ = $3->addQualifiers( $2 ); }
-
-// Temp, testing TreeStruct
-    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name
-        {
-            typedefTable.makeTypedef( *$4 );            // create typedef
-            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
-            forall = false;                             // reset
-        }
-      '{' field_declaration_list '}'
-        {
-            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
-                $4, nullptr, nullptr, $7, true )->addQualifiers( $3 );
-        }
-    | STRUCT TRY attribute_list_opt no_attr_identifier_or_type_name TYPEDEFname
-        {
-            typedefTable.makeTypedef( *$4 );            // create typedef
-            if ( forall ) typedefTable.changeKind( *$4, TypedefTable::TG ); // $
-            forall = false;                             // reset
-        }
-      '{' field_declaration_list '}'
-        {
-            $$ = DeclarationNode::newTreeStruct( DeclarationNode::Struct,
-                $4, $5, nullptr, $8, true )->addQualifiers( $3 );
-        }
         ;
 
@@ -1969 +1930 @@
         | '=' initializer
                 { $$ = $2; }
+        | '=' VOID
+                { $$ = nullptr; }
         | ATassign initializer
                 { $$ = $2->set_maybeConstructed( false ); }