Changeset 12bc63a for src/Parser/parser.cc

Timestamp:

Sep 15, 2016, 3:49:22 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:

3c13c03

Parents:

4ab9536 (diff), fc4a0fa (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' into tuples

Conflicts:

src/Parser/parser.cc

File:

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

src/Parser/parser.cc

@@ -6758 +6758 @@
 /* Line 1806 of yacc.c  */
 #line 1367 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Long ); }
+    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Long ); }
     break;
 
@@ -6765 +6765 @@
 /* Line 1806 of yacc.c  */
 #line 1369 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Short ); }
+    { (yyval.decl) = DeclarationNode::newLength( DeclarationNode::Short ); }
     break;
 
@@ -6772 +6772 @@
 /* Line 1806 of yacc.c  */
 #line 1371 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Signed ); }
+    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Signed ); }
     break;
 
@@ -6779 +6779 @@
 /* Line 1806 of yacc.c  */
 #line 1373 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newModifier( DeclarationNode::Unsigned ); }
+    { (yyval.decl) = DeclarationNode::newSignedNess( DeclarationNode::Unsigned ); }
     break;
 
@@ -6800 +6800 @@
 /* Line 1806 of yacc.c  */
 #line 1379 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Complex ); }
+    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Complex ); }
     break;
 
@@ -6807 +6807 @@
 /* Line 1806 of yacc.c  */
 #line 1381 "parser.yy"
-    { (yyval.decl) = DeclarationNode::newBasicType( DeclarationNode::Imaginary ); }
+    { (yyval.decl) = DeclarationNode::newComplexType( DeclarationNode::Imaginary ); }
     break;
 
@@ -7558 +7558 @@
 /* Line 1806 of yacc.c  */
 #line 1853 "parser.yy"
-    { (yyval.tclass) = DeclarationNode::Type; }
+    { (yyval.tclass) = DeclarationNode::Otype; }
     break;