implemented rubyish lambda, etc - nqp::makeclosure++

dwarring · dwarring · commit a7c5369fe13c · 2013-10-18T09:27:11.000+11:00
diff --git a/examples/rubyish/README.md b/examples/rubyish/README.md
@@ -27,6 +27,9 @@ Features:
 - basic arrays and hashes
 - for loops on arrays: `for val in [10,20,30] do puts val end`
 - for loops on hash keys: `h = {'a'=>10, 'b'=>20}; for k in h do puts h{k} end`
+- lambda blocks: `def make_counter(n,incr) ; n-=incr; lambda { n += incr }; end`
+end
+
 - lightweight eRuby like templating, see [template.rbi](rubyish-examples/template.rbi)
 
 Notes:
@@ -53,7 +56,7 @@ curly brackets `puts fruit{'bannanas'}`
 
 - nqp op-codes can be called like regular functions. E.g.
 ```
-    puts nqp:if(2+2 == 4, 'yup', 'nope' )
+    puts nqp::if(2+2 == 4, 'yup', 'nope' )
 ```
 - this includes nqp control-flow functions:
 ```
diff --git a/examples/rubyish/rubyish-examples/pi.rbi b/examples/rubyish/rubyish-examples/pi.rbi
@@ -1,7 +1,7 @@
 # naive approximation: pi = 4 * (1 - /1/3 + 1/5 ...)
 
 limit = 2500000
-def time ; nqp:time_i() ; end
+def time ; nqp::time_i() ; end
 
 n = 1;
 pi_over_4 = 0.0
diff --git a/examples/rubyish/rubyish-examples/template.rbi b/examples/rubyish/rubyish-examples/template.rbi
@@ -7,7 +7,7 @@
 # Any arbritrary code can appear before the template. Output to stdout
 # is appended to the template, both before and within the template body
 
-puts "<?xml version='1.0' encoding='utf-8'?>"
+puts %q{<?xml version='1.0' encoding='utf-8'?>}
 
 <?rbi?>
 <html>
diff --git a/examples/rubyish/rubyish.nqp b/examples/rubyish/rubyish.nqp
@@ -41,6 +41,7 @@ grammar Rubyish::Grammar is HLL::Grammar {
     token template-chunk { [<tmpl-unesc>|<tmpl-hdr>] ~ [<tmpl-esc>|$] <template-nibble>* }
     proto token template-nibble {*}
     token template-nibble:sym<interp>     { <interp> }
+    token template-nibble:sym<stray-tag>  { [<.tmpl-unesc>|<.tmpl-hdr>] <.panic("Stray tag, e.g. '%>' or '<?rbi?>'")> }
     token template-nibble:sym<plain-text> { [<!before [<tmpl-esc>|'#{'|$]> .]+ }
 
     token tmpl-hdr   {'<?rbi?>' \h* \n? <?{$*IN_TEMPLATE := 1}>}
@@ -73,14 +74,14 @@ grammar Rubyish::Grammar is HLL::Grammar {
 
     rule defbody {
         :my $*CUR_BLOCK := QAST::Block.new(QAST::Stmts.new());
-        <operation> <signature>? <separator>?
+        <operation> ['(' ~ ')' <signature>]? <separator>?
         <stmtlist>
     }
 
     token comma { :s [','|'=>'] :s }
 
     rule signature {
-        '(' ~ ')' [:my $*LINE_SPAN := 1; <param>* %% <comma>]
+        :my $*LINE_SPAN := 1; <param>* %% <comma>
     }
 
     token param { <ident> }
@@ -128,6 +129,10 @@ grammar Rubyish::Grammar is HLL::Grammar {
         ['new' \h+ :s <ident> | <ident> '.' 'new'] ['(' ~ ')' <call-args=.paren-args>?]?
     }
 
+    token term:sym<lambda-call> {
+        <ident> '.' 'call' ['(' ~ ')' <call-args=.paren-args>?]?
+    }
+
     token var {
         :my $*MAYBE_DECL := 0;
         [$<sigil>=[\$|\@\@?]|<!keyword>]
@@ -183,7 +188,7 @@ grammar Rubyish::Grammar is HLL::Grammar {
     proto token comment {*}
     token comment:sym<line>   { '#' [<?{!$*IN_TEMPLATE}> \N* || [<!before <tmpl-unesc>>\N]*] }
     token comment:sym<podish> {[^^'=begin'\n] ~ [^^'=end'\n ] .*?}
-    token ws { <!ww>[\h | <.comment> | <.continuation> | <?{$*LINE_SPAN}> \n]* }
+    token ws { <!ww> [\h | <.comment> | <.continuation> | <?{$*LINE_SPAN}> \n]* }
 
     # Operator precedence levels
     INIT {
@@ -288,7 +293,10 @@ grammar Rubyish::Grammar is HLL::Grammar {
 
     token term:sym<code>  {
         'begin' ~ 'end' <stmtlist> 
-        | '{' ~ '}' <stmtlist> 
+    }
+
+    token term:sym<lambda>  {
+        'lambda' :s ['{' ['|' ~ '|' <signature>]?]  ~ '}' <stmtlist> 
     }
 
     method builtin-init() {
@@ -442,6 +450,17 @@ class Rubyish::Actions is HLL::Actions {
             );
     }
 
+    method term:sym<lambda-call>($/) {
+        my $call := QAST::Op.new( :op<call>,
+                                  :name(~$<ident>),
+            );
+        if $<call-args> {
+            $call.push($_)
+                for $<call-args>.ast;
+        }
+        make $call;
+    }
+
     method var($/) {
         my $sigil := ~$<sigil>//'';
         my $name := $sigil ~ $<ident>;
@@ -507,6 +526,12 @@ class Rubyish::Actions is HLL::Actions {
 
     method defbody($/) {
         $*CUR_BLOCK.name(~$<operation>);
+        if $<signature> {
+            for $<signature>.ast {
+                $*CUR_BLOCK[0].push($_);
+                $*CUR_BLOCK.symbol($_.name, :declared(1));
+            }
+        }
         $*CUR_BLOCK.push($<stmtlist>.ast);
         if $*IN_CLASS {
             # it's a method, self will be automatically passed
@@ -520,12 +545,13 @@ class Rubyish::Actions is HLL::Actions {
     }
 
     method signature($/) {
+        my @params;
         for $<param> {
-            $*CUR_BLOCK[0].push(QAST::Var.new(
+              @params.push(QAST::Var.new(
                 :name(~$_), :scope('lexical'), :decl('param')
             ));
-            $*CUR_BLOCK.symbol(~$_, :declared(1));
         }
+        make @params;
     }
 
     method stmt:sym<class>($/) {
@@ -566,7 +592,6 @@ class Rubyish::Actions is HLL::Actions {
     method stmt:sym<EXPR>($/) { make $<EXPR>.ast; }
 
     method term:sym<assign>($/) { 
-        my $sym := ~$<OPER>;
         my $op := $<OPER><O><op>;
         make  QAST::Op.new( :op('bind'),
                             $<var>.ast,
@@ -621,6 +646,7 @@ class Rubyish::Actions is HLL::Actions {
         $hash.push($_) for $<paren-list>.ast;
         make $hash;
     }
+
     method value:sym<nil>($/) {
         make QAST::Op.new( :op<null> );
     }
@@ -630,7 +656,7 @@ class Rubyish::Actions is HLL::Actions {
     }
 
     method value:sym<false>($/) {
-        make QAST::IVal.new(0);
+        make QAST::IVal.new( :value<0> );
     }
 
     method  interp($/) { make $<stmt>.ast }
@@ -699,6 +725,21 @@ class Rubyish::Actions is HLL::Actions {
         make $<stmtlist>.ast;
     }
 
+    method term:sym<lambda>($/) {
+        my $block := QAST::Block.new();
+        if $<signature> {
+            for $<signature>.ast {
+                $block.push($_);
+                $block.symbol($_.name, :declared(1));
+            }
+        }
+        $block.push($<stmtlist>.ast);
+
+        make  QAST::Op.new(:op<takeclosure>,
+                           $block,
+            );
+    }
+
 }
 
 class Rubyish::Compiler is HLL::Compiler {
diff --git a/examples/rubyish/t/00hello-worldish.t b/examples/rubyish/t/00hello-worldish.t
@@ -1,7 +1,7 @@
 puts "1..4"
 
 def capitalize(s)
-    nqp:uc(nqp:substr(s, 0, 1)) ~ nqp:lc(nqp:substr(s, 1));
+    nqp::uc(nqp::substr(s, 0, 1)) ~ nqp::lc(nqp::substr(s, 1));
 end
 
 class HelloWorld
@@ -15,7 +15,7 @@ class HelloWorld
 end
 
 hello = HelloWorld.new("worldish")
-puts "#{nqp:can(hello, 'sayHi')? 'ok' : 'nok'} 2 - can say Hi"
-puts "#{nqp:can(hello, 'sayBye')? 'nok' : 'ok'} 3 - can't say Bye"
+puts "#{nqp::can(hello, 'sayHi')? 'ok' : 'nok'} 2 - can say Hi"
+puts "#{nqp::can(hello, 'sayBye')? 'nok' : 'ok'} 3 - can't say Bye"
 hello.sayHi
 
diff --git a/examples/rubyish/t/lamba.t b/examples/rubyish/t/lamba.t
@@ -0,0 +1,14 @@
+puts "1..5"
+def make_iterator(n)
+    lambda { |incr,desc| n += incr; puts "ok #{n} - #{desc}"}
+end
+
+it1 = make_iterator(-1)
+it2 = make_iterator(3)
+
+it1.call(2,"iterator 1")
+it1.call(1,"iterator 1")
+it2.call(0,"iterator 2")
+it2.call(1,"iterator 2")
+it1.call(3,"iterator 1")
+
diff --git a/examples/rubyish/t/nqp-ops.t b/examples/rubyish/t/nqp-ops.t
@@ -1,24 +1,24 @@
 puts "1..11"
-nqp:say("ok 1 - nqp:say")
-nqp:print("ok 2 - nqp:print with new-line\n")
-puts nqp:concat("ok ", '3 - nqp:concat')
-puts nqp:substr("nok 4 - nqp:substr", 1)
-puts nqp:lc("OK 5 - nqp:lC")
-nqp:print nqp:chr(nqp:ord('o')); puts 'k 6 - nqp:ord and nqp:chr'
+nqp::say("ok 1 - nqp::say")
+nqp::print("ok 2 - nqp::print with new-line\n")
+puts nqp::concat("ok ", '3 - nqp::concat')
+puts nqp::substr("nok 4 - nqp::substr", 1)
+puts nqp::lc("OK 5 - nqp::lC")
+nqp::print nqp::chr(nqp::ord('o')); puts 'k 6 - nqp::ord and nqp::chr'
 
 def ok(i,msg)
-    nqp:say("ok #{i} - #{msg}");
+    nqp::say("ok #{i} - #{msg}");
 end
 def nok(i,msg)
-    nqp:say("nok #{i} - #{msg}");
+    nqp::say("nok #{i} - #{msg}");
 end
 
-nqp:if(2+2 == 4, ok(7, "nqp:if (true)"),  nok(7, "nqp:if (true)"))
-nqp:if(2+2 == 5, nok(8, "nqp:if (true)"),  ok(8, "nqp:if (false)"))
+nqp::if(2+2 == 4, ok(7, "nqp::if (true)"),  nok(7, "nqp::if (true)"))
+nqp::if(2+2 == 5, nok(8, "nqp::if (true)"),  ok(8, "nqp::if (false)"))
 
 n = 9
 
-nqp:while n <= 11, begin
-    ok(n, "nqp:while (#{n})")
+nqp::while n <= 11, begin
+    ok(n, "nqp::while (#{n})")
     n += 1
 end
