brakeman 4.8.0 → 5.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (273) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES.md +144 -2
  3. data/README.md +23 -6
  4. data/bundle/load.rb +7 -5
  5. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/CHANGELOG.md +24 -0
  6. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/FAQ.md +0 -0
  7. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/Gemfile +1 -4
  8. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/MIT-LICENSE +0 -0
  9. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/README.md +21 -16
  10. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/REFERENCE.md +39 -10
  11. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/TODO +0 -0
  12. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/haml.gemspec +2 -1
  13. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/attribute_builder.rb +58 -3
  14. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/attribute_compiler.rb +45 -32
  15. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/attribute_parser.rb +0 -0
  16. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/buffer.rb +0 -56
  17. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/compiler.rb +0 -0
  18. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/engine.rb +0 -0
  19. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/error.rb +0 -0
  20. data/bundle/ruby/2.7.0/gems/haml-5.2.2/lib/haml/escapable.rb +77 -0
  21. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/exec.rb +0 -0
  22. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/filters.rb +0 -0
  23. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/generator.rb +0 -0
  24. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/helpers/action_view_extensions.rb +0 -0
  25. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/helpers/action_view_mods.rb +0 -0
  26. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/helpers/action_view_xss_mods.rb +0 -0
  27. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/helpers/safe_erubi_template.rb +0 -0
  28. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/helpers/safe_erubis_template.rb +0 -0
  29. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/helpers/xss_mods.rb +6 -3
  30. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/helpers.rb +7 -1
  31. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/options.rb +0 -0
  32. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/parser.rb +32 -4
  33. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/plugin.rb +18 -1
  34. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/railtie.rb +5 -0
  35. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/sass_rails_filter.rb +0 -0
  36. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/template/options.rb +0 -0
  37. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/template.rb +0 -0
  38. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/temple_engine.rb +2 -1
  39. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/temple_line_counter.rb +0 -0
  40. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/util.rb +1 -1
  41. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml/version.rb +1 -1
  42. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/lib/haml.rb +0 -0
  43. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/yard/default/fulldoc/html/css/common.sass +0 -0
  44. data/bundle/ruby/2.7.0/gems/{haml-5.1.2 → haml-5.2.2}/yard/default/layout/html/footer.erb +0 -0
  45. data/bundle/ruby/2.7.0/gems/parallel-1.21.0/MIT-LICENSE.txt +20 -0
  46. data/bundle/ruby/2.7.0/gems/parallel-1.21.0/lib/parallel/processor_count.rb +45 -0
  47. data/bundle/ruby/2.7.0/gems/parallel-1.21.0/lib/parallel/version.rb +4 -0
  48. data/bundle/ruby/2.7.0/gems/parallel-1.21.0/lib/parallel.rb +532 -0
  49. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/LICENSE.txt +22 -0
  50. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/NEWS.md +178 -0
  51. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/README.md +48 -0
  52. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/attlistdecl.rb +63 -0
  53. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/attribute.rb +205 -0
  54. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/cdata.rb +68 -0
  55. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/child.rb +97 -0
  56. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/comment.rb +80 -0
  57. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/doctype.rb +311 -0
  58. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/document.rb +451 -0
  59. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/dtd/attlistdecl.rb +11 -0
  60. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/dtd/dtd.rb +47 -0
  61. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/dtd/elementdecl.rb +18 -0
  62. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/dtd/entitydecl.rb +57 -0
  63. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/dtd/notationdecl.rb +40 -0
  64. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/element.rb +2599 -0
  65. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/encoding.rb +51 -0
  66. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/entity.rb +171 -0
  67. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/formatters/default.rb +116 -0
  68. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/formatters/pretty.rb +142 -0
  69. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/formatters/transitive.rb +58 -0
  70. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/functions.rb +447 -0
  71. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/instruction.rb +79 -0
  72. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/light/node.rb +188 -0
  73. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/namespace.rb +59 -0
  74. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/node.rb +76 -0
  75. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/output.rb +30 -0
  76. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parent.rb +166 -0
  77. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parseexception.rb +52 -0
  78. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/baseparser.rb +694 -0
  79. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/lightparser.rb +59 -0
  80. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/pullparser.rb +197 -0
  81. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/sax2parser.rb +273 -0
  82. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/streamparser.rb +61 -0
  83. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/treeparser.rb +101 -0
  84. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/ultralightparser.rb +57 -0
  85. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/parsers/xpathparser.rb +689 -0
  86. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/quickpath.rb +266 -0
  87. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/rexml.rb +37 -0
  88. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/sax2listener.rb +98 -0
  89. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/security.rb +28 -0
  90. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/source.rb +298 -0
  91. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/streamlistener.rb +93 -0
  92. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/text.rb +424 -0
  93. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/undefinednamespaceexception.rb +9 -0
  94. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/validation/relaxng.rb +539 -0
  95. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/validation/validation.rb +144 -0
  96. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/validation/validationexception.rb +10 -0
  97. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/xmldecl.rb +130 -0
  98. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/xmltokens.rb +85 -0
  99. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/xpath.rb +81 -0
  100. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml/xpath_parser.rb +974 -0
  101. data/bundle/ruby/2.7.0/gems/rexml-3.2.5/lib/rexml.rb +3 -0
  102. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/History.rdoc +148 -0
  103. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/Manifest.txt +7 -0
  104. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/README.rdoc +1 -0
  105. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/compare/normalize.rb +51 -6
  106. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/debugging.md +190 -0
  107. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/gauntlet.md +106 -0
  108. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/rp_extensions.rb +15 -36
  109. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/rp_stringscanner.rb +33 -0
  110. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby20_parser.rb +7128 -0
  111. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby20_parser.y +420 -296
  112. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby21_parser.rb +7182 -0
  113. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby21_parser.y +415 -293
  114. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby22_parser.rb +7228 -0
  115. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby22_parser.y +419 -295
  116. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby23_parser.rb +7237 -0
  117. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby23_parser.y +419 -295
  118. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby24_parser.rb +7268 -0
  119. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby24_parser.y +419 -295
  120. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby25_parser.rb +7268 -0
  121. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2/lib/ruby26_parser.y → ruby_parser-3.18.1/lib/ruby25_parser.y} +418 -308
  122. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby26_parser.rb +7287 -0
  123. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2/lib/ruby_parser.yy → ruby_parser-3.18.1/lib/ruby26_parser.y} +419 -399
  124. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby27_parser.rb +8517 -0
  125. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2/lib/ruby25_parser.y → ruby_parser-3.18.1/lib/ruby27_parser.y} +1030 -294
  126. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby30_parser.rb +8751 -0
  127. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby30_parser.y +3472 -0
  128. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby3_parser.yy +3476 -0
  129. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby_lexer.rb +308 -605
  130. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby_lexer.rex +33 -27
  131. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby_lexer.rex.rb +65 -31
  132. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby_lexer_strings.rb +638 -0
  133. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby_parser.rb +4 -0
  134. data/bundle/ruby/2.7.0/gems/ruby_parser-3.18.1/lib/ruby_parser.yy +3487 -0
  135. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/lib/ruby_parser_extras.rb +341 -127
  136. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/tools/munge.rb +43 -10
  137. data/bundle/ruby/2.7.0/gems/{ruby_parser-3.14.2 → ruby_parser-3.18.1}/tools/ripper.rb +15 -10
  138. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/History.rdoc +39 -0
  139. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/Manifest.txt +0 -0
  140. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/README.rdoc +0 -0
  141. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/lib/composite_sexp_processor.rb +0 -0
  142. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/lib/pt_testcase.rb +9 -4
  143. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/lib/sexp.rb +19 -9
  144. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/lib/sexp_matcher.rb +4 -7
  145. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/lib/sexp_processor.rb +1 -1
  146. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/lib/strict_sexp.rb +25 -3
  147. data/bundle/ruby/2.7.0/gems/{sexp_processor-4.14.1 → sexp_processor-4.16.0}/lib/unique.rb +0 -0
  148. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/CHANGES +4 -0
  149. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/Gemfile +12 -13
  150. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/LICENSE +0 -0
  151. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/README.jp.md +0 -0
  152. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/README.md +0 -0
  153. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/code_attributes.rb +0 -0
  154. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/command.rb +13 -13
  155. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/controls.rb +0 -0
  156. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/do_inserter.rb +0 -0
  157. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/embedded.rb +0 -0
  158. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/end_inserter.rb +0 -0
  159. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/engine.rb +0 -0
  160. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/erb_converter.rb +0 -0
  161. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/filter.rb +0 -0
  162. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/grammar.rb +0 -0
  163. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/include.rb +0 -0
  164. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/interpolation.rb +0 -0
  165. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/logic_less/context.rb +0 -0
  166. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/logic_less/filter.rb +0 -0
  167. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/logic_less.rb +0 -0
  168. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/parser.rb +1 -1
  169. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/smart/escaper.rb +0 -0
  170. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/smart/filter.rb +0 -0
  171. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/smart/parser.rb +0 -0
  172. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/smart.rb +0 -0
  173. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/splat/builder.rb +0 -0
  174. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/splat/filter.rb +0 -0
  175. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/template.rb +0 -0
  176. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/translator.rb +0 -0
  177. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim/version.rb +1 -1
  178. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/lib/slim.rb +0 -0
  179. data/bundle/ruby/2.7.0/gems/{slim-4.0.1 → slim-4.1.0}/slim.gemspec +0 -0
  180. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/CHANGELOG.md +8 -0
  181. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/MIT-LICENSE.txt +0 -0
  182. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/README.md +1 -1
  183. data/bundle/ruby/2.7.0/gems/unicode-display_width-1.8.0/data/display_width.marshal.gz +0 -0
  184. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/lib/unicode/display_width/constants.rb +2 -2
  185. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/lib/unicode/display_width/index.rb +0 -0
  186. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/lib/unicode/display_width/no_string_ext.rb +0 -0
  187. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/lib/unicode/display_width/string_ext.rb +0 -0
  188. data/bundle/ruby/2.7.0/gems/{unicode-display_width-1.6.1 → unicode-display_width-1.8.0}/lib/unicode/display_width.rb +0 -0
  189. data/lib/brakeman/app_tree.rb +37 -4
  190. data/lib/brakeman/checks/base_check.rb +18 -2
  191. data/lib/brakeman/checks/check_basic_auth.rb +2 -0
  192. data/lib/brakeman/checks/check_csrf_token_forgery_cve.rb +28 -0
  193. data/lib/brakeman/checks/check_deserialize.rb +21 -1
  194. data/lib/brakeman/checks/check_detailed_exceptions.rb +1 -1
  195. data/lib/brakeman/checks/check_eol_rails.rb +23 -0
  196. data/lib/brakeman/checks/check_eol_ruby.rb +26 -0
  197. data/lib/brakeman/checks/check_evaluation.rb +1 -1
  198. data/lib/brakeman/checks/check_execute.rb +12 -1
  199. data/lib/brakeman/checks/check_json_entity_escape.rb +38 -0
  200. data/lib/brakeman/checks/check_json_parsing.rb +1 -1
  201. data/lib/brakeman/checks/check_mass_assignment.rb +37 -9
  202. data/lib/brakeman/checks/check_model_attr_accessible.rb +1 -1
  203. data/lib/brakeman/checks/check_model_attributes.rb +1 -1
  204. data/lib/brakeman/checks/check_page_caching_cve.rb +37 -0
  205. data/lib/brakeman/checks/check_permit_attributes.rb +1 -1
  206. data/lib/brakeman/checks/check_regex_dos.rb +1 -1
  207. data/lib/brakeman/checks/check_render.rb +15 -1
  208. data/lib/brakeman/checks/check_sanitize_methods.rb +2 -1
  209. data/lib/brakeman/checks/check_skip_before_filter.rb +4 -4
  210. data/lib/brakeman/checks/check_sql.rb +60 -9
  211. data/lib/brakeman/checks/check_symbol_dos.rb +1 -1
  212. data/lib/brakeman/checks/check_template_injection.rb +32 -0
  213. data/lib/brakeman/checks/check_unsafe_reflection_methods.rb +68 -0
  214. data/lib/brakeman/checks/check_verb_confusion.rb +75 -0
  215. data/lib/brakeman/checks/eol_check.rb +47 -0
  216. data/lib/brakeman/commandline.rb +25 -1
  217. data/lib/brakeman/file_parser.rb +58 -22
  218. data/lib/brakeman/options.rb +39 -2
  219. data/lib/brakeman/parsers/template_parser.rb +26 -3
  220. data/lib/brakeman/processors/alias_processor.rb +132 -24
  221. data/lib/brakeman/processors/base_processor.rb +4 -4
  222. data/lib/brakeman/processors/controller_alias_processor.rb +6 -43
  223. data/lib/brakeman/processors/controller_processor.rb +1 -1
  224. data/lib/brakeman/processors/gem_processor.rb +3 -0
  225. data/lib/brakeman/processors/haml_template_processor.rb +17 -1
  226. data/lib/brakeman/processors/lib/call_conversion_helper.rb +13 -7
  227. data/lib/brakeman/processors/lib/file_type_detector.rb +64 -0
  228. data/lib/brakeman/processors/lib/find_all_calls.rb +28 -13
  229. data/lib/brakeman/processors/lib/rails3_config_processor.rb +16 -16
  230. data/lib/brakeman/processors/lib/rails3_route_processor.rb +2 -0
  231. data/lib/brakeman/processors/lib/rails4_config_processor.rb +2 -1
  232. data/lib/brakeman/processors/lib/render_helper.rb +3 -1
  233. data/lib/brakeman/processors/library_processor.rb +9 -0
  234. data/lib/brakeman/processors/model_processor.rb +32 -0
  235. data/lib/brakeman/processors/output_processor.rb +1 -1
  236. data/lib/brakeman/processors/template_alias_processor.rb +5 -0
  237. data/lib/brakeman/report/ignore/config.rb +5 -1
  238. data/lib/brakeman/report/ignore/interactive.rb +1 -1
  239. data/lib/brakeman/report/report_base.rb +0 -2
  240. data/lib/brakeman/report/report_csv.rb +37 -60
  241. data/lib/brakeman/report/report_github.rb +31 -0
  242. data/lib/brakeman/report/report_junit.rb +2 -2
  243. data/lib/brakeman/report/report_sarif.rb +133 -0
  244. data/lib/brakeman/report/report_sonar.rb +38 -0
  245. data/lib/brakeman/report/report_tabs.rb +1 -1
  246. data/lib/brakeman/report/report_text.rb +38 -17
  247. data/lib/brakeman/report.rb +19 -1
  248. data/lib/brakeman/rescanner.rb +7 -5
  249. data/lib/brakeman/scanner.rb +65 -31
  250. data/lib/brakeman/tracker/collection.rb +57 -7
  251. data/lib/brakeman/tracker/config.rb +87 -5
  252. data/lib/brakeman/tracker/constants.rb +8 -7
  253. data/lib/brakeman/tracker/controller.rb +1 -1
  254. data/lib/brakeman/tracker/method_info.rb +70 -0
  255. data/lib/brakeman/tracker.rb +42 -5
  256. data/lib/brakeman/util.rb +58 -21
  257. data/lib/brakeman/version.rb +1 -1
  258. data/lib/brakeman/warning.rb +10 -2
  259. data/lib/brakeman/warning_codes.rb +13 -0
  260. data/lib/brakeman.rb +45 -6
  261. data/lib/ruby_parser/bm_sexp.rb +33 -9
  262. metadata +201 -123
  263. data/bundle/ruby/2.7.0/gems/haml-5.1.2/lib/haml/escapable.rb +0 -50
  264. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/debugging.md +0 -18
  265. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/rp_stringscanner.rb +0 -64
  266. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/ruby20_parser.rb +0 -7042
  267. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/ruby21_parser.rb +0 -7113
  268. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/ruby22_parser.rb +0 -7146
  269. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/ruby23_parser.rb +0 -7163
  270. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/ruby24_parser.rb +0 -7175
  271. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/ruby25_parser.rb +0 -7175
  272. data/bundle/ruby/2.7.0/gems/ruby_parser-3.14.2/lib/ruby26_parser.rb +0 -7195
  273. data/bundle/ruby/2.7.0/gems/unicode-display_width-1.6.1/data/display_width.marshal.gz +0 -0
