Changeset adaee12 for tests

Timestamp:

Apr 28, 2021, 1:06:13 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7fd2db6

Parents:

e9c0b4c (diff), c7015e6b (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

Location:

tests

Files:

• io/io-acquire.cfa (modified) (2 diffs)
• strstream.cfa (modified) (1 diff)

tests/io/io-acquire.cfa

@@ -10 +10 @@
 // Created On       : Mon Mar  1 18:40:09 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar  2 12:06:35 2021
-// Update Count     : 17
+// Last Modified On : Tue Apr 27 11:49:34 2021
+// Update Count     : 18
 // 
 
@@ -43 +43 @@
         int a, b, c, d, e, f, g, h, i;
         for ( 100 ) {                                                                           // local protection
-                sin  | acquire | a | b | c | d | e | f | g | h | i;
+                sin | acquire | a | b | c | d | e | f | g | h | i;
         }
         {                                                                                                       // global protection (RAII)

tests/strstream.cfa

@@ -5 +5 @@
     enum { size = 256 };
     char buf[size];
-    strstream sstr = { buf, size };
+    ostrstream osstr = { buf, size };
     int i = 3, j = 5, k = 7;
     double x = 12345678.9, y = 98765.4321e-11;
 
-    sstr | i | hex(j) | wd(10, k) | sci(x) | unit(eng(y));
-    write( sstr );
+    osstr | i | hex(j) | wd(10, k) | sci(x) | unit(eng(y));
+    write( osstr );
     printf( "%s", buf );
     sout | i | hex(j) | wd(10, k) | sci(x) | unit(eng(y));
+
+    // char buf2[] = "12 14 15 3.5 7e4";
+    // istrstream isstr = { buf2 };
+    // isstr | i | j | k | x | y;
+    // sout | i | j | k | x | y;
 }