Changeset 6e4c44d

Timestamp:

Apr 27, 2023, 4:26:37 PM (19 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

3982384

Parents:

b110bcc (diff), e6d8d11 (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

Files:

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

src/Parser/parser.yy

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Apr  4 14:02:00 2023
-// Update Count     : 6329
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Apr 26 16:45:37 2023
+// Update Count     : 6330
 //
 
@@ -1679 +1679 @@
 
 waituntil:
-        WAITUNTIL '(' cast_expression ')'
+        WAITUNTIL '(' comma_expression ')'
                 { $$ = $3; }
         ;

tests/PRNG.cfa

@@ -8 +8 @@
 // Created On       : Wed Dec 29 09:38:12 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr 15 16:44:31 2023
-// Update Count     : 419
+// Last Modified On : Sun Apr 23 22:02:09 2023
+// Update Count     : 420
 // 
 
@@ -123 +123 @@
 
 int main() {
-        // causes leaked storage message
-        // setlocale( LC_NUMERIC, getenv( "LANG" ) );                   // print digit separator
+        // setlocale( LC_NUMERIC, getenv( "LANG" ) );           // causes leaked storage message
+
+        // only works on the current pthread thread
         // locale_t loc = newlocale( LC_NUMERIC_MASK, getenv( "LANG" ), (locale_t)0p );
         // if ( loc == (locale_t)0p ) abort( "newlocale" );