delorean_lang 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: f51984247bdded71f32757212ebef7550f047308
-  data.tar.gz: d7ad1108229516517af20540716b7779f9ae1405
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NjRmOWNjNTZjNTM5MWE0ZmE3OTM4MGE3MTY1MjRjZDgzNDdjZWRlMQ==
+  data.tar.gz: !binary |-
+    ZDlhMDJkNjhmODM4Yjg0OTAxYWZhMDk1MDE2M2M2NGU4ZTQ4Yzc2ZA==
 SHA512:
-  metadata.gz: ab67c2085eced7cc1745437b8137eadec5fc9f1de17e8ab5ab4962239b2b948c47d5f5d95e9f8595bb24dccd84da398a90842e27ae578e3b70faec5445727812
-  data.tar.gz: 0e07256b63586bd26ce0ecb429af36636e81123c5e59e310d55eaa9ebff241ab5310c7dda1ab3b1ed596949ee2fa27b19b03a2e333d2933aee06beb0bbe71f66
+  metadata.gz: !binary |-
+    YmQ4NjNlMDgyMDBkMTczNzc5NGU5YjE1NmJlMDAzODhkMWJmMTkwNzIzZDc4
+    ZDQzZTVmMmQ4MTlmYzllOTc3ZDdhZGJiNjk5NDA3MmUwNTY4OGFkNmRjODYw
+    YjM2ZWEyMTliMjY4OWUxOTg5NGUzODVkMzQxODVhMmFlYTJjYTY=
+  data.tar.gz: !binary |-
+    NzE3NWI2ZGE2OTVjMDQ2NDg4YTAwN2ZmNjRkOWE4YTRmZjI3NDY1ZGI5N2Vk
+    ODU2MmZjMzM0YzYyNDgwYzlmODlmZDc1YjFhYjQyMWI5N2JjOTZlOTgxMDBi
+    ZTQwNzEyY2M4ZjA2ZmEzMDAwZTQ0M2M4MGQzNjM3ODQ2MTk4ODk=

data/lib/delorean/base.rb

@@ -18,6 +18,17 @@ module Delorean
     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]],
@@ -28,6 +39,24 @@ module Delorean
     day:	[[Date, Time, ActiveSupport::TimeWithZone]],
     year:	[[Date, Time, ActiveSupport::TimeWithZone]],
 
+    next_month:	[[Date, Time, ActiveSupport::TimeWithZone],
+                 [nil, Fixnum],
+                ],
+    prev_month:	[[Date, Time, ActiveSupport::TimeWithZone],
+                 [nil, Fixnum],
+                ],
+
+    beginning_of_month:	[[Date, Time, ActiveSupport::TimeWithZone]],
+
+    end_of_month:	[[Date, Time, ActiveSupport::TimeWithZone]],
+
+    next_day:	[[Date, Time, ActiveSupport::TimeWithZone],
+                 [nil, Fixnum],
+                ],
+    prev_day:	[[Date, Time, ActiveSupport::TimeWithZone],
+                 [nil, Fixnum],
+                ],
+
     to_i:	[[Numeric, String]],
     to_f:	[[Numeric, String]],
     to_d:	[[Numeric, String]],
@@ -37,12 +66,7 @@ module Delorean
   }
 
   module BaseModule
-    class NodeCall
-      attr_reader :engine, :node, :params
-      def initialize(engine, node, params)
-        @engine, @node, @params = engine, node, params
-      end
-
+    class NodeCall < Struct.new(:_e, :engine, :node, :params)
       def evaluate(attr)
         engine.evaluate(node, attr, params)
       end
@@ -57,7 +81,6 @@ module Delorean
     end
 
     class BaseClass
-
       def self._get_attr(obj, attr, _e)
         return nil if obj.nil?
 
@@ -114,10 +137,14 @@ module Delorean
         raise str
       end
 
-      def self._node_call(node, mname, _e, params)
+      def self._node_call(node, _e, params)
         context = _e[:_engine]
-        engine = mname ? context.get_import_engine(mname) : context
-        NodeCall.new(engine, node || self, params)
+
+        engine = node.is_a?(Class) &&
+          context.module_name != node.module_name ?
+        context.get_import_engine(node.module_name) : context
+
+        NodeCall.new(_e, engine, node || self, params)
       end
 
       ######################################################################
