Changeset ca35c51 for src/Parser/parser.yy

Timestamp:

Jun 30, 2016, 1:47:52 PM (8 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, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1bc1bb2

Parents:

84d4d6f

Message:

move implementation of ConstantNode? to ConstantExpr?

File:

• src/Parser/parser.yy (modified) (6 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 : Mon Jun 27 17:47:56 2016
-// Update Count     : 1627
+// Last Modified On : Thu Jun 30 13:26:01 2016
+// Update Count     : 1639
 //
 
@@ -303 +303 @@
 constant:
                 // ENUMERATIONconstant is not included here; it is treated as a variable with type "enumeration constant".
-        INTEGERconstant                                                         { $$ = new ConstantNode( ConstantNode::Integer, $1 ); }
-        | FLOATINGconstant                                                      { $$ = new ConstantNode( ConstantNode::Float, $1 ); }
-        | CHARACTERconstant                                                     { $$ = new ConstantNode( ConstantNode::Character, $1 ); }
+INTEGERconstant                                                                 { $$ = makeConstant( ConstantNode::Integer, $1 ); }
+        | FLOATINGconstant                                                      { $$ = makeConstant( ConstantNode::Float, $1 ); }
+        | CHARACTERconstant                                                     { $$ = makeConstant( ConstantNode::Character, $1 ); }
         ;
 
@@ -330 +330 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = new ConstantNode( ConstantNode::String, $1 ); }
+        STRINGliteral                                                           { $$ = makeConstantStr( ConstantNode::String, $1 ); }
         | string_literal_list STRINGliteral                     { $$ = $1->appendstr( $2 ); }
         ;
@@ -682 +682 @@
                 { $$ = new StatementNode( $1 ); }
         | EXTENSION declaration                                                         // GCC
-                { $$ = new StatementNode( $2 )/*->set_extension( true )*/; }
+        { $$ = (new StatementNode( $2 ))->set_extension( true ); }
         | function_definition
                 { $$ = new StatementNode( $1 ); }
@@ -1472 +1472 @@
         new_field_declaring_list ';'                                            // CFA, new style field declaration
         | EXTENSION new_field_declaring_list ';'                        // GCC
-                { $$ = $2/*->set_extension( true )*/; }
+                { $$ = $2->set_extension( true ); }
         | field_declaring_list ';'
         | EXTENSION field_declaring_list ';'                            // GCC
-                { $$ = $2/*->set_extension( true )*/; }
+                { $$ = $2->set_extension( true ); }
         ;
 
@@ -1991 +1991 @@
                 }
         | EXTENSION external_definition
-                { $$ = $2/*->set_extension( true )*/; }
+                { $$ = $2->set_extension( true ); }
         ;