delorean_lang 0.3.6 → 0.3.7

data/lib/delorean/delorean.treetop

@@ -74,6 +74,12 @@ grammar Delorean
   rule set_expr
     '{-}' <SetExpr>
     /
+    '{' sp? e2:expression sp
+        'for' sp args:unpack_args sp
+        'in' sp e1:expression sp?
+        ifexp:('if' sp e3:expression sp?)?
+    '}' <SetComprehension>
+    /
     '{' sp? args:fn_args sp? '}' <SetExpr>
   end
 

data/lib/delorean/nodes.rb

@@ -459,6 +459,12 @@ eos
     end
   end
 
+  class SetComprehension < ListComprehension
+    def rewrite(context)
+      "Set[*#{super}]"
+    end
+  end
+
   class HashComprehension < SNode
     # used in generating unique hash names
     @@comp_count = 0

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

data/spec/eval_spec.rb

@@ -534,20 +534,23 @@ eof
       ]
   end
 
-  it "should eval sets" do
+  it "should eval sets and set comprehension" do
     engine.parse defn("A:",
                       "    a = {-}",
+                      "    b = {i*5 for i in {1,2,3}}",
                       "    c = {1,2,3} | {4,5}",
                       )
-    engine.evaluate_attrs("A", ["a", "c"]).should ==
-      [Set[], Set[1,2,3,4,5]]
+    engine.evaluate_attrs("A", ["a", "b", "c"]).should ==
+      [Set[], Set[5,10,15], Set[1,2,3,4,5]]
   end
 
   it "should eval list comprehension" do
     engine.parse defn("A:",
                       "    b = [i*5 for i in [1,2,3]]",
+                      "    c = [a-b for a, b in [[1,2],[4,3]]]"
                       )
     engine.evaluate("A", "b").should == [5, 10, 15]
+    engine.evaluate("A", "c").should == [-1, 1]
   end
 
   it "should eval nested list comprehension" do
@@ -647,8 +650,10 @@ eof
   it "should eval multi-var hash comprehension" do
     engine.parse defn("A:",
                       "    b = {k*5 : v+1 for k, v in {1:2, 7:-30}}",
+                      "    c = [k-v for k, v in {1:2, 7:-30}]",
                       )
     engine.evaluate("A", "b").should == {5=>3, 35=>-29}
+    engine.evaluate("A", "c").should == [-1, 37]
   end
 
   it "should be able to amend node calls" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: A "compiler" for the Delorean programming language
 email:
 - arman.bostani@pnmac.com