Changeset fc4a0fa for src/Parser/parser.cc

Timestamp:

Sep 15, 2016, 3:45:32 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

12bc63a, 24bc651, 89e6ffc

Parents:

1eba452 (diff), 101e0bd (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:/u/cforall/software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

• src/Parser/parser.cc (modified) (8 diffs)

src/Parser/parser.cc

@@ -5929 +5929 @@
 /* Line 1806 of yacc.c  */
 #line 829 "parser.yy"
-    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn) ) ); }
+    { (yyval.sn) = new StatementNode( build_while( (yyvsp[(5) - (7)].en), (yyvsp[(2) - (7)].sn), true ) ); }
     break;
 
@@ -6744 +6744 @@
 /* Line 1806 of yacc.c  */
 #line 1365 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
+    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Long ); }
     break;
 
@@ -6751 +6751 @@
 /* Line 1806 of yacc.c  */
 #line 1367 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
+    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Short ); }
     break;
 
@@ -6758 +6758 @@
 /* Line 1806 of yacc.c  */
 #line 1369 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
+    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Signed ); }
     break;
 
@@ -6765 +6765 @@
 /* Line 1806 of yacc.c  */
 #line 1371 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
+    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Unsigned ); }
     break;
 
@@ -6786 +6786 @@
 /* Line 1806 of yacc.c  */
 #line 1377 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
+    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
     break;
 
@@ -6793 +6793 @@
 /* Line 1806 of yacc.c  */
 #line 1379 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
     break;
 
@@ -7544 +7544 @@
 /* Line 1806 of yacc.c  */
 #line 1851 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Type; }
+    { (yyval.tclass) = DeclarationNode::Otype; }
     break;