Changeset f676b84 for src/Parser/parser.yy

Timestamp:

Aug 25, 2017, 10:47:42 AM (7 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:

19a9822, 6b224a52, f22b7aef

Parents:

ddf8a29 (diff), 3eab308c (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.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 : Wed Aug 23 18:00:46 2017
-// Update Count     : 2703
+// Last Modified On : Wed Aug 23 21:08:08 2017
+// Update Count     : 2704
 //
 
@@ -303 +303 @@
 // Similar issues exit with the waitfor statement.
 
-// Order of these lines matters. THEN is left associative over WOR/TIMEOUT/ELSE, WOR is left associative over
-// TIMEOUT/ELSE, and TIMEOUT is left associative over ELSE.
+// Order of these lines matters (low-to-high precedence). THEN is left associative over WOR/TIMEOUT/ELSE, WOR is left
+// associative over TIMEOUT/ELSE, and TIMEOUT is left associative over ELSE.
 %precedence THEN        // rule precedence for IF/WAITFOR statement
 %precedence WOR         // token precedence for start of WOR in WAITFOR statement