ruby_parser 3.6.6 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09754494e04948801beb28a7a2f32a8e53ba20c5
-  data.tar.gz: d24103e108f923b0f0665b3bf9e367f1618f9b73
+  metadata.gz: 41b49f3089bda3758931dcacdbfacfe188099d40
+  data.tar.gz: 16bdfbd9b6b350aadee20337abdc30145df20b01
 SHA512:
-  metadata.gz: f0c22a3e4dd845e6df193ccef9cd23cb9b461070b2964a11413b6e8c30d3851d69a8cee31e472fb48d9a3e5b0ac42d0adbd6ccf1456260d7f87d8ef526588147
-  data.tar.gz: 43f5cfddfe50a2c212536d002f99b7bef6bca40c9e92493bca0a1caea8a8ed2847eb66be041661d7f1ab171980a75b9d33609bf24e4e7f74babcb95e86ac6c78
+  metadata.gz: 54e6bf7dd57d961e29c7378f9779cc0b62d2f3e9f3d8c940605b78306fa6a27bc4bd37d49da2e96e1ca15c324b0d51fc03f861d12ffe8e919b491d9a5e2fcdac
+  data.tar.gz: 31a135b14a05303a46d8f5f227900139bf255ce297f1c1b23fcef382edd2362e77468aa5562588d516a9e8098be0be1bbfd43716e957b6b19e24bcaaf7def85c

data/.autotest

@@ -15,6 +15,11 @@ Autotest.add_hook :initialize do |at|
   at.add_exception "lib/ruby18_parser.rb"
   at.add_exception "lib/ruby19_parser.rb"
   at.add_exception "lib/ruby20_parser.rb"
+  at.add_exception "lib/ruby21_parser.rb"
+  at.add_exception "lib/ruby22_parser.rb"
+  at.add_exception "lib/ruby20_parser.y"
+  at.add_exception "lib/ruby21_parser.y"
+  at.add_exception "lib/ruby22_parser.y"
   at.add_exception "lib/ruby_lexer.rex.rb"
 
   Dir["gauntlet*"].each do |f|
@@ -25,7 +30,12 @@ Autotest.add_hook :initialize do |at|
   at.testlib = "minitest/autorun"
 
   at.add_mapping(/^lib\/.*\.y$/) do |f, _|
-    g = File.basename(f, ".y").gsub("_", "_?").gsub(/1[89]|2[01]/, '')
+    g = File.basename(f, ".y").gsub("_", "_?").gsub(/1[89]|2[012]/, '')
+    at.files_matching %r%^test/.*#{g}.rb$%
+  end
+
+  at.add_mapping(/^lib\/.*\.yy$/) do |f, _|
+    g = File.basename(f, ".yy").gsub("_", "_?").gsub(/1[89]|2[012]/, '')
     at.files_matching %r%^test/.*#{g}.rb$%
   end
 
@@ -46,7 +56,7 @@ Autotest.add_hook :initialize do |at|
     at.extra_class_map[klass] = "test/test_ruby_parser_extras.rb"
   end
 
-  %w(TestRuby18Parser TestRuby19Parser TestRuby20Parser TestRuby21Parser TestParseTree).each do |klass| # HACK
+  %w(TestRuby18Parser TestRuby19Parser TestRuby20Parser TestRuby21Parser TestRuby22Parser TestParseTree).each do |klass| # HACK
     at.extra_class_map[klass] = "test/test_ruby_parser.rb"
   end
 end

data/History.txt

@@ -1,3 +1,21 @@
+=== 3.7.0 / 2015-05-28
+
+* 2 major enhancements:
+
+  * Added preliminary support for ruby 2.2 syntax.
+  * Now writing all 2.x parsers from one source, generating racc files.
+
+* 1 minor enhancement:
+
+  * Added RubyLexer#process_label and hooked it up to "x": and 'x': productions.
+
+* 4 bug fixes:
+
+  * Fixed handling of block_args to be consistent across all parse versions.
+  * Fixed lexing of label assoc args w/ newlines in between k/v. (jeremyf)
+  * Fixed lexing of x?'':y for ruby22 (not a label). (presidentbeef)
+  * clear and restore cmdarg stack around def args and body.
+
 === 3.6.6 / 2015-04-13
 
 * 1 minor enhancement:

data/Manifest.txt

@@ -14,10 +14,13 @@ lib/ruby20_parser.rb
 lib/ruby20_parser.y
 lib/ruby21_parser.rb
 lib/ruby21_parser.y
+lib/ruby22_parser.rb
+lib/ruby22_parser.y
 lib/ruby_lexer.rb
 lib/ruby_lexer.rex
 lib/ruby_lexer.rex.rb
 lib/ruby_parser.rb
+lib/ruby_parser.yy
 lib/ruby_parser_extras.rb
 test/test_ruby_lexer.rb
 test/test_ruby_parser.rb

data/Rakefile

@@ -22,21 +22,38 @@ Hoe.spec "ruby_parser" do
   dependency "rake", "< 11", :developer
   dependency "oedipus_lex", "~> 2.1", :developer
 
-  if plugin? :perforce then
+  if plugin? :perforce then     # generated files
     self.perforce_ignore << "lib/ruby18_parser.rb"
     self.perforce_ignore << "lib/ruby19_parser.rb"
     self.perforce_ignore << "lib/ruby20_parser.rb"
+    self.perforce_ignore << "lib/ruby20_parser.y"
     self.perforce_ignore << "lib/ruby21_parser.rb"
+    self.perforce_ignore << "lib/ruby21_parser.y"
+    self.perforce_ignore << "lib/ruby22_parser.rb"
+    self.perforce_ignore << "lib/ruby22_parser.y"
     self.perforce_ignore << "lib/ruby_lexer.rex.rb"
   end
 
   self.racc_flags << " -t" if plugin?(:racc) && ENV["DEBUG"]
 end
 
+file "lib/ruby20_parser.y" => "lib/ruby_parser.yy" do |t|
+  sh "unifdef -tk -DRUBY20 -URUBY21 -URUBY22 -UDEAD #{t.source} > #{t.name} || true"
+end
+
+file "lib/ruby21_parser.y" => "lib/ruby_parser.yy" do |t|
+  sh "unifdef -tk -URUBY20 -DRUBY21 -URUBY22 -UDEAD #{t.source} > #{t.name} || true"
+end
+
+file "lib/ruby22_parser.y" => "lib/ruby_parser.yy" do |t|
+  sh "unifdef -tk -URUBY20 -URUBY21 -DRUBY22 -UDEAD #{t.source} > #{t.name} || true"
+end
+
 file "lib/ruby18_parser.rb" => "lib/ruby18_parser.y"
 file "lib/ruby19_parser.rb" => "lib/ruby19_parser.y"
 file "lib/ruby20_parser.rb" => "lib/ruby20_parser.y"
 file "lib/ruby21_parser.rb" => "lib/ruby21_parser.y"
+file "lib/ruby22_parser.rb" => "lib/ruby22_parser.y"
 file "lib/ruby_lexer.rex.rb" => "lib/ruby_lexer.rex"
 
 task :clean do
@@ -44,6 +61,7 @@ task :clean do
         Dir["diff.diff"] + # not all diffs. bit me too many times
         Dir["coverage.info"] +
         Dir["coverage"] +
+        Dir["lib/ruby2*_parser.y"] +
         Dir["lib/*.output"])
 end
 
@@ -75,18 +93,24 @@ task :isolate => :phony
 # 4) run `bison -r all parse.tmp.y`
 # 5) mv parse.tmp.output parseXX.output
 
-%w[18 19 20 21].each do |v|
+# possibly new instructions:
+#
+# 1) check out the XX version of ruby
+# 2) YFLAGS="-r all" make parse.c
+# 3) mv y.output parseXX.output
+
+%w[18 19 20 21 22].each do |v|
   task "compare#{v}" do
     sh "./yack.rb lib/ruby#{v}_parser.output > racc#{v}.txt"
     sh "./yack.rb parse#{v}.output > yacc#{v}.txt"
-    sh "diff -du yacc#{v}.txt racc#{v}.txt || true"
+    sh "diff -du racc#{v}.txt yacc#{v}.txt || true"
     puts
-    sh "diff -du yacc#{v}.txt racc#{v}.txt | wc -l"
+    sh "diff -du racc#{v}.txt yacc#{v}.txt | wc -l"
   end
 end
 
 task :debug => :isolate do
-  ENV["V"] ||= "21"
+  ENV["V"] ||= "22"
   Rake.application[:parser].invoke # this way we can have DEBUG set
   Rake.application[:lexer].invoke # this way we can have DEBUG set
 
@@ -103,13 +127,16 @@ task :debug => :isolate do
              Ruby20Parser.new
            when "21" then
              Ruby21Parser.new
+           when "22" then
+             Ruby22Parser.new
            else
              raise "Unsupported version #{ENV["V"]}"
            end
 
   time = (ENV["RP_TIMEOUT"] || 10).to_i
 
-  file = ENV["F"] || ENV["FILE"]
+  n = ENV["BUG"]
+  file = (n && "bug#{n}.rb") || ENV["F"] || ENV["FILE"]
 
   ruby = if file then
            File.read(file)

data/lib/ruby18_parser.rb

@@ -2428,7 +2428,7 @@ racc_reduce_table = [
   2, 240, :_reduce_352,
   1, 240, :_reduce_353,
   2, 240, :_reduce_354,
-  1, 168, :_reduce_none,
+  1, 168, :_reduce_355,
   2, 168, :_reduce_356,
   1, 168, :_reduce_357,
   3, 168, :_reduce_358,
@@ -3167,7 +3167,7 @@ def _reduce_22(val, _values, result)
                       if (in_def || in_single > 0) then
                         yyerror "END in method; use at_exit"
                       end
-                      result = new_iter s(:postexe), nil, val[2]
+                      result = new_iter s(:postexe), 0, val[2]
                     
     result
 end
@@ -4874,17 +4874,20 @@ def _reduce_354(val, _values, result)
     result
 end
 
-# reduce 355 omitted
+def _reduce_355(val, _values, result)
+ result = 0 
+    result
+end
 
 def _reduce_356(val, _values, result)
-                      result = 0
+                      result = s(:args)
                       self.lexer.command_start = true
                     
     result
 end
 
 def _reduce_357(val, _values, result)
-                      result = 0
+                      result = s(:args)
                       self.lexer.command_start = true
                     
     result

data/lib/ruby18_parser.y

@@ -135,7 +135,7 @@ rule
                       if (in_def || in_single > 0) then
                         yyerror "END in method; use at_exit"
                       end
-                      result = new_iter s(:postexe), nil, val[2]
+                      result = new_iter s(:postexe), 0, val[2]
                     }
                 | lhs tEQL command_call
                     {
@@ -1271,15 +1271,15 @@ rule
                     }
                 ;
 
-   opt_block_var: none
+   opt_block_var: none { result = 0 }
                 | tPIPE tPIPE
                     {
-                      result = 0
+                      result = s(:args)
                       self.lexer.command_start = true
                     }
                 | tOROP
                     {
-                      result = 0
+                      result = s(:args)
                       self.lexer.command_start = true
                     }
                 | tPIPE block_var tPIPE

data/lib/ruby19_parser.rb

@@ -2466,7 +2466,7 @@ racc_reduce_table = [
   2, 265, :_reduce_379,
   4, 265, :_reduce_380,
   1, 265, :_reduce_381,
-  1, 178, :_reduce_none,
+  1, 178, :_reduce_382,
   1, 178, :_reduce_none,
   3, 271, :_reduce_384,
   1, 271, :_reduce_385,
@@ -3297,7 +3297,7 @@ def _reduce_28(val, _values, result)
                       if (self.in_def || self.in_single > 0) then
                         yyerror "END in method; use at_exit"
                       end
-                      result = new_iter s(:postexe), nil, val[2]
+                      result = new_iter s(:postexe), 0, val[2]
                     
     result
 end
@@ -4759,20 +4759,22 @@ def _reduce_321(val, _values, result)
 end
 
 def _reduce_322(val, _values, result)
-                      result = self.in_def
+                      result = [self.in_def, self.lexer.cmdarg.stack.dup]
 
                       self.comments.push self.lexer.comments
                       self.in_def = true
                       self.env.extend
+                      lexer.cmdarg.stack.replace [false]
                     
     result
 end
 
 def _reduce_323(val, _values, result)
-                      in_def = val[2]
+                      in_def, cmdarg = val[2]
 
                       result = new_defn val
 
+                      lexer.cmdarg.stack.replace cmdarg
                       self.env.unextend
                       self.in_def = in_def
                       self.lexer.comments # we don't care about comments in the body
@@ -5073,19 +5075,21 @@ def _reduce_381(val, _values, result)
     result
 end
 
-# reduce 382 omitted
+def _reduce_382(val, _values, result)
+ result = 0 
+    result
+end
 
 # reduce 383 omitted
 
 def _reduce_384(val, _values, result)
                       result = args val
-                      result = 0 if result == s(:args)
                     
     result
 end
 
 def _reduce_385(val, _values, result)
-                      result = 0
+                      result = s(:args)
                       self.lexer.command_start = true
                     
     result
@@ -5138,8 +5142,6 @@ def _reduce_394(val, _values, result)
                       lpar, args, body = val
                       lexer.lpar_beg = lpar
 
-                      args = 0 if args == s(:args)
-
                       call = new_call nil, :lambda
                       result = new_iter call, args, body
                     
@@ -5154,6 +5156,7 @@ end
 
 def _reduce_396(val, _values, result)
                       result = val[0]
+                      result = 0 if result == s(:args)
                     
     result
 end

data/lib/ruby19_parser.y

@@ -152,7 +152,7 @@ rule
                       if (self.in_def || self.in_single > 0) then
                         yyerror "END in method; use at_exit"
                       end
-                      result = new_iter s(:postexe), nil, val[2]
+                      result = new_iter s(:postexe), 0, val[2]
                     }
                 | command_asgn
                 | mlhs tEQL command_call
@@ -1104,18 +1104,20 @@ rule
                     }
                 | kDEF fname
                     {
-                      result = self.in_def
+                      result = [self.in_def, self.lexer.cmdarg.stack.dup]
 
                       self.comments.push self.lexer.comments
                       self.in_def = true
                       self.env.extend
+                      lexer.cmdarg.stack.replace [false]
                     }
                     f_arglist bodystmt kEND
                     {
-                      in_def = val[2]
+                      in_def, cmdarg = val[2]
 
                       result = new_defn val
 
+                      lexer.cmdarg.stack.replace cmdarg
                       self.env.unextend
                       self.in_def = in_def
                       self.lexer.comments # we don't care about comments in the body
@@ -1330,17 +1332,16 @@ rule
                       result = args val
                     }
 
- opt_block_param: none
+ opt_block_param: none { result = 0 }
                 | block_param_def
 
  block_param_def: tPIPE opt_bv_decl tPIPE
                     {
                       result = args val
-                      result = 0 if result == s(:args)
                     }
                 | tOROP
                     {
-                      result = 0
+                      result = s(:args)
                       self.lexer.command_start = true
                     }
                 | tPIPE block_param opt_bv_decl tPIPE
@@ -1380,8 +1381,6 @@ rule
                       lpar, args, body = val
                       lexer.lpar_beg = lpar
 
-                      args = 0 if args == s(:args)
-
                       call = new_call nil, :lambda
                       result = new_iter call, args, body
                     }
@@ -1393,6 +1392,7 @@ rule
                 | f_args
                     {
                       result = val[0]
+                      result = 0 if result == s(:args)
                     }
 
      lambda_body: tLAMBEG compstmt tRCURLY

data/lib/ruby20_parser.rb

