Ignore:
Timestamp:
Jul 6, 2017, 4:19:50 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
eaace25
Parents:
f3c1737 (diff), 9ff56e7 (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.yy

    rf3c1737 r3873b5a1  
    23322332        | TYPEGENname
    23332333        | CONST
    2334                 { $$ = Token{ new string( "__const__" ) }; }
     2334                { $$ = Token{ new string( "__const__" ), { nullptr, -1 } }; }
    23352335        ;
    23362336
Note: See TracChangeset for help on using the changeset viewer.