- Improved the next loop controller. Now it can take an argument th…

…at represent the depth of nexting (default: 1). Example: for (1..5) { |i| for (1..5) { |j| say "#{i} #{j}"; next(2); }; say i; # never get's printed } Output: 1 1 2 1 3 1 4 1 5 1
trizen · Jun 20, 2015 · b9b242e · b9b242e
1 parent 99d875c
commit b9b242e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/lib/Sidef/Parser.pm b/lib/Sidef/Parser.pm
@@ -39,7 +39,6 @@ package Sidef::Parser {
                        nil\b                          (?{ state $x = Sidef::Types::Nil::Nil->new })
                      | true\b                         (?{ state $x = Sidef::Types::Bool::Bool->true })
                      | (?:false|Bool)\b               (?{ state $x = Sidef::Types::Bool::Bool->false })
-                     | next\b                         (?{ state $x = Sidef::Types::Block::Next->new })
                      | continue\b                     (?{ state $x = Sidef::Types::Block::Continue->new })
                      | BlackHole\b                    (?{ state $x = Sidef::Types::Black::Hole->new })
                      | Block\b                        (?{ state $x = Sidef::Types::Block::Code->new })
@@ -100,6 +99,7 @@ package Sidef::Parser {
                 | while\b                                         (?{ Sidef::Types::Bool::While->new })
                 | for(?:each)?+\b                                 (?{ Sidef::Types::Block::For->new })
                 | return\b                                        (?{ Sidef::Types::Block::Return->new })
+                | next\b                                          (?{ Sidef::Types::Block::Next->new })
                 | break\b                                         (?{ Sidef::Types::Block::Break->new })
                 | try\b                                           (?{ Sidef::Types::Block::Try->new })
                 | (?:given|switch)\b                              (?{ Sidef::Types::Block::Given->new })

diff --git a/lib/Sidef/Types/Block/Code.pm b/lib/Sidef/Types/Block/Code.pm
@@ -118,6 +118,9 @@ package Sidef::Types::Block::Code {
           : ref($result) eq 'Sidef::Types::Block::Break' ? --$result->{depth} <= 0
               ? $self
               : $result
+          : ref($result) eq 'Sidef::Types::Block::Next' ? --$result->{depth} <= 0
+              ? ()
+              : $result
           : ();
     }
 

diff --git a/lib/Sidef/Types/Block/Next.pm b/lib/Sidef/Types/Block/Next.pm
@@ -1,11 +1,13 @@
 package Sidef::Types::Block::Next {
 
     sub new {
-        bless {}, __PACKAGE__;
+        bless {depth => 1}, __PACKAGE__;
     }
 
     sub next {
-        $_[0];
+        my ($self, $depth) = @_;
+        $self->{depth} = ref($depth) ? $depth->get_value : 1;
+        $self;
     }
 
 }

diff --git a/scripts/Expensive/universal_turing_machine.sf b/scripts/Expensive/universal_turing_machine.sf
@@ -29,7 +29,6 @@ func run_utm(state="", blank="", rules=[], tape=[], halt="", pos=0) {
             break;
         }
 
-        var ok = false;
         rules.each { |rule|
             var (s0, v0, v1, dir, s1) = rule...;
             if ((s0 != state) || (tape[pos] != v0)) {
@@ -50,11 +49,9 @@ func run_utm(state="", blank="", rules=[], tape=[], halt="", pos=0) {
                 };
 
             state = s1;
-            ok = true;
-            break;
+            next(2);
         };
 
-        ok && next;
         die 'No matching rules';
     }
 }