Changeset 85acec94 for tests/io1.cfa

Timestamp:

Dec 12, 2018, 3:48:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

515a037

Parents:

90cfc16 (diff), 5ebb1368 (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:

• tests/io1.cfa (modified) (5 diffs)

tests/io1.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Nov  6 17:57:17 2018
-// Update Count     : 105
+// Last Modified On : Tue Dec  4 21:40:28 2018
+// Update Count     : 106
 //
 
@@ -18 +18 @@
 int main() {
         int x = 3, y = 5, z = 7;
-        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2) | endl;
-        sout | 1 | 2 | 3 | endl;
-        sout | '1' | '2' | '3' | endl;
-        sout | 1 | "" | 2 | "" | 3 | endl;
-        sout | endl;
+        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
+        sout | 1 | 2 | 3;
+        sout | '1' | '2' | '3';
+        sout | 1 | "" | 2 | "" | 3;
+        sout;
 
-        sout | "opening delimiters" | endl;
+        sout | "opening delimiters";
         sout
                  | "x (" | 1
@@ -36 +36 @@
                  | "x ¿" | 9
                  | "x «" | 10
-                 | endl | endl;
+                 | nl;
 
-        sout | "closing delimiters" | endl;
+        sout | "closing delimiters";
         sout
                  | 1 | ", x"
@@ -51 +51 @@
                  | 10 | "] x"
                  | 11 | "} x"
-                 | endl | endl;
+                 | nl;
 
-        sout | "opening/closing delimiters" | endl;
+        sout | "opening/closing delimiters";
         sout
                  | "x`" | 1 | "`x'" | 2
@@ -61 +61 @@
                  | "\vx\n" | 9 | "\nx\r" | 10
                  | "\rx"
-                 | endl | endl;
+                 | nl;
 
-        sout | "override opening/closing delimiters" | endl;
-        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4 | endl;
-        sout | endl;
+        sout | "override opening/closing delimiters";
+        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4;
+        sout;
 }