@@ -1,6 +1,6 @@
1
1
  # -*- racc -*-
2
2
 
3
- class Ruby25Parser
3
+ class Ruby27Parser
4
4
 
5
5
  token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
6
6
  kTHEN kELSIF kELSE kCASE kWHEN kWHILE kUNTIL kFOR kBREAK kNEXT
@@ -18,10 +18,11 @@ token kCLASS kMODULE kDEF kUNDEF kBEGIN kRESCUE kENSURE kEND kIF kUNLESS
18
18
  tBACK_REF2 tSYMBEG tSTRING_BEG tXSTRING_BEG tREGEXP_BEG
19
19
  tWORDS_BEG tQWORDS_BEG tSTRING_DBEG tSTRING_DVAR tSTRING_END
20
20
  tSTRING tSYMBOL tNL tEH tCOLON tCOMMA tSPACE tSEMI tLAMBDA
21
- tLAMBEG tDSTAR tCHAR tSYMBOLS_BEG tQSYMBOLS_BEG tSTRING_DEND tUBANG
21
+ tLAMBEG tDSTAR tCHAR tSYMBOLS_BEG tQSYMBOLS_BEG tSTRING_DEND
22
22
  tRATIONAL tIMAGINARY
23
23
  tLABEL_END
24
24
  tLONELY
25
+ tBDOT2 tBDOT3
25
26
 
26
27
  preclow
27
28
  nonassoc tLOWEST
@@ -33,7 +34,7 @@ preclow
33
34
  right tEQL tOP_ASGN
34
35
  left kRESCUE_MOD
35
36
  right tEH tCOLON
36
- nonassoc tDOT2 tDOT3
37
+ nonassoc tDOT2 tDOT3 tBDOT2 tBDOT3
37
38
  left tOROP
38
39
  left tANDOP
39
40
  nonassoc tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
@@ -56,6 +57,9 @@ rule
56
57
  top_compstmt
57
58
  {
58
59
  result = new_compstmt val
60
+
61
+ lexer.cond.pop # local_pop
62
+ lexer.cmdarg.pop
59
63
  }
60
64
 
61
65
  top_compstmt: top_stmts opt_terms
@@ -76,7 +80,7 @@ rule
76
80
  | klBEGIN
77
81
  {
78
82
  if (self.in_def || self.in_single > 0) then
79
- debug20 1
83
+ debug 11
80
84
  yyerror "BEGIN in method"
81
85
  end
82
86
  self.env.extend
@@ -101,6 +105,8 @@ rule
101
105
  bodystmt: compstmt opt_rescue k_else
102
106
  {
103
107
  res = _values[-2]
108
+ # TODO: move down to main match so I can just use val
109
+
104
110
  yyerror "else without rescue is useless" unless res
105
111
  }
106
112
  compstmt
@@ -131,7 +137,7 @@ rule
131
137
  | error stmt
132
138
  {
133
139
  result = val[1]
134
- debug20 2, val, result
140
+ debug 12
135
141
  }
136
142
 
137
143
  stmt_or_begin: stmt
@@ -139,6 +145,10 @@ rule
139
145
  {
140
146
  yyerror "BEGIN is permitted only at toplevel"
141
147
  }
148
+ begin_block
149
+ {
150
+ result = val[2] # wtf?
151
+ }
142
152
 
143
153
  stmt: kALIAS fitem
144
154
  {
@@ -151,12 +161,12 @@ rule
151
161
  }
152
162
  | kALIAS tGVAR tGVAR
153
163
  {
154
- (_, line), lhs, rhs = val
164
+ (_, line), (lhs, _), (rhs, _) = val
155
165
  result = s(:valias, lhs.to_sym, rhs.to_sym).line line
156
166
  }
157
167
  | kALIAS tGVAR tBACK_REF
158
168
  {
159
- (_, line), lhs, rhs = val
169
+ (_, line), (lhs, _), (rhs, _) = val
160
170
  result = s(:valias, lhs.to_sym, :"$#{rhs}").line line
161
171
  }
162
172
  | kALIAS tGVAR tNTH_REF
@@ -199,7 +209,7 @@ rule
199
209
  (_, line), _, stmt, _ = val
200
210
 
201
211
  if (self.in_def || self.in_single > 0) then
202
- debug20 3
212
+ debug 13
203
213
  yyerror "END in method; use at_exit"
204
214
  end
205
215
 
@@ -215,6 +225,15 @@ rule
215
225
  lhs, _, rhs = val
216
226
  result = new_assign lhs, s(:svalue, rhs).line(rhs.line)
217
227
  }
228
+ | mlhs tEQL mrhs_arg kRESCUE_MOD stmt
229
+ {
230
+ # unwraps s(:to_ary, rhs)
231
+ lhs, _, (_, rhs), _, resbody = val
232
+
233
+ resbody = new_resbody s(:array).line(resbody.line), resbody
234
+
235
+ result = new_masgn lhs, new_rescue(rhs, resbody), :wrap
236
+ }
218
237
  | mlhs tEQL mrhs_arg
219
238
  {
220
239
  result = new_masgn val[0], val[2]
@@ -239,30 +258,31 @@ rule
239
258
  }
240
259
  | primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
241
260
  {
242
- prim, _, id, opasgn, rhs = val
243
- result = s(:op_asgn, prim, rhs, id.to_sym, opasgn.to_sym)
244
- if val[1] == '&.'
245
- result.sexp_type = :safe_op_asgn
246
- end
247
- result.line = val[0].line
261
+ prim, (call_op, _), (id, _), (op_asgn, _), rhs = val
262
+
263
+ result = s(:op_asgn, prim, rhs, id.to_sym, op_asgn.to_sym)
264
+ result.sexp_type = :safe_op_asgn if call_op == '&.'
265
+ result.line prim.line
248
266
  }
249
267
  | primary_value call_op tCONSTANT tOP_ASGN command_rhs
250
268
  {
251
- result = s(:op_asgn, val[0], val[4], val[2].to_sym, val[3].to_sym)
252
- if val[1] == '&.'
253
- result.sexp_type = :safe_op_asgn
254
- end
255
- result.line = val[0].line
269
+ prim, (call_op, _), (id, _), (op_asgn, _), rhs = val
270
+
271
+ result = s(:op_asgn, prim, rhs, id.to_sym, op_asgn.to_sym)
272
+ result.sexp_type = :safe_op_asgn if call_op == '&.'
273
+ result.line prim.line
256
274
  }
257
275
  | primary_value tCOLON2 tCONSTANT tOP_ASGN command_rhs
258
276
  {
259
- result = s(:op_asgn, val[0], val[4], val[2], val[3])
260
- debug20 4, val, result
277
+ lhs1, _, (lhs2, line), (id, _), rhs = val
278
+
279
+ result = s(:op_asgn, lhs1, rhs, lhs2.to_sym, id.to_sym).line line
261
280
  }
262
281
  | primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_rhs
263
282
  {
264
- result = s(:op_asgn, val[0], val[4], val[2], val[3])
265
- debug20 5, val, result
283
+ lhs1, _, (lhs2, line), (id, _), rhs = val
284
+
285
+ result = s(:op_asgn, lhs1, rhs, lhs2.to_sym, id.to_sym).line line
266
286
  }
267
287
  | backref tOP_ASGN command_rhs
268
288
  {
@@ -309,6 +329,28 @@ rule
309
329
  # REFACTOR: call_uni_op -- see parse26.y
310
330
  }
311
331
  | arg
332
+ kIN
333
+ {
334
+ # TODO? value_expr($1);
335
+ self.lexer.lex_state = EXPR_BEG|EXPR_LABEL
336
+ self.lexer.command_start = false
337
+ result = self.in_kwarg
338
+ self.in_kwarg = true
339
+ self.env.extend
340
+ }
341
+ p_expr
342
+ {
343
+ self.env.unextend
344
+
345
+ expr, _, old_kwarg, pat = val
346
+
347
+ expr = value_expr expr
348
+
349
+ self.in_kwarg = old_kwarg
350
+ pat_in = new_in pat, nil, nil, expr.line
351
+ result = new_case expr, pat_in, expr.line
352
+ }
353
+ | arg =tLBRACE_ARG
312
354
 
313
355
  expr_value: expr
314
356
  {
@@ -333,7 +375,7 @@ rule
333
375
  block_command: block_call
334
376
  | block_call call_op2 operation2 command_args
335
377
  {
336
- blk, _, msg, args = val
378
+ blk, _, (msg, _line), args = val
337
379
  result = new_call(blk, msg.to_sym, args).line blk.line
338
380
  }
339
381
 
@@ -347,15 +389,15 @@ rule
347
389
  _, line, body, _ = val
348
390
 
349
391
  result = body
350
- result.line = line
392
+ result.line line
351
393
 
352
394
  # self.env.unextend
353
395
  }