@@ -74,52 +74,52 @@ clist = [
 '173,199,203,204,183,172,186,190,192,184,177,574,573,705,193,200,195',
 '194,187,197,182,170,189,188,116,117,118,119,120,169,176,167,168,164',
 '165,166,124,126,123,687,125,704,952,239,557,556,555,899,558,158,159',
-'701,154,136,137,138,145,142,144,253,254,139,140,-265,903,905,161,162',
+'701,154,136,137,138,145,142,144,253,254,139,140,-265,903,905,160,161',
 '146,147,717,906,557,556,555,236,558,242,219,238,237,234,235,151,150',
-'704,135,157,153,152,148,149,143,141,133,156,134,909,911,163,91,913,1004',
+'704,135,157,153,152,148,149,143,141,133,156,134,909,911,162,91,913,1004',
 '915,915,-514,219,219,713,1005,92,717,-514,557,556,555,921,558,1003,155',
-'694,-514,923,693,160,174,185,175,198,171,191,181,180,201,202,196,179',
+'694,-514,923,693,163,174,185,175,198,171,191,181,180,201,202,196,179',
 '178,173,199,203,204,183,172,186,190,192,184,177,713,925,687,193,200',
 '195,194,187,197,182,170,189,188,116,117,118,119,120,169,176,167,168',
 '164,165,166,124,126,532,219,125,867,868,239,676,869,107,108,-85,158',
-'159,219,154,136,137,138,145,142,144,253,254,139,140,219,219,219,161',
-'162,146,147,717,239,557,556,555,236,558,242,239,238,237,234,235,151',
-'150,935,135,157,153,152,148,149,143,141,133,156,134,936,219,163,91,939',
+'159,219,154,136,137,138,145,142,144,253,254,139,140,219,219,219,160',
+'161,146,147,717,239,557,556,555,236,558,242,239,238,237,234,235,151',
+'150,935,135,157,153,152,148,149,143,141,133,156,134,936,219,162,91,939',
 '743,-268,239,211,239,646,713,742,92,717,212,557,556,555,270,558,744',
-'155,635,210,634,219,160,174,185,175,198,171,191,181,180,201,202,196',
+'155,635,210,634,219,163,174,185,175,198,171,191,181,180,201,202,196',
 '179,178,173,199,203,204,183,172,186,190,192,184,177,713,630,949,193',
 '200,195,194,187,197,182,170,189,188,116,117,118,119,120,169,176,167',
 '168,164,165,166,124,126,396,395,125,-265,397,628,-290,621,956,957,618',
 '158,159,-290,154,136,137,138,145,142,144,959,-290,139,140,-289,-289',
-'743,161,162,146,147,-289,-289,955,960,615,-595,-595,611,589,-289,-289',
+'743,160,161,146,147,-289,-289,955,960,615,-595,-595,611,589,-289,-289',
 '744,588,151,150,399,135,157,153,152,148,149,143,141,133,156,134,743',
-'-336,163,586,-281,-290,584,955,-336,502,587,-281,-290,543,542,976,744',
-'-336,536,585,-281,-290,155,978,979,239,528,160,174,185,175,198,171,191',
+'-336,162,586,-281,-290,584,955,-336,502,587,-281,-290,543,542,976,744',
+'-336,536,585,-281,-290,155,978,979,239,528,163,174,185,175,198,171,191',
 '181,180,201,202,196,179,178,173,199,203,204,183,172,186,190,192,184',
 '177,983,527,523,193,200,195,194,187,197,182,170,189,188,116,117,118',
 '119,120,169,176,167,168,164,165,166,124,126,704,988,125,990,992,994',
 '517,994,270,219,273,158,159,518,154,136,137,138,145,142,144,1001,516',
-'139,140,-289,529,519,161,162,146,147,-289,530,512,511,219,-595,1006',
+'139,140,-289,529,519,160,161,146,147,-289,530,512,511,219,-595,1006',
 '-70,1007,-289,452,915,915,151,150,915,135,157,153,152,148,149,143,141',
-'133,156,134,1012,502,163,976,500,497,270,487,218,456,455,453,410,405',
-'389,-595,-594,693,386,383,380,356,155,219,316,976,315,160,174,185,175',
+'133,156,134,1012,502,162,976,500,497,270,487,218,456,455,453,410,405',
+'389,-595,-594,693,386,383,380,356,155,219,316,976,315,163,174,185,175',
 '198,171,191,181,180,201,202,196,179,178,173,199,203,204,183,172,186',
 '190,192,184,177,1035,1036,1037,193,200,195,194,187,197,182,170,189,188',
 '1038,994,994,994,219,169,176,167,168,164,165,166,124,126,258,214,125',
 '209,208,915,976,207,109,994,,158,159,,154,136,137,138,145,142,144,,',
-'139,140,,,,161,162,146,147,,,,,,,,,,,,,,151,150,,135,157,153,152,148',
-'149,143,141,133,156,134,,,163,91,,,,,,,,,,92,,,,,,,,,155,,,,,160,174',
+'139,140,,,,160,161,146,147,,,,,,,,,,,,,,151,150,,135,157,153,152,148',
+'149,143,141,133,156,134,,,162,91,,,,,,,,,,92,,,,,,,,,155,,,,,163,174',
 '185,175,198,171,191,181,180,201,202,196,179,178,173,199,203,204,183',
 '172,186,190,192,184,177,,,,193,200,195,194,187,197,182,170,189,188,',
 ',,,,169,176,167,168,164,165,166,124,126,,,125,,,,,,,,,158,159,,154,136',
-'137,138,145,142,144,,,139,140,,,,161,162,146,147,,,,,,,,,,,,,,151,150',
-',135,157,153,152,148,149,143,141,133,156,134,,,163,91,,,,,,,,,,92,,',
-',,,,,,155,,,,,160,174,185,175,198,171,191,181,180,201,202,196,179,178',
+'137,138,145,142,144,,,139,140,,,,160,161,146,147,,,,,,,,,,,,,,151,150',
+',135,157,153,152,148,149,143,141,133,156,134,,,162,91,,,,,,,,,,92,,',
+',,,,,,155,,,,,163,174,185,175,198,171,191,181,180,201,202,196,179,178',
 '173,199,203,204,183,172,186,190,192,184,177,,,,193,200,195,365,364,366',
 '363,170,189,188,,,,,,169,176,167,168,360,361,362,358,126,97,96,359,',
-'99,,,,,,,158,159,,154,136,137,138,145,142,144,,,139,140,,,,161,162,146',
+'99,,,,,,,158,159,,154,136,137,138,145,142,144,,,139,140,,,,160,161,146',
 '147,,,,,,372,,,,,,,,151,150,,135,157,153,152,148,149,143,141,133,156',
-'134,,,163,,,,,,,,,,,,291,72,73,74,12,60,,,155,66,67,,,160,70,,68,69',
+'134,,,162,,,,,,,,,,,,291,72,73,74,12,60,,,155,66,67,,,163,70,,68,69',
 '71,33,34,75,76,,,,,,32,31,30,101,100,102,103,,,22,,,,,647,11,48,,13',
 '105,104,106,95,59,97,96,98,,99,107,108,,93,94,,45,46,44,239,243,248',
 '249,250,245,247,255,256,251,252,,232,233,,,253,254,,43,,,36,,,61,62',
@@ -818,49 +818,49 @@ clist = [
 '-425,-425,-425,-425,-425,-425,-425,-425,-425,,,-425,-425,-425,,,-425',
 ',270,-425,,,-425,-425,,-425,,-425,,-425,,-425,-425,-425,-425,-425,-425',
 '-425,,-425,-425,-425,,,,,,424,428,,,425,,,-425,-425,,-425,,-425,158',
-'159,,154,136,137,138,145,142,144,,,139,140,,,,161,162,146,147,,,,,,270',
-',,,,,,,151,150,,135,157,153,152,148,149,143,141,133,156,134,,798,163',
-'557,556,555,799,558,,,,,485,428,,,486,566,,,,,155,,,158,159,160,154',
-'136,137,138,145,142,144,,,139,140,562,,,161,162,146,147,,,571,570,574',
-'573,,,,,,,,151,150,,135,157,153,152,148,149,143,141,133,156,134,,,163',
-',,,,,,,,567,736,435,,,737,,,,,,155,,,158,159,160,154,136,137,138,145',
-'142,144,,,139,140,,,,161,162,146,147,,,,,,270,,,,,,,,151,150,,135,157',
-'153,152,148,149,143,141,133,156,134,,,163,,,,,,,,,,485,428,,,486,,,',
-',,155,,,158,159,160,154,136,137,138,145,142,144,,,139,140,,,,161,162',
+'159,,154,136,137,138,145,142,144,,,139,140,,,,160,161,146,147,,,,,,270',
+',,,,,,,151,150,,135,157,153,152,148,149,143,141,133,156,134,,798,162',
+'557,556,555,799,558,,,,,485,428,,,486,566,,,,,155,,,158,159,163,154',
+'136,137,138,145,142,144,,,139,140,562,,,160,161,146,147,,,571,570,574',
+'573,,,,,,,,151,150,,135,157,153,152,148,149,143,141,133,156,134,,,162',
+',,,,,,,,567,736,435,,,737,,,,,,155,,,158,159,163,154,136,137,138,145',
+'142,144,,,139,140,,,,160,161,146,147,,,,,,270,,,,,,,,151,150,,135,157',
+'153,152,148,149,143,141,133,156,134,,,162,,,,,,,,,,485,428,,,486,,,',
+',,155,,,158,159,163,154,136,137,138,145,142,144,,,139,140,,,,160,161',
 '146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152,148,149,143,141,133',
-'156,134,,,163,,,,,,,,,,734,428,,,735,,,,,,155,,,158,159,160,154,136',
-'137,138,145,142,144,,,139,140,,,,161,162,146,147,,,,,,270,,,,,,,,151',
-'150,,135,157,153,152,148,149,143,141,133,156,134,,,163,,,,,,,,,,1028',
-'428,,,1029,,,,,,155,,,158,159,160,154,136,137,138,145,142,144,,,139',
-'140,,,,161,162,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152,148',
-'149,143,141,133,156,134,,,163,,,,,,,,,,852,435,,,853,,,,,,155,,,158',
-'159,160,154,136,137,138,145,142,144,,,139,140,,,,161,162,146,147,,,',
+'156,134,,,162,,,,,,,,,,734,428,,,735,,,,,,155,,,158,159,163,154,136',
+'137,138,145,142,144,,,139,140,,,,160,161,146,147,,,,,,270,,,,,,,,151',
+'150,,135,157,153,152,148,149,143,141,133,156,134,,,162,,,,,,,,,,1028',
+'428,,,1029,,,,,,155,,,158,159,163,154,136,137,138,145,142,144,,,139',
+'140,,,,160,161,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152,148',
+'149,143,141,133,156,134,,,162,,,,,,,,,,852,435,,,853,,,,,,155,,,158',
+'159,163,154,136,137,138,145,142,144,,,139,140,,,,160,161,146,147,,,',
 ',,270,,,,,,,,151,150,,135,157,153,152,148,149,143,141,133,156,134,,',
-'163,,,,,,,,,,1030,435,,,1031,,,,,,155,,,158,159,160,154,136,137,138',
-'145,142,144,,,139,140,,,,161,162,146,147,,,,,,270,,,,,,,,151,150,,135',
-'157,153,152,148,149,143,141,133,156,134,,,163,,,,,,,,,,1000,435,,,999',
-',,,,,155,,,158,159,160,154,136,137,138,145,142,144,,,139,140,,,,161',
-'162,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152,148,149,143,141',
-'133,156,134,,,163,,,,,,,,,,651,435,,,652,,,,,,155,,,158,159,160,154',
-'136,137,138,145,142,144,,,139,140,,,,161,162,146,147,,,,,,270,,,,,,',
-',151,150,,135,157,153,152,148,149,143,141,133,156,134,,,163,,,,,,,,',
-',649,428,,,650,,,,,,155,,,158,159,160,154,136,137,138,145,142,144,,',
-'139,140,,,,161,162,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152',
-'148,149,143,141,133,156,134,,,163,,,,,,,,,,680,428,,,681,,,,,,155,,',
-'158,159,160,154,136,137,138,145,142,144,,,139,140,,,,161,162,146,147',
+'162,,,,,,,,,,1030,435,,,1031,,,,,,155,,,158,159,163,154,136,137,138',
+'145,142,144,,,139,140,,,,160,161,146,147,,,,,,270,,,,,,,,151,150,,135',
+'157,153,152,148,149,143,141,133,156,134,,,162,,,,,,,,,,1000,435,,,999',
+',,,,,155,,,158,159,163,154,136,137,138,145,142,144,,,139,140,,,,160',
+'161,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152,148,149,143,141',
+'133,156,134,,,162,,,,,,,,,,651,435,,,652,,,,,,155,,,158,159,163,154',
+'136,137,138,145,142,144,,,139,140,,,,160,161,146,147,,,,,,270,,,,,,',
+',151,150,,135,157,153,152,148,149,143,141,133,156,134,,,162,,,,,,,,',
+',649,428,,,650,,,,,,155,,,158,159,163,154,136,137,138,145,142,144,,',
+'139,140,,,,160,161,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152',
+'148,149,143,141,133,156,134,,,162,,,,,,,,,,680,428,,,681,,,,,,155,,',
+'158,159,163,154,136,137,138,145,142,144,,,139,140,,,,160,161,146,147',
 ',,,,,270,,,,,,,,151,150,,135,157,153,152,148,149,143,141,133,156,134',
-',,163,,,,,,,,,,649,428,,,650,,,,,,155,,,158,159,160,154,136,137,138',
-'145,142,144,,,139,140,,,,161,162,146,147,,,,,,270,,,,,,,,151,150,,135',
-'157,153,152,148,149,143,141,133,156,134,,,163,,,,,,,,,,431,435,,,430',
-',,,,,155,,,158,159,160,154,136,137,138,145,142,144,,,139,140,,,,161',
-'162,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152,148,149,143,141',
-'133,156,134,,,163,,,,,,,,,,651,435,,,652,,,,,,155,,,158,159,160,154',
-'136,137,138,145,142,144,,,139,140,,,,161,162,146,147,,,,,,270,,,,,,',
-',151,150,,135,157,153,152,148,149,143,141,133,156,134,,,163,,,,,,,,',
-',683,435,,,684,,,,,,155,,,158,159,160,154,136,137,138,145,142,144,,',
-'139,140,,,,161,162,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152',
-'148,149,143,141,133,156,134,,560,163,557,556,555,564,558,560,,557,556',
-'555,564,558,,,566,,,,,155,,566,,798,160,557,556,555,799,558,,,,,,,562',
+',,162,,,,,,,,,,649,428,,,650,,,,,,155,,,158,159,163,154,136,137,138',
+'145,142,144,,,139,140,,,,160,161,146,147,,,,,,270,,,,,,,,151,150,,135',
+'157,153,152,148,149,143,141,133,156,134,,,162,,,,,,,,,,431,435,,,430',
+',,,,,155,,,158,159,163,154,136,137,138,145,142,144,,,139,140,,,,160',
+'161,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152,148,149,143,141',
+'133,156,134,,,162,,,,,,,,,,651,435,,,652,,,,,,155,,,158,159,163,154',
+'136,137,138,145,142,144,,,139,140,,,,160,161,146,147,,,,,,270,,,,,,',
+',151,150,,135,157,153,152,148,149,143,141,133,156,134,,,162,,,,,,,,',
+',683,435,,,684,,,,,,155,,,158,159,163,154,136,137,138,145,142,144,,',
+'139,140,,,,160,161,146,147,,,,,,270,,,,,,,,151,150,,135,157,153,152',
+'148,149,143,141,133,156,134,,560,162,557,556,555,564,558,560,,557,556',
+'555,564,558,,,566,,,,,155,,566,,798,163,557,556,555,799,558,,,,,,,562',
 ',,566,,,,562,752,571,570,574,573,,,,571,570,574,573,,,,,798,562,557',
 '556,555,799,558,,,,571,570,574,573,,,566,,,,798,567,557,556,555,799',
 '558,,567,,,,,,,,566,,562,560,,557,556,555,564,558,567,571,570,574,573',
@@ -2637,7 +2637,7 @@ racc_reduce_table = [
   2, 279, :_reduce_390,
   4, 279, :_reduce_391,
   1, 279, :_reduce_392,
-  1, 184, :_reduce_none,
+  1, 184, :_reduce_393,
   1, 184, :_reduce_none,
   3, 283, :_reduce_395,
   1, 283, :_reduce_396,
@@ -3532,7 +3532,7 @@ def _reduce_28(val, _values, result)
                         debug20 3
                         yyerror "END in method; use at_exit"
                       end
-                      result = new_iter s(:postexe), nil, val[2]
+                      result = new_iter s(:postexe), 0, val[2]
                     
     result
 end
@@ -4381,6 +4381,7 @@ end
 
 def _reduce_217(val, _values, result)
                       result = new_call(new_call(s(:lit, val[1]), :"**", argl(val[3])), :"-@")
+                      ## TODO: why is this 2.0 only?
                       debug20 12, val, result
                     
     result
@@ -5022,20 +5023,24 @@ def _reduce_326(val, _values, result)
 end
 
 def _reduce_327(val, _values, result)
-                      result = self.in_def
+                      result = [self.in_def, self.lexer.cmdarg.stack.dup]
 
                       self.comments.push self.lexer.comments
                       self.in_def = true
                       self.env.extend
+                      # TODO: local->cmdargs = cmdarg_stack;
+                      # TODO: port local_push_gen and local_pop_gen
+                      lexer.cmdarg.stack.replace [false]
                     
     result
 end
 
 def _reduce_328(val, _values, result)
-                      in_def = val[2]
+                      in_def, cmdarg = val[2]
 
                       result = new_defn val
 
+                      lexer.cmdarg.stack.replace cmdarg
                       self.env.unextend
                       self.in_def = in_def
                       self.lexer.comments # we don't care about comments in the body
@@ -5371,20 +5376,22 @@ def _reduce_392(val, _values, result)
     result
 end
 
-# reduce 393 omitted
+def _reduce_393(val, _values, result)
+ result = 0 
+    result
+end
 
 # reduce 394 omitted
 
 def _reduce_395(val, _values, result)
                       result = args val
-                      result = 0 if result == s(:args)
                     
     result
 end
 
 def _reduce_396(val, _values, result)
-                      result = 0
                       self.lexer.command_start = true
+                      result = s(:args)
                     
     result
 end
@@ -5438,8 +5445,6 @@ def _reduce_405(val, _values, result)
                       lpar, args, body = val
                       lexer.lpar_beg = lpar
 
-                      args = 0 if args == s(:args)
-
                       call = new_call nil, :lambda
                       result = new_iter call, args, body
                       self.env.unextend
@@ -5455,6 +5460,7 @@ end
 
 def _reduce_407(val, _values, result)
                       result = val[0]
+                      result = 0 if result == s(:args)
                     
     result
 end
@@ -5497,8 +5503,8 @@ end
 
 def _reduce_413(val, _values, result)
                       # TODO:
-                      # if (nd_type($1) == NODE_YIELD) {
-                      #     compile_error(PARSER_ARG "block given to yield");
+                      ## if (nd_type($1) == NODE_YIELD) {
+                      ##     compile_error(PARSER_ARG "block given to yield");
 
                       syntax_error "Both block arg and actual block given." if
                         val[0].block_pass?
@@ -5951,7 +5957,9 @@ def _reduce_484(val, _values, result)
                                 lexer.brace_nest, 
                                 lexer.string_nest, # TODO: remove
                                 lexer.cond.store, 
-                                lexer.cmdarg.store]
+                                lexer.cmdarg.store,
+                                lexer.lex_state,
+                               ]
 
                       lexer.lex_strterm = nil
                       lexer.brace_nest  = 0
@@ -5966,7 +5974,7 @@ def _reduce_485(val, _values, result)
                       # TODO: tRCURLY -> tSTRING_DEND
                       _, memo, stmt, _ = val
 
-                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg = memo
+                      lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg, oldlex_state = memo
 
                       lexer.lex_strterm = lex_strterm
                       lexer.brace_nest  = brace_nest
@@ -5975,6 +5983,8 @@ def _reduce_485(val, _values, result)
                       lexer.cond.restore oldcond
                       lexer.cmdarg.restore oldcmdarg
 
+                      lexer.lex_state = oldlex_state
+
                       case stmt
                       when Sexp then
                         case stmt[0]
@@ -6185,11 +6195,15 @@ def _reduce_523(val, _values, result)
                       result = val[1]
                       self.lexer.lex_state = :expr_beg
                       self.lexer.command_start = true
+                      # TODO:
+                      # $<num>$ = parser->parser_in_kwarg;
+                      # parser->parser_in_kwarg = 1;
                     
     result
 end
 
 def _reduce_524(val, _values, result)
+                      # TODO: parser->parser_in_kwarg = $<num>1;
                       result = val[0]
                       self.lexer.lex_state = :expr_beg
                       self.lexer.command_start = true