Changeset 88bc876 for tests/ctrl-flow

Timestamp:

Jul 16, 2024, 5:28:10 PM (5 weeks ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

97f9619

Parents:

2363147

Message:

Breaks (and some other control flow) in a loop else clause now work. I also implemented else clauses in printing and code generation.

Location:

tests/ctrl-flow

Files:

• .expect/loop_else.txt (modified) (1 diff)
• loop_else.cfa (modified) (2 diffs)

tests/ctrl-flow/.expect/loop_else.txt

@@ -63 +63 @@
 (10 10)(9 9)(8 8)(7 7)(6 6)(5 5)(4 4)(3 3)(2 2)(1 1)(0 0)else
 
+before begin else after

tests/ctrl-flow/loop_else.cfa

@@ -74 +74 @@
                 i -= 1.7;
         } else { sout | "else"; }                                                                                                               sout | nl | nl;
-        
+
         enum { N = 10 };
         for ( N ) { sout | "N"; } else { sout | "else"; }                                                       sout | nl;
@@ -109 +109 @@
         for ( s; (S){0} -~  (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
         for ( s; (S){0} -~= (S){10,10} ) { sout | s; } else { sout | "else"; }           sout | nl;
-        for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl | nl;
+        for ( s; (S){0} -~= (S){10,10} ~ (S){1} ) { sout | s; } else { sout | "else"; } sout | nl;
+        sout | nl;
+
+        // A break (or a continue) in an else clause should target an outer loop.
+        sout | "before";
+        while ( true ) {
+                sout | " begin";
+                while ( false ) {
+                        sout | "never";
+                } else {
+                        sout | " else";
+                        break;
+                }
+                sout | " end";
+        }
+        sout | " after" | nl;
 }