Generate control exn records for loops

sorear · Sep 15, 2010 · 2d649c9 · 2d649c9
1 parent a413960
commit 2d649c9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/lib/Kernel.cs b/lib/Kernel.cs
@@ -155,7 +155,8 @@ public class SubInfo {
         // records: $start-ip, $end-ip, $type, $goto, $lid
         public const int ON_NEXT = 1;
         public const int ON_LAST = 2;
-        public const int ON_RETURN = 3;
+        public const int ON_REDO = 3;
+        public const int ON_RETURN = 4;
         public int[] edata;
         public string[] label_names;
 

diff --git a/src/CgOp.pm b/src/CgOp.pm
@@ -399,6 +399,10 @@ use warnings;
         CgOp::Span->new(lstart => $ls, lend => $le, zyg => [prog(@r)]);
     }
 
+    sub ehspan {
+        CgOp::Primitive->new(op => [ ehspan => @_ ]);
+    }
+
     sub wrap {
         newscalar(rawnew('CLRImportObject', $_[0]));
     }

diff --git a/src/Niecza/Actions.pm b/src/Niecza/Actions.pm
@@ -2227,6 +2227,7 @@ sub routine_declarator__S_method { my ($cl, $M) = @_;
 
 my $next_anon_id = 0;
 sub gensym { 'anon_' . ($next_anon_id++) }
+sub genid  { ($next_anon_id++) }
 
 sub blockcheck { my ($cl) = @_;
 }

diff --git a/src/Op.pm b/src/Op.pm
@@ -468,13 +468,21 @@ use CgOp;
 
     sub code {
         my ($self, $body) = @_;
+        my $id = Niecza::Actions->genid;
 
         CgOp::prog(
             CgOp::whileloop($self->until, $self->once,
                 CgOp::unbox('Boolean',
                     CgOp::fetch(
                         CgOp::methodcall($self->check->cgop($body), "Bool"))),
-                CgOp::sink($self->body->cgop($body))),
+                CgOp::prog(
+                    CgOp::label("redo$id"),
+                    CgOp::sink($self->body->cgop($body)),
+                    CgOp::label("next$id"),
+                    CgOp::ehspan(1, undef, 0, "redo$id", "next$id", "next$id"),
+                    CgOp::ehspan(2, undef, 0, "redo$id", "next$id", "last$id"),
+                    CgOp::ehspan(3, undef, 0, "redo$id", "next$id", "redo$id"))),
+            CgOp::label("last$id"),
             CgOp::null('Variable'));
     }