delorean_lang 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjQ5M2EzMTc3OGJlMmFhYTY0YmY1YTE5ODg5MTZiYjk2NmFjNDk1OA==
+    N2RjODkwNmY0M2EyNDgwNmZmZWE3YWU5ZTY1YmM0YjVjMDFmM2E3Mg==
   data.tar.gz: !binary |-
-    NTVhYzM1MGQxNmNkNjM1YWQ4Zjc3ZjU2MDQzOGJjNzA5MjczNmNmNA==
+    YTRiZjEzOTJjMGI5MjkyYjJmZTQzZGQ1NTA0N2I0MzZmYmU4ODNlYg==
 SHA512:
   metadata.gz: !binary |-
-    ZjA2NWM5NmQ0Zjg1NjkxYTI1YjBmZTEzYTdkNzJiODRkMzI2YTQ1NWNlZjA1
-    ODgyZjkzODAxYWViOTBmNDI0ODViNzBmMWE0NjRjZjE2NzI4ZWZjMmMzZDYw
-    YzhjMDQ5MjQyNzVhYjYyN2ZhYTMzODcyNzNkYTg4Y2Q5OWVmZWY=
+    YWZlMzhjOWEzZTJiNzQ0Y2E5YjBjNGJlYmY4ODU5MzcxNGUwMzdlN2ZjZWI0
+    ZjYzYWI3M2NkNzdlY2ExYmVhNDQyZjVhNjUxY2U5NjhjMDQ2MWI0NDBlZmY5
+    MzY4MjEyMzIyZjI1NzYzYjNhMThkNWY2ZDNlNzc4YjdlZmRmZTE=
   data.tar.gz: !binary |-
-    NzQ5YTJmODYwNTdkMjYyM2I1NzZiYjU2MjIyZmMzNzk1MTU4YTJmNDBlMzE4
-    MzlmYzU0ZmRmNmNmMThiYzA5ODdkNThhZjQ5MzAzZDI5MTVkMjk3MTE4ZjFl
-    ZjAyYjkzOTA5YmJlMmYxYTk5YjcwOWMxYWJjMTJhNWJmY2U2MDI=
+    OGEzNmQ5NzQyNDkyYjIyNDI4ZjJiZmQwZDRmMmNkMjkwYTI3ZTUwMDdjZWNk
+    MjA3NzZjZTgwZWI5MmU3Y2I1NzQ3YTJkYjZmZTBkM2E4NzYwNGE1NzA0ZWVm
+    MTM0NWRhYzIzMGIxYTU4YzBkZTNiMzhiMGE4ZjNkOWM4NzcwM2U=

data/lib/delorean/base.rb

