Changeset a7741435 for src/Parser/parser.yy

Timestamp:

Dec 14, 2016, 9:43:35 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

c7800bfc

Parents:

74e5a3aa

Message:

fix empty assignment_opt allocation

File:

• src/Parser/parser.yy (modified) (9 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 Dec 13 14:14:52 2016
-// Update Count     : 2081
+// Last Modified On : Wed Dec 14 21:28:22 2016
+// Update Count     : 2090
 //
 
@@ -775 +775 @@
                         // therefore, are removed from the grammar even though C allows it. The change also applies to choose
                         // statement.
-                        $$ = $7 != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
+                        $$ = $7 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
         | CHOOSE '(' comma_expression ')' case_clause           // CFA
@@ -782 +782 @@
                 {
                         StatementNode *sw = new StatementNode( build_switch( $3, $8 ) );
-                        $$ = $7 != 0 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
+                        $$ = $7 ? new StatementNode( build_compound( (StatementNode *)((new StatementNode( $7 ))->set_last( sw )) ) ) : sw;
                 }
         ;
@@ -1014 +1014 @@
                 { $$ = new ExpressionNode( $1 ); }
         | asm_clobbers_list_opt ',' string_literal
+                // set_last return ParseNode *
                 { $$ = (ExpressionNode *)$1->set_last( new ExpressionNode( $3 ) ); }
         ;
@@ -1535 +1536 @@
                 { $$ = nullptr; }
         | field_declaration_list field_declaration
-                { $$ = $1 != 0 ? $1->appendList( $2 ) : $2; }
+                { $$ = $1 ? $1->appendList( $2 ) : $2; }
         ;
 
@@ -1713 +1714 @@
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        $$ = $2->addType( $1 )->addInitializer( new InitializerNode( $3 ) );
+                        $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
                 }
         | declaration_specifier type_parameter_redeclarator assignment_opt
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
-                        $$ = $2->addType( $1 )->addInitializer( new InitializerNode( $3 ) );
+                        $$ = $2->addType( $1 )->addInitializer( $3 ? new InitializerNode( $3 ) : nullptr );
                 }
         ;
@@ -1901 +1902 @@
                 { $$ = nullptr; }
         | assertion_list_opt assertion
-                { $$ = $1 != 0 ? $1->appendList( $2 ) : $2; }
+                { $$ = $1 ? $1->appendList( $2 ) : $2; }
         ;
 
@@ -2022 +2023 @@
                 {}                                                                                              // empty input file
         | external_definition_list
-                { parseTree = parseTree != nullptr ? parseTree->appendList( $1 ) : $1;  }
+                { parseTree = parseTree ? parseTree->appendList( $1 ) : $1;     }
         ;
 
@@ -2028 +2029 @@
         external_definition
         | external_definition_list push external_definition
-                { $$ = $1 != nullptr ? $1->appendList( $3 ) : $3; }
+                { $$ = $1 ? $1->appendList( $3 ) : $3; }
         ;