354
396
 
355
397
  fcall: operation
356
398
  {
357
- msg, = val
358
- result = new_call(nil, msg.to_sym).line lexer.lineno
399
+ (msg, line), = val
400
+ result = new_call(nil, msg.to_sym).line line
359
401
  }
360
402
 
361
403
  command: fcall command_args =tLOWEST
@@ -378,12 +420,14 @@ rule
378
420
  }
379
421
  | primary_value call_op operation2 command_args =tLOWEST
380
422
  {
381
- lhs, callop, op, args = val
423
+ lhs, callop, (op, _), args = val
424
+
382
425
  result = new_call lhs, op.to_sym, args, callop
426
+ result.line lhs.line
383
427
  }
384
428
  | primary_value call_op operation2 command_args cmd_brace_block
385
429
  {
386
- recv, _, msg, args, block = val
430
+ recv, _, (msg, _line), args, block = val
387
431
  call = new_call recv, msg.to_sym, args, val[1]
388
432
 
389
433
  block_dup_check call, block
@@ -393,11 +437,14 @@ rule
393
437
  }
394
438
  | primary_value tCOLON2 operation2 command_args =tLOWEST
395
439
  {
396
- result = new_call val[0], val[2].to_sym, val[3]
440
+ lhs, _, (id, line), args = val
441
+
442
+ result = new_call lhs, id.to_sym, args
443
+ result.line line
397
444
  }
398
445
  | primary_value tCOLON2 operation2 command_args cmd_brace_block
399
446
  {
400
- recv, _, msg, args, block = val
447
+ recv, _, (msg, _line), args, block = val
401
448
  call = new_call recv, msg.to_sym, args
402
449
 
403
450
  block_dup_check call, block
@@ -555,25 +602,29 @@ rule
555
602
  }
556
603
  | primary_value call_op tIDENTIFIER
557
604
  {
558
- result = new_attrasgn val[0], val[2], val[1]
605
+ lhs, call_op, (id, _line) = val
606
+
607
+ result = new_attrasgn lhs, id, call_op
559
608
  }
560
609
  | primary_value tCOLON2 tIDENTIFIER
561
610
  {
562
- recv, _, id = val
611
+ recv, _, (id, _line) = val
563
612
  result = new_attrasgn recv, id
564
613
  }
565
614
  | primary_value call_op tCONSTANT
566
615
  {
567
- result = new_attrasgn val[0], val[2], val[1]
616
+ lhs, call_op, (id, _line) = val
617
+
618
+ result = new_attrasgn lhs, id, call_op
568
619
  }
569
620
  | primary_value tCOLON2 tCONSTANT
570
621
  {
571
622
  if (self.in_def || self.in_single > 0) then
572
- debug20 7
623
+ debug 14
573
624
  yyerror "dynamic constant assignment"
574
625
  end
575
626
 
576
- expr, _, id = val
627
+ expr, _, (id, _line) = val
577
628
  l = expr.line
578
629
 
579
630
  result = s(:const, s(:colon2, expr, id.to_sym).line(l), nil).line l
@@ -581,58 +632,65 @@ rule
581
632
  | tCOLON3 tCONSTANT
582
633
  {
583
634
  if (self.in_def || self.in_single > 0) then
584
- debug20 8
635
+ debug 15
585
636
  yyerror "dynamic constant assignment"
586
637
  end
587
638
 
588
- _, id = val
589
- l = lexer.lineno
639
+ _, (id, l) = val
590
640
 
591
641
  result = s(:const, nil, s(:colon3, id.to_sym).line(l)).line l
592
642
  }
593
643
  | backref
594
644
  {
595
- self.backref_assign_error val[0]
645
+ ref, = val
646
+
647
+ self.backref_assign_error ref
596
648
  }
597
649
 
598
650
  lhs: user_variable
599
651
  {
600
- line = lexer.lineno
601
- result = self.assignable val[0]
602
- result.line = line
652
+ var, = val
653
+
654
+ result = self.assignable var
603
655
  }
604
656
  | keyword_variable
605
657
  {
606
- line = lexer.lineno
607
- result = self.assignable val[0]
608
- result.line = line
609
- debug20 9, val, result
658
+ var, = val
659
+
660
+ result = self.assignable var
661
+
662
+ debug 16
610
663
  }
611
664
  | primary_value tLBRACK2 opt_call_args rbracket
612
665
  {
613
666
  lhs, _, args, _ = val
667
+
614
668
  result = self.aryset lhs, args
615
669
  }
616
670
  | primary_value call_op tIDENTIFIER # REFACTOR
617
671
  {
618
- lhs, op, id = val
672
+ lhs, op, (id, _line) = val
673
+
619
674
  result = new_attrasgn lhs, id, op
620
675
  }
621
676
  | primary_value tCOLON2 tIDENTIFIER
622
677
  {
623
- lhs, _, id = val
678
+ lhs, _, (id, _line) = val
679
+
624
680
  result = new_attrasgn lhs, id
625
681
  }
626
682
  | primary_value call_op tCONSTANT # REFACTOR?
627
683
  {
628
- result = new_attrasgn val[0], val[2], val[1]
684
+ lhs, call_op, (id, _line) = val
685
+
686
+ result = new_attrasgn lhs, id, call_op
629
687
  }
630
688
  | primary_value tCOLON2 tCONSTANT
631
689
  {
632
- expr, _, id = val
690
+ expr, _, (id, _line) = val
633
691
 
634
692
  if (self.in_def || self.in_single > 0) then
635
- debug20 10
693
+ debug 17
636
694
  yyerror "dynamic constant assignment"
637
695
  end
638
696
 
@@ -641,14 +699,13 @@ rule
641
699
  }
642
700
  | tCOLON3 tCONSTANT
643
701
  {
644
- _, id = val
702
+ _, (id, l) = val
645
703
 
646
704
  if (self.in_def || self.in_single > 0) then
647
- debug20 11
705
+ debug 18
648
706
  yyerror "dynamic constant assignment"
649
707
  end
650
708
 
651
- l = lexer.lineno
652
709
  result = s(:const, s(:colon3, id.to_sym).line(l)).line l
653
710
  }
654
711
  | backref
@@ -664,16 +721,17 @@ rule
664
721
 
665
722
  cpath: tCOLON3 cname
666
723
  {
667
- _, name = val
668
- result = s(:colon3, name.to_sym).line lexer.lineno
724
+ _, (name, line) = val
725
+ result = s(:colon3, name.to_sym).line line
669
726
  }
670
727
  | cname
671
728
  {
672
- result = val[0].to_sym
729
+ (id, line), = val
730
+ result = [id.to_sym, line] # TODO: sexp?
673
731
  }
674
732
  | primary_value tCOLON2 cname
675
733
  {
676
- pval, _, name = val
734
+ pval, _, (name, _line) = val
677
735
 
678
736
  result = s(:colon2, pval, name.to_sym)
679
737
  result.line pval.line
@@ -683,24 +741,17 @@ rule
683
741
  | op
684
742
  {
685
743
  lexer.lex_state = EXPR_END
686
- result = val[0]
687
744
  }
688
745
 
689
746
  | reswords
690
- {
691
- (sym, _line), = val
692
- lexer.lex_state = EXPR_END
693
- result = sym
694
- }
695
747
 
696
- fsym: fname | symbol
697
-
698
- fitem: fsym
748
+ fitem: fname
699
749
  {
700
- id, = val
701
- result = s(:lit, id.to_sym).line lexer.lineno
750
+ (id, line), = val
751
+
752
+ result = s(:lit, id.to_sym).line line
702
753
  }
703
- | dsym
754
+ | symbol
704
755
 
705
756
  undef_list: fitem
706
757
  {
@@ -721,8 +772,6 @@ rule
721
772
  | tNEQ | tLSHFT | tRSHFT | tPLUS | tMINUS | tSTAR2
722
773
  | tSTAR | tDIVIDE | tPERCENT | tPOW | tDSTAR | tBANG | tTILDE
723
774
  | tUPLUS | tUMINUS | tAREF | tASET | tBACK_REF2
724
- # TODO: tUBANG dead?
725
- | tUBANG
726
775
 
727
776
  reswords: k__LINE__ | k__FILE__ | k__ENCODING__ | klBEGIN | klEND
728
777
  | kALIAS | kAND | kBEGIN | kBREAK | kCASE
@@ -756,24 +805,20 @@ rule
756
805
  }
757
806
  | primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg_rhs
758
807
  {
759
- lhs, _, id, op, rhs = val
808
+ lhs, _, (id, _line), (op, _), rhs = val
760
809
 
761
810
  result = s(:op_asgn, lhs, rhs, id.to_sym, op.to_sym).line lhs.line
762
811
  }
763
812
  | primary_value tCOLON2 tCONSTANT tOP_ASGN arg_rhs
764
813
  {
765
- lhs1, _, lhs2, op, rhs = val
814
+ lhs1, _, (lhs2, _line), op, rhs = val
766
815
 
767
816
  lhs = s(:colon2, lhs1, lhs2.to_sym).line lhs1.line
768
817
  result = new_const_op_asgn [lhs, op, rhs]
769
818
  }
770
- | tCOLON3 tCONSTANT
771
- {
772
- result = self.lexer.lineno
773
- }
774
- tOP_ASGN arg_rhs
819
+ | tCOLON3 tCONSTANT tOP_ASGN arg_rhs
775
820
  {
776
- _, lhs, line, op, rhs = val
821
+ _, (lhs, line), op, rhs = val
777
822
 
778
823
  lhs = s(:colon3, lhs.to_sym).line line
779
824
  result = new_const_op_asgn [lhs, op, rhs]
@@ -787,7 +832,7 @@ rule
787
832
  | arg tDOT2 arg
788
833
  {
789
834
  v1, v2 = val[0], val[2]
790
- if v1.node_type == :lit and v2.node_type == :lit and Integer === v1.last and Integer === v2.last then
835
+ if v1.sexp_type == :lit and v2.sexp_type == :lit and Integer === v1.last and Integer === v2.last then
791
836
  result = s(:lit, (v1.last)..(v2.last)).line v1.line
792
837
  else
793
838
  result = s(:dot2, v1, v2).line v1.line
@@ -796,12 +841,42 @@ rule
796
841
  | arg tDOT3 arg
797
842
  {
798
843
  v1, v2 = val[0], val[2]
799
- if v1.node_type == :lit and v2.node_type == :lit and Integer === v1.last and Integer === v2.last then
844
+ if v1.sexp_type == :lit and v2.sexp_type == :lit and Integer === v1.last and Integer === v2.last then
800
845
  result = s(:lit, (v1.last)...(v2.last)).line v1.line
801
846
  else
802
847
  result = s(:dot3, v1, v2).line v1.line
803
848
  end
804
849
  }
850
+ | arg tDOT2
851
+ {
852
+ v1, _ = val
853
+ v2 = nil
854
+
855
+ result = s(:dot2, v1, v2).line v1.line
856
+ }
857
+ | arg tDOT3
858
+ {
859
+ v1, _ = val
860
+ v2 = nil
861
+
862
+ result = s(:dot3, v1, v2).line v1.line
863
+ }
864
+
865
+ | tBDOT2 arg
866
+ {
867
+ _, v2, = val
868
+ v1 = nil
869
+
870
+ result = s(:dot2, v1, v2).line v2.line
871
+ }
872
+ | tBDOT3 arg
873
+ {
874
+ _, v2 = val
875
+ v1 = nil
876
+
877
+ result = s(:dot3, v1, v2).line v2.line
878
+ }
879
+
805
880
  | arg tPLUS arg
806
881
  {
807
882
  result = new_call val[0], :+, argl(val[2])
@@ -828,8 +903,9 @@ rule
828
903
  }
829
904
  | tUMINUS_NUM simple_numeric tPOW arg
830
905
  {
831
- lit = s(:lit, val[1]).line lexer.lineno
832
- result = new_call(new_call(lit, :"**", argl(val[3])), :"-@")
906
+ _, (num, line), _, arg = val
907
+ lit = s(:lit, num).line line
908
+ result = new_call(new_call(lit, :"**", argl(arg)), :"-@")
833
909
 
834
910
  }
835
911
  | tUPLUS arg
@@ -928,12 +1004,12 @@ rule
928
1004
 
929
1005
  rel_expr: arg relop arg =tGT
930
1006
  {
931
- lhs, op, rhs = val
1007
+ lhs, (op, _), rhs = val
932
1008
  result = new_call lhs, op.to_sym, argl(rhs)
933
1009
  }
934
1010
  | rel_expr relop arg =tGT
935
1011
  {
936
- lhs, op, rhs = val
1012
+ lhs, (op, _), rhs = val
937
1013
  warn "comparison '%s' after comparison", op
938
1014
  result = new_call lhs, op.to_sym, argl(rhs)
939
1015
  }
@@ -973,6 +1049,24 @@ rule
973
1049
  _, args, _ = val
974
1050
  result = args
975
1051
  }
1052
+ | tLPAREN2 args tCOMMA args_forward rparen
1053
+ {
1054
+ yyerror "Unexpected ..." unless
1055
+ self.lexer.is_local_id(:"*") &&
1056
+ self.lexer.is_local_id(:"**") &&
1057
+ self.lexer.is_local_id(:"&")
1058
+
1059
+ result = call_args val
1060
+ }
1061
+ | tLPAREN2 args_forward rparen
1062
+ {
1063
+ yyerror "Unexpected ..." unless
1064
+ self.lexer.is_local_id(:"*") &&
1065
+ self.lexer.is_local_id(:"**") &&
1066
+ self.lexer.is_local_id(:"&")
1067
+
1068
+ result = call_args val
1069
+ }
976
1070
 
977
1071
  opt_paren_args: none
978
1072
  | paren_args
@@ -1015,12 +1109,39 @@ rule
1015
1109
  }
1016
1110
 
1017
1111
  command_args: {
1018
- result = lexer.cmdarg.store true
1112
+ # parse26.y line 2200
1113
+
1114
+ # If call_args starts with a open paren '(' or
1115
+ # '[', look-ahead reading of the letters calls
1116
+ # CMDARG_PUSH(0), but the push must be done
1117
+ # after CMDARG_PUSH(1). So this code makes them
1118
+ # consistent by first cancelling the premature
1119
+ # CMDARG_PUSH(0), doing CMDARG_PUSH(1), and
1120
+ # finally redoing CMDARG_PUSH(0).
1121
+
1122
+ result = yychar = self.last_token_type.first
1123
+ lookahead = [:tLPAREN, :tLPAREN_ARG, :tLPAREN2, :tLBRACK, :tLBRACK2].include?(yychar)
1124
+ lexer.cmdarg.pop if lookahead
1125
+ lexer.cmdarg.push true
1126
+ lexer.cmdarg.push false if lookahead
1019
1127
  }
1020
1128
  call_args
1021
1129
  {
1022
- lexer.cmdarg.restore val[0]
1023
- result = val[1]
1130
+ yychar, args = val
1131
+
1132
+ # call_args can be followed by tLBRACE_ARG (that
1133
+ # does CMDARG_PUSH(0) in the lexer) but the push
1134
+ # must be done after CMDARG_POP() in the parser.
1135
+ # So this code does CMDARG_POP() to pop 0 pushed
1136
+ # by tLBRACE_ARG, CMDARG_POP() to pop 1 pushed
1137
+ # by command_args, and CMDARG_PUSH(0) to restore
1138
+ # back the flag set by tLBRACE_ARG.
1139
+
1140
+ lookahead = [:tLBRACE_ARG].include?(yychar)
1141
+ lexer.cmdarg.pop if lookahead
1142
+ lexer.cmdarg.pop
1143
+ lexer.cmdarg.push false if lookahead
1144
+ result = args
1024
1145
  }
1025
1146
 
1026
1147
  block_arg: tAMPER arg_value
@@ -1038,8 +1159,9 @@ rule
1038
1159
  args: arg_value
1039
1160
  {
1040
1161
  arg, = val
1162
+ lineno = arg.line || lexer.lineno # HACK
1041
1163
 
1042
- result = s(:array, arg).line arg.line
1164
+ result = s(:array, arg).line lineno
1043
1165
  }
1044
1166
  | tSTAR arg_value
1045
1167
  {
@@ -1051,9 +1173,11 @@ rule
1051
1173
  args, _, id = val
1052
1174
  result = self.list_append args, id
1053
1175
  }
1054
- | args tCOMMA tSTAR { result = lexer.lineno } arg_value
1176
+ | args tCOMMA tSTAR arg_value
1055
1177
  {
1056
- args, _, _, line, id = val
1178
+ # TODO: the line number from tSTAR has been dropped
1179
+ args, _, _, id = val
1180
+ line = lexer.lineno
1057
1181
  result = self.list_append args, s(:splat, id).line(line)
1058
1182
  }
1059
1183
 
@@ -1072,7 +1196,6 @@ rule
1072
1196
  }
1073
1197
  | args tCOMMA tSTAR arg_value
1074
1198
  {
1075
- # FIX: bad shift/reduce conflict with rhs' comma star prod
1076
1199
  # TODO: make all tXXXX terminals include lexer.lineno
1077
1200
  arg, _, _, splat = val
1078
1201
  result = self.arg_concat arg, splat
@@ -1095,26 +1218,19 @@ rule
1095
1218
  | backref
1096
1219
  | tFID
1097
1220
  {
1098
- msg, = val
1221
+ (msg, line), = val
1099
1222
  result = new_call nil, msg.to_sym
1223
+ result.line line
1100
1224
  }
1101
1225
  | k_begin
1102
1226
  {
1227
+ lexer.cmdarg.push false
1103
1228
  result = self.lexer.lineno
1104
- # TODO:
1105
- # $<val>1 = cmdarg_stack;
1106
- # CMDARG_SET(0);
1107
1229
  }
1108
1230
  bodystmt k_end
1109
1231
  {
1110
- # TODO: CMDARG_SET($<val>1);
1111
- unless val[2] then
1112
- result = s(:nil)
1113
- else
1114
- result = s(:begin, val[2])
1115
- end
1116
-
1117
- result.line = val[1]
1232
+ lexer.cmdarg.pop
1233
+ result = new_begin val
1118
1234
  }
1119
1235
  | tLPAREN_ARG
1120
1236
  {
@@ -1127,18 +1243,14 @@ rule
1127
1243
  result = s(:begin).line line
1128
1244
  }
1129
1245
  | tLPAREN_ARG
1130
- {
1131
- result = lexer.cmdarg.store false
1132
- }
1133
1246
  stmt
1134
1247
  {
1135
1248
  lexer.lex_state = EXPR_ENDARG
1136
1249
  }
1137
1250
  rparen
1138
1251
  {
1139
- _, cmdarg, stmt, _, _, = val
1140
- warning "(...) interpreted as grouped expression"
1141
- lexer.cmdarg.restore cmdarg
1252
+ _, stmt, _, _, = val
1253
+ # warning "(...) interpreted as grouped expression"
1142
1254
  result = stmt
1143
1255
  }
1144
1256
  | tLPAREN compstmt tRPAREN
@@ -1150,15 +1262,15 @@ rule
1150
1262
  }
1151
1263
  | primary_value tCOLON2 tCONSTANT
1152
1264
  {
1153
- expr, _, id = val
1265
+ expr, _, (id, _line) = val
1154
1266
 
1155
1267
  result = s(:colon2, expr, id.to_sym).line expr.line
1156
1268
  }
1157
1269
  | tCOLON3 tCONSTANT
1158
1270
  {
1159
- _, id = val
1271
+ _, (id, line) = val
1160
1272
 
1161
- result = s(:colon3, id.to_sym).line lexer.lineno
1273
+ result = s(:colon3, id.to_sym).line line
1162
1274
  }
1163
1275
  | tLBRACK { result = lexer.lineno } aref_args tRBRACK
1164
1276
  {
@@ -1182,15 +1294,21 @@ rule
1182
1294
  }
1183
1295
  | kYIELD tLPAREN2 call_args rparen
1184
1296
  {
1185
- result = new_yield val[2]
1297
+ (_, line), _, args, _ = val
1298
+
1299
+ result = new_yield(args).line line
1186
1300
  }
1187
1301
  | kYIELD tLPAREN2 rparen
1188
1302
  {
1189
- result = new_yield
1303
+ (_, line), _, _ = val
1304
+
1305
+ result = new_yield.line line
1190
1306
  }
1191
1307
  | kYIELD
1192
1308
  {
1193
- result = new_yield
1309
+ (_, line), = val
1310
+
1311
+ result = new_yield.line line
1194
1312
  }
1195
1313
  | kDEFINED opt_nl tLPAREN2 expr rparen
1196
1314
  {
@@ -1205,7 +1323,7 @@ rule
1205
1323
  }
1206
1324
  | kNOT tLPAREN2 rparen
1207
1325
  {
1208
- debug20 14, val, result
1326
+ debug 20
1209
1327
  }
1210
1328
  | fcall brace_block
1211
1329
  {
@@ -1223,9 +1341,10 @@ rule
1223
1341
  iter.insert 1, call # FIX
1224
1342
  result = iter
1225
1343
  }
1226
- | tLAMBDA lambda
1344
+ | lambda
1227
1345
  {
1228
- result = val[1] # TODO: fix lineno
1346
+ expr, = val
1347
+ result = expr
1229
1348
  }
1230
1349
  | k_if expr_value then compstmt if_tail k_end
1231
1350
  {
@@ -1257,6 +1376,12 @@ rule
1257
1376
  (_, line), _, body, _ = val
1258
1377
  result = new_case nil, body, line
1259
1378
  }
1379
+ | k_case expr_value opt_terms p_case_body k_end
1380
+ {
1381
+ (_, line), expr, _, body, _ = val
1382
+
1383
+ result = new_case expr, body, line
1384
+ }
1260
1385
  | k_for for_var kIN expr_value_do compstmt k_end
1261
1386
  {
1262
1387
  _, var, _, iter, body, _ = val
@@ -1268,7 +1393,6 @@ rule
1268
1393
  }
1269
1394
  cpath superclass
1270
1395
  {
1271
- self.comments.push self.lexer.comments
1272
1396
  if (self.in_def || self.in_single > 0) then
1273
1397
  yyerror "class definition in method body"
1274
1398
  end
@@ -1278,7 +1402,7 @@ rule
1278
1402
  {
1279
1403
  result = new_class val
1280
1404
  self.env.unextend
1281
- self.lexer.comments # we don't care about comments in the body
1405
+ self.lexer.ignore_body_comments
1282
1406
  }
1283
1407
  | k_class tLSHFT
1284
1408
  {
@@ -1299,7 +1423,7 @@ rule
1299
1423
  {
1300
1424
  result = new_sclass val
1301
1425
  self.env.unextend
1302
- self.lexer.comments # we don't care about comments in the body
1426
+ self.lexer.ignore_body_comments
1303
1427
  }
1304
1428
  | k_module
1305
1429
  {
@@ -1307,7 +1431,6 @@ rule
1307
1431
  }
1308
1432
  cpath
1309
1433
  {
1310
- self.comments.push self.lexer.comments
1311
1434
  yyerror "module definition in method body" if
1312
1435
  self.in_def or self.in_single > 0
1313
1436
 
@@ -1317,53 +1440,67 @@ rule
1317
1440
  {
1318
1441
  result = new_module val
1319
1442
  self.env.unextend
1320
- self.lexer.comments # we don't care about comments in the body
1443
+ self.lexer.ignore_body_comments
1321
1444
  }
1322
1445
  | k_def fname
1323
1446
  {
1324
- result = [self.in_def, self.lexer.cmdarg.stack.dup]
1447
+ result = self.in_def
1325
1448
 
1326
- self.comments.push self.lexer.comments
1327
- self.in_def = true
1449
+ self.in_def = true # group = local_push
1328
1450
  self.env.extend
1329
- # TODO: local->cmdargs = cmdarg_stack;
1330
- # TODO: port local_push_gen and local_pop_gen
1331
- lexer.cmdarg.stack.replace [false]
1451
+ lexer.cmdarg.push false
1452
+ lexer.cond.push false
1332
1453
  }
1333
- f_arglist bodystmt { result = lexer.lineno } k_end
1454
+ f_arglist bodystmt k_end
1334
1455
  {
1335
- in_def, cmdarg = val[2]
1336
-
1337
- result = new_defn val
1456
+ result, in_def = new_defn val
1338
1457
 
1339
- lexer.cmdarg.stack.replace cmdarg
1458
+ lexer.cond.pop # group = local_pop
1459
+ lexer.cmdarg.pop
1340
1460
  self.env.unextend
1341
1461
  self.in_def = in_def
1342
- self.lexer.comments # we don't care about comments in the body
1462
+
1463
+ self.lexer.ignore_body_comments
1343
1464
  }
1344
1465
  | k_def singleton dot_or_colon
1345
1466
  {
1346
- self.comments.push self.lexer.comments
1347
1467
  lexer.lex_state = EXPR_FNAME
1348
1468
  }
1349
1469
  fname
1350
1470
  {
1351
- self.in_single += 1
1471
+ result = self.in_def
1472
+
1473
+ self.in_single += 1 # TODO: remove?
1474
+
1475
+ self.in_def = true # local_push
1352
1476
  self.env.extend
1353
- lexer.lex_state = EXPR_ENDFN # force for args
1354
- result = [lexer.lineno, self.lexer.cmdarg.stack.dup]
1355
- lexer.cmdarg.stack.replace [false]
1477
+ lexer.cmdarg.push false
1478
+ lexer.cond.push false
1479
+
1480
+ lexer.lex_state = EXPR_ENDFN|EXPR_LABEL
1356
1481
  }
1357
1482
  f_arglist bodystmt k_end
1358
1483
  {
1359
- _, cmdarg = val[5]
1360
- result = new_defs val
1361
1484
 
1362
- lexer.cmdarg.stack.replace cmdarg
1485
+ # [kdef, recv, _, _, (name, line), in_def, args, body, kend]
1486
+ # =>
1487
+ # [kdef, recv, (name, line), in_def, args, body, kend]
1363
1488
 
1489
+ val.delete_at 3
1490
+ val.delete_at 2
1491
+
1492
+ result, in_def = new_defs val
1493
+
1494
+ lexer.cond.pop # group = local_pop
1495
+ lexer.cmdarg.pop
1364
1496
  self.env.unextend
1497
+ self.in_def = in_def
1498
+
1365
1499
  self.in_single -= 1
1366
- self.lexer.comments # we don't care about comments in the body
1500
+
1501
+ # TODO: restore cur_arg ? what's cur_arg?
1502
+
1503
+ self.lexer.ignore_body_comments
1367
1504
  }
1368
1505
  | kBREAK
1369
1506
  {
@@ -1400,8 +1537,17 @@ rule
1400
1537
  k_case: kCASE
1401
1538
  k_for: kFOR
1402
1539
  k_class: kCLASS
1540
+ {
1541
+ self.comments.push self.lexer.comments
1542
+ }
1403
1543
  k_module: kMODULE
1544
+ {
1545
+ self.comments.push self.lexer.comments
1546
+ }
1404
1547
  k_def: kDEF
1548
+ {
1549
+ self.comments.push self.lexer.comments
1550
+ }
1405
1551
  k_do: kDO
1406
1552
  k_do_block: kDO_BLOCK
1407
1553
  k_rescue: kRESCUE
@@ -1462,51 +1608,42 @@ rule
1462
1608
 
1463
1609
  result = block_var args
1464
1610
  }
1465
- | f_marg_list tCOMMA tSTAR f_norm_arg
1611
+ | f_marg_list tCOMMA f_rest_marg
1466
1612
  {
1467
- args, _, _, splat = val
1613
+ args, _, rest = val
1468
1614
 
1469
- result = block_var args, "*#{splat}".to_sym
1615
+ result = block_var args, rest
1470
1616
  }
1471
- | f_marg_list tCOMMA tSTAR f_norm_arg tCOMMA f_marg_list
1617
+ | f_marg_list tCOMMA f_rest_marg tCOMMA f_marg_list
1472
1618
  {
1473
- args, _, _, splat, _, args2 = val
1619
+ lhs, _, splat, _, rhs = val
1474
1620
 
1475
- result = block_var args, "*#{splat}".to_sym, args2
1621
+ result = block_var lhs, splat, rhs
1476
1622
  }
1477
- | f_marg_list tCOMMA tSTAR
1623
+ | f_rest_marg
1478
1624
  {
1479
- args, _, _ = val
1625
+ rest, = val
1480
1626
 
1481
- result = block_var args, :*
1627
+ result = block_var rest
1482
1628
  }
1483
- | f_marg_list tCOMMA tSTAR tCOMMA f_marg_list
1629
+ | f_rest_marg tCOMMA f_marg_list
1484
1630
  {
1485
- args, _, _, _, args2 = val
1631
+ splat, _, rest = val
1486
1632
 
1487
- result = block_var args, :*, args2
1633
+ result = block_var splat, rest
1488
1634
  }
1489
- | tSTAR f_norm_arg
1490
- {
1491
- _, splat = val
1492
1635
 
1493
- result = block_var :"*#{splat}"
1494
- }
1495
- | tSTAR f_norm_arg tCOMMA f_marg_list
1636
+ f_rest_marg: tSTAR f_norm_arg
1496
1637
  {
1497
- _, splat, _, args = val
1638
+ _, (id, line) = val
1498
1639
 
1499
- result = block_var :"*#{splat}", args
1640
+ result = args ["*#{id}".to_sym]
1641
+ result.line line
1500
1642
  }
1501
1643
  | tSTAR
1502
1644
  {
1503
- result = block_var :*
1504
- }
1505
- | tSTAR tCOMMA f_marg_list
1506
- {
1507
- _, _, args = val
1508
-
1509
- result = block_var :*, args
1645
+ result = args [:*]
1646
+ result.line lexer.lineno # FIX: tSTAR -> line
1510
1647
  }
1511
1648
 
1512
1649
  block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
@@ -1521,10 +1658,14 @@ rule
1521
1658
  {
1522
1659
  result = call_args val
1523
1660
  }
1661
+ | f_no_kwarg opt_f_block_arg
1662
+ {
1663
+ result = args val
1664
+ }
1524
1665
  | f_block_arg
1525
1666
  {
1526
- line = lexer.lineno
1527
- result = call_args val # TODO: push line down
1667
+ (id, line), = val
1668
+ result = call_args [id]
1528
1669
  result.line line
1529
1670
  }
1530
1671
 
@@ -1633,13 +1774,13 @@ opt_block_args_tail: tCOMMA block_args_tail
1633
1774
 
1634
1775
  bvar: tIDENTIFIER
1635
1776
  {
1636
- id, = val
1637
- line = lexer.lineno
1777
+ (id, line), = val
1638
1778
  result = s(:shadow, id.to_sym).line line
1639
1779
  }
1640
1780
  | f_bad_arg
1641
1781
 
1642
- lambda: {
1782
+ lambda: tLAMBDA
1783
+ {
1643
1784
  self.env.extend :dynamic
1644
1785
  result = [lexer.lineno, lexer.lpar_beg]
1645
1786
  lexer.paren_nest += 1
@@ -1647,20 +1788,19 @@ opt_block_args_tail: tCOMMA block_args_tail
1647
1788
  }
1648
1789
  f_larglist
1649
1790
  {
1650
- result = lexer.cmdarg.store(false)
1791
+ lexer.cmdarg.push false
1651
1792
  }
1652
1793
  lambda_body
1653
1794
  {
1654
- (line, lpar), args, cmdarg, body = val
1795
+ _, (line, lpar), args, _cmdarg, body = val
1655
1796
  lexer.lpar_beg = lpar
1656
1797
 
1657
- lexer.cmdarg.restore cmdarg
1658
- lexer.cmdarg.lexpop
1798
+ lexer.cmdarg.pop
1659
1799
 
1660
1800
  call = s(:lambda).line line
1661
1801
  result = new_iter call, args, body
1662
- result.line = line
1663
- self.env.unextend
1802
+ result.line line
1803
+ self.env.unextend # TODO: dynapush & dynapop
1664
1804
  }
1665
1805
 
1666
1806
  f_larglist: tLPAREN2 f_args opt_bv_decl rparen
@@ -1694,23 +1834,28 @@ opt_block_args_tail: tCOMMA block_args_tail
1694
1834
  ## if (nd_type($1) == NODE_YIELD) {
1695
1835
  ## compile_error(PARSER_ARG "block given to yield");
1696
1836
 
1697
- syntax_error "Both block arg and actual block given." if
1698
- val[0].block_pass?
1837
+ cmd, blk = val
1699
1838
 
1700
- val = invert_block_call val if inverted? val
1839
+ syntax_error "Both block arg and actual block given." if
1840
+ cmd.block_pass?
1701
1841
 
1702
- cmd, blk = val
1842
+ if inverted? val then
1843
+ val = invert_block_call val
1844
+ cmd, blk = val
1845
+ end
1703
1846
 
1704
1847
  result = blk
1705
1848
  result.insert 1, cmd
1706
1849
  }
1707
1850
  | block_call call_op2 operation2 opt_paren_args
1708
1851
  {
1709
- result = new_call val[0], val[2].to_sym, val[3]
1852
+ lhs, _, (id, _line), args = val
1853
+
1854
+ result = new_call lhs, id.to_sym, args
1710
1855
  }
1711
1856
  | block_call call_op2 operation2 opt_paren_args brace_block
1712
1857
  {
1713
- iter1, _, name, args, iter2 = val
1858
+ iter1, _, (name, _line), args, iter2 = val
1714
1859
 
1715
1860
  call = new_call iter1, name.to_sym, args
1716
1861
  iter2.insert 1, call
@@ -1719,7 +1864,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1719
1864
  }
1720
1865
  | block_call call_op2 operation2 command_args do_block
1721
1866
  {
1722
- iter1, _, name, args, iter2 = val
1867
+ iter1, _, (name, _line), args, iter2 = val
1723
1868
 
1724
1869
  call = new_call iter1, name.to_sym, args
1725
1870
  iter2.insert 1, call
@@ -1727,28 +1872,29 @@ opt_block_args_tail: tCOMMA block_args_tail
1727
1872
  result = iter2
1728
1873
  }
1729
1874
 
1730
- method_call: fcall
1875
+ method_call: fcall paren_args
1731
1876
  {
1732
- result = self.lexer.lineno
1733
- }
1734
- paren_args
1735
- {
1736
- call, lineno, args = val
1877
+ call, args = val
1737
1878
 
1738
1879
  result = call.concat args.sexp_body if args
1739
- result.line lineno
1740
1880
  }
1741
1881
  | primary_value call_op operation2 opt_paren_args
1742
1882
  {
1743
- result = new_call val[0], val[2].to_sym, val[3], val[1]
1883
+ recv, call_op, (op, _line), args = val
1884
+
1885
+ result = new_call recv, op.to_sym, args, call_op
1744
1886
  }
1745
1887
  | primary_value tCOLON2 operation2 paren_args
1746
1888
  {
1747
- result = new_call val[0], val[2].to_sym, val[3]
1889
+ recv, _, (op, _line), args = val
1890
+
1891
+ result = new_call recv, op.to_sym, args
1748
1892
  }
1749
1893
  | primary_value tCOLON2 operation3
1750
1894
  {
1751
- result = new_call val[0], val[2].to_sym
1895
+ lhs, _, (id, _line) = val
1896
+
1897
+ result = new_call lhs, id.to_sym
1752
1898
  }
1753
1899
  | primary_value call_op paren_args
1754
1900
  {
@@ -1781,7 +1927,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1781
1927
  _, line, body, _ = val
1782
1928
 
1783
1929
  result = body
1784
- result.line = line
1930
+ result.line line
1785
1931
 
1786
1932
  self.env.unextend
1787
1933
  }
@@ -1795,7 +1941,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1795
1941
  _, line, body, _ = val
1796
1942
 
1797
1943
  result = body
1798
- result.line = line
1944
+ result.line line
1799
1945
 
1800
1946
  self.env.unextend
1801
1947
  }
@@ -1813,29 +1959,557 @@ opt_block_args_tail: tCOMMA block_args_tail
1813
1959
  }
1814
1960
 
1815
1961
  do_body: { self.env.extend :dynamic; result = self.lexer.lineno }
1816
- { result = lexer.cmdarg.store(false) }
1962
+ { lexer.cmdarg.push false }
1817
1963
  opt_block_param
1818
1964
  bodystmt
1819
1965
  {
1820
- line, cmdarg, param, cmpstmt = val
1966
+ line, _cmdarg, param, cmpstmt = val
1821
1967
 
1822
1968
  result = new_do_body param, cmpstmt, line
1969
+ lexer.cmdarg.pop
1823
1970
  self.env.unextend
1824
- lexer.cmdarg.restore cmdarg
1971
+ }
1972
+
1973
+ case_args: arg_value
1974
+ {
1975
+ arg, = val
1976
+
1977
+ result = s(:array, arg).line arg.line
1978
+ }
1979
+ | tSTAR arg_value
1980
+ {
1981
+ _, arg = val
1982
+
1983
+ result = s(:array, s(:splat, arg).line(arg.line)).line arg.line
1984
+ }
1985
+ | case_args tCOMMA arg_value
1986
+ {
1987
+ args, _, id = val
1988
+
1989
+ result = self.list_append args, id
1990
+ }
1991
+ | case_args tCOMMA tSTAR arg_value
1992
+ {
1993
+ args, _, _, id = val
1994
+
1995
+ result = self.list_append args, s(:splat, id).line(id.line)
1825
1996
  }
1826
1997
 
1827
1998
  case_body: k_when
1828
1999
  {
1829
2000
  result = self.lexer.lineno
1830
2001
  }
1831
- args then compstmt cases
2002
+ case_args then compstmt cases
1832
2003
  {
1833
2004
  result = new_when(val[2], val[4])
1834
- result.line = val[1]
2005
+ result.line val[1]
1835
2006
  result << val[5] if val[5]
1836
2007
  }
1837
2008
 
1838
2009
  cases: opt_else | case_body
2010
+ ######################################################################
2011
+
2012
+ p_case_body: kIN
2013
+ {
2014
+ self.lexer.lex_state = EXPR_BEG|EXPR_LABEL
2015
+ self.lexer.command_start = false
2016
+ result = self.in_kwarg
2017
+ self.in_kwarg = true
2018
+ push_pvtbl
2019
+ push_pktbl
2020
+ }
2021
+ p_top_expr then
2022
+ {
2023
+ pop_pktbl
2024
+ pop_pvtbl
2025
+ old_kwargs = _values[-3]
2026
+ self.in_kwarg = old_kwargs
2027
+ }
2028
+ compstmt
2029
+ p_cases
2030
+ {
2031
+ (_, line), _, pat, _, _, body, cases = val
2032
+
2033
+ result = new_in pat, body, cases, line
2034
+ }
2035
+
2036
+ p_cases: opt_else
2037
+ | p_case_body
2038
+
2039
+ p_top_expr: p_top_expr_body
2040
+ | p_top_expr_body kIF_MOD expr_value
2041
+ {
2042
+ body, _, cond = val
2043
+ body = remove_begin body
2044
+
2045
+ result = s(:if, cond, body, nil).line body.line
2046
+ }
2047
+ | p_top_expr_body kUNLESS_MOD expr_value
2048
+ {
2049
+ body, _, cond = val
2050
+ body = remove_begin body
2051
+
2052
+ result = s(:if, cond, nil, body).line body.line
2053
+ }
2054
+
2055
+ p_top_expr_body: p_expr
2056
+ | p_expr tCOMMA
2057
+ {
2058
+ expr, _ = val
2059
+
2060
+ tail = new_array_pattern_tail nil, true, nil, nil
2061
+ result = new_array_pattern nil, expr, tail, expr.line
2062
+ }
2063
+ | p_expr tCOMMA p_args
2064
+ {
2065
+ expr, _, args = val
2066
+
2067
+ result = new_array_pattern nil, expr, args, expr.line
2068
+ }
2069
+ | p_args_tail
2070
+ {
2071
+ args, = val
2072
+ result = new_array_pattern nil, nil, args, args.line
2073
+ }
2074
+ | p_kwargs
2075
+ {
2076
+ kwargs, = val
2077
+ result = new_hash_pattern nil, kwargs, kwargs.line
2078
+ }
2079
+
2080
+ p_expr: p_as
2081
+
2082
+ p_as: p_expr tASSOC p_variable
2083
+ {
2084
+ # NODE *n = NEW_LIST($1, &@$);
2085
+ # n = list_append(p, n, $3);
2086
+ # $$ = new_hash(p, n, &@$);
2087
+
2088
+ expr, _, var = val
2089
+
2090
+ id = var.last
2091
+
2092
+ self.env[id] = :lvar # HACK: need to extend env
2093
+ lhs = s(:lasgn, id).line var.line
2094
+
2095
+ result = new_assign lhs, expr
2096
+ }
2097
+ | p_alt
2098
+
2099
+ p_alt: p_alt tPIPE p_expr_basic
2100
+ {
2101
+ lhs, _, rhs = val
2102
+
2103
+ result = s(:or, lhs, rhs).line lhs.line
2104
+ }
2105
+ | p_expr_basic
2106
+
2107
+ p_lparen: tLPAREN2 { push_pktbl }
2108
+ p_lbracket: tLBRACK2 { push_pktbl }
2109
+
2110
+ p_expr_basic: p_value
2111
+ | p_const p_lparen p_args tRPAREN
2112
+ {
2113
+ lhs, _, args, _ = val
2114
+
2115
+ pop_pktbl
2116
+ result = new_array_pattern(lhs, nil, args, lhs.line)
2117
+ }
2118
+ | p_const p_lparen p_kwargs tRPAREN
2119
+ {
2120
+ lhs, _, kwargs, _ = val
2121
+
2122
+ pop_pktbl
2123
+ result = new_hash_pattern(lhs, kwargs, lhs.line)
2124
+ }
2125
+ | p_const tLPAREN2 tRPAREN
2126
+ {
2127
+ const, _, _ = val
2128
+
2129
+ tail = new_array_pattern_tail nil, nil, nil, nil
2130
+ result = new_array_pattern const, nil, tail, const.line
2131
+ }
2132
+ | p_const p_lbracket p_args rbracket
2133
+ {
2134
+ const, _, pre_arg, _ = val
2135
+
2136
+ pop_pktbl
2137
+ result = new_array_pattern const, nil, pre_arg, const.line
2138
+ }
2139
+ | p_const p_lbracket p_kwargs rbracket
2140
+ {
2141
+ const, _, kwargs, _ = val
2142
+
2143
+ result = new_hash_pattern const, kwargs, const.line
2144
+ }
2145
+ | p_const tLBRACK2 rbracket
2146
+ {
2147
+ const, _, _ = val
2148
+
2149
+ tail = new_array_pattern_tail nil, nil, nil, nil
2150
+ result = new_array_pattern const, nil, tail, const.line
2151
+ }
2152
+ | tLBRACK { push_pktbl } p_args rbracket
2153
+ {
2154
+ _, _, pat, _ = val
2155
+
2156
+ pop_pktbl
2157
+ result = new_array_pattern nil, nil, pat, pat.line
2158
+ }
2159
+ | tLBRACK rbracket
2160
+ {
2161
+ (_, line), _ = val
2162
+
2163
+ result = s(:array_pat).line line
2164
+ }
2165
+ | tLBRACE
2166
+ {
2167
+ push_pktbl
2168
+ result = self.in_kwarg
2169
+ self.in_kwarg = false
2170
+ }
2171
+ p_kwargs rbrace
2172
+ {
2173
+ _, in_kwarg, kwargs, _ = val
2174
+
2175
+ pop_pktbl
2176
+ self.in_kwarg = in_kwarg
2177
+
2178
+ result = new_hash_pattern(nil, kwargs, kwargs.line)
2179
+ }
2180
+ | tLBRACE rbrace
2181
+ {
2182
+ (_, line), _ = val
2183
+
2184
+ tail = new_hash_pattern_tail nil, nil, line
2185
+ result = new_hash_pattern nil, tail, line
2186
+ }
2187
+ | tLPAREN { push_pktbl } p_expr tRPAREN
2188
+ {
2189
+ _, _, expr, _ = val
2190
+
2191
+ pop_pktbl
2192
+ result = expr
2193
+ }
2194
+
2195
+ p_args: p_expr
2196
+ {
2197
+ expr, = val
2198
+
2199
+ ary = s(:array_TAIL, expr).line expr.line
2200
+ result = new_array_pattern_tail(ary, nil, nil, nil).line expr.line
2201
+ }
2202
+ | p_args_head
2203
+ {
2204
+ head, = val
2205
+
2206
+ result = new_array_pattern_tail head, true, nil, nil
2207
+ }
2208
+ | p_args_head p_arg
2209
+ {
2210
+ head, tail = val
2211
+
2212
+ both = array_pat_concat head, tail
2213
+
2214
+ result = new_array_pattern_tail both, nil, nil, nil
2215
+ result.line head.line
2216
+ }
2217
+ | p_args_head tSTAR tIDENTIFIER
2218
+ {
2219
+ head, _, (id, _line) = val
2220
+
2221
+ result = new_array_pattern_tail head, true, id.to_sym, nil
2222
+ result.line head.line
2223
+ }
2224
+ | p_args_head tSTAR tIDENTIFIER tCOMMA p_args_post
2225
+ {
2226
+ head, _, (id, _line), _, post = val
2227
+
2228
+ result = new_array_pattern_tail head, true, id.to_sym, post
2229
+ result.line head.line
2230
+ }
2231
+ | p_args_head tSTAR
2232
+ {
2233
+ expr, _ = val
2234
+
2235
+ result = new_array_pattern_tail(expr, true, nil, nil).line expr.line
2236
+ }
2237
+ | p_args_head tSTAR tCOMMA p_args_post
2238
+ {
2239
+ head, _, _, post = val
2240
+
2241
+ result = new_array_pattern_tail(head, true, nil, post).line head.line
2242
+ }
2243
+ | p_args_tail
2244
+
2245
+ p_args_head: p_arg tCOMMA
2246
+ {
2247
+ arg, _ = val
2248
+ result = arg
2249
+ }
2250
+ | p_args_head p_arg tCOMMA
2251
+ {
2252
+ head, tail, _ = val
2253
+
2254
+ result = s(:PATTERN, *head.sexp_body, *tail.sexp_body)
2255
+ result.line head.line
2256
+ }
2257
+
2258
+ p_args_tail: tSTAR tIDENTIFIER
2259
+ {
2260
+ _, (id, line) = val
2261
+
2262
+ result = new_array_pattern_tail nil, true, id.to_sym, nil
2263
+ result.line line
2264
+ }
2265
+ | tSTAR tIDENTIFIER tCOMMA p_args_post
2266
+ {
2267
+ _, (id, line), _, rhs = val
2268
+
2269
+ result = new_array_pattern_tail nil, true, id.to_sym, rhs
2270
+ result.line line
2271
+ }
2272
+ | tSTAR
2273
+ {
2274
+ (_, line), = val
2275
+
2276
+ result = new_array_pattern_tail nil, true, nil, nil
2277
+ result.line line
2278
+ }
2279
+ | tSTAR tCOMMA p_args_post
2280
+ {
2281
+ (_, line), _, args = val
2282
+
2283
+ result = new_array_pattern_tail nil, true, nil, args
2284
+ result.line line
2285
+ }
2286
+
2287
+ p_args_post: p_arg
2288
+ | p_args_post tCOMMA p_arg
2289
+ {
2290
+ lhs, _, rhs = val
2291
+
2292
+ result = array_pat_concat lhs, rhs
2293
+ }
2294
+
2295
+ p_arg: p_expr
2296
+ {
2297
+ expr, = val
2298
+ expr = s(:array_TAIL, expr).line expr.line unless
2299
+ expr.sexp_type == :array_TAIL
2300
+ result = expr
2301
+ }
2302
+
2303
+ p_kwargs: p_kwarg tCOMMA p_kwrest
2304
+ {
2305
+ kw_arg, _, rest = val
2306
+ # TODO? new_unique_key_hash(p, $1, &@$)
2307
+ result = new_hash_pattern_tail kw_arg, rest, kw_arg.line
2308
+ }
2309
+ | p_kwarg
2310
+ {
2311
+ kwarg, = val
2312
+ # TODO? new_unique_key_hash(p, $1, &@$)
2313
+ result = new_hash_pattern_tail kwarg, nil, kwarg.line
2314
+ }
2315
+ | p_kwarg tCOMMA
2316
+ {
2317
+ kwarg, _ = val
2318
+ # TODO? new_unique_key_hash(p, $1, &@$)
2319
+ result = new_hash_pattern_tail kwarg, nil, kwarg.line
2320
+ }
2321
+ | p_kwrest
2322
+ {
2323
+ rest, = val
2324
+
2325
+ result = new_hash_pattern_tail nil, rest, rest.line
2326
+ }
2327
+ | p_kwarg tCOMMA p_kwnorest
2328
+ {
2329
+ kwarg, _, norest = val
2330
+
2331
+ # TODO? new_unique_key_hash(p, $1, &@$)
2332
+ result = new_hash_pattern_tail kwarg, norest, kwarg.line
2333
+ }
2334
+ | p_kwnorest
2335
+ {
2336
+ norest, = val
2337
+
2338
+ result = new_hash_pattern_tail nil, norest, norest.line
2339
+ }
2340
+
2341
+ p_kwarg: p_kw # TODO? rb_ary_new_from_args(1, $1)
2342
+ | p_kwarg tCOMMA p_kw
2343
+ {
2344
+ kwarg, _, kw = val
2345
+ kwarg.concat kw.sexp_body
2346
+ result = kwarg
2347
+ }
2348
+
2349
+ p_kw: p_kw_label p_expr
2350
+ {
2351
+ # TODO: error_duplicate_pattern_key(p, get_id($1), &@1);
2352
+ lhs, rhs = val
2353
+
2354
+ result = s(:PAIR, lhs, rhs).line lhs.line
2355
+ }
2356
+ | p_kw_label
2357
+ {
2358
+ lhs, = val
2359
+
2360
+ # TODO: error_duplicate_pattern_variable(p, get_id($1), &@1);
2361
+
2362
+ # TODO: if ($1 && !is_local_id(get_id($1))) {
2363
+ # yyerror1(&@1, "key must be valid as local variables");
2364
+ # }
2365
+
2366
+ # $$ = list_append(p, NEW_LIST(NEW_LIT(ID2SYM($1), &@$), &@$),
2367
+ # assignable(p, $1, 0, &@$));
2368
+
2369
+
2370
+ case lhs.sexp_type
2371
+ when :lit then
2372
+ assignable [lhs.value, lhs.line]
2373
+ else
2374
+ # TODO or done?
2375
+ debug 666
2376
+ end
2377
+
2378
+ # TODO PAIR -> LIST ?
2379
+ result = s(:PAIR, lhs, nil).line lhs.line
2380
+ }
2381
+
2382
+ p_kw_label: tLABEL
2383
+ {
2384
+ (id, line), = val
2385
+
2386
+ result = s(:lit, id.to_sym).line line
2387
+ }
2388
+
2389
+ p_kwrest: kwrest_mark tIDENTIFIER
2390
+ {
2391
+ _, (id, line) = val
2392
+
2393
+ name = id.to_sym
2394
+ self.assignable [name, line]
2395
+ result = s(:kwrest, :"**#{name}").line line
2396
+ }
2397
+ | kwrest_mark
2398
+ {
2399
+ (_, line), = val
2400
+
2401
+ result = s(:kwrest, :"**").line line
2402
+ }
2403
+
2404
+ p_kwnorest: kwrest_mark kNIL
2405
+ {
2406
+ (_, line), _ = val
2407
+
2408
+ # TODO: or s(:norest)? s(:**nil)?
2409
+ result = s(:kwrest, :"**nil").line line
2410
+ }
2411
+
2412
+ p_value: p_primitive
2413
+ | p_primitive tDOT2 p_primitive
2414
+ {
2415
+ lhs, _, rhs = val
2416
+
2417
+ lhs = value_expr lhs
2418
+ rhs = value_expr rhs
2419
+
2420
+ result = s(:dot2, lhs, rhs).line lhs.line
2421
+ }
2422
+ | p_primitive tDOT3 p_primitive
2423
+ {
2424
+ lhs, _, rhs = val
2425
+
2426
+ lhs = value_expr lhs
2427
+ rhs = value_expr rhs
2428
+
2429
+ result = s(:dot3, lhs, rhs).line lhs.line
2430
+ }
2431
+ | p_primitive tDOT2
2432
+ {
2433
+ v1, _ = val
2434
+
2435
+ result = s(:dot2, v1, nil).line v1.line
2436
+ }
2437
+ | p_primitive tDOT3
2438
+ {
2439
+ v1, _ = val
2440
+
2441
+ result = s(:dot3, v1, nil).line v1.line
2442
+ }
2443
+ | p_variable
2444
+ | p_var_ref
2445
+ | p_const
2446
+ | tBDOT2 p_primitive
2447
+ {
2448
+ _, v1 = val
2449
+
2450
+ result = s(:dot2, nil, v1).line v1.line
2451
+ }
2452
+ | tBDOT3 p_primitive
2453
+ {
2454
+ _, v1 = val
2455
+
2456
+ result = s(:dot3, nil, v1).line v1.line
2457
+ }
2458
+
2459
+ p_primitive: literal
2460
+ | strings
2461
+ | xstring
2462
+ | regexp
2463
+ | words
2464
+ | qwords
2465
+ | symbols
2466
+ | qsymbols
2467
+ | keyword_variable
2468
+ {
2469
+ # TODO? if (!($$ = gettable(p, $1, &@$))) $$ = NEW_BEGIN(0, &@$);
2470
+ var, = val
2471
+
2472
+ result = var
2473
+ }
2474
+ | lambda
2475
+
2476
+ p_variable: tIDENTIFIER
2477
+ {
2478
+ (id, line), = val
2479
+
2480
+ # TODO: error_duplicate_pattern_variable(p, $1, &@1);
2481
+ # TODO: assignable(p, $1, 0, &@$);
2482
+ result = s(:lvar, id.to_sym).line line
2483
+ }
2484
+
2485
+ p_var_ref: tCARET tIDENTIFIER
2486
+ {
2487
+ _, (id, line) = val
2488
+
2489
+ # TODO: check id against env for lvar or dvar
2490
+
2491
+ result = s(:lvar, id.to_sym).line line
2492
+ }
2493
+
2494
+ p_const: tCOLON3 cname
2495
+ {
2496
+ _, (id, line) = val
2497
+ result = s(:colon3, id.to_sym).line line
2498
+ }
2499
+ | p_const tCOLON2 cname
2500
+ {
2501
+ lhs, _, (id, _line) = val
2502
+
2503
+ l = lhs.line
2504
+ result = s(:const, s(:colon2, lhs, id.to_sym).line(l)).line l
2505
+ }
2506
+ | tCONSTANT
2507
+ {
2508
+ # TODO $$ = gettable(p, $1, &@$);
2509
+ (id, line), = val
2510
+ result = s(:const, id.to_sym).line line
2511
+ }
2512
+ ######################################################################
1839
2513
 
1840
2514
  opt_rescue: k_rescue exc_list exc_var then compstmt opt_rescue
1841
2515
  {
@@ -1877,17 +2551,10 @@ opt_block_args_tail: tCOMMA block_args_tail
1877
2551
 
1878
2552
  literal: numeric
1879
2553
  {
1880
- line = lexer.lineno
1881
- result = s(:lit, val[0])
1882
- result.line = line
2554
+ (lit, line), = val
2555
+ result = s(:lit, lit).line line
1883
2556
  }
1884
2557
  | symbol
1885
- {
1886
- line = lexer.lineno
1887
- result = s(:lit, val[0])
1888
- result.line = line
1889
- }
1890
- | dsym
1891
2558
 
1892
2559
  strings: string
1893
2560
  {
@@ -1898,7 +2565,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1898
2565
 
1899
2566
  string: tCHAR
1900
2567
  {
1901
- debug20 23, val, result
2568
+ debug 37
1902
2569
  }
1903
2570
  | string1
1904
2571
  | string string1
@@ -1908,11 +2575,11 @@ opt_block_args_tail: tCOMMA block_args_tail
1908
2575
 
1909
2576
  string1: tSTRING_BEG string_contents tSTRING_END
1910
2577
  {
1911
- _, str, (_, func) = val
2578
+ (_, line), str, (_, func) = val
1912
2579
 
1913
- str = dedent str if func =~ RubyLexer::STR_FUNC_ICNTNT
2580
+ str = dedent str if func =~ RubyLexer::STR_FUNC_DEDENT
1914
2581
 
1915
- result = str
2582
+ result = str.line line
1916
2583
  }
1917
2584
  | tSTRING
1918
2585
  {
@@ -1921,7 +2588,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1921
2588
 
1922
2589
  xstring: tXSTRING_BEG xstring_contents tSTRING_END
1923
2590
  {
1924
- result = new_xstring val[1]
2591
+ result = new_xstring val
1925
2592
  # TODO: dedent?!?! SERIOUSLY?!?
1926
2593
  }
1927
2594
 
@@ -1932,11 +2599,15 @@ opt_block_args_tail: tCOMMA block_args_tail
1932
2599
 
1933
2600
  words: tWORDS_BEG tSPACE tSTRING_END
1934
2601
  {
1935
- result = s(:array).line lexer.lineno
2602
+ (_, line), _, _ = val
2603
+
2604
+ result = s(:array).line line
1936
2605
  }
1937
2606
  | tWORDS_BEG word_list tSTRING_END
1938
2607
  {
1939
- result = val[1]
2608
+ (_, line), list, _ = val
2609
+
2610
+ result = list.line line
1940
2611
  }
1941
2612
 
1942
2613
  word_list: none
@@ -1956,18 +2627,20 @@ opt_block_args_tail: tCOMMA block_args_tail
1956
2627
 
1957
2628
  symbols: tSYMBOLS_BEG tSPACE tSTRING_END
1958
2629
  {
1959
- result = s(:array).line lexer.lineno
2630
+ (_, line), _, _ = val
2631
+
2632
+ result = s(:array).line line
1960
2633
  }
1961
- | tSYMBOLS_BEG { result = lexer.lineno } symbol_list tSTRING_END
2634
+ | tSYMBOLS_BEG symbol_list tSTRING_END
1962
2635
  {
1963
- _, line, list, _, = val
1964
- list.line = line
2636
+ (_, line), list, _, = val
2637
+ list.line line
1965
2638
  result = list
1966
2639
  }
1967
2640
 
1968
2641
  symbol_list: none
1969
2642
  {
1970
- result = new_symbol_list.line lexer.lineno
2643
+ result = new_symbol_list
1971
2644
  }
1972
2645
  | symbol_list word tSPACE
1973
2646
  {
@@ -1977,20 +2650,28 @@ opt_block_args_tail: tCOMMA block_args_tail
1977
2650
 
1978
2651
  qwords: tQWORDS_BEG tSPACE tSTRING_END
1979
2652
  {
1980
- result = s(:array).line lexer.lineno
2653
+ (_, line), _, _ = val
2654
+
2655
+ result = s(:array).line line
1981
2656
  }
1982
2657
  | tQWORDS_BEG qword_list tSTRING_END
1983
2658
  {
1984
- result = val[1]
2659
+ (_, line), list, _ = val
2660
+
2661
+ result = list.line line
1985
2662
  }
1986
2663
 
1987
2664
  qsymbols: tQSYMBOLS_BEG tSPACE tSTRING_END
1988
2665
  {
1989
- result = s(:array).line lexer.lineno # FIX
2666
+ (_, line), _, _ = val
2667
+
2668
+ result = s(:array).line line
1990
2669
  }
1991
2670
  | tQSYMBOLS_BEG qsym_list tSTRING_END
1992
2671
  {
1993
- result = val[1]
2672
+ (_, line), list, _ = val
2673
+
2674
+ result = list.line line
1994
2675
  }
1995
2676
 
1996
2677
  qword_list: none
@@ -2013,7 +2694,8 @@ opt_block_args_tail: tCOMMA block_args_tail
2013
2694
 
2014
2695
  string_contents: none
2015
2696
  {
2016
- result = s(:str, "").line lexer.lineno
2697
+ line = prev_value_to_lineno _values.last
2698
+ result = s(:str, +"").line line
2017
2699
  }
2018
2700
  | string_contents string_content
2019
2701
  {
@@ -2063,12 +2745,13 @@ regexp_contents: none
2063
2745
  result = [lexer.lex_strterm,
2064
2746
  lexer.brace_nest,
2065
2747
  lexer.string_nest, # TODO: remove
2066
- lexer.cond.store,
2067
- lexer.cmdarg.store,
2068
2748
  lexer.lex_state,
2069
2749
  lexer.lineno,
2070
2750
  ]
2071
2751
 
2752
+ lexer.cmdarg.push false
2753
+ lexer.cond.push false
2754
+
2072
2755
  lexer.lex_strterm = nil
2073
2756
  lexer.brace_nest = 0
2074
2757
  lexer.string_nest = 0
@@ -2080,14 +2763,15 @@ regexp_contents: none
2080
2763
  {
2081
2764
  _, memo, stmt, _ = val
2082
2765
 
2083
- lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg, oldlex_state, line = memo
2766
+ lex_strterm, brace_nest, string_nest, oldlex_state, line = memo
2767
+ # TODO: heredoc_indent
2084
2768
 
2085
2769
  lexer.lex_strterm = lex_strterm
2086
2770
  lexer.brace_nest = brace_nest
2087
2771
  lexer.string_nest = string_nest
2088
2772
 
2089
- lexer.cond.restore oldcond
2090
- lexer.cmdarg.restore oldcmdarg
2773
+ lexer.cond.pop
2774
+ lexer.cmdarg.pop
2091
2775
 
2092
2776
  lexer.lex_state = oldlex_state
2093
2777
 
@@ -2102,29 +2786,49 @@ regexp_contents: none
2102
2786
  when nil then
2103
2787
  result = s(:evstr).line line
2104
2788
  else
2105
- debug20 25
2789
+ debug 38
2106
2790
  raise "unknown string body: #{stmt.inspect}"
2107
2791
  end
2108
2792
  }
2109
2793
 
2110
- string_dvar: tGVAR { result = s(:gvar, val[0].to_sym).line lexer.lineno }
2111
- | tIVAR { result = s(:ivar, val[0].to_sym).line lexer.lineno }
2112
- | tCVAR { result = s(:cvar, val[0].to_sym).line lexer.lineno }
2794
+ string_dvar: tGVAR
2795
+ {
2796
+ (id, line), = val
2797
+ result = s(:gvar, id.to_sym).line line
2798
+ }
2799
+ | tIVAR
2800
+ {
2801
+ (id, line), = val
2802
+ result = s(:ivar, id.to_sym).line line
2803
+ }
2804
+ | tCVAR
2805
+ {
2806
+ (id, line), = val
2807
+ result = s(:cvar, id.to_sym).line line
2808
+ }
2113
2809
  | backref
2114
2810
 
2115
- symbol: tSYMBEG sym
2811
+ symbol: ssym
2812
+ | dsym
2813
+
2814
+ ssym: tSYMBEG sym
2116
2815
  {
2816
+ _, (id, line) = val
2817
+
2117
2818
  lexer.lex_state = EXPR_END
2118
- result = val[1].to_sym
2819
+ result = s(:lit, id.to_sym).line line
2119
2820
  }
2120
2821
  | tSYMBOL
2121
2822
  {
2122
- result = val[0].to_sym
2823
+ (id, line), = val
2824
+
2825
+ lexer.lex_state = EXPR_END
2826
+ result = s(:lit, id.to_sym).line line
2123
2827
  }
2124
2828
 
2125
2829
  sym: fname | tIVAR | tGVAR | tCVAR
2126
2830
 
2127
- dsym: tSYMBEG xstring_contents tSTRING_END
2831
+ dsym: tSYMBEG string_contents tSTRING_END
2128
2832
  {
2129
2833
  _, result, _ = val
2130
2834
 
@@ -2140,14 +2844,15 @@ regexp_contents: none
2140
2844
  when :evstr then
2141
2845
  result = s(:dsym, "", result).line result.line
2142
2846
  else
2143
- debug20 26, val, result
2847
+ debug 39
2144
2848
  end
2145
2849
  }
2146
2850
 
2147
2851
  numeric: simple_numeric
2148
- | tUMINUS_NUM simple_numeric
2852
+ | tUMINUS_NUM simple_numeric =tLOWEST
2149
2853
  {
2150
- result = -val[1] # TODO: pt_testcase
2854
+ _, (num, line) = val
2855
+ result = [-num, line]
2151
2856
  }
2152
2857
 
2153
2858
  simple_numeric: tINTEGER
@@ -2180,8 +2885,10 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2180
2885
 
2181
2886
  var_ref: user_variable
2182
2887
  {
2183
- var = val[0]
2888
+ raise "NO: #{val.inspect}" if Sexp === val.first
2889
+ (var, line), = val
2184
2890
  result = Sexp === var ? var : self.gettable(var)
2891
+ result.line line
2185
2892
  }
2186
2893
  | keyword_variable
2187
2894
  {
@@ -2196,11 +2903,19 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2196
2903
  | keyword_variable
2197
2904
  {
2198
2905
  result = self.assignable val[0]
2199
- debug20 29, val, result
2906
+ debug 40
2200
2907
  }
2201
2908
 
2202
- backref: tNTH_REF { result = s(:nth_ref, val[0]).line lexer.lineno }
2203
- | tBACK_REF { result = s(:back_ref, val[0]).line lexer.lineno }
2909
+ backref: tNTH_REF
2910
+ {
2911
+ (ref, line), = val
2912
+ result = s(:nth_ref, ref).line line
2913
+ }
2914
+ | tBACK_REF
2915
+ {
2916
+ (ref, line), = val
2917
+ result = s(:back_ref, ref).line line
2918
+ }
2204
2919
 
2205
2920
  superclass: tLT
2206
2921
  {
@@ -2218,9 +2933,15 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2218
2933
 
2219
2934
  f_arglist: tLPAREN2 f_args rparen
2220
2935
  {
2221
- result = val[1]
2222
- self.lexer.lex_state = EXPR_BEG
2223
- self.lexer.command_start = true
2936
+ result = end_args val
2937
+ }
2938
+ | tLPAREN2 f_arg tCOMMA args_forward rparen
2939
+ {
2940
+ result = end_args val
2941
+ }
2942
+ | tLPAREN2 args_forward rparen
2943
+ {
2944
+ result = end_args val
2224
2945
  }
2225
2946
  | {
2226
2947
  result = self.in_kwarg
@@ -2229,12 +2950,7 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2229
2950
  }
2230
2951
  f_args term
2231
2952
  {
2232
- kwarg, args, _ = val
2233
-
2234
- self.in_kwarg = kwarg
2235
- result = args
2236
- lexer.lex_state = EXPR_BEG
2237
- lexer.command_start = true
2953
+ result = end_args val
2238
2954
  }
2239
2955
 
2240
2956
  args_tail: f_kwarg tCOMMA f_kwrest opt_f_block_arg
@@ -2249,6 +2965,10 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2249
2965
  {
2250
2966
  result = args val
2251
2967
  }
2968
+ | f_no_kwarg opt_f_block_arg
2969
+ {
2970
+ result = args val
2971
+ }
2252
2972
  | f_block_arg
2253
2973
 
2254
2974
  opt_args_tail: tCOMMA args_tail
@@ -2319,6 +3039,12 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2319
3039
  |
2320
3040
  {
2321
3041
  result = args val
3042
+ # result.line lexer.lineno
3043
+ }
3044
+
3045
+ args_forward: tBDOT3
3046
+ {
3047
+ result = s(:forward_args).line lexer.lineno
2322
3048
  }
2323
3049
 
2324
3050
  f_bad_arg: tCONSTANT
@@ -2341,10 +3067,11 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2341
3067
  f_norm_arg: f_bad_arg
2342
3068
  | tIDENTIFIER
2343
3069
  {
2344
- identifier = val[0].to_sym
3070
+ (id, line), = val
3071
+ identifier = id.to_sym
2345
3072
  self.env[identifier] = :lvar
2346
3073
 
2347
- result = identifier
3074
+ result = [identifier, line]
2348
3075
  }
2349
3076
 
2350
3077
  f_arg_asgn: f_norm_arg
@@ -2352,22 +3079,14 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2352
3079
  f_arg_item: f_arg_asgn
2353
3080
  | tLPAREN f_margs rparen
2354
3081
  {
2355
- result = val[1]
3082
+ _, margs, _ = val
3083
+
3084
+ result = margs
2356
3085
  }
2357
3086
 
2358
3087
  f_arg: f_arg_item
2359
3088
  {
2360
- arg, = val
2361
-
2362
- case arg
2363
- when Symbol then
2364
- result = s(:args, arg).line lexer.lineno
2365
- when Sexp then
2366
- result = arg
2367
- else
2368
- debug20 32
2369
- raise "Unknown f_arg type: #{val.inspect}"
2370
- end
3089
+ result = new_arg val
2371
3090
  }
2372
3091
  | f_arg tCOMMA f_arg_item
2373
3092
  {
@@ -2379,7 +3098,7 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2379
3098
  result = s(:args, list).line list.line
2380
3099
  end
2381
3100
 
2382
- result << item
3101
+ result << (Sexp === item ? item : item.first)
2383
3102
  }
2384
3103
 
2385
3104
  f_label: tLABEL
@@ -2440,26 +3159,37 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2440
3159
  kwrest_mark: tPOW
2441
3160
  | tDSTAR
2442
3161
 
3162
+ f_no_kwarg: kwrest_mark kNIL
3163
+ {
3164
+ result = :"**nil"
3165
+ }
3166
+
2443
3167
  f_kwrest: kwrest_mark tIDENTIFIER
2444
3168
  {
2445
- name = val[1].to_sym
2446
- self.assignable name
2447
- result = :"**#{name}"
3169
+ _, (id, line) = val
3170
+
3171
+ name = id.to_sym
3172
+ self.assignable [name, line]
3173
+ result = [:"**#{name}", line]
2448
3174
  }
2449
3175
  | kwrest_mark
2450
3176
  {
2451
- result = :"**"
3177
+ id = :"**"
3178
+ self.env[id] = :lvar # TODO: needed?!?
3179
+ result = [id, lexer.lineno] # TODO: tPOW/tDSTAR include lineno
2452
3180
  }
2453
3181
 
2454
3182
  f_opt: f_arg_asgn tEQL arg_value
2455
3183
  {
2456
- result = self.assignable val[0], val[2]
3184
+ lhs, _, rhs = val
3185
+ result = self.assignable lhs, rhs
2457
3186
  # TODO: detect duplicate names
2458
3187
  }
2459
3188
 
2460
3189
  f_block_opt: f_arg_asgn tEQL primary_value
2461
3190
  {
2462
- result = self.assignable val[0], val[2]
3191
+ lhs, _, rhs = val
3192
+ result = self.assignable lhs, rhs
2463
3193
  }
2464
3194
 
2465
3195
  f_block_optarg: f_block_opt
@@ -2489,30 +3219,33 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2489
3219
  f_rest_arg: restarg_mark tIDENTIFIER
2490
3220
  {
2491
3221
  # TODO: differs from parse.y - needs tests
2492
- name = val[1].to_sym
2493
- self.assignable name
2494
- result = :"*#{name}"
3222
+ _, (id, line) = val
3223
+ name = id.to_sym
3224
+ self.assignable [name, line]
3225
+ result = [:"*#{name}", line]
2495
3226
  }
2496
3227
  | restarg_mark
2497
3228
  {
2498
3229
  name = :"*"
2499
3230
  self.env[name] = :lvar
2500
- result = name
3231
+ result = [name, lexer.lineno] # FIX: tSTAR to include lineno
2501
3232
  }
2502
3233
 
2503
3234
  blkarg_mark: tAMPER2 | tAMPER
2504
3235
 
2505
3236
  f_block_arg: blkarg_mark tIDENTIFIER
2506
3237
  {
2507
- identifier = val[1].to_sym
3238
+ _, (id, line) = val
3239
+ identifier = id.to_sym
2508
3240
 
2509
3241
  self.env[identifier] = :lvar
2510
- result = "&#{identifier}".to_sym
3242
+ result = ["&#{identifier}".to_sym, line]
2511
3243
  }
2512
3244
 
2513
3245
  opt_f_block_arg: tCOMMA f_block_arg
2514
3246
  {
2515
- result = val[1]
3247
+ _, arg = val
3248
+ result = arg
2516
3249
  }
2517
3250
  |
2518
3251
  {
@@ -2561,9 +3294,11 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2561
3294
  }
2562
3295
  | tSTRING_BEG string_contents tLABEL_END arg_value
2563
3296
  {
2564
- _, sym, _, value = val
3297
+ (_, line), sym, _, value = val
3298
+
2565
3299
  sym.sexp_type = :dsym
2566
- result = s(:array, sym, value).line sym.line
3300
+
3301
+ result = s(:array, sym, value).line line
2567
3302
  }
2568
3303
  | tDSTAR arg_value
2569
3304
  {
@@ -2586,6 +3321,7 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2586
3321
  opt_nl: | tNL
2587
3322
  rparen: opt_nl tRPAREN
2588
3323
  rbracket: opt_nl tRBRACK
3324
+ rbrace: opt_nl tRCURLY
2589
3325
  trailer: | tNL | tCOMMA
2590
3326
 
2591
3327
  term: tSEMI { yyerrok }