@@ -7,62 +7,62 @@ module Delorean
   # hash.  The whole whitelist mechanism should be eventually
   # rethought.
   RUBY_WHITELIST = {
-    compact:	[Array],
-    flatten:	[Array, [Fixnum, nil]],
-    length: 	[[Array, String]],
-    max: 	[Array],
-    member:	"member?",
-    member?:	[Array, [Fixnum, String]],
-    reverse: 	[Array],
-    slice:    	[Array, Fixnum, Fixnum],
-    sort: 	[Array],
-    split:	[String, String],
-    uniq: 	[Array],
-    sum: 	[Array],
-    zip:	[Array, [Array, Array, Array]],
-    index:	[Array, [Integer, Numeric, String, Array, Fixnum]],
-    product:	[Array, Array],
-    first: 	[Enumerable, [nil, Fixnum]],
-
-    keys: 	[Hash],
-    values: 	[Hash],
-    upcase: 	[String],
-    downcase: 	[String],
-    match:	[String, [String], [nil, Fixnum]],
-
-    hour:	[[Date, Time, ActiveSupport::TimeWithZone]],
-    min:	[[Date, Time, ActiveSupport::TimeWithZone, Array]],
-    sec:	[[Date, Time, ActiveSupport::TimeWithZone]],
-    to_date:	[[Date, Time, ActiveSupport::TimeWithZone]],
-
-    month:	[[Date, Time, ActiveSupport::TimeWithZone]],
-    day:	[[Date, Time, ActiveSupport::TimeWithZone]],
-    year:	[[Date, Time, ActiveSupport::TimeWithZone]],
-
-    next_month:	[[Date, Time, ActiveSupport::TimeWithZone],
+    compact:    [Array],
+    flatten:    [Array, [Fixnum, nil]],
+    length:     [[Array, String]],
+    max:        [Array],
+    member:     "member?",
+    member?:    [Array, [Fixnum, String]],
+    reverse:    [Array],
+    slice:      [Array, Fixnum, Fixnum],
+    sort:       [Array],
+    split:      [String, String],
+    uniq:       [Array],
+    sum:        [Array],
+    zip:        [Array, [Array, Array, Array]],
+    index:      [Array, [Integer, Numeric, String, Array, Fixnum]],
+    product:    [Array, Array],
+    first:      [Enumerable, [nil, Fixnum]],
+
+    keys:       [Hash],
+    values:     [Hash],
+    upcase:     [String],
+    downcase:   [String],
+    match:      [String, [String], [nil, Fixnum]],
+
+    hour:       [[Date, Time, ActiveSupport::TimeWithZone]],
+    min:        [[Date, Time, ActiveSupport::TimeWithZone, Array]],
+    sec:        [[Date, Time, ActiveSupport::TimeWithZone]],
+    to_date:    [[Date, Time, ActiveSupport::TimeWithZone]],
+
+    month:      [[Date, Time, ActiveSupport::TimeWithZone]],
+    day:        [[Date, Time, ActiveSupport::TimeWithZone]],
+    year:       [[Date, Time, ActiveSupport::TimeWithZone]],
+
+    next_month: [[Date, Time, ActiveSupport::TimeWithZone],
                  [nil, Fixnum],
                 ],
-    prev_month:	[[Date, Time, ActiveSupport::TimeWithZone],
+    prev_month: [[Date, Time, ActiveSupport::TimeWithZone],
                  [nil, Fixnum],
                 ],
 
-    beginning_of_month:	[[Date, Time, ActiveSupport::TimeWithZone]],
+    beginning_of_month: [[Date, Time, ActiveSupport::TimeWithZone]],
 
-    end_of_month:	[[Date, Time, ActiveSupport::TimeWithZone]],
+    end_of_month:       [[Date, Time, ActiveSupport::TimeWithZone]],
 
-    next_day:	[[Date, Time, ActiveSupport::TimeWithZone],
+    next_day:   [[Date, Time, ActiveSupport::TimeWithZone],
                  [nil, Fixnum],
                 ],
-    prev_day:	[[Date, Time, ActiveSupport::TimeWithZone],
+    prev_day:   [[Date, Time, ActiveSupport::TimeWithZone],
                  [nil, Fixnum],
                 ],
 
-    to_i:	[[Numeric, String]],
-    to_f:	[[Numeric, String]],
-    to_d:	[[Numeric, String]],
-    to_s:	[Object],
-    abs:	[Numeric],
-    round:	[Numeric, [nil, Integer]],
+    to_i:       [[Numeric, String]],
+    to_f:       [[Numeric, String]],
+    to_d:       [[Numeric, String]],
+    to_s:       [Object],
+    abs:        [Numeric],
+    round:      [Numeric, [nil, Integer]],
   }
 
   module BaseModule
@@ -78,6 +78,13 @@ module Delorean
           h[attr] = evaluate(attr)
         }
       end
+
+      # add new arguments, results in a new NodeCall
+      def +(args)
+        raise "bad arg to %" unless args.is_a?(Hash)
+
+        NodeCall.new(_e, engine, node, params.merge(args))
+      end
     end
 
     class BaseClass

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/eval_spec.rb

@@ -582,6 +582,19 @@ eof
     engine.evaluate_attrs("A", ["d", "f"]).should == [26, 2]
   end
 
+  it "should be able to amend node calls" do
+    engine.parse defn("A:",
+                      "    a =?",
+                      "    aa = a*2",
+                      "    e = A(a=12)",
+                      "    d = e+{'a':3}",
+                      "    f = e+{'a':4}",
+                      "    g = d.aa + f.aa",
+                      )
+
+    engine.evaluate("A", "g").should == 3*2 + 4*2
+  end
+
   it "should eval module calls 1" do
     engine.parse defn("A:",
                       "    a = 123",

metadata

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