@@ -150,7 +177,7 @@ module Delorean
               break
             end
           }
-          raise "bad arg #{i} to method #{method}: #{ai}/#{ai.class} #{s}" unless ok
+          raise "bad arg #{i}, method #{method}: #{ai}/#{ai.class} #{s}" if !ok
         }
 
         obj.send(msg, *args)

data/lib/delorean/engine.rb

@@ -5,11 +5,12 @@ require 'pp'
 
 module Delorean
   class Engine
-    attr_reader :last_node, :module_name, :line_no, :comp_set, :pm, :m, :imports
+    attr_reader :last_node, :module_name, :version,
+    :line_no, :comp_set, :pm, :m, :imports
 
-    def initialize(module_name)
+    def initialize(module_name, version=nil)
       # name of current module
-      @module_name = module_name
+      @module_name, @version = module_name, version
       reset
     end
 
@@ -142,13 +143,14 @@ module Delorean
         @node_attrs[@last_node].member? name
 
       @node_attrs[@last_node] << name
-      
+
       checks = spec.map { |a|
-        n = a.index('.') ? a : (@last_node + "." + a)
+        n = a.index('.') ? a : "#{@last_node}.#{a}"
         "_x.member?('#{n}') ? raise('#{n}') : #{a}#{POST}(_x + ['#{n}'])"
       }.join(';')
 
-      code = "class #{@last_node}; def self.#{name}#{POST}(_x); #{checks}; end; end"
+      code =
+        "class #{@last_node}; def self.#{name}#{POST}(_x); #{checks}; end; end"
 
       # pp code
 
@@ -213,8 +215,12 @@ module Delorean
     def generate(t, sset=nil)
       t.check(self, sset)
 
-      # generate ruby code
-      gen = t.rewrite(self)
+      begin
+        # generate ruby code
+        gen = t.rewrite(self)
+      rescue RuntimeError => exc
+        err(ParseError, "codegen error: " + exc.message)
+      end
 
       # puts gen
 
@@ -251,7 +257,7 @@ module Delorean
           # Inside a multiline and next line doesn't look like a
           # continuation => syntax error.
           err(ParseError, "syntax error") unless line =~ /^\s+/
-          
+
           multi_line += line
           t = parser.parse(multi_line)
 
@@ -362,16 +368,14 @@ module Delorean
       }
     end
 
