delorean_lang 2.4.0 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84e137368e1c85b7005b7662f33e54e7cf6c7f1b0eb7fd2e3ebc8d9ebfbd8a04
-  data.tar.gz: 1b2039558b54352be0a030a2992aa50fc99c498fe3c1a96c84e36f9b4febb194
+  metadata.gz: a2f391feb742261cf7205700f71a6455c3994b88ff33e07ec3acc8b5bba322e7
+  data.tar.gz: af2616d688fc0b18844737aaa26dd37a597ed92a8ef338a46fc27c252beab739
 SHA512:
-  metadata.gz: 641d20f5de1251faaae77f7e571e6c2d43de03cc314d450b1c6246e00074c4fcb6a59506615d67968cc73b627901eedb7b3ee6375353b4a59e488ff43e4d06b7
-  data.tar.gz: 85afcad55380bb346f84fae8aa7e8b29601e28fe6a55e1f04d1bd9b968c064d40ab7235e2c19cf9791b3c7dc6b33d9339428e1809e9f51d5e81f1f7fea5cde9a
+  metadata.gz: 202515ed652a577f8eb270116397254c0d46e601e4062db196f8c4dd07abd13914e74dce21ee4a086d9e7e404b823f56671573bbafc382f950b32fec9fdfdab8
+  data.tar.gz: 2fca9df1461cc20b7e5a4c0e6aa60c9c54d35ec2bbe3b954b539b5b757818cfab5d315bc8bbd48d53aa35a2beb3a8fdb3f914dfced09068299cc104da0088578

data/lib/delorean/nodes.rb

@@ -464,7 +464,7 @@ eos
 
       return "#{a_name}#{POST}" if expr.empty?
 
-      "#{a_name}#{POST} = #{expr}"
+      "#{a_name}#{POST} = (#{expr})"
     end
 
     def force_def(context)
@@ -523,10 +523,6 @@ eos
         element.force_def(context)
       end
 
-      formulas = expressions.elements.select do |elem|
-        elem.is_a? BlockFormula
-      end
-
       result_formula = formulas.find do |formula|
         formula.i.text_value == 'result'
       end
@@ -548,6 +544,12 @@ eos
       end
     end
 
+    def formulas
+      expressions.elements.select do |elem|
+        elem.is_a? BlockFormula
+      end
+    end
+
     def rewrite(context, vcode)
       if !respond_to?(:al) || al.text_value.empty?
         args_str = ''
@@ -556,6 +558,7 @@ eos
         args_str = al.rewrite(context)
         arg_count = al.arg_count
       end
+
       if vcode.is_a?(ClassText)
         # FIXME: Do we really need this check here?
         # ruby class call
@@ -567,6 +570,10 @@ eos
         element.force_def(context)
       end
 
+      formulas.each do |element|
+        element.force_def(context)
+      end
+
       block_args_str = if b_args.elements.any?
                          block_args = b_args.elements.map do |v|
                            v.rewrite(context)
@@ -587,6 +594,10 @@ eos
         element.force_undef(context)
       end
 
+      formulas.each do |element|
+        element.force_undef(context)
+      end
+
       block = "{ #{block_args_str} #{expression_str} }"
 
       "_instance_call(#{vcode}, '#{i.text_value}', [#{args_str}], _e) #{block}"
@@ -654,8 +665,8 @@ eos
     end
 
     def rewrite(context)
-      "(#{v.rewrite(context)}) ? (#{e1.rewrite(context)}) :
-       (#{e2.rewrite(context)})"
+      "((#{v.rewrite(context)}) ? (#{e1.rewrite(context)}) :
+       (#{e2.rewrite(context)}))"
     end
   end
 
@@ -678,12 +689,12 @@ eos
            (#{node.e1.rewrite(context)})"
       end.join("\n")
 
-      "if (#{v.rewrite(context)})
+      "(if (#{v.rewrite(context)})
          (#{e1.rewrite(context)})
        #{elsifs_string}
        else
          (#{e2.rewrite(context)})
-      end"
+      end)"
     end
   end
 

data/lib/delorean/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delorean
-  VERSION = '2.4.0'
+  VERSION = '2.4.2'
 end

data/spec/eval_spec.rb

@@ -1386,6 +1386,17 @@ eof
     expect(r).to eq [5, 2460, 128, 1230]
   end
 
+  it 'works with the weird if case' do
+    engine.parse defn('A:',
+                      '    a = 1',
+                      '    b = 1',
+                      '    c = nil',
+                      '    d = a || if b || c then 999 else 0',
+                     )
+    r = engine.evaluate('A', 'd')
+    expect(r).to eq 1
+  end
+
   describe 'blocks' do
     let(:default_node) do
       ['A:',
@@ -1560,6 +1571,42 @@ eof
       expect(r).to eq([[3], 1])
     end
 
+    it 'works with custom formulas in blocks' do
+      engine.parse defn(*default_node,
+                        '    a = 1',
+                        '    b = 1',
+                        '    c = array.select     ',
+                        '        b =? 1',
+                        '        base_result = (b + a) > 2',
+                        '        base_result2 = base_result || false',
+                        '        result = base_result2',
+                        '    result = 10',
+                       )
+      r = engine.evaluate('A', 'c')
+      expect(r).to eq([2, 3])
+
+      r = engine.evaluate('A', 'result')
+      expect(r).to eq(10)
+    end
+
+    it 'block parameter can reference another block parameter or outside var' do
+      engine.parse defn(*default_node,
+                        '    a = 1',
+                        '    ab = 1',
+                        '    b = 1',
+                        '    c = array.select     ',
+                        '        b =? 1',
+                        '        ab =? b + a - 1',
+                        '        result = ab > 2',
+                        '    result = 10',
+                       )
+      r = engine.evaluate('A', 'c')
+      expect(r).to eq([3])
+
+      r = engine.evaluate('A', ['c', 'ab'])
+      expect(r).to eq([[3], 1])
+    end
+
     it 'works with syntax in blocks' do
       engine.parse defn(*default_node,
                         '    b = 1',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.2
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-27 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord