Changeset fe26fbf for src/Parser/parser.h

Timestamp:

Feb 7, 2017, 1:01:34 PM (9 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:

35b1bf4

Parents:

dbe8f244 (diff), b4d65c7 (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

File:

• src/Parser/parser.h (modified) (1 diff)

src/Parser/parser.h

@@ -272 +272 @@
 
 /* Line 2068 of yacc.c  */
-#line 119 "parser.yy"
+#line 139 "parser.yy"
 
         Token tok;
-        ParseNode *pn;
-        ExpressionNode *en;
-        DeclarationNode *decl;
+        ParseNode * pn;
+        ExpressionNode * en;
+        DeclarationNode * decl;
         DeclarationNode::Aggregate aggKey;
         DeclarationNode::TypeClass tclass;
-        StatementNode *sn;
-        ConstantExpr *constant;
-        ForCtl *fctl;
-        LabelNode *label;
-        InitializerNode *in;
+        StatementNode * sn;
+        ConstantExpr * constant;
+        ForCtl * fctl;
+        LabelNode * label;
+        InitializerNode * in;
         OperKinds op;
-        std::string *str;
+        std::string * str;
         bool flag;