Changeset 72c6950

Timestamp:

Feb 21, 2021, 11:11:00 AM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

a9ea758

Parents:

d447238

Message:

change UTF-8 characters back to Latin-1, restructure code, update associated .expect file for old ast

Location:

tests

Files:

• .expect/io1.oast.txt (moved) (moved from tests/.expect/io1.txt) (2 diffs)
• .expect/io2.oast.txt (moved) (moved from tests/.expect/io2.txt)
• io1.cfa (modified) (3 diffs)

tests/.expect/io1.oast.txt

@@ -1 @@
-9 6 28 0 7 1 2
-0 1 2 3
-0123
-0123
-
 opening delimiters
 x (1 x [2 x {3 x =4 x $5 x £6 x ¥7 x ¡8 x ¿9 x «10
 
 closing delimiters
-1, x 2. x 3; x 4! x 5? x 6% x 7 ¢ x 8 » x 9) x 10] x 11} x
+1, x 2. x 3; x 4! x 5? x 6% x 7¢ x 8» x 9) x 10] x 11} x
 
 opening/closing delimiters
@@ -24 +19 @@
 x ( 1 ) x 2 , x 3 :x: 4
 
+spacing
+0 1 2 3
+0123
+0123
+
+expressions
+9 6 28 0 7 1 2

tests/io1.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar  4 21:42:47 2019
-// Update Count     : 115
+// Last Modified On : Sun Feb 21 10:07:07 2021
+// Update Count     : 119
 //
 
@@ -17 +17 @@
 
 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);
-        sout | 0 | 1 | 2 | 3;
-        sout | '0' | '1' | '2' | '3';
-        sout | 0 | "" | 1 | "" | 2 | "" | 3;
-        sout | nl;
+        sout | nlOff;                                                                           // auto nl off
 
-        sout | nlOff;
         sout | "opening delimiters" | nl;
         sout | "x (" | 1;
@@ -61 +55 @@
         sout | nl | nl;
 
-        sout | nlOn;
+        sout | nlOn;                                                                            // auto nl on
+
         sout | "override opening/closing delimiters";
         sout | "x ( " | 1 | " ) x" | 2 | " , x" | 3 | " :x: " | 4;
         sout | nl;
+
+        sout | "spacing";
+        sout | 0 | 1 | 2 | 3;
+        sout | '0' | '1' | '2' | '3';
+        sout | 0 | "" | 1 | "" | 2 | "" | 3;
+        sout | nl;
+
+        sout | "expressions";
+        int x = 3, y = 5, z = 7;
+        sout | x * 3 | y + 1 | z << 2 | x == y | (x | y) | (x || y) | (x > z ? 1 : 2);
 }