delorean_lang 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e16424d7fcee1580734a4acd92800dfe12d6843
-  data.tar.gz: b0e838fd40d2dc67e56c6a0902ac18c6334e62cb
+SHA256:
+  metadata.gz: 5e28b88960385dcb51187a4ad4aa9f6449ba7d2ab3bf2d156954136466ba783a
+  data.tar.gz: 04c88ebab877fa9ee7e623246954a3734f3d28400e35316f52da930015b135df
 SHA512:
-  metadata.gz: c206b29669d8089786b2e06bc33b2ed5f83c38d5c8feb648282b316aee98fb333cba456f042f321c3f89196e28ee0635165c49c1ce2a8dc2fcdf6f677cb738cd
-  data.tar.gz: 703a9c28bdfb4c52f0d242583a1003d1649601be87e06552dab7f8a860cd4193c5b3c22e3bac0dc1d23c452512f7567af438e4982f0d31e00653358b09367250
+  metadata.gz: 99a1c358f6fb77804cfb434d683721080d3fdfec500f757b50c62e6c6393e32cd082ceac78cf76735b520c4e06282199a178a34cc48a13aa0dd5dce4b84af033
+  data.tar.gz: b4413fd38b79db395ccd53b150e8f667809969235def188142ef55ee7e841ae1e6020d1adf32f5314815be6d08801ef825f90cc2aa571f606594d88483f835b8

data/delorean.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "activerecord", ">= 3.2"
   gem.add_development_dependency "rspec", '~> 2.1'
   gem.add_development_dependency "sqlite3", '~> 1.3.10'
+  gem.add_development_dependency "pry"
 end

data/lib/delorean/base.rb

@@ -86,22 +86,28 @@ module Delorean
   }
 
   module BaseModule
+    # _e is used by Marty promise_jobs to pass promise-related
+    # information
     class NodeCall < Struct.new(:_e, :engine, :node, :params)
-      def evaluate(attr)
+      def cloned_params
         # FIXME: evaluate() modifies params! => need to clone it.
         # This is pretty awful.  NOTE: can't sanitize params as Marty
         # patches NodeCall and modifies params to send _parent_id.
         # This whole thing needs to be redone.
-        engine.evaluate(node, attr, params.clone)
+        @cp ||= params.clone
+      end
+
+      def evaluate(attr)
+        engine.evaluate(node, attr, cloned_params)
       end
 
       def /(args)
         begin
           case args
           when Array
-            engine.eval_to_hash(node, args, params.clone)
+            engine.eval_to_hash(node, args, cloned_params)
           when String
-            engine.evaluate(node, args, params.clone)
+            self.evaluate(args)
           else
             raise "non-array/string arg to /"
           end
@@ -114,8 +120,7 @@ module Delorean
       def %(args)
         raise "non-array arg to %" unless args.is_a?(Array)
 
-        # FIXME: params.clone!!!!
-        engine.eval_to_hash(node, args, params.clone)
+        engine.eval_to_hash(node, args, cloned_params)
       end
 
       # add new arguments, results in a new NodeCall
@@ -124,10 +129,6 @@ module Delorean
 
         NodeCall.new(_e, engine, node, params.merge(args))
       end
-
-      def sanitized_params
-        BaseClass._sanitize_hash(params)
-      end
     end
 
     class BaseClass

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/dev_spec.rb

@@ -20,7 +20,7 @@ describe "Delorean" do
     engine.enumerate_nodes.should == SortedSet.new(["A", "X", "XX", "Y"])
   end
 
-  it "can enumerate all attrs" do
+  it "can enumerate attrs by node" do
     engine.parse defn("X:",
                       "    a = 123",
                       "    b = a",
@@ -31,29 +31,23 @@ describe "Delorean" do
                       "    c =?",
                       "    d = 456",
                       )
-    engine.enumerate_attrs.should == {
-      "X"=>["a", "b"],
-      "Y"=>["a", "b"],
-      "Z"=>[],
-      "XX"=>["a", "c", "d", "b"],
+
+    exp = {
+      "X"  => ["a", "b"],
+      "Y"  => ["a", "b"],
+      "Z"  => [],
+      "XX" => ["a", "b", "c", "d"],
     }
-  end
+    res = engine.enumerate_attrs
 
-  it "can enumerate attrs by node" do
-    engine.parse defn("X:",
-                      "    a = 123",
-                      "    b = a",
-                      "Y: X",
-                      "Z:",
-                      "XX: Y",
-                      "    a = 11",
-                      "    c =?",
-                      "    d = 456",
-                      )
-    engine.enumerate_attrs_by_node("X").should == ["a", "b"]
-    engine.enumerate_attrs_by_node("Y").should == ["a", "b"]
-    engine.enumerate_attrs_by_node("Z").should == []
-    engine.enumerate_attrs_by_node("XX").should == ["a", "c", "d", "b"]
+    res.keys.sort.should == exp.keys.sort
+
+    exp.each {
+      |k, v|
+
+      engine.enumerate_attrs_by_node(k).sort.should == v
+      res[k].sort.should == v
+    }
   end
 
   it "can enumerate params" do

data/spec/eval_spec.rb

@@ -967,7 +967,7 @@ eof
     expect(r[2]).to be_nil
   end
 
-  xit "can use nodes as continuations" do
+  it "can use nodes as continuations" do
 
     # FIME: This is actually a trivial exmaple. Ideally we should be
     # able to pass arguments to the nodes when evaluating ys.  If the
@@ -987,4 +987,21 @@ eof
     r = engine.evaluate("B", "res")
     expect(r[1]).to eq r[0]
   end
+
+  it "can use nodes as continuations -- simple" do
+    engine.parse defn("A:",
+                      "    x = Dummy.side_effect",
+                      "    y = x",
+                      "B:",
+                      "    ns = A()",
+                      "    res = [ns.x, ns.y]",
+                      "    res2 = ns % ['x', 'y']",
+                     )
+    r = engine.evaluate("B", "res")
+    expect(r[1]).to eq r[0]
+
+    # this one works as expected
+    r2 = engine.evaluate("B", "res2")
+    expect(r2.values.uniq.length).to eq 1
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: pry
+  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
 email:
 - arman.bostani@pnmac.com
@@ -118,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Delorean compiler