Changeset 59db689 for src/Parser/parser.yy

Timestamp:

Jun 6, 2015, 11:38:58 PM (9 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, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

cd623a4

Parents:

a65d92e

Message:

constant types, first attempt

File:

• src/Parser/parser.yy (modified) (4 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 : Thu Jun  4 21:38:06 2015
-// Update Count     : 1021
+// Last Modified On : Sat Jun  6 20:18:36 2015
+// Update Count     : 1026
 // 
 
@@ -295 +295 @@
                 // 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                                                         { $$ = new ConstantNode( ConstantNode::Integer, $1 ); }
+        | FLOATINGconstant                                                      { $$ = new ConstantNode( ConstantNode::Float, $1 ); }
+        | CHARACTERconstant                                                     { $$ = new ConstantNode( ConstantNode::Character, $1 ); }
         ;
 
@@ -321 +321 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = new ConstantNode(ConstantNode::String, $1); }
-        | string_literal_list STRINGliteral                     { $$ = $1->append( $2 ); }
+        STRINGliteral                                                           { $$ = new ConstantNode( ConstantNode::String, $1 ); }
+        | string_literal_list STRINGliteral                     { $$ = $1->appendstr( $2 ); }
         ;
 
@@ -536 +536 @@
         logical_OR_expression
         | logical_OR_expression '?' comma_expression ':' conditional_expression
-                { $$ = new CompositeExprNode(new OperatorNode(OperatorNode::Cond), (ExpressionNode *)mkList((*$1,*$3,*$5))); }
+                { $$ = new CompositeExprNode( new OperatorNode(OperatorNode::Cond), (ExpressionNode *)mkList( (*$1, *$3, *$5) ) ); }
         | logical_OR_expression '?' /* empty */ ':' conditional_expression // GCC, omitted first operand
                 { $$=new CompositeExprNode(new OperatorNode(OperatorNode::NCond),$1,$4); }
         | logical_OR_expression '?' comma_expression ':' tuple // CFA, tuple expression
-                { $$ = new CompositeExprNode(new OperatorNode(OperatorNode::Cond), (ExpressionNode *)mkList(( *$1, *$3, *$5 ))); }
+                { $$ = new CompositeExprNode( new OperatorNode(OperatorNode::Cond), (ExpressionNode *)mkList( (*$1, *$3, *$5) ) ); }
         ;