delorean_lang 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee6c299a28d2661c437cfc0553212fea130fd66ecf24c0ffee3e107862c39cf
-  data.tar.gz: c4e175afaddad9ef6ec2f8c8f38627b0ccae1dc0221750c330fee618eede8797
+  metadata.gz: f883290f82867edc3d1c7d8fa4414bb5dccbc9561619a1af1ab99348518828cd
+  data.tar.gz: b7f0128847fbb2ac7ff0f1364f549e3911a981a64ed07a2b0de8005ae2e7abb7
 SHA512:
-  metadata.gz: 40e755c1bc18b01c98a91954dd7b1885c3b36d807cd596fe6c867f94a8194d8475d3e0e5bc6784a7b64af40e4f55d39f125e3bcd63b020e163b18c95f5e24392
-  data.tar.gz: ad92b4bca8c7707fb3995799eb1de2b838972be97da2934d51f32dd2bc97c59f6f40dedf44be9f60ad74711bdb4eed4c8d6c557035d0e7d6765afacc53bbee9b
+  metadata.gz: 27541d90b44f21b3dcc24055c548059282c4a857ef32aec58b97a20c0ded8f752aa1bc1be763e207e7222914711935baa9f3d1295132a6719ab5a3b664c1f836
+  data.tar.gz: 516c7f76522351367deb20ed771dc87b239cee2665dc05ddcebd2b0fcba106396db9a9d0e12e3f7b9729470a530739e6f756298b1c46780dc7d27407fc3566c2

data/lib/delorean/nodes.rb

@@ -367,19 +367,24 @@ eos
 
   class FnArgs < SNode
     def check(context, *)
-      arg0.check(context) +
-        (defined?(args_rest.args) && !args_rest.args.text_value.empty? ?
-         args_rest.args.check(context) : [])
+      [
+        arg0.check(context),
+        (args_rest.args.check(context) if
+          defined?(args_rest.args) && !args_rest.args.text_value.empty?)
+      ].compact.sum
     end
 
     def rewrite(context)
-      arg0.rewrite(context) +
-        (defined?(args_rest.args) && !args_rest.args.text_value.empty? ?
-         ", " + args_rest.args.rewrite(context) : "")
+      [
+        arg0.rewrite(context),
+        (", " + args_rest.args.rewrite(context) if
+          defined?(args_rest.args) && !args_rest.args.text_value.empty?),
+      ].compact.sum
     end
 
     def arg_count
-      defined?(args_rest.args) ? 1 + args_rest.args.arg_count : 1
+      defined?(args_rest.args) && !args_rest.args.text_value.empty? ?
+        1 + args_rest.args.arg_count : 1
     end
   end
 
@@ -391,8 +396,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
 
@@ -442,16 +447,16 @@ eos
     end
 
     def rewrite(context)
-      res = "(#{e1.rewrite(context)})"
+      res = ["(#{e1.rewrite(context)})"]
       unpack_vars = args.check(context)
       unpack_vars.each {|vname| context.parse_define_var(vname)}
       args_str = args.rewrite(context)
 
-      res += ".select{|#{args_str}|(#{ifexp.e3.rewrite(context)})}" if
+      res << ".select{|#{args_str}|(#{ifexp.e3.rewrite(context)})}" if
         defined?(ifexp.e3)
-      res += ".map{|#{args_str}| (#{e2.rewrite(context)}) }"
+      res << ".map{|#{args_str}| (#{e2.rewrite(context)}) }"
       unpack_vars.each {|vname| context.parse_undef_var(vname)}
-      res
+      res.sum
     end
   end
 
@@ -493,23 +498,23 @@ eos
     end
 
     def rewrite(context)
-      res = "(#{e1.rewrite(context)})"
+      res = ["(#{e1.rewrite(context)})"]
       unpack_vars = args.check(context)
       unpack_vars.each {|vname| context.parse_define_var(vname)}
       args_str = args.rewrite(context)
 
       hid = @@comp_count += 1
 
-      res += ".select{|#{args_str}| (#{ifexp.ei.rewrite(context)}) }" if
+      res << ".select{|#{args_str}| (#{ifexp.ei.rewrite(context)}) }" if
         defined?(ifexp.ei)
 
       unpack_str = unpack_vars.count > 1 ? "(#{args_str})" : args_str
 
-      res += ".each_with_object({}){|#{unpack_str}, _h#{hid}| " +
+      res << ".each_with_object({}){|#{unpack_str}, _h#{hid}| " +
         "_h#{hid}[#{el.rewrite(context)}]=(#{er.rewrite(context)})}"
 
       unpack_vars.each {|vname| context.parse_undef_var(vname)}
-      res
+      res.sum
     end
   end
 
@@ -564,10 +569,10 @@ eos
     end
 
     def rewrite(context, var)
-      if defined?(splat)
-        res = "#{var}.merge!(#{e0.rewrite(context)})"
+      res = if defined?(splat)
+        "#{var}.merge!(#{e0.rewrite(context)})"
       else
-        res = "#{var}[#{e0.rewrite(context)}]=(#{e1.rewrite(context)})"
+        "#{var}[#{e0.rewrite(context)}]=(#{e1.rewrite(context)})"
       end
       res += " if (#{ifexp.e3.rewrite(context)})" if defined?(ifexp.e3)
       res += ";"

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Arman Bostani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop