Ignore:
Timestamp:
Aug 16, 2016, 3:20:06 PM (9 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:
1f6d4624
Parents:
950f7a7 (diff), 7880579 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/parser.h

    r950f7a7 r7527e63  
    262262
    263263/* Line 2068 of yacc.c  */
    264 #line 110 "parser.yy"
     264#line 115 "parser.yy"
    265265
    266266        Token tok;
     
    271271        DeclarationNode::TypeClass tclass;
    272272        StatementNode *sn;
    273         ConstantNode *constant;
     273        ConstantExpr *constant;
     274        ForCtl *fctl;
    274275        LabelNode *label;
    275276        InitializerNode *in;
     277        OperKinds op;
    276278        bool flag;
    277279
     
    279281
    280282/* Line 2068 of yacc.c  */
    281 #line 282 "Parser/parser.h"
     283#line 284 "Parser/parser.h"
    282284} YYSTYPE;
    283285# define YYSTYPE_IS_TRIVIAL 1
Note: See TracChangeset for help on using the changeset viewer.