Changeset 29038ef for src/Parser

Timestamp:

Jul 7, 2017, 10:39:13 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

54d714e, b5f9829

Parents:

53a6c2a (diff), e182ce3 (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 plg2:software/cfa/cfa-cc

File:

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

src/Parser/parser.yy

@@ -2332 +2332 @@
         | TYPEGENname
         | CONST
-                { $$ = Token{ new string( "__const__" ) }; }
+                { $$ = Token{ new string( "__const__" ), { nullptr, -1 } }; }
         ;