delorean_lang 0.1.03 → 0.1.04

data/lib/delorean/container.rb

@@ -15,14 +15,6 @@ module Delorean
     end
 
     def add(name, version, engine)
-      @engines[ [name, version] ] = engine
-    end
-
-    def import(name, version)
-      engine = get(name, version)
-
-      return engine if engine
-
       if names.member? name
         n, v = @engines.keys.detect {|n, v| n == name}
 
@@ -30,7 +22,21 @@ module Delorean
           "Collides with imported version #{v}."
       end
 
-      add(name, version, get_engine(name, version))
+      @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)

data/lib/delorean/engine.rb

@@ -36,22 +36,23 @@ module Delorean
         name == module_name
 
       begin
-        @imports[name] = sset.import(name, version)
+        @imports[name] = [sset.import(name, version), version]
       rescue => exc
         err(ImportError, exc.to_s)
       end
 
-      @pm.const_set("#{MOD}#{name}", @imports[name].pm)
+      @pm.const_set("#{MOD}#{name}", @imports[name][0].pm)
     end
 
     def gen_import(name, version)
-      @imports.merge!(@imports[name].imports)
+      @imports.merge!(@imports[name][0].imports)
 
-      @m.const_set("#{MOD}#{name}", @imports[name].m)
+      @m.const_set("#{MOD}#{name}", @imports[name][0].m)
     end
 
     def get_import_engine(name)
-      @imports[name] || err(ParseError, "#{name} not imported")
+      err(ParseError, "#{name} not imported") unless @imports[name]
+      @imports[name][0]
     end
 
     def is_node_defined(name)

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.1.03"
+  VERSION = "0.1.04"
 end

data/spec/parse_spec.rb

@@ -733,5 +733,29 @@ describe "Delorean" do
     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
+  end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.1.03
+  version: 0.1.04
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-24 00:00:00.000000000 Z
+date: 2013-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop