Changeset d0c91a6 for tests/io1.cfa

Timestamp:

Jan 15, 2019, 4:16:15 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

c802eb88

Parents:

5e49e47 (diff), c9aba81 (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' into jenkins-sandbox

File:

• tests/io1.cfa (modified) (2 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 : Fri Dec 21 16:02:55 2018
+// Update Count     : 114
 //
 
@@ -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 | nl;
 
-        sout | "opening delimiters" | endl;
-        sout
-                 | "x (" | 1
-                 | "x [" | 2
-                 | "x {" | 3
-                 | "x =" | 4
-                 | "x $" | 5
-                 | "x £" | 6
-                 | "x ¥" | 7
-                 | "x ¡" | 8
-                 | "x ¿" | 9
-                 | "x «" | 10
-                 | endl | endl;
+        sout | nlOff;
+        sout | "opening delimiters" | nl;
+        sout | "x (" | 1;
+        sout | "x [" | 2;
+        sout | "x {" | 3;
+        sout | "x =" | 4;
+        sout | "x $" | 5;
+        sout | "x £" | 6;
+        sout | "x ¥" | 7;
+        sout | "x ¡" | 8;
+        sout | "x ¿" | 9;
+        sout | "x «" | 10;
+        sout | nl | nl;
 
-        sout | "closing delimiters" | endl;
-        sout
-                 | 1 | ", x"
-                 | 2 | ". x"
-                 | 3 | "; x"
-                 | 4 | "! x"
-                 | 5 | "? x"
-                 | 6 | "% x"
-                 | 7 | "¢ x"
-                 | 8 | "» x"
-                 | 9 | ") x"
-                 | 10 | "] x"
-                 | 11 | "} x"
-                 | endl | endl;
+        sout | "closing delimiters" | nl;
+        sout | 1 | ", x";
+        sout | 2 | ". x";
+        sout | 3 | "; x";
+        sout | 4 | "! x";
+        sout | 5 | "? x";
+        sout | 6 | "% x";
+        sout | 7 | "¢ x";
+        sout | 8 | "» x";
+        sout | 9 | ") x";
+        sout | 10 | "] x";
+        sout | 11 | "} x";
+        sout | nl | nl;
 
-        sout | "opening/closing delimiters" | endl;
-        sout
-                 | "x`" | 1 | "`x'" | 2
-                 | "'x\"" | 3 | "\"x:" | 4
-                 | ":x " | 5 | " x\t" | 6
-                 | "\tx\f" | 7 | "\fx\v" | 8
-                 | "\vx\n" | 9 | "\nx\r" | 10
-                 | "\rx"
-                 | endl | endl;
+        sout | "opening/closing delimiters" | nl;
+        sout | "x`" | 1 | "`x'" | 2;
+        sout | "'x\"" | 3 | "\"x:" | 4;
+        sout | ":x " | 5 | " x\t" | 6;
+        sout | "\tx\f" | 7 | "\fx\v" | 8;
+        sout | "\vx\n" | 9 | "\nx\r" | 10;
+        sout | "\rx";
+        sout | nl | nl;
 
-        sout | "override opening/closing delimiters" | endl;
-        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4 | endl;
-        sout | endl;
+        sout | nlOn;
+        sout | "override opening/closing delimiters";
+        sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4;
+        sout | nl;
 }