Changeset 5e644d3e for src/Parser/parser.yy

Timestamp:

Aug 29, 2016, 11:02:37 AM (8 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, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

46f6134

Parents:

1e8b02f5 (diff), 6943a987 (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:

• src/Parser/parser.yy (modified) (2 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 25 21:24:19 2016
-// Update Count     : 1963
+// Last Modified On : Fri Aug 26 16:45:44 2016
+// Update Count     : 1964
 //
 
@@ -619 +619 @@
         | ERassign                                                                      { $$ = OperKinds::ERAssn; }
         | ORassign                                                                      { $$ = OperKinds::OrAssn; }
-;
+        ;
 
 tuple:                                                                                                  // CFA, tuple