delorean_lang 0.0.39 → 0.0.40

data/lib/delorean/functions.rb

@@ -26,6 +26,8 @@ module Delorean
 
     MAXLIST_SIG = [ 1, 1 ]
 
+    ######################################################################
+
     def MINLIST(_e, arg)
       raise "argument must be list" unless arg.is_a? Array
       arg.min
@@ -43,8 +45,19 @@ module Delorean
 
     ######################################################################
 
+    def ABS(_e, n)
+      raise "#{n} is not a number" unless
+        n.is_a?(Float) || n.is_a?(Fixnum) || n.is_a?(BigDecimal)
+      n.abs
+    end
+
+    ABS_SIG = [ 1, 1 ]
+
+    ######################################################################
+
     def NUMBER(_e, s)
-      return s if s.is_a?(Float) || s.is_a?(Fixnum)
+      # FIXME: handle BigDecimal
+      return s if s.is_a?(Float) || s.is_a?(Fixnum) || s.is_a?(BigDecimal)
       raise "Can't convert #{s} to number" unless
         s =~ /^\d+(\.\d+)?$/
       
@@ -138,5 +151,45 @@ module Delorean
 
     ######################################################################
 
+    RUBY_METHODS = {
+      sort: 	[Array],
+      reverse: 	[Array],
+      min: 	[Array],
+      max: 	[Array],
+      uniq: 	[Array],
+      length: 	[[Array, String]],
+      flatten:	[Array, [Fixnum, nil]],
+    }
+
+    def RUBY(_e, method, *args)
+      raise "method must be a string" unless method.class.name=="String"
+      msg = method.to_sym
+
+      raise "no such method #{method}" unless RUBY_METHODS.member? msg
+
+      sig = RUBY_METHODS[msg]
+      raise "too many args to #{method}" if args.length>sig.length
+
+      sig.each_with_index { |s, i|
+        s = [s] unless s.is_a?(Array)
+
+        ok = false
+        s.each { |sc|
+          if (sc.nil? && i>=args.length) || (sc && args[i].class <= sc)
+            ok = true
+            break
+          end
+        }
+
+        raise "bad argument #{args[i]} at position #{i} to method #{method}" unless ok
+      }
+
+      args[0].send(msg, *args[1, args.length])
+    end
+
+    RUBY_SIG = [ 1, Float::INFINITY ]
+
+    ######################################################################
+
   end
 end

data/lib/delorean/nodes.rb

@@ -351,7 +351,7 @@ eos
 
   class HashExpr < SNode
     def check(context, *)
-      defined?(args) ? args.check(context) : {}
+      defined?(args) ? args.check(context) : []
     end
 
     def rewrite(context)

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.0.39"
+  VERSION = "0.0.40"
 end

data/spec/func_spec.rb

@@ -79,6 +79,18 @@ describe "Delorean" do
     r.should == [12.3456, 12.3456, 12]
   end
 
+  it "should handle ABS" do
+    engine.parse defn("A:",
+                      "  a = ABS(-123)",
+                      "  b = ABS(-1.1)",
+                      "  c = ABS(2.3)",
+                      "  d = ABS(0)",
+                      )
+
+    r = engine.evaluate_attrs("A", ["a", "b", "c", "d"])
+    r.should == [123, 1.1, 2.3, 0]
+  end
+
   it "should handle STRING" do
     engine.parse defn("A:",
                       "  a = STRING('hello')",
@@ -191,6 +203,28 @@ describe "Delorean" do
     lambda {
       r = engine.evaluate("A", "b")
     }.should raise_error("xx, 1, 2, 3")
+  end
+
+  it "should handle RUBY" do
+    x = [[1, 2, [-3]], 4, 5, [6], -3, 4, 5, 0]
 
+    engine.parse defn("A:",
+                      "  a = #{x}",
+                      "  b = RUBY('flatten', a)",
+                      "  c = RUBY('flatten', a, 1)",
+                      "  d = b+c",
+                      "  dd = RUBY('flatten', d)",
+                      "  e = RUBY('sort', dd)",
+                      "  f = RUBY('uniq', e)",
+                      "  g = RUBY('length', e)",
+                      )
+
+    engine.evaluate("A", "c").should == x.flatten(1)
+    d = engine.evaluate("A", "d").should == x.flatten + x.flatten(1)
+    dd = engine.evaluate("A", "dd")
+    engine.evaluate("A", "e").should == dd.sort
+    engine.evaluate("A", "f").should == dd.sort.uniq
+    engine.evaluate("A", "g").should == dd.length
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop