Changeset e7b2559 for src/Parser/parser.yy

Timestamp:

Aug 2, 2016, 9:30:34 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

155cce0f

Parents:

e21c72d (diff), 79f64f1 (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

Conflicts:

src/tests/test.py

File:

• src/Parser/parser.yy (modified) (3 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 Jul 12 20:52:53 2016
-// Update Count     : 1661
+// Last Modified On : Sat Jul 23 17:01:30 2016
+// Update Count     : 1668
 //
 
@@ -303 +303 @@
 constant:
                 // ENUMERATIONconstant is not included here; it is treated as a variable with type "enumeration constant".
-INTEGERconstant                                                                 { $$ = makeConstant( ConstantNode::Integer, $1 ); }
-        | FLOATINGconstant                                                      { $$ = makeConstant( ConstantNode::Float, $1 ); }
-        | CHARACTERconstant                                                     { $$ = makeConstant( ConstantNode::Character, $1 ); }
+INTEGERconstant                                                                 { $$ = makeConstantInteger( *$1 ); }
+        | FLOATINGconstant                                                      { $$ = makeConstantFloat( *$1 ); }
+        | CHARACTERconstant                                                     { $$ = makeConstantChar( *$1 ); }
         ;
 
@@ -330 +330 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = makeConstantStr( ConstantNode::String, $1 ); }
+        STRINGliteral                                                           { $$ = makeConstantStr( *$1 ); }
         | string_literal_list STRINGliteral                     { $$ = $1->appendstr( $2 ); }
         ;