Changeset 67fa9f9 for src/Parser

Timestamp:

Jul 5, 2017, 10:50:22 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

0614d14

Parents:

11dbfe1 (diff), 307a732 (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

Location:

src/Parser

Files:

• InitializerNode.cc (modified) (1 diff)
• TypeData.cc (modified) (2 diffs)
• parser.yy (modified) (4 diffs)

src/Parser/InitializerNode.cc

@@ -74 +74 @@
 
         InitializerNode *moreInit;
-        if  ( get_next() != 0 && ((moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) != 0) )
+        if ( (moreInit = dynamic_cast< InitializerNode * >( get_next() ) ) ) {
                 moreInit->printOneLine( os );
+        }
 }
 
 Initializer *InitializerNode::build() const {
         if ( aggregate ) {
+                // steal designators from children
+                std::list< Designation * > designlist;
+                InitializerNode * child = next_init();
+                for ( ; child != nullptr; child = dynamic_cast< InitializerNode * >( child->get_next() ) ) {
+                        std::list< Expression * > desList;
+                        buildList< Expression, ExpressionNode >( child->designator, desList );
+                        designlist.push_back( new Designation( desList ) );
+                } // for
                 std::list< Initializer * > initlist;
                 buildList< Initializer, InitializerNode >( next_init(), initlist );
-
-                std::list< Expression * > designlist;
-
-                if ( designator != 0 ) {
-                        buildList< Expression, ExpressionNode >( designator, designlist );
-                } // if
-
                 return new ListInit( initlist, designlist, maybeConstructed );
         } else {
-                std::list< Expression * > designators;
-
-                if ( designator != 0 )
-                        buildList< Expression, ExpressionNode >( designator, designators );
-
-                if ( get_expression() != 0)
-                        return new SingleInit( maybeBuild< Expression >( get_expression() ), designators, maybeConstructed );
+                if ( get_expression() != 0) {
+                        return new SingleInit( maybeBuild< Expression >( get_expression() ), maybeConstructed );
+                }
         } // if
-
         return 0;
 }

src/Parser/TypeData.cc

@@ -760 +760 @@
                 if ( cur->has_enumeratorValue() ) {
                         ObjectDecl * member = dynamic_cast< ObjectDecl * >(* members);
-                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ), list< Expression * >() ) );
+                        member->set_init( new SingleInit( maybeMoveBuild< Expression >( cur->consume_enumeratorValue() ) ) );
                 } // if
         } // for
@@ -777 +777 @@
 TupleType * buildTuple( const TypeData * td ) {
         assert( td->kind == TypeData::Tuple );
-        TupleType * ret = new TupleType( buildQualifiers( td ) );
-        buildTypeList( td->tuple, ret->get_types() );
+        std::list< Type * > types;
+        buildTypeList( td->tuple, types );
+        TupleType * ret = new TupleType( buildQualifiers( td ), types );
         buildForall( td->forall, ret->get_forall() );
         return ret;

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 : Wed Jun 28 22:11:22 2017
-// Update Count     : 2414
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Jun 30 15:38:00 2017
+// Update Count     : 2415
 //
 
@@ -104 +104 @@
         std::string * str;
         bool flag;
+        CatchStmt::Kind catch_kind;
 }
 
@@ -192 +193 @@
 %type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
 %type<sn> /* handler_list */                    handler_clause                          finally_clause
+%type<catch_kind> handler_key
 
 // declarations
@@ -958 +960 @@
 handler_clause:
         // TEMPORARY, TEST EXCEPTIONS
-        CATCH '(' push push INTEGERconstant pop ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( CatchStmt::Terminate, nullptr, new ExpressionNode( build_constantInteger( *$5 ) ), $8 ) ); }
-        | handler_clause CATCH '(' push push INTEGERconstant pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, nullptr, new ExpressionNode( build_constantInteger( *$6 ) ), $9 ) ) ); }
-
-        | CATCH '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( CatchStmt::Terminate, $5, nullptr, $8 ) ); }
-        | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Terminate, $6, nullptr, $9 ) ) ); }
-        | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = new StatementNode( build_catch( CatchStmt::Resume, $5, nullptr, $8 ) ); }
-        | handler_clause CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
-                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( CatchStmt::Resume, $6, nullptr, $9 ) ) ); }
+        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 ')' compound_statement pop
+                { $$ = new StatementNode( build_catch( $1, $5, nullptr, $8 ) ); }
+        | handler_clause handler_key '(' push push exception_declaration pop ')' compound_statement pop
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $2, $6, nullptr, $9 ) ) ); }
+        ;
+
+handler_key:
+        CATCH
+                { $$ = CatchStmt::Terminate; }
+        | CATCHRESUME
+                { $$ = CatchStmt::Resume; }
         ;