added rubyish unless blocks

Author: dwarring

examples/rubyish/README.md

@@ -16,8 +16,7 @@ Implemented:
 - interpolating strings: "number #{37+5}" %Q{Hello #{planet}!}
 - quoted words: `%w[aa bb cc]` 
 - scoping, including $globals, @class_instance and @@package variables
-- conditional blocks: `if ... then ... elsif ... else ... endif`
-- begin .. end blocks
+- conditional blocks: `if ... then ... elsif ... else ... endif`, `unless..end`
 - nqp opcode calls: `nqp::sleep(5)`
 - a few built-ins: `abort`, `print`, `puts`, `sleep`
 - a couple of methods: `.call` and `.nil?`

examples/rubyish/examples-rubyish/fractal-tree.rbi

@@ -10,14 +10,18 @@
 <svg width='100%' height='100%' version='1.1'
 xmlns='http://www.w3.org/2000/svg'>
     <%#----------
+
+    def cos(a); nqp::cos_n(a); end
+    def sin(a); nqp::sin_n(a); end
+
     @scale = 0.66
     @PI = 3.1415926535
     @eps = 2.0
 
     def tree(x, y, len, angle)
        if len >= @eps then
-            x2 = x + len * nqp::cos_n(angle)
-            y2 = y + len * nqp::sin_n(angle)
+            x2 = x + len * cos(angle)
+            y2 = y + len * sin(angle)
             sw = len > 20? len / 10 : 2;
             g = len < @eps*2? 210: 20;
             puts "    <line x1='#{x}' y1='#{y}' x2='#{x2}' y2='#{y2}' style='stroke:rgb(130,#{g},80);stroke-width:#{sw}'/>" \

examples/rubyish/rubyish-examples/closure.rbi

@@ -293,8 +293,8 @@ grammar Rubyish::Grammar is HLL::Grammar {
         <EXPR> [ <separator> [:s 'then']? | 'then' | <?before <tmpl-unesc>>] <stmtlist>
     }
 
-    token stmt:sym<if> {
-        if ~ 'end' [ :s <xblock> [<else=.elsif>|<else>]? ]
+    token stmt:sym<cond> {
+        $<op>=[if|unless] ~ 'end' [ :s <xblock> [<else=.elsif>|<else>]? ]
     }
 
     token elsif {
@@ -715,11 +715,12 @@ class Rubyish::Actions is HLL::Actions {
     }
 
     method xblock($/) {
-        make QAST::Op.new( $<EXPR>.ast, $<stmtlist>.ast, :op('if'), :node($/) );
+        make QAST::Op.new( $<EXPR>.ast, $<stmtlist>.ast, :node($/) );
     }
 
-    method stmt:sym<if>($/) {
+    method stmt:sym<cond>($/) {
         my $ast := $<xblock>.ast;
+	$ast.op( ~$<op> );
         $ast.push( $<else>.ast )
             if $<else>;
 
@@ -728,6 +729,7 @@ class Rubyish::Actions is HLL::Actions {
 
     method elsif($/) {
         my $ast := $<xblock>.ast;
+	$ast.op( 'if' );
         $ast.push( $<else>.ast )
             if $<else>;
 

examples/rubyish/rubyish-examples/fractal-tree.rbi

@@ -1,5 +1,5 @@
 puts "1..8"
-h = {'a' =>10,'b' => 18+2 , 'c' , 30}
+h = {'a' =>10,'b' => 18+2 , 'c' => 30}
 h{'d'} = 100
 puts "#{h{'a'} == 10? 'ok' : 'nok'} 1 - h{'a'}"
 puts "#{h<b> == 20? 'ok' : 'nok'} 2 - h<b>"

examples/rubyish/rubyish-examples/pi.rbi

@@ -1,4 +1,4 @@
-puts "1..18"
+puts "1..17"
 
 if 1+1==3 then
     puts "nok 1"
@@ -69,5 +69,11 @@ puts "ok #{iffy 20} -  if [elsif] elsif  else"
 puts "ok #{iffy 30} -  if  elsif [elsif] else"
 puts "ok #{iffy 42} -  if  elsif  elsif [else]"
 
-puts "#{true? 'ok' : 'nok'}  17 - true"
-puts "#{false ? 'nok' : 'ok'}  18 - false"
+x=10
+unless x > 2
+  puts "nok 17 - unless"
+elsif x == 20
+  puts "nok 17 - unless (elsif)"
+else
+  puts "ok 17 - unless"
+end

examples/rubyish/rubyish-examples/template.rbi

@@ -29,8 +29,8 @@ puts "#{(false && 2)? 'nok' : 'ok'} 12 - infix &&"
 xx = nil
 yy = 42
 puts "#{(false || 2) == 2? 'ok' : 'nok'} 13 - infix ||"
-puts "#{xx.nil? == true? 'ok' : 'nok'} 14 - .nil? when true"
-puts "#{yy.nil? == false? 'ok' : 'nok'} 15 - .nil? when false"
+puts "#{(xx.nil? == true)? 'ok' : 'nok'} 14 - .nil? when true"
+puts "#{(yy.nil? == false)? 'ok' : 'nok'} 15 - .nil? when false"
 
 puts "ok #{2 ** 4} - exponentiation **"
 puts "ok #{37 % 20} - modulus %"