delorean_lang 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d598222e48c3aa0dc66abf2993cbf701a7721d70
-  data.tar.gz: deed54fdf0c63237da12727568c352053dbba2bd
+  metadata.gz: b9e807e4b0e258dcb0a059957acd6f03b9056b80
+  data.tar.gz: 7b847737484ec32546b6e54d75a553e8ace2129b
 SHA512:
-  metadata.gz: 91712dabce3789731bfa8d0fb13a97476636be7bd200fa2dacb4fd5b9afde9a7b151bad04f6955d036be9a3625e69af8ab2c71f7331c02e5a37b6a9e18c3fde9
-  data.tar.gz: 1bf85c2f0a84a0380f44b987a19fffed6b1a2e79c453178ac82d5ad03b194801e8eed80fe6a90db500342ebdd160586c65b17c3428df2154fa412f622624bca2
+  metadata.gz: bbebebdd4c9bfb82345d1c0c9e618652e5b02d7c0e62bd1783460aebe4ee298eb3a4cd8b1e841cd34b1e540703cf94d577cd7607534e3c263177b9d2496708bd
+  data.tar.gz: 3477a50fb9f760f313b0d49ae2f869f924d25bf1837362704d4f14bc4fff5d1b8566f0057493e87096f3f73fade3aa9d8562be472c4ceaf5df26a7a00400a327

data/lib/delorean/base.rb

@@ -14,7 +14,7 @@ module Delorean
     length:             [Enumerable],
     max:                [Array],
     member:             "member?",
-    member?:            [Array, [Object]],
+    member?:            [Enumerable, [Object]],
     reverse:            [Array],
     slice:              [Array, Fixnum, Fixnum],
     sort:               [Array],

data/lib/delorean/delorean.rb

@@ -2150,6 +2150,12 @@ module Delorean
     r0
   end
 
+  module BinaryOp0
+    def sp
+      elements[1]
+    end
+  end
+
   def _nt_binary_op
     start_index = index
     if node_cache[:binary_op].has_key?(index)
@@ -2338,8 +2344,33 @@ module Delorean
                                     r16 = SyntaxNode.new(input, (index-1)...index) if r16 == true
                                     r0 = r16
                                   else
-                                    @index = i0
-                                    r0 = nil
+                                    i17, s17 = index, []
+                                    if (match_len = has_terminal?('in', false, index))
+                                      r18 = instantiate_node(SyntaxNode,input, index...(index + match_len))
+                                      @index += match_len
+                                    else
+                                      terminal_parse_failure('in')
+                                      r18 = nil
+                                    end
+                                    s17 << r18
+                                    if r18
+                                      r19 = _nt_sp
+                                      s17 << r19
+                                    end
+                                    if s17.last
+                                      r17 = instantiate_node(SyntaxNode,input, i17...index, s17)
+                                      r17.extend(BinaryOp0)
+                                    else
+                                      @index = i17
+                                      r17 = nil
+                                    end
+                                    if r17
+                                      r17 = SyntaxNode.new(input, (index-1)...index) if r17 == true
+                                      r0 = r17
+                                    else
+                                      @index = i0
+                                      r0 = nil
+                                    end
                                   end
                                 end
                               end

data/lib/delorean/delorean.treetop

@@ -100,7 +100,7 @@ grammar Delorean
   rule binary_op
     '==' / '!=' / '>=' / '<=' / '&&' / '||' /
     '>'  / '<'  / '+' / '-' / '*' / '/' / '%' /
-    '&'  / '^'  / '|'
+    '&'  / '^'  / '|' / 'in' sp
   end
 
   rule unary_op

data/lib/delorean/nodes.rb

@@ -177,7 +177,11 @@ eos
     end
 
     def rewrite(context)
-      v.rewrite(context) + " " + op.text_value + " " + e.rewrite(context)
+      if op.text_value.start_with? 'in'
+        "(#{e.rewrite(context)}).member?( #{v.rewrite(context)} )"
+      else
+        v.rewrite(context) + " #{op.text_value} " + e.rewrite(context)
+      end
     end
   end
 

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.15"
+  VERSION = "0.3.16"
 end

data/spec/eval_spec.rb

@@ -781,6 +781,19 @@ eof
       ["A", {"a"=>123, "b"=>579}, {"a"=>123, "b"=>579}, {"b"=>579}]
   end
 
+  it "should eval in expressions" do
+    engine.parse defn("A:",
+                      "    a = [1,2,3,33,44]",
+                      "    s = {22,33,44}",
+                      "    b = (1 in a) && (2 in {22,44})",
+                      "    c = (2 in a) && (22 in s)",
+                      "    d = [i*2 for i in s if i in a]",
+                      )
+
+    engine.evaluate_attrs("A", %w{b c d}).should ==
+      [false, true, [66, 88]]
+  end
+
   it "should eval imports" do
     engine.parse defn("import AAA",
                       "A:",

data/spec/parse_spec.rb

@@ -159,6 +159,14 @@ describe "Delorean" do
                       )
   end
 
+  it "should allow in expressions" do
+    engine.parse defn("A:",
+                      "    int =? 1",
+                      "    a = if int>1 then int*2 else int/2",
+                      "    b = int in [1,2,3]",
+                      )
+  end
+
   it "should allow non-recursive code 1" do
     # this is not a recursion error
     engine.parse defn("A:",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop