delorean_lang 0.1.01 → 0.1.02

data/lib/delorean/delorean.rb

@@ -2463,7 +2463,12 @@ module Delorean
             end
             s9 << r13
             if r13
-              r15 = _nt_kw_args
+              r16 = _nt_kw_args
+              if r16
+                r15 = r16
+              else
+                r15 = instantiate_node(SyntaxNode,input, index...index)
+              end
               s9 << r15
             end
           end

data/lib/delorean/delorean.treetop

@@ -108,7 +108,7 @@ grammar Delorean
   end
 
   rule kw_args
-    k:(i:identifier ':' sp?)? arg0:expression args_rest:(sp? ',' sp? al:kw_args)? <KwArgs>
+    k:(i:identifier ':' sp?)? arg0:expression args_rest:(sp? ',' sp? al:kw_args?)? <KwArgs>
   end
 
   rule number

data/lib/delorean/nodes.rb

@@ -297,10 +297,6 @@ eos
     end
 
     def rewrite(context, node_name)
-      do_rewrite(context, node_name)
-    end
-
-    def do_rewrite(context, node_name, mname="nil")
       args, kw = al.text_value.empty? ? [[], {}] : al.rewrite(context)
 
       raise "No positional arguments to node call" unless
@@ -308,7 +304,7 @@ eos
 
       kw_str = '{' + kw.map {|k, v| "'#{k}' => #{v}" }.join(',') + '}'
 
-      "_node_call(#{node_name}, #{mname}, _e, #{kw_str})"
+      "_node_call(#{node_name}, nil, _e, #{kw_str})"
     end
   end
 
@@ -394,8 +390,7 @@ eos
       context.parse_define_var(i.text_value)
       res += ".select{|#{i.rewrite(context)}| (#{ifexp.e3.rewrite(context)}) }" if
         defined?(ifexp.e3)
-      res += ".map{"
-      res += "|#{i.rewrite(context)}| (#{e2.rewrite(context)}) }"
+      res += ".map{|#{i.rewrite(context)}| (#{e2.rewrite(context)}) }"
       context.parse_undef_var(i.text_value)
       res
     end
@@ -427,8 +422,7 @@ eos
       iw = i.rewrite(context)
       res += ".select{|#{iw}| (#{ifexp.ei.rewrite(context)}) }" if
         defined?(ifexp.ei)
-      res += ".inject({}){"
-      res += "|_h#{iw}, #{iw}| "+
+      res += ".inject({}){|_h#{iw}, #{iw}| " +
         "_h#{iw}[#{el.rewrite(context)}]=(#{er.rewrite(context)}); _h#{iw}}"
       context.parse_undef_var(i.text_value)
       res
@@ -454,7 +448,7 @@ eos
     def rewrite(context)
       arg0_rw = arg0.rewrite(context)
 
-      if defined?(args_rest.al)
+      if defined?(args_rest.al) && !args_rest.al.text_value.empty?
         args, kw = args_rest.al.rewrite(context)
       else
         args, kw = [], {}

data/lib/delorean/version.rb

@@ -1,3 +1,3 @@
 module Delorean
-  VERSION = "0.1.01"
+  VERSION = "0.1.02"
 end

data/spec/parse_spec.rb

@@ -635,7 +635,9 @@ describe "Delorean" do
                       "  b = 456 + a",
                       "  n = 'A'",
                       "  c = nil(x: 123, y: 456)",
-                      "  d = n(x: 123, y: 456)",
+                      "  d = n(x: 123,",
+                      "        y: 456,",
+                      "       )",
                       )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delorean_lang
 version: !ruby/object:Gem::Version
-  version: 0.1.01
+  version: 0.1.02
   prerelease: 
 platform: ruby
 authors: