delorean_lang 0.1.7 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjRmOWNjNTZjNTM5MWE0ZmE3OTM4MGE3MTY1MjRjZDgzNDdjZWRlMQ==
+    NzA4ZGU5ZGEwNmIwNjU0NzYyYWZkMTU4MTAxNzdiMzg3ZjFjODQyNA==
   data.tar.gz: !binary |-
-    ZDlhMDJkNjhmODM4Yjg0OTAxYWZhMDk1MDE2M2M2NGU4ZTQ4Yzc2ZA==
+    ZmNkNTk2Y2Y2YzU5NzJiZTE5MzNmYTU4ODAwYzU3NTAyNmY5ZTJiNg==
 SHA512:
   metadata.gz: !binary |-
-    YmQ4NjNlMDgyMDBkMTczNzc5NGU5YjE1NmJlMDAzODhkMWJmMTkwNzIzZDc4
-    ZDQzZTVmMmQ4MTlmYzllOTc3ZDdhZGJiNjk5NDA3MmUwNTY4OGFkNmRjODYw
-    YjM2ZWEyMTliMjY4OWUxOTg5NGUzODVkMzQxODVhMmFlYTJjYTY=
+    MzY1ZTk3YWMyYTgzODY5ZjM1YjFmODAxM2JlZWJlNDQ4NTg4Yzg1ODNjNGFm
+    NGQwYzM1MmE4YTYxZDVhNzA0NDlhYmFiZGM1NjJhNTVlOGEzYjViYmRiYzA2
+    NGFhMDQyZWEwYjUxOTdiOTc2ZDAyYjE5M2M1NjZlMzgxMDU3OTc=
   data.tar.gz: !binary |-
-    NzE3NWI2ZGE2OTVjMDQ2NDg4YTAwN2ZmNjRkOWE4YTRmZjI3NDY1ZGI5N2Vk
-    ODU2MmZjMzM0YzYyNDgwYzlmODlmZDc1YjFhYjQyMWI5N2JjOTZlOTgxMDBi
-    ZTQwNzEyY2M4ZjA2ZmEzMDAwZTQ0M2M4MGQzNjM3ODQ2MTk4ODk=
+    MzkwMmQwOGUxN2U2MjJmZjJhZjQ0MmU0NGY0Mzg4ZmQ2NmVhZGRlNzI0YjNi
+    NzQyNGE2MTRiYzRkNTdiMTRiMDNmNmNlYzJmOTMyYWU5MDM4ZmY1NjRlM2Y5
+    ZmQxZWNmMmQyZjAyYzE3NmQ0ODg0YWUxZDY2MjAzMTNjOWFiYmU=

data/lib/delorean/base.rb

@@ -187,4 +187,3 @@ module Delorean
     end
   end
 end
-

data/lib/delorean/container.rb

@@ -1,46 +1,7 @@
 require 'delorean/base'
 
-module Delorean
-  class AbstractContainer
-    def initialize
-      @engines = {}
-    end
-
-    def names
-      @engines.keys.map {|n, v| n}
-    end
-
-    def get(name, version)
-      @engines[ [name, version] ]
-    end
-
-    def add(name, version, engine)
-      if names.member? name
-        n, v = @engines.keys.detect {|n, v| n == name}
-
-        raise "Can't import #{name} version #{version}. " +
-          "Collides with imported version #{v}."
-      end
-
-      @engines[ [name, version] ] = engine
-    end
-
-    def add_imports(engine)
-      # Given an engine, make sure that all of its imports are added
-      # to the script container.  This makes sure we don't have
-      # version conflict among different scripts.
-      engine.imports.each { |name, ev|
-        get(name, ev[1]) || add(name, ev[1], ev[0])
-      }
-    end
-
-    def import(name, version)
-      get(name, version) ||
-        add(name, version, get_engine(name, version))
-    end
-
-    def get_engine(name, version)
-      raise "get_engine needs to be overriden"
-    end
+class Delorean::AbstractContainer
+  def get_engine(name)
+    raise "get_engine needs to be overriden"
   end
 end

data/lib/delorean/delorean.rb

@@ -165,21 +165,13 @@ module Delorean
   end
 
   module Formula6
-    def sp1
+    def sp
       elements[1]
     end
 
     def n
       elements[2]
     end
-
-    def sp2
-      elements[3]
-    end
-
-    def v
-      elements[4]
-    end
   end
 
   def _nt_formula
@@ -430,14 +422,6 @@ module Delorean
                 if r40
                   r41 = _nt_class_name
                   s38 << r41
-                  if r41
-                    r42 = _nt_sp
-                    s38 << r42
-                    if r42
-                      r43 = _nt_integer
-                      s38 << r43
-                    end
-                  end
                 end
               end
               if s38.last

data/lib/delorean/delorean.treetop

@@ -14,7 +14,7 @@ grammar Delorean
     /
     n:class_name ':' <BaseNode>
     /
-    'import' sp n:class_name sp v:integer <Import>
+    'import' sp n:class_name <Import>
   end
 
   rule class_name

data/lib/delorean/engine.rb

@@ -5,12 +5,13 @@ require 'pp'
 
 module Delorean
   class Engine
-    attr_reader :last_node, :module_name, :version,
-    :line_no, :comp_set, :pm, :m, :imports
+    attr_reader :last_node, :module_name, :line_no,
+    :comp_set, :pm, :m, :imports, :sset
 
-    def initialize(module_name, version=nil)
+    def initialize(module_name, sset=nil)
       # name of current module
-      @module_name, @version = module_name, version
+      @module_name = module_name
+      @sset = sset
       reset
     end
 
@@ -32,30 +33,30 @@ module Delorean
       @multi_no || @line_no
     end
 
-    def parse_import(sset, name, version)
+    def parse_import(name)
       err(ParseError, "No script set") unless sset
 
       err(ParseError, "Module #{name} importing itself") if
         name == module_name
 
       begin
-        @imports[name] = [sset.import(name, version), version]
+        @imports[name] = sset.get_engine(name)
       rescue => exc
         err(ImportError, exc.to_s)
       end
 
-      @pm.const_set("#{MOD}#{name}", @imports[name][0].pm)
+      @pm.const_set("#{MOD}#{name}", @imports[name].pm)
     end
 
-    def gen_import(name, version)
-      @imports.merge!(@imports[name][0].imports)
+    def gen_import(name)
+      @imports.merge!(@imports[name].imports)
 
-      @m.const_set("#{MOD}#{name}", @imports[name][0].m)
+      @m.const_set("#{MOD}#{name}", @imports[name].m)
     end
 
     def get_import_engine(name)
       err(ParseError, "#{name} not imported") unless @imports[name]
-      @imports[name][0]
+      @imports[name]
     end
 
     def is_node_defined(name)
@@ -212,8 +213,8 @@ module Delorean
       @@parser ||= DeloreanParser.new
     end
 
-    def generate(t, sset=nil)
-      t.check(self, sset)
+    def generate(t)
+      t.check(self)
 
       begin
         # generate ruby code
@@ -233,7 +234,7 @@ module Delorean
       end
     end
 
-    def parse(source, sset=nil)
+    def parse(source)
       raise "can't call parse again without reset" if @pm
 
       # @m module is used at runtime for code evaluation.  @pm module
@@ -263,7 +264,7 @@ module Delorean
 
           if t
             multi_line, @multi_no = nil, nil
-            generate(t, sset)
+            generate(t)
           end
 
         else
@@ -275,7 +276,7 @@ module Delorean
             multi_line = line
             @multi_no = @line_no
           else
-            generate(t, sset)
+            generate(t)
           end
         end
       end
@@ -295,9 +296,8 @@ module Delorean
 
     # enumerate qualified list of all attrs
     def enumerate_attrs
-      @node_attrs.keys.inject({}) { |h, node|
+      @node_attrs.keys.each_with_object({}) { |node, h|
         h[node] = enumerate_attrs_by_node(node)
-        h
       }
     end
 

data/lib/delorean/nodes.rb

@@ -52,12 +52,12 @@ eos
   end
 
   class Import < SNode
-    def check(context, sset)
-      context.parse_import(sset, n.text_value, v.text_value)
+    def check(context)
+      context.parse_import(n.text_value)
     end
 
     def rewrite(context)
-      context.gen_import(n.text_value, v.text_value)
+      context.gen_import(n.text_value)
       ""
     end
   end

data/lib/delorean/version.rb

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

data/spec/eval_spec.rb

@@ -2,13 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Delorean" do
 
-  let(:engine) {
-    Delorean::Engine.new "XXX"
-  }
-
   let(:sset) {
     TestContainer.new({
-                        ["AAA", "0001"] =>
+                        "AAA" =>
                         defn("X:",
                              "  a =? 123",
                              "  b = a*2",
@@ -16,6 +12,10 @@ describe "Delorean" do
                       })
   }
 
+  let(:engine) {
+    Delorean::Engine.new "XXX", sset
+  }
+
   it "evaluate simple expressions" do
     engine.parse defn("A:",
                       "  a = 123",
@@ -308,7 +308,7 @@ eoc
     engine.evaluate("E", "xx").should == [1,2,3]
   end
 
-  it "should be able to call class methods on ActiveRecord classes in modules" do
+  it "should be able to call class methods on AR classes in modules" do
     engine.parse defn("A:",
                       "  b = M::LittleDummy.heres_my_number(867, 5309)",
                       )
@@ -433,7 +433,8 @@ eof
     engin2.evaluate_attrs("A", ["a", "b"]).should == [222.0, 222.0/5]
 
     engine.evaluate_attrs("B", ["a", "b", "c"]).should == [123, 123*3, 123*3*2]
-    engin2.evaluate_attrs("B", ["a", "b", "c"]).should == [222.0, 222.0/5, 222.0/5*3]
+    engin2.evaluate_attrs("B", ["a", "b", "c"]).should ==
+      [222.0, 222.0/5, 222.0/5*3]
 
     engin2.evaluate("C", "d").should == 111
     lambda {
@@ -662,29 +663,29 @@ eof
   end
 
   it "should eval imports" do
-    engine.parse defn("import AAA 0001",
+    engine.parse defn("import AAA",
                       "A:",
                       "  b = 456",
                       "B: AAA::X",
                       "  a = 111",
                       "  c = AAA::X(a: 456).b",
-                      ), sset
+                      )
     engine.evaluate_attrs("B", ["a", "b", "c"], {}).should ==
       [111, 222, 456*2]
   end
 
   it "should eval imports (2)" do
     sset.merge({
-                 ["BBB", "0002"] =>
-                 defn("import AAA 0001",
+                 "BBB"  =>
+                 defn("import AAA",
                       "B: AAA::X",
                       "  a = 111",
                       "  c = AAA::X(a: -1).b",
                       "  d = a * 2",
                       ),
-                 ["CCC", "0003"] =>
-                 defn("import BBB 0002",
-                      "import AAA 0001",
+                 "CCC" =>
+                 defn("import BBB",
+                      "import AAA",
                       "B: BBB::B",
                       "  e = d * 3",
                       "C: AAA::X",
@@ -692,20 +693,20 @@ eof
                       ),
                })
 
-    e2 = sset.get_engine("BBB", "0002")
+    e2 = sset.get_engine("BBB")
 
     e2.evaluate_attrs("B", ["a", "b", "c", "d"]).should ==
       [111, 222, -2, 222]
 
-    engine.parse defn("import BBB 0002",
+    engine.parse defn("import BBB",
                       "B: BBB::B",
                       "  e = d + 3",
-                      ), sset
+                      )
 
     engine.evaluate_attrs("B", ["a", "b", "c", "d", "e"]).should ==
       [111, 222, -2, 222, 225]
 
-    e4 = sset.get_engine("CCC", "0003")
+    e4 = sset.get_engine("CCC")
 
     e4.evaluate_attrs("B", ["a", "b", "c", "d", "e"]).should ==
       [111, 222, -2, 222, 666]
@@ -715,16 +716,16 @@ eof
 
   it "should eval imports (3)" do
     sset.merge({
-                 ["BBB", "0002"] => getattr_code,
-                 ["CCC", "0003"] =>
-                 defn("import BBB 0002",
+                 "BBB" => getattr_code,
+                 "CCC" =>
+                 defn("import BBB",
                       "X:",
                       "  xx = [n.x for n in BBB::D().xs]",
                       "  yy = [n.x for n in BBB::D.xs]",
                       ),
                })
 
-    e4 = sset.get_engine("CCC", "0003")
+    e4 = sset.get_engine("CCC")
     e4.evaluate("X", "xx").should == [1,2,3]
     e4.evaluate("X", "yy").should == [1,2,3]
   end
@@ -750,7 +751,8 @@ eof
                       "  d = c['b'].x * c['a'] - c['b'].y",
                       )
     r = engine.evaluate_attrs("A", ["a", "b", "c", "d"])
-    r.should == [1, {"x"=>123, "y"=>456}, {"a"=>1, "b"=>{"x"=>123, "y"=>456}}, -333]
+    r.should ==
+      [1, {"x"=>123, "y"=>456}, {"a"=>1, "b"=>{"x"=>123, "y"=>456}}, -333]
   end
 
   it "should properly eval overridden attrs" do

data/spec/parse_spec.rb

@@ -2,13 +2,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Delorean" do
 
-  let(:engine) {
-    Delorean::Engine.new "YYY"
-  }
-
   let(:sset) {
     TestContainer.new({
-                        ["AAA", "0001"] =>
+                        "AAA" =>
                         defn("X:",
                              "  a = 123",
                              "  b = a",
@@ -16,6 +12,10 @@ describe "Delorean" do
                       })
   }
 
+  let(:engine) {
+    Delorean::Engine.new "YYY", sset
+  }
+
   it "can parse very simple calls" do
     engine.parse defn("X:",
                       "  a = 123",
@@ -702,71 +702,25 @@ describe "Delorean" do
   end
 
   it "should parse imports" do
-    engine.parse defn("import AAA 0001",
+    engine.parse defn("import AAA",
                       "A:",
                       "  b = 456",
                       "B: AAA::X",
-                      ), sset
-    
+                      )
   end
 
   it "should disallow import loops" do
     pending
     sset.merge({
-                 ["BBB", "0001"] =>
-                 defn("import AAA 0001",
-                      "import CCC 0001",
+                 "BBB" =>
+                 defn("import AAA",
+                      "import CCC",
                       ),
-                 ["CCC", "0001"] =>
-                 defn("import BBB 0001",
+                 "CCC" =>
+                 defn("import BBB",
                       ),
                })
-    sset.get_engine("CCC", "0001")
-  end
-
-  it "should disallow multiple versions of same script" do
-    sset.merge({
-                 ["AAA", "0002"] =>
-                 defn("A:",
-                      ),
-                 ["BBB", "0001"] =>
-                 defn("import AAA 0001",
-                      ),
-                 ["CCC", "0001"] =>
-                 defn("import BBB 0001",
-                      "import AAA 0002",
-                      ),
-               })
-    begin
-      sset.get_engine("CCC", "0001")
-    rescue Delorean::ImportError => exc
-      exc.line.should == 2
-    end
-  end
-
-  it "should disallow multiple versions of same script (2)" do
-    sset.merge({
-                 ["BBB", "0001"] =>
-                 defn("import AAA 0001",
-                      ),
-                 ["CCC", "0001"] =>
-                 defn("import AAA 0001",
-                      "import BBB 0001",
-                      ),
-                 ["AAA", "0002"] =>
-                 defn("A:",
-                      ),
-                 ["CCC", "0002"] =>
-                 defn("import AAA 0002",
-                      "import BBB 0001",
-                      ),
-               })
-    begin
-      sset.get_engine("CCC", "0002")
-    rescue Delorean::ImportError => exc
-      exc.line.should == 2
-    end
+    sset.get_engine("CCC")
   end
 
 end
-

data/spec/spec_helper.rb

@@ -10,7 +10,7 @@ require 'active_record'
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|
-  
+
 end
 
 def defn(*l)
@@ -18,7 +18,7 @@ def defn(*l)
 end
 
 ######################################################################
-# ActiveRecord related 
+# ActiveRecord related
 
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
@@ -79,22 +79,24 @@ class TestContainer < Delorean::AbstractContainer
   def initialize(scripts={})
     super()
     @scripts = scripts
+    @engines = {}
   end
 
   def merge(scripts)
     @scripts.merge!(scripts)
   end
 
-  def get_engine(name, version)
-    script = @scripts[ [name, version] ]
+  def get_engine(name)
+    return @engines[name] if @engines[name]
+
+    script = @scripts[name]
 
-    raise "can't find #{name} #{version}" unless script
+    raise "can't find #{name}" unless script
 
-    engine = Delorean::Engine.new name
-    engine.parse script, self
+    engine = Delorean::Engine.new name, self
+    engine.parse script
     engine
   end
 end
 
 ######################################################################
-

metadata

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