Changeset cbce272 for src/Parser/parser.yy

Timestamp:

Aug 9, 2017, 2:08:14 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

65cdc1e

Parents:

e195093

Message:

Structure based exception handling.

File:

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

src/Parser/parser.yy

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 31 14:54:32 2017
-// Update Count     : 2474
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Aug  4 13:33:00 2017
+// Update Count     : 2475
 //
 
@@ -182 +182 @@
 %type<en> asm_clobbers_list_opt
 %type<flag> asm_volatile_opt
+%type<en> handler_predicate_opt
 
 // statements
@@ -968 +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; }
         ;
 
@@ -1674 +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 );
-        }
         ;