-    # FIXME: should be renamed to grok_runtime_exception so as to not
-    # be confused with other parse_* calls which occur at parse time.
-    def parse_runtime_exception(exc)
+    def self.grok_runtime_exception(exc)
       # parse out the delorean-related backtrace records
       bt = exc.backtrace.map{ |x|
         x.match(/^#{MOD}(.+?):(\d+)(|:in `(.+)')$/);
         $1 && [$1, $2.to_i, $4.sub(/#{POST}$/, '')]
       }.reject(&:!)
 
-      [exc.message, bt]
+      {"error" => exc.message, "backtrace" => bt}
     end
 
     ######################################################################

data/lib/delorean/nodes.rb

@@ -68,15 +68,20 @@ eos
       context.parse_define_node(n.text_value, nil)
     end
 
-    def rewrite(context)
+    def def_class(context, base_name)
       # Nodes are simply translated to classes.  Define our own
       # self.name() since it's extremely slow in MRI 2.0.
-      "class #{n.text_value} < BaseClass; " +
+      "class #{n.text_value} < #{base_name}; " +
+        "def self.module_name; '#{context.module_name}'; end;" +
         "def self.name; '#{n.text_value}'; end; end"
     end
+
+    def rewrite(context)
+      def_class(context, "BaseClass")
+    end
   end
 
-  class SubNode < SNode
+  class SubNode < BaseNode
     def check(context, *)
       mname = mod.m.text_value if defined?(mod.m)
       context.parse_define_node(n.text_value, p.text_value, mname)
@@ -87,8 +92,7 @@ eos
       sname = context.super_name(p.text_value, mname)
 
       # A sub-node (derived node) is just a subclass.
-      "class #{n.text_value} < #{sname}; " +
-        "def self.name; '#{n.text_value}'; end; end"
+      def_class(context, sname)
     end
   end
 
@@ -302,9 +306,9 @@ eos
       raise "No positional arguments to node call" unless
         args.empty?
 
-      kw_str = '{' + kw.map {|k, v| "'#{k}' => #{v}" }.join(',') + '}'
+      kw_str = kw.map {|k, v| "'#{k}' => #{v}"}.join(',')
 
-      "_node_call(#{node_name}, nil, _e, #{kw_str})"
+      "_node_call(#{node_name}, _e, {#{kw_str}})"
     end
   end
 

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/eval_spec.rb

@@ -23,7 +23,7 @@ describe "Delorean" do
                       "  b = -(a + 1)",
                       "  c = -a + 1",
                       )
-    
+
     engine.evaluate_attrs("A", ["a"]).should == [123]
 
     r = engine.evaluate_attrs("A", ["x", "b"])
@@ -143,28 +143,31 @@ describe "Delorean" do
                       "  a = 1/0",
                       "  b = 10 * a",
                       )
-    
+
     begin
       engine.evaluate("A", "b")
     rescue => exc
-      res = engine.parse_runtime_exception(exc)
+      res = Delorean::Engine.grok_runtime_exception(exc)
     end
 
-    res.should == ["divided by 0", [["XXX", 2, "/"], ["XXX", 2, "a"], ["XXX", 3, "b"]]]
+    res.should == {
+      "error" => "divided by 0",
+      "backtrace" => [["XXX", 2, "/"], ["XXX", 2, "a"], ["XXX", 3, "b"]],
+    }
   end
 
   it "should handle runtime errors 2" do
     engine.parse defn("A:",
                       "  b = Dummy.call_me_maybe('a', 'b')",
                       )
-    
+
     begin
       engine.evaluate("A", "b")
     rescue => exc
-      res = engine.parse_runtime_exception(exc)
+      res = Delorean::Engine.grok_runtime_exception(exc)
     end
 
-    res[1].should == [["XXX", 2, "b"]]
+    res["backtrace"].should == [["XXX", 2, "b"]]
   end
 
   it "should handle operator precedence properly" do
@@ -190,7 +193,7 @@ describe "Delorean" do
 
     engine.parse text
     r = engine.evaluate("A", "e", {"d" => -100})
-    r.should == "gungam"+"style"
+    r.should == "gungamstyle"
 
     r = engine.evaluate("A", "e")
     r.should == "korea"
@@ -206,7 +209,7 @@ describe "Delorean" do
                       "C:",
                       "  c = A.c + B.c",
                       )
-    
+
     r = engine.evaluate("B", "c")
     r.should == 123*123
     r = engine.evaluate("C", "c", {"c" => 5})
@@ -369,13 +372,13 @@ eoc
 
     r = engine.evaluate("B", "b", {"a" => 10})
     r.should == 10*3
-    
+
     lambda {
       r = engine.evaluate("B", "b")
     }.should raise_error(Delorean::UndefinedParamError)
 
   end
-  
+
   sample_script = <<eof
 A:
 	a = 2
@@ -618,7 +621,7 @@ eof
                       "  n =?",
                       "  fact = if n <= 1 then 1 else n * A(n: n-1).fact",
                       )
-    
+
     engine.evaluate("A", "fact", "n" => 10).should == 3628800
   end
 

data/spec/parse_spec.rb

@@ -648,6 +648,17 @@ describe "Delorean" do
                       )
   end
 
+  it "should not allow positional args to node calls" do
+    begin
+      engine.parse defn("A:",
+                        "  d = A(1, 2, 3)",
+                        )
+      raise "fail"
+    rescue Delorean::ParseError => exc
+      exc.line.should == 2
+    end
+  end
+
   it "should parse instance calls" do
     engine.parse defn("A:",
                       "  a = [1,2,[4]].flatten(1)",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -42,28 +42,28 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A "compiler" for the Delorean programming language
@@ -105,12 +105,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -125,3 +125,4 @@ test_files:
 - spec/func_spec.rb
 - spec/parse_spec.rb
 - spec/spec_helper.rb
+has_rdoc: