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 Ruby26Parser
3
+ class Ruby25Parser
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,7 +18,7 @@ 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
@@ -33,7 +33,7 @@ preclow
33
33
  right tEQL tOP_ASGN
34
34
  left kRESCUE_MOD
35
35
  right tEH tCOLON
36
- nonassoc tDOT2 tDOT3
36
+ nonassoc tDOT2 tDOT3 tBDOT2 tBDOT3
37
37
  left tOROP
38
38
  left tANDOP
39
39
  nonassoc tCMP tEQ tEQQ tNEQ tMATCH tNMATCH
@@ -56,6 +56,9 @@ rule
56
56
  top_compstmt
57
57
  {
58
58
  result = new_compstmt val
59
+
60
+ lexer.cond.pop # local_pop
61
+ lexer.cmdarg.pop
59
62
  }
60
63
 
61
64
  top_compstmt: top_stmts opt_terms
@@ -76,7 +79,7 @@ rule
76
79
  | klBEGIN
77
80
  {
78
81
  if (self.in_def || self.in_single > 0) then
79
- debug20 1
82
+ debug 11
80
83
  yyerror "BEGIN in method"
81
84
  end
82
85
  self.env.extend
@@ -101,7 +104,9 @@ rule
101
104
  bodystmt: compstmt opt_rescue k_else
102
105
  {
103
106
  res = _values[-2]
104
- yyerror "else without rescue is useless" unless res
107
+ # TODO: move down to main match so I can just use val
108
+
109
+ warn "else without rescue is useless" unless res
105
110
  }
106
111
  compstmt
107
112
  opt_ensure
@@ -131,7 +136,7 @@ rule
131
136
  | error stmt
132
137
  {
133
138
  result = val[1]
134
- debug20 2, val, result
139
+ debug 12
135
140
  }
136
141
 
137
142
  stmt_or_begin: stmt
@@ -139,6 +144,10 @@ rule
139
144
  {
140
145
  yyerror "BEGIN is permitted only at toplevel"
141
146
  }
147
+ begin_block
148
+ {
149
+ result = val[2] # wtf?
150
+ }
142
151
 
143
152
  stmt: kALIAS fitem
144
153
  {
@@ -151,12 +160,12 @@ rule
151
160
  }
152
161
  | kALIAS tGVAR tGVAR
153
162
  {
154
- (_, line), lhs, rhs = val
163
+ (_, line), (lhs, _), (rhs, _) = val
155
164
  result = s(:valias, lhs.to_sym, rhs.to_sym).line line
156
165
  }
157
166
  | kALIAS tGVAR tBACK_REF
158
167
  {
159
- (_, line), lhs, rhs = val
168
+ (_, line), (lhs, _), (rhs, _) = val
160
169
  result = s(:valias, lhs.to_sym, :"$#{rhs}").line line
161
170
  }
162
171
  | kALIAS tGVAR tNTH_REF
@@ -199,7 +208,7 @@ rule
199
208
  (_, line), _, stmt, _ = val
200
209
 
201
210
  if (self.in_def || self.in_single > 0) then
202
- debug20 3
211
+ debug 13
203
212
  yyerror "END in method; use at_exit"
204
213
  end
205
214
 
@@ -239,30 +248,31 @@ rule
239
248
  }
240
249
  | primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
241
250
  {
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
251
+ prim, (call_op, _), (id, _), (op_asgn, _), rhs = val
252
+
253
+ result = s(:op_asgn, prim, rhs, id.to_sym, op_asgn.to_sym)
254
+ result.sexp_type = :safe_op_asgn if call_op == '&.'
255
+ result.line prim.line
248
256
  }
249
257
  | primary_value call_op tCONSTANT tOP_ASGN command_rhs
250
258
  {
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
259
+ prim, (call_op, _), (id, _), (op_asgn, _), rhs = val
260
+
261
+ result = s(:op_asgn, prim, rhs, id.to_sym, op_asgn.to_sym)
262
+ result.sexp_type = :safe_op_asgn if call_op == '&.'
263
+ result.line prim.line
256
264
  }
257
265
  | primary_value tCOLON2 tCONSTANT tOP_ASGN command_rhs
258
266
  {
259
- result = s(:op_asgn, val[0], val[4], val[2], val[3])
260
- debug20 4, val, result
267
+ lhs1, _, (lhs2, line), (id, _), rhs = val
268
+
269
+ result = s(:op_asgn, lhs1, rhs, lhs2.to_sym, id.to_sym).line line
261
270
  }
262
271
  | primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_rhs
263
272
  {
264
- result = s(:op_asgn, val[0], val[4], val[2], val[3])
265
- debug20 5, val, result
273
+ lhs1, _, (lhs2, line), (id, _), rhs = val
274
+
275
+ result = s(:op_asgn, lhs1, rhs, lhs2.to_sym, id.to_sym).line line
266
276
  }
267
277
  | backref tOP_ASGN command_rhs
268
278
  {
@@ -308,7 +318,7 @@ rule
308
318
  # TODO: fix line number to tBANG... but causes BAD shift/reduce conflict
309
319
  # REFACTOR: call_uni_op -- see parse26.y
310
320
  }
311
- | arg
321
+ | arg =tLBRACE_ARG
312
322
 
313
323
  expr_value: expr
314
324
  {
@@ -333,7 +343,7 @@ rule
333
343
  block_command: block_call
334
344
  | block_call call_op2 operation2 command_args
335
345
  {
336
- blk, _, msg, args = val
346
+ blk, _, (msg, _line), args = val
337
347
  result = new_call(blk, msg.to_sym, args).line blk.line
338
348
  }
339
349
 
@@ -347,15 +357,15 @@ rule
347
357
  _, line, body, _ = val
348
358
 
349
359
  result = body
350
- result.line = line
360
+ result.line line
351
361
 
352
362
  # self.env.unextend
353
363
  }
354
364
 
355
365
  fcall: operation
356
366
  {
357
- msg, = val
358
- result = new_call(nil, msg.to_sym).line lexer.lineno
367
+ (msg, line), = val
368
+ result = new_call(nil, msg.to_sym).line line
359
369
  }
360
370
 
361
371
  command: fcall command_args =tLOWEST
@@ -378,12 +388,14 @@ rule
378
388
  }
379
389
  | primary_value call_op operation2 command_args =tLOWEST
380
390
  {
381
- lhs, callop, op, args = val
391
+ lhs, callop, (op, _), args = val
392
+
382
393
  result = new_call lhs, op.to_sym, args, callop
394
+ result.line lhs.line
383
395
  }
384
396
  | primary_value call_op operation2 command_args cmd_brace_block
385
397
  {
386
- recv, _, msg, args, block = val
398
+ recv, _, (msg, _line), args, block = val
387
399
  call = new_call recv, msg.to_sym, args, val[1]
388
400
 
389
401
  block_dup_check call, block
@@ -393,11 +405,14 @@ rule
393
405
  }
394
406
  | primary_value tCOLON2 operation2 command_args =tLOWEST
395
407
  {
396
- result = new_call val[0], val[2].to_sym, val[3]
408
+ lhs, _, (id, line), args = val
409
+
410
+ result = new_call lhs, id.to_sym, args
411
+ result.line line
397
412
  }
398
413
  | primary_value tCOLON2 operation2 command_args cmd_brace_block
399
414
  {
400
- recv, _, msg, args, block = val
415
+ recv, _, (msg, _line), args, block = val
401
416
  call = new_call recv, msg.to_sym, args
402
417
 
403
418
  block_dup_check call, block
@@ -555,25 +570,29 @@ rule
555
570
  }
556
571
  | primary_value call_op tIDENTIFIER
557
572
  {
558
- result = new_attrasgn val[0], val[2], val[1]
573
+ lhs, call_op, (id, _line) = val
574
+
575
+ result = new_attrasgn lhs, id, call_op
559
576
  }
560
577
  | primary_value tCOLON2 tIDENTIFIER
561
578
  {
562
- recv, _, id = val
579
+ recv, _, (id, _line) = val
563
580
  result = new_attrasgn recv, id
564
581
  }
565
582
  | primary_value call_op tCONSTANT
566
583
  {
567
- result = new_attrasgn val[0], val[2], val[1]
584
+ lhs, call_op, (id, _line) = val
585
+
586
+ result = new_attrasgn lhs, id, call_op
568
587
  }
569
588
  | primary_value tCOLON2 tCONSTANT
570
589
  {
571
590
  if (self.in_def || self.in_single > 0) then
572
- debug20 7
591
+ debug 14
573
592
  yyerror "dynamic constant assignment"
574
593
  end
575
594
 
576
- expr, _, id = val
595
+ expr, _, (id, _line) = val
577
596
  l = expr.line
578
597
 
579
598
  result = s(:const, s(:colon2, expr, id.to_sym).line(l), nil).line l
@@ -581,58 +600,65 @@ rule
581
600
  | tCOLON3 tCONSTANT
582
601
  {
583
602
  if (self.in_def || self.in_single > 0) then
584
- debug20 8
603
+ debug 15
585
604
  yyerror "dynamic constant assignment"
586
605
  end
587
606
 
588
- _, id = val
589
- l = lexer.lineno
607
+ _, (id, l) = val
590
608
 
591
609
  result = s(:const, nil, s(:colon3, id.to_sym).line(l)).line l
592
610
  }
593
611
  | backref
594
612
  {
595
- self.backref_assign_error val[0]
613
+ ref, = val
614
+
615
+ self.backref_assign_error ref
596
616
  }
597
617
 
598
618
  lhs: user_variable
599
619
  {
600
- line = lexer.lineno
601
- result = self.assignable val[0]
602
- result.line = line
620
+ var, = val
621
+
622
+ result = self.assignable var
603
623
  }
604
624
  | keyword_variable
605
625
  {
606
- line = lexer.lineno
607
- result = self.assignable val[0]
608
- result.line = line
609
- debug20 9, val, result
626
+ var, = val
627
+
628
+ result = self.assignable var
629
+
630
+ debug 16
610
631
  }
611
632
  | primary_value tLBRACK2 opt_call_args rbracket
612
633
  {
613
634
  lhs, _, args, _ = val
635
+
614
636
  result = self.aryset lhs, args
615
637
  }
616
638
  | primary_value call_op tIDENTIFIER # REFACTOR
617
639
  {
618
- lhs, op, id = val
640
+ lhs, op, (id, _line) = val
641
+
619
642
  result = new_attrasgn lhs, id, op
620
643
  }
621
644
  | primary_value tCOLON2 tIDENTIFIER
622
645
  {
623
- lhs, _, id = val
646
+ lhs, _, (id, _line) = val
647
+
624
648
  result = new_attrasgn lhs, id
625
649
  }
626
650
  | primary_value call_op tCONSTANT # REFACTOR?
627
651
  {
628
- result = new_attrasgn val[0], val[2], val[1]
652
+ lhs, call_op, (id, _line) = val
653
+
654
+ result = new_attrasgn lhs, id, call_op
629
655
  }
630
656
  | primary_value tCOLON2 tCONSTANT
631
657
  {
632
- expr, _, id = val
658
+ expr, _, (id, _line) = val
633
659
 
634
660
  if (self.in_def || self.in_single > 0) then
635
- debug20 10
661
+ debug 17
636
662
  yyerror "dynamic constant assignment"
637
663
  end
638
664
 
@@ -641,14 +667,13 @@ rule
641
667
  }
642
668
  | tCOLON3 tCONSTANT
643
669
  {
644
- _, id = val
670
+ _, (id, l) = val
645
671
 
646
672
  if (self.in_def || self.in_single > 0) then
647
- debug20 11
673
+ debug 18
648
674
  yyerror "dynamic constant assignment"
649
675
  end
650
676
 
651
- l = lexer.lineno
652
677
  result = s(:const, s(:colon3, id.to_sym).line(l)).line l
653
678
  }
654
679
  | backref
@@ -664,16 +689,17 @@ rule
664
689
 
665
690
  cpath: tCOLON3 cname
666
691
  {
667
- _, name = val
668
- result = s(:colon3, name.to_sym).line lexer.lineno
692
+ _, (name, line) = val
693
+ result = s(:colon3, name.to_sym).line line
669
694
  }
670
695
  | cname
671
696
  {
672
- result = val[0].to_sym
697
+ (id, line), = val
698
+ result = [id.to_sym, line] # TODO: sexp?
673
699
  }
674
700
  | primary_value tCOLON2 cname
675
701
  {
676
- pval, _, name = val
702
+ pval, _, (name, _line) = val
677
703
 
678
704
  result = s(:colon2, pval, name.to_sym)
679
705
  result.line pval.line
@@ -683,24 +709,17 @@ rule
683
709
  | op
684
710
  {
685
711
  lexer.lex_state = EXPR_END
686
- result = val[0]
687
712
  }
688
713
 
689
714
  | reswords
690
- {
691
- (sym, _line), = val
692
- lexer.lex_state = EXPR_END
693
- result = sym
694
- }
695
-
696
- fsym: fname | symbol
697
715
 
698
- fitem: fsym
716
+ fitem: fname
699
717
  {
700
- id, = val
701
- result = s(:lit, id.to_sym).line lexer.lineno
718
+ (id, line), = val
719
+
720
+ result = s(:lit, id.to_sym).line line
702
721
  }
703
- | dsym
722
+ | symbol
704
723
 
705
724
  undef_list: fitem
706
725
  {
@@ -721,8 +740,6 @@ rule
721
740
  | tNEQ | tLSHFT | tRSHFT | tPLUS | tMINUS | tSTAR2
722
741
  | tSTAR | tDIVIDE | tPERCENT | tPOW | tDSTAR | tBANG | tTILDE
723
742
  | tUPLUS | tUMINUS | tAREF | tASET | tBACK_REF2
724
- # TODO: tUBANG dead?
725
- | tUBANG
726
743
 
727
744
  reswords: k__LINE__ | k__FILE__ | k__ENCODING__ | klBEGIN | klEND
728
745
  | kALIAS | kAND | kBEGIN | kBREAK | kCASE
@@ -756,24 +773,20 @@ rule
756
773
  }
757
774
  | primary_value tCOLON2 tIDENTIFIER tOP_ASGN arg_rhs
758
775
  {
759
- lhs, _, id, op, rhs = val
776
+ lhs, _, (id, _line), (op, _), rhs = val
760
777
 
761
778
  result = s(:op_asgn, lhs, rhs, id.to_sym, op.to_sym).line lhs.line
762
779
  }
763
780
  | primary_value tCOLON2 tCONSTANT tOP_ASGN arg_rhs
764
781
  {
765
- lhs1, _, lhs2, op, rhs = val
782
+ lhs1, _, (lhs2, _line), op, rhs = val
766
783
 
767
784
  lhs = s(:colon2, lhs1, lhs2.to_sym).line lhs1.line
768
785
  result = new_const_op_asgn [lhs, op, rhs]
769
786
  }
770
- | tCOLON3 tCONSTANT
771
- {
772
- result = self.lexer.lineno
773
- }
774
- tOP_ASGN arg_rhs
787
+ | tCOLON3 tCONSTANT tOP_ASGN arg_rhs
775
788
  {
776
- _, lhs, line, op, rhs = val
789
+ _, (lhs, line), op, rhs = val
777
790
 
778
791
  lhs = s(:colon3, lhs.to_sym).line line
779
792
  result = new_const_op_asgn [lhs, op, rhs]
@@ -787,7 +800,7 @@ rule
787
800
  | arg tDOT2 arg
788
801
  {
789
802
  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
803
+ if v1.sexp_type == :lit and v2.sexp_type == :lit and Integer === v1.last and Integer === v2.last then
791
804
  result = s(:lit, (v1.last)..(v2.last)).line v1.line
792
805
  else
793
806
  result = s(:dot2, v1, v2).line v1.line
@@ -796,26 +809,14 @@ rule
796
809
  | arg tDOT3 arg
797
810
  {
798
811
  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
812
+ if v1.sexp_type == :lit and v2.sexp_type == :lit and Integer === v1.last and Integer === v2.last then
800
813
  result = s(:lit, (v1.last)...(v2.last)).line v1.line
801
814
  else
802
815
  result = s(:dot3, v1, v2).line v1.line
803
816
  end
804
817
  }
805
- | arg tDOT2
806
- {
807
- v1, _ = val
808
- v2 = nil
809
818
 
810
- result = s(:dot2, v1, v2).line v1.line
811
- }
812
- | arg tDOT3
813
- {
814
- v1, _ = val
815
- v2 = nil
816
819
 
817
- result = s(:dot3, v1, v2).line v1.line
818
- }
819
820
  | arg tPLUS arg
820
821
  {
821
822
  result = new_call val[0], :+, argl(val[2])
@@ -842,8 +843,9 @@ rule
842
843
  }
843
844
  | tUMINUS_NUM simple_numeric tPOW arg
844
845
  {
845
- lit = s(:lit, val[1]).line lexer.lineno
846
- result = new_call(new_call(lit, :"**", argl(val[3])), :"-@")
846
+ _, (num, line), _, arg = val
847
+ lit = s(:lit, num).line line
848
+ result = new_call(new_call(lit, :"**", argl(arg)), :"-@")
847
849
 
848
850
  }
849
851
  | tUPLUS arg
@@ -942,12 +944,12 @@ rule
942
944
 
943
945
  rel_expr: arg relop arg =tGT
944
946
  {
945
- lhs, op, rhs = val
947
+ lhs, (op, _), rhs = val
946
948
  result = new_call lhs, op.to_sym, argl(rhs)
947
949
  }
948
950
  | rel_expr relop arg =tGT
949
951
  {
950
- lhs, op, rhs = val
952
+ lhs, (op, _), rhs = val
951
953
  warn "comparison '%s' after comparison", op
952
954
  result = new_call lhs, op.to_sym, argl(rhs)
953
955
  }
@@ -1029,12 +1031,39 @@ rule
1029
1031
  }
1030
1032
 
1031
1033
  command_args: {
1032
- result = lexer.cmdarg.store true
1034
+ # parse26.y line 2200
1035
+
1036
+ # If call_args starts with a open paren '(' or
1037
+ # '[', look-ahead reading of the letters calls
1038
+ # CMDARG_PUSH(0), but the push must be done
1039
+ # after CMDARG_PUSH(1). So this code makes them
1040
+ # consistent by first cancelling the premature
1041
+ # CMDARG_PUSH(0), doing CMDARG_PUSH(1), and
1042
+ # finally redoing CMDARG_PUSH(0).
1043
+
1044
+ result = yychar = self.last_token_type.first
1045
+ lookahead = [:tLPAREN, :tLPAREN_ARG, :tLPAREN2, :tLBRACK, :tLBRACK2].include?(yychar)
1046
+ lexer.cmdarg.pop if lookahead
1047
+ lexer.cmdarg.push true
1048
+ lexer.cmdarg.push false if lookahead
1033
1049
  }
1034
1050
  call_args
1035
1051
  {
1036
- lexer.cmdarg.restore val[0]
1037
- result = val[1]
1052
+ yychar, args = val
1053
+
1054
+ # call_args can be followed by tLBRACE_ARG (that
1055
+ # does CMDARG_PUSH(0) in the lexer) but the push
1056
+ # must be done after CMDARG_POP() in the parser.
1057
+ # So this code does CMDARG_POP() to pop 0 pushed
1058
+ # by tLBRACE_ARG, CMDARG_POP() to pop 1 pushed
1059
+ # by command_args, and CMDARG_PUSH(0) to restore
1060
+ # back the flag set by tLBRACE_ARG.
1061
+
1062
+ lookahead = [:tLBRACE_ARG].include?(yychar)
1063
+ lexer.cmdarg.pop if lookahead
1064
+ lexer.cmdarg.pop
1065
+ lexer.cmdarg.push false if lookahead
1066
+ result = args
1038
1067
  }
1039
1068
 
1040
1069
  block_arg: tAMPER arg_value
@@ -1052,8 +1081,9 @@ rule
1052
1081
  args: arg_value
1053
1082
  {
1054
1083
  arg, = val
1084
+ lineno = arg.line || lexer.lineno # HACK
1055
1085
 
1056
- result = s(:array, arg).line arg.line
1086
+ result = s(:array, arg).line lineno
1057
1087
  }
1058
1088
  | tSTAR arg_value
1059
1089
  {
@@ -1065,9 +1095,11 @@ rule
1065
1095
  args, _, id = val
1066
1096
  result = self.list_append args, id
1067
1097
  }
1068
- | args tCOMMA tSTAR { result = lexer.lineno } arg_value
1098
+ | args tCOMMA tSTAR arg_value
1069
1099
  {
1070
- args, _, _, line, id = val
1100
+ # TODO: the line number from tSTAR has been dropped
1101
+ args, _, _, id = val
1102
+ line = lexer.lineno
1071
1103
  result = self.list_append args, s(:splat, id).line(line)
1072
1104
  }
1073
1105
 
@@ -1086,7 +1118,6 @@ rule
1086
1118
  }
1087
1119
  | args tCOMMA tSTAR arg_value
1088
1120
  {
1089
- # FIX: bad shift/reduce conflict with rhs' comma star prod
1090
1121
  # TODO: make all tXXXX terminals include lexer.lineno
1091
1122
  arg, _, _, splat = val
1092
1123
  result = self.arg_concat arg, splat
@@ -1109,26 +1140,19 @@ rule
1109
1140
  | backref
1110
1141
  | tFID
1111
1142
  {
1112
- msg, = val
1143
+ (msg, line), = val
1113
1144
  result = new_call nil, msg.to_sym
1145
+ result.line line
1114
1146
  }
1115
1147
  | k_begin
1116
1148
  {
1149
+ lexer.cmdarg.push false
1117
1150
  result = self.lexer.lineno
1118
- # TODO:
1119
- # $<val>1 = cmdarg_stack;
1120
- # CMDARG_SET(0);
1121
1151
  }
1122
1152
  bodystmt k_end
1123
1153
  {
1124
- # TODO: CMDARG_SET($<val>1);
1125
- unless val[2] then
1126
- result = s(:nil)
1127
- else
1128
- result = s(:begin, val[2])
1129
- end
1130
-
1131
- result.line = val[1]
1154
+ lexer.cmdarg.pop
1155
+ result = new_begin val
1132
1156
  }
1133
1157
  | tLPAREN_ARG
1134
1158
  {
@@ -1141,18 +1165,14 @@ rule
1141
1165
  result = s(:begin).line line
1142
1166
  }
1143
1167
  | tLPAREN_ARG
1144
- {
1145
- result = lexer.cmdarg.store false
1146
- }
1147
1168
  stmt
1148
1169
  {
1149
1170
  lexer.lex_state = EXPR_ENDARG
1150
1171
  }
1151
1172
  rparen
1152
1173
  {
1153
- _, cmdarg, stmt, _, _, = val
1154
- warning "(...) interpreted as grouped expression"
1155
- lexer.cmdarg.restore cmdarg
1174
+ _, stmt, _, _, = val
1175
+ # warning "(...) interpreted as grouped expression"
1156
1176
  result = stmt
1157
1177
  }
1158
1178
  | tLPAREN compstmt tRPAREN
@@ -1164,15 +1184,15 @@ rule
1164
1184
  }
1165
1185
  | primary_value tCOLON2 tCONSTANT
1166
1186
  {
1167
- expr, _, id = val
1187
+ expr, _, (id, _line) = val
1168
1188
 
1169
1189
  result = s(:colon2, expr, id.to_sym).line expr.line
1170
1190
  }
1171
1191
  | tCOLON3 tCONSTANT
1172
1192
  {
1173
- _, id = val
1193
+ _, (id, line) = val
1174
1194
 
1175
- result = s(:colon3, id.to_sym).line lexer.lineno
1195
+ result = s(:colon3, id.to_sym).line line
1176
1196
  }
1177
1197
  | tLBRACK { result = lexer.lineno } aref_args tRBRACK
1178
1198
  {
@@ -1196,15 +1216,21 @@ rule
1196
1216
  }
1197
1217
  | kYIELD tLPAREN2 call_args rparen
1198
1218
  {
1199
- result = new_yield val[2]
1219
+ (_, line), _, args, _ = val
1220
+
1221
+ result = new_yield(args).line line
1200
1222
  }
1201
1223
  | kYIELD tLPAREN2 rparen
1202
1224
  {
1203
- result = new_yield
1225
+ (_, line), _, _ = val
1226
+
1227
+ result = new_yield.line line
1204
1228
  }
1205
1229
  | kYIELD
1206
1230
  {
1207
- result = new_yield
1231
+ (_, line), = val
1232
+
1233
+ result = new_yield.line line
1208
1234
  }
1209
1235
  | kDEFINED opt_nl tLPAREN2 expr rparen
1210
1236
  {
@@ -1219,7 +1245,7 @@ rule
1219
1245
  }
1220
1246
  | kNOT tLPAREN2 rparen
1221
1247
  {
1222
- debug20 14, val, result
1248
+ debug 20
1223
1249
  }
1224
1250
  | fcall brace_block
1225
1251
  {
@@ -1237,9 +1263,10 @@ rule
1237
1263
  iter.insert 1, call # FIX
1238
1264
  result = iter
1239
1265
  }
1240
- | tLAMBDA lambda
1266
+ | lambda
1241
1267
  {
1242
- result = val[1] # TODO: fix lineno
1268
+ expr, = val
1269
+ result = expr
1243
1270
  }
1244
1271
  | k_if expr_value then compstmt if_tail k_end
1245
1272
  {
@@ -1282,7 +1309,6 @@ rule
1282
1309
  }
1283
1310
  cpath superclass
1284
1311
  {
1285
- self.comments.push self.lexer.comments
1286
1312
  if (self.in_def || self.in_single > 0) then
1287
1313
  yyerror "class definition in method body"
1288
1314
  end
@@ -1292,7 +1318,7 @@ rule
1292
1318
  {
1293
1319
  result = new_class val
1294
1320
  self.env.unextend
1295
- self.lexer.comments # we don't care about comments in the body
1321
+ self.lexer.ignore_body_comments
1296
1322
  }
1297
1323
  | k_class tLSHFT
1298
1324
  {
@@ -1313,7 +1339,7 @@ rule
1313
1339
  {
1314
1340
  result = new_sclass val
1315
1341
  self.env.unextend
1316
- self.lexer.comments # we don't care about comments in the body
1342
+ self.lexer.ignore_body_comments
1317
1343
  }
1318
1344
  | k_module
1319
1345
  {
@@ -1321,7 +1347,6 @@ rule
1321
1347
  }
1322
1348
  cpath
1323
1349
  {
1324
- self.comments.push self.lexer.comments
1325
1350
  yyerror "module definition in method body" if
1326
1351
  self.in_def or self.in_single > 0
1327
1352
 
@@ -1331,53 +1356,67 @@ rule
1331
1356
  {
1332
1357
  result = new_module val
1333
1358
  self.env.unextend
1334
- self.lexer.comments # we don't care about comments in the body
1359
+ self.lexer.ignore_body_comments
1335
1360
  }
1336
1361
  | k_def fname
1337
1362
  {
1338
- result = [self.in_def, self.lexer.cmdarg.stack.dup]
1363
+ result = self.in_def
1339
1364
 
1340
- self.comments.push self.lexer.comments
1341
- self.in_def = true
1365
+ self.in_def = true # group = local_push
1342
1366
  self.env.extend
1343
- # TODO: local->cmdargs = cmdarg_stack;
1344
- # TODO: port local_push_gen and local_pop_gen
1345
- lexer.cmdarg.stack.replace [false]
1367
+ lexer.cmdarg.push false
1368
+ lexer.cond.push false
1346
1369
  }
1347
- f_arglist bodystmt { result = lexer.lineno } k_end
1370
+ f_arglist bodystmt k_end
1348
1371
  {
1349
- in_def, cmdarg = val[2]
1350
-
1351
- result = new_defn val
1372
+ result, in_def = new_defn val
1352
1373
 
1353
- lexer.cmdarg.stack.replace cmdarg
1374
+ lexer.cond.pop # group = local_pop
1375
+ lexer.cmdarg.pop
1354
1376
  self.env.unextend
1355
1377
  self.in_def = in_def
1356
- self.lexer.comments # we don't care about comments in the body
1378
+
1379
+ self.lexer.ignore_body_comments
1357
1380
  }
1358
1381
  | k_def singleton dot_or_colon
1359
1382
  {
1360
- self.comments.push self.lexer.comments
1361
1383
  lexer.lex_state = EXPR_FNAME
1362
1384
  }
1363
1385
  fname
1364
1386
  {
1365
- self.in_single += 1
1387
+ result = self.in_def
1388
+
1389
+ self.in_single += 1 # TODO: remove?
1390
+
1391
+ self.in_def = true # local_push
1366
1392
  self.env.extend
1367
- lexer.lex_state = EXPR_ENDFN # force for args
1368
- result = [lexer.lineno, self.lexer.cmdarg.stack.dup]
1369
- lexer.cmdarg.stack.replace [false]
1393
+ lexer.cmdarg.push false
1394
+ lexer.cond.push false
1395
+
1396
+ lexer.lex_state = EXPR_ENDFN|EXPR_LABEL
1370
1397
  }
1371
1398
  f_arglist bodystmt k_end
1372
1399
  {
1373
- _, cmdarg = val[5]
1374
- result = new_defs val
1375
1400
 
1376
- lexer.cmdarg.stack.replace cmdarg
1401
+ # [kdef, recv, _, _, (name, line), in_def, args, body, kend]
1402
+ # =>
1403
+ # [kdef, recv, (name, line), in_def, args, body, kend]
1404
+
1405
+ val.delete_at 3
1406
+ val.delete_at 2
1407
+
1408
+ result, in_def = new_defs val
1377
1409
 
1410
+ lexer.cond.pop # group = local_pop
1411
+ lexer.cmdarg.pop
1378
1412
  self.env.unextend
1413
+ self.in_def = in_def
1414
+
1379
1415
  self.in_single -= 1
1380
- self.lexer.comments # we don't care about comments in the body
1416
+
1417
+ # TODO: restore cur_arg ? what's cur_arg?
1418
+
1419
+ self.lexer.ignore_body_comments
1381
1420
  }
1382
1421
  | kBREAK
1383
1422
  {
@@ -1414,8 +1453,17 @@ rule
1414
1453
  k_case: kCASE
1415
1454
  k_for: kFOR
1416
1455
  k_class: kCLASS
1456
+ {
1457
+ self.comments.push self.lexer.comments
1458
+ }
1417
1459
  k_module: kMODULE
1460
+ {
1461
+ self.comments.push self.lexer.comments
1462
+ }
1418
1463
  k_def: kDEF
1464
+ {
1465
+ self.comments.push self.lexer.comments
1466
+ }
1419
1467
  k_do: kDO
1420
1468
  k_do_block: kDO_BLOCK
1421
1469
  k_rescue: kRESCUE
@@ -1476,51 +1524,42 @@ rule
1476
1524
 
1477
1525
  result = block_var args
1478
1526
  }
1479
- | f_marg_list tCOMMA tSTAR f_norm_arg
1527
+ | f_marg_list tCOMMA f_rest_marg
1480
1528
  {
1481
- args, _, _, splat = val
1529
+ args, _, rest = val
1482
1530
 
1483
- result = block_var args, "*#{splat}".to_sym
1531
+ result = block_var args, rest
1484
1532
  }
1485
- | f_marg_list tCOMMA tSTAR f_norm_arg tCOMMA f_marg_list
1533
+ | f_marg_list tCOMMA f_rest_marg tCOMMA f_marg_list
1486
1534
  {
1487
- args, _, _, splat, _, args2 = val
1535
+ lhs, _, splat, _, rhs = val
1488
1536
 
1489
- result = block_var args, "*#{splat}".to_sym, args2
1537
+ result = block_var lhs, splat, rhs
1490
1538
  }
1491
- | f_marg_list tCOMMA tSTAR
1539
+ | f_rest_marg
1492
1540
  {
1493
- args, _, _ = val
1541
+ rest, = val
1494
1542
 
1495
- result = block_var args, :*
1543
+ result = block_var rest
1496
1544
  }
1497
- | f_marg_list tCOMMA tSTAR tCOMMA f_marg_list
1545
+ | f_rest_marg tCOMMA f_marg_list
1498
1546
  {
1499
- args, _, _, _, args2 = val
1547
+ splat, _, rest = val
1500
1548
 
1501
- result = block_var args, :*, args2
1549
+ result = block_var splat, rest
1502
1550
  }
1503
- | tSTAR f_norm_arg
1504
- {
1505
- _, splat = val
1506
1551
 
1507
- result = block_var :"*#{splat}"
1508
- }
1509
- | tSTAR f_norm_arg tCOMMA f_marg_list
1552
+ f_rest_marg: tSTAR f_norm_arg
1510
1553
  {
1511
- _, splat, _, args = val
1554
+ _, (id, line) = val
1512
1555
 
1513
- result = block_var :"*#{splat}", args
1556
+ result = args ["*#{id}".to_sym]
1557
+ result.line line
1514
1558
  }
1515
1559
  | tSTAR
1516
1560
  {
1517
- result = block_var :*
1518
- }
1519
- | tSTAR tCOMMA f_marg_list
1520
- {
1521
- _, _, args = val
1522
-
1523
- result = block_var :*, args
1561
+ result = args [:*]
1562
+ result.line lexer.lineno # FIX: tSTAR -> line
1524
1563
  }
1525
1564
 
1526
1565
  block_args_tail: f_block_kwarg tCOMMA f_kwrest opt_f_block_arg
@@ -1537,8 +1576,8 @@ rule
1537
1576
  }
1538
1577
  | f_block_arg
1539
1578
  {
1540
- line = lexer.lineno
1541
- result = call_args val # TODO: push line down
1579
+ (id, line), = val
1580
+ result = call_args [id]
1542
1581
  result.line line
1543
1582
  }
1544
1583
 
@@ -1647,13 +1686,13 @@ opt_block_args_tail: tCOMMA block_args_tail
1647
1686
 
1648
1687
  bvar: tIDENTIFIER
1649
1688
  {
1650
- id, = val
1651
- line = lexer.lineno
1689
+ (id, line), = val
1652
1690
  result = s(:shadow, id.to_sym).line line
1653
1691
  }
1654
1692
  | f_bad_arg
1655
1693
 
1656
- lambda: {
1694
+ lambda: tLAMBDA
1695
+ {
1657
1696
  self.env.extend :dynamic
1658
1697
  result = [lexer.lineno, lexer.lpar_beg]
1659
1698
  lexer.paren_nest += 1
@@ -1661,20 +1700,19 @@ opt_block_args_tail: tCOMMA block_args_tail
1661
1700
  }
1662
1701
  f_larglist
1663
1702
  {
1664
- result = lexer.cmdarg.store(false)
1703
+ lexer.cmdarg.push false
1665
1704
  }
1666
1705
  lambda_body
1667
1706
  {
1668
- (line, lpar), args, cmdarg, body = val
1707
+ _, (line, lpar), args, _cmdarg, body = val
1669
1708
  lexer.lpar_beg = lpar
1670
1709
 
1671
- lexer.cmdarg.restore cmdarg
1672
- lexer.cmdarg.lexpop
1710
+ lexer.cmdarg.pop
1673
1711
 
1674
1712
  call = s(:lambda).line line
1675
1713
  result = new_iter call, args, body
1676
- result.line = line
1677
- self.env.unextend
1714
+ result.line line
1715
+ self.env.unextend # TODO: dynapush & dynapop
1678
1716
  }
1679
1717
 
1680
1718
  f_larglist: tLPAREN2 f_args opt_bv_decl rparen
@@ -1708,23 +1746,28 @@ opt_block_args_tail: tCOMMA block_args_tail
1708
1746
  ## if (nd_type($1) == NODE_YIELD) {
1709
1747
  ## compile_error(PARSER_ARG "block given to yield");
1710
1748
 
1711
- syntax_error "Both block arg and actual block given." if
1712
- val[0].block_pass?
1749
+ cmd, blk = val
1713
1750
 
1714
- val = invert_block_call val if inverted? val
1751
+ syntax_error "Both block arg and actual block given." if
1752
+ cmd.block_pass?
1715
1753
 
1716
- cmd, blk = val
1754
+ if inverted? val then
1755
+ val = invert_block_call val
1756
+ cmd, blk = val
1757
+ end
1717
1758
 
1718
1759
  result = blk
1719
1760
  result.insert 1, cmd
1720
1761
  }
1721
1762
  | block_call call_op2 operation2 opt_paren_args
1722
1763
  {
1723
- result = new_call val[0], val[2].to_sym, val[3]
1764
+ lhs, _, (id, _line), args = val
1765
+
1766
+ result = new_call lhs, id.to_sym, args
1724
1767
  }
1725
1768
  | block_call call_op2 operation2 opt_paren_args brace_block
1726
1769
  {
1727
- iter1, _, name, args, iter2 = val
1770
+ iter1, _, (name, _line), args, iter2 = val
1728
1771
 
1729
1772
  call = new_call iter1, name.to_sym, args
1730
1773
  iter2.insert 1, call
@@ -1733,7 +1776,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1733
1776
  }
1734
1777
  | block_call call_op2 operation2 command_args do_block
1735
1778
  {
1736
- iter1, _, name, args, iter2 = val
1779
+ iter1, _, (name, _line), args, iter2 = val
1737
1780
 
1738
1781
  call = new_call iter1, name.to_sym, args
1739
1782
  iter2.insert 1, call
@@ -1741,28 +1784,29 @@ opt_block_args_tail: tCOMMA block_args_tail
1741
1784
  result = iter2
1742
1785
  }
1743
1786
 
1744
- method_call: fcall
1745
- {
1746
- result = self.lexer.lineno
1747
- }
1748
- paren_args
1787
+ method_call: fcall paren_args
1749
1788
  {
1750
- call, lineno, args = val
1789
+ call, args = val
1751
1790
 
1752
1791
  result = call.concat args.sexp_body if args
1753
- result.line lineno
1754
1792
  }
1755
1793
  | primary_value call_op operation2 opt_paren_args
1756
1794
  {
1757
- result = new_call val[0], val[2].to_sym, val[3], val[1]
1795
+ recv, call_op, (op, _line), args = val
1796
+
1797
+ result = new_call recv, op.to_sym, args, call_op
1758
1798
  }
1759
1799
  | primary_value tCOLON2 operation2 paren_args
1760
1800
  {
1761
- result = new_call val[0], val[2].to_sym, val[3]
1801
+ recv, _, (op, _line), args = val
1802
+
1803
+ result = new_call recv, op.to_sym, args
1762
1804
  }
1763
1805
  | primary_value tCOLON2 operation3
1764
1806
  {
1765
- result = new_call val[0], val[2].to_sym
1807
+ lhs, _, (id, _line) = val
1808
+
1809
+ result = new_call lhs, id.to_sym
1766
1810
  }
1767
1811
  | primary_value call_op paren_args
1768
1812
  {
@@ -1795,7 +1839,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1795
1839
  _, line, body, _ = val
1796
1840
 
1797
1841
  result = body
1798
- result.line = line
1842
+ result.line line
1799
1843
 
1800
1844
  self.env.unextend
1801
1845
  }
@@ -1809,7 +1853,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1809
1853
  _, line, body, _ = val
1810
1854
 
1811
1855
  result = body
1812
- result.line = line
1856
+ result.line line
1813
1857
 
1814
1858
  self.env.unextend
1815
1859
  }
@@ -1827,25 +1871,50 @@ opt_block_args_tail: tCOMMA block_args_tail
1827
1871
  }
1828
1872
 
1829
1873
  do_body: { self.env.extend :dynamic; result = self.lexer.lineno }
1830
- { result = lexer.cmdarg.store(false) }
1874
+ { lexer.cmdarg.push false }
1831
1875
  opt_block_param
1832
1876
  bodystmt
1833
1877
  {
1834
- line, cmdarg, param, cmpstmt = val
1878
+ line, _cmdarg, param, cmpstmt = val
1835
1879
 
1836
1880
  result = new_do_body param, cmpstmt, line
1881
+ lexer.cmdarg.pop
1837
1882
  self.env.unextend
1838
- lexer.cmdarg.restore cmdarg
1883
+ }
1884
+
1885
+ case_args: arg_value
1886
+ {
1887
+ arg, = val
1888
+
1889
+ result = s(:array, arg).line arg.line
1890
+ }
1891
+ | tSTAR arg_value
1892
+ {
1893
+ _, arg = val
1894
+
1895
+ result = s(:array, s(:splat, arg).line(arg.line)).line arg.line
1896
+ }
1897
+ | case_args tCOMMA arg_value
1898
+ {
1899
+ args, _, id = val
1900
+
1901
+ result = self.list_append args, id
1902
+ }
1903
+ | case_args tCOMMA tSTAR arg_value
1904
+ {
1905
+ args, _, _, id = val
1906
+
1907
+ result = self.list_append args, s(:splat, id).line(id.line)
1839
1908
  }
1840
1909
 
1841
1910
  case_body: k_when
1842
1911
  {
1843
1912
  result = self.lexer.lineno
1844
1913
  }
1845
- args then compstmt cases
1914
+ case_args then compstmt cases
1846
1915
  {
1847
1916
  result = new_when(val[2], val[4])
1848
- result.line = val[1]
1917
+ result.line val[1]
1849
1918
  result << val[5] if val[5]
1850
1919
  }
1851
1920
 
@@ -1891,17 +1960,10 @@ opt_block_args_tail: tCOMMA block_args_tail
1891
1960
 
1892
1961
  literal: numeric
1893
1962
  {
1894
- line = lexer.lineno
1895
- result = s(:lit, val[0])
1896
- result.line = line
1963
+ (lit, line), = val
1964
+ result = s(:lit, lit).line line
1897
1965
  }
1898
1966
  | symbol
1899
- {
1900
- line = lexer.lineno
1901
- result = s(:lit, val[0])
1902
- result.line = line
1903
- }
1904
- | dsym
1905
1967
 
1906
1968
  strings: string
1907
1969
  {
@@ -1912,7 +1974,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1912
1974
 
1913
1975
  string: tCHAR
1914
1976
  {
1915
- debug20 23, val, result
1977
+ debug 37
1916
1978
  }
1917
1979
  | string1
1918
1980
  | string string1
@@ -1922,11 +1984,11 @@ opt_block_args_tail: tCOMMA block_args_tail
1922
1984
 
1923
1985
  string1: tSTRING_BEG string_contents tSTRING_END
1924
1986
  {
1925
- _, str, (_, func) = val
1987
+ (_, line), str, (_, func) = val
1926
1988
 
1927
- str = dedent str if func =~ RubyLexer::STR_FUNC_ICNTNT
1989
+ str = dedent str if func =~ RubyLexer::STR_FUNC_DEDENT
1928
1990
 
1929
- result = str
1991
+ result = str.line line
1930
1992
  }
1931
1993
  | tSTRING
1932
1994
  {
@@ -1935,7 +1997,7 @@ opt_block_args_tail: tCOMMA block_args_tail
1935
1997
 
1936
1998
  xstring: tXSTRING_BEG xstring_contents tSTRING_END
1937
1999
  {
1938
- result = new_xstring val[1]
2000
+ result = new_xstring val
1939
2001
  # TODO: dedent?!?! SERIOUSLY?!?
1940
2002
  }
1941
2003
 
@@ -1946,11 +2008,15 @@ opt_block_args_tail: tCOMMA block_args_tail
1946
2008
 
1947
2009
  words: tWORDS_BEG tSPACE tSTRING_END
1948
2010
  {
1949
- result = s(:array).line lexer.lineno
2011
+ (_, line), _, _ = val
2012
+
2013
+ result = s(:array).line line
1950
2014
  }
1951
2015
  | tWORDS_BEG word_list tSTRING_END
1952
2016
  {
1953
- result = val[1]
2017
+ (_, line), list, _ = val
2018
+
2019
+ result = list.line line
1954
2020
  }
1955
2021
 
1956
2022
  word_list: none
@@ -1970,18 +2036,20 @@ opt_block_args_tail: tCOMMA block_args_tail
1970
2036
 
1971
2037
  symbols: tSYMBOLS_BEG tSPACE tSTRING_END
1972
2038
  {
1973
- result = s(:array).line lexer.lineno
2039
+ (_, line), _, _ = val
2040
+
2041
+ result = s(:array).line line
1974
2042
  }
1975
- | tSYMBOLS_BEG { result = lexer.lineno } symbol_list tSTRING_END
2043
+ | tSYMBOLS_BEG symbol_list tSTRING_END
1976
2044
  {
1977
- _, line, list, _, = val
1978
- list.line = line
2045
+ (_, line), list, _, = val
2046
+ list.line line
1979
2047
  result = list
1980
2048
  }
1981
2049
 
1982
2050
  symbol_list: none
1983
2051
  {
1984
- result = new_symbol_list.line lexer.lineno
2052
+ result = new_symbol_list
1985
2053
  }
1986
2054
  | symbol_list word tSPACE
1987
2055
  {
@@ -1991,20 +2059,28 @@ opt_block_args_tail: tCOMMA block_args_tail
1991
2059
 
1992
2060
  qwords: tQWORDS_BEG tSPACE tSTRING_END
1993
2061
  {
1994
- result = s(:array).line lexer.lineno
2062
+ (_, line), _, _ = val
2063
+
2064
+ result = s(:array).line line
1995
2065
  }
1996
2066
  | tQWORDS_BEG qword_list tSTRING_END
1997
2067
  {
1998
- result = val[1]
2068
+ (_, line), list, _ = val
2069
+
2070
+ result = list.line line
1999
2071
  }
2000
2072
 
2001
2073
  qsymbols: tQSYMBOLS_BEG tSPACE tSTRING_END
2002
2074
  {
2003
- result = s(:array).line lexer.lineno # FIX
2075
+ (_, line), _, _ = val
2076
+
2077
+ result = s(:array).line line
2004
2078
  }
2005
2079
  | tQSYMBOLS_BEG qsym_list tSTRING_END
2006
2080
  {
2007
- result = val[1]
2081
+ (_, line), list, _ = val
2082
+
2083
+ result = list.line line
2008
2084
  }
2009
2085
 
2010
2086
  qword_list: none
@@ -2027,7 +2103,8 @@ opt_block_args_tail: tCOMMA block_args_tail
2027
2103
 
2028
2104
  string_contents: none
2029
2105
  {
2030
- result = s(:str, "").line lexer.lineno
2106
+ line = prev_value_to_lineno _values.last
2107
+ result = s(:str, +"").line line
2031
2108
  }
2032
2109
  | string_contents string_content
2033
2110
  {
@@ -2077,12 +2154,13 @@ regexp_contents: none
2077
2154
  result = [lexer.lex_strterm,
2078
2155
  lexer.brace_nest,
2079
2156
  lexer.string_nest, # TODO: remove
2080
- lexer.cond.store,
2081
- lexer.cmdarg.store,
2082
2157
  lexer.lex_state,
2083
2158
  lexer.lineno,
2084
2159
  ]
2085
2160
 
2161
+ lexer.cmdarg.push false
2162
+ lexer.cond.push false
2163
+
2086
2164
  lexer.lex_strterm = nil
2087
2165
  lexer.brace_nest = 0
2088
2166
  lexer.string_nest = 0
@@ -2094,14 +2172,15 @@ regexp_contents: none
2094
2172
  {
2095
2173
  _, memo, stmt, _ = val
2096
2174
 
2097
- lex_strterm, brace_nest, string_nest, oldcond, oldcmdarg, oldlex_state, line = memo
2175
+ lex_strterm, brace_nest, string_nest, oldlex_state, line = memo
2176
+ # TODO: heredoc_indent
2098
2177
 
2099
2178
  lexer.lex_strterm = lex_strterm
2100
2179
  lexer.brace_nest = brace_nest
2101
2180
  lexer.string_nest = string_nest
2102
2181
 
2103
- lexer.cond.restore oldcond
2104
- lexer.cmdarg.restore oldcmdarg
2182
+ lexer.cond.pop
2183
+ lexer.cmdarg.pop
2105
2184
 
2106
2185
  lexer.lex_state = oldlex_state
2107
2186
 
@@ -2116,29 +2195,49 @@ regexp_contents: none
2116
2195
  when nil then
2117
2196
  result = s(:evstr).line line
2118
2197
  else
2119
- debug20 25
2198
+ debug 38
2120
2199
  raise "unknown string body: #{stmt.inspect}"
2121
2200
  end
2122
2201
  }
2123
2202
 
2124
- string_dvar: tGVAR { result = s(:gvar, val[0].to_sym).line lexer.lineno }
2125
- | tIVAR { result = s(:ivar, val[0].to_sym).line lexer.lineno }
2126
- | tCVAR { result = s(:cvar, val[0].to_sym).line lexer.lineno }
2203
+ string_dvar: tGVAR
2204
+ {
2205
+ (id, line), = val
2206
+ result = s(:gvar, id.to_sym).line line
2207
+ }
2208
+ | tIVAR
2209
+ {
2210
+ (id, line), = val
2211
+ result = s(:ivar, id.to_sym).line line
2212
+ }
2213
+ | tCVAR
2214
+ {
2215
+ (id, line), = val
2216
+ result = s(:cvar, id.to_sym).line line
2217
+ }
2127
2218
  | backref
2128
2219
 
2129
- symbol: tSYMBEG sym
2220
+ symbol: ssym
2221
+ | dsym
2222
+
2223
+ ssym: tSYMBEG sym
2130
2224
  {
2225
+ _, (id, line) = val
2226
+
2131
2227
  lexer.lex_state = EXPR_END
2132
- result = val[1].to_sym
2228
+ result = s(:lit, id.to_sym).line line
2133
2229
  }
2134
2230
  | tSYMBOL
2135
2231
  {
2136
- result = val[0].to_sym
2232
+ (id, line), = val
2233
+
2234
+ lexer.lex_state = EXPR_END
2235
+ result = s(:lit, id.to_sym).line line
2137
2236
  }
2138
2237
 
2139
2238
  sym: fname | tIVAR | tGVAR | tCVAR
2140
2239
 
2141
- dsym: tSYMBEG xstring_contents tSTRING_END
2240
+ dsym: tSYMBEG string_contents tSTRING_END
2142
2241
  {
2143
2242
  _, result, _ = val
2144
2243
 
@@ -2154,14 +2253,15 @@ regexp_contents: none
2154
2253
  when :evstr then
2155
2254
  result = s(:dsym, "", result).line result.line
2156
2255
  else
2157
- debug20 26, val, result
2256
+ debug 39
2158
2257
  end
2159
2258
  }
2160
2259
 
2161
2260
  numeric: simple_numeric
2162
- | tUMINUS_NUM simple_numeric
2261
+ | tUMINUS_NUM simple_numeric =tLOWEST
2163
2262
  {
2164
- result = -val[1] # TODO: pt_testcase
2263
+ _, (num, line) = val
2264
+ result = [-num, line]
2165
2265
  }
2166
2266
 
2167
2267
  simple_numeric: tINTEGER
@@ -2194,8 +2294,10 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2194
2294
 
2195
2295
  var_ref: user_variable
2196
2296
  {
2197
- var = val[0]
2297
+ raise "NO: #{val.inspect}" if Sexp === val.first
2298
+ (var, line), = val
2198
2299
  result = Sexp === var ? var : self.gettable(var)
2300
+ result.line line
2199
2301
  }
2200
2302
  | keyword_variable
2201
2303
  {
@@ -2210,11 +2312,19 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2210
2312
  | keyword_variable
2211
2313
  {
2212
2314
  result = self.assignable val[0]
2213
- debug20 29, val, result
2315
+ debug 40
2214
2316
  }
2215
2317
 
2216
- backref: tNTH_REF { result = s(:nth_ref, val[0]).line lexer.lineno }
2217
- | tBACK_REF { result = s(:back_ref, val[0]).line lexer.lineno }
2318
+ backref: tNTH_REF
2319
+ {
2320
+ (ref, line), = val
2321
+ result = s(:nth_ref, ref).line line
2322
+ }
2323
+ | tBACK_REF
2324
+ {
2325
+ (ref, line), = val
2326
+ result = s(:back_ref, ref).line line
2327
+ }
2218
2328
 
2219
2329
  superclass: tLT
2220
2330
  {
@@ -2232,9 +2342,7 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2232
2342
 
2233
2343
  f_arglist: tLPAREN2 f_args rparen
2234
2344
  {
2235
- result = val[1]
2236
- self.lexer.lex_state = EXPR_BEG
2237
- self.lexer.command_start = true
2345
+ result = end_args val
2238
2346
  }
2239
2347
  | {
2240
2348
  result = self.in_kwarg
@@ -2243,12 +2351,7 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2243
2351
  }
2244
2352
  f_args term
2245
2353
  {
2246
- kwarg, args, _ = val
2247
-
2248
- self.in_kwarg = kwarg
2249
- result = args
2250
- lexer.lex_state = EXPR_BEG
2251
- lexer.command_start = true
2354
+ result = end_args val
2252
2355
  }
2253
2356
 
2254
2357
  args_tail: f_kwarg tCOMMA f_kwrest opt_f_block_arg
@@ -2333,8 +2436,10 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2333
2436
  |
2334
2437
  {
2335
2438
  result = args val
2439
+ # result.line lexer.lineno
2336
2440
  }
2337
2441
 
2442
+
2338
2443
  f_bad_arg: tCONSTANT
2339
2444
  {
2340
2445
  yyerror "formal argument cannot be a constant"
@@ -2355,10 +2460,11 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2355
2460
  f_norm_arg: f_bad_arg
2356
2461
  | tIDENTIFIER
2357
2462
  {
2358
- identifier = val[0].to_sym
2463
+ (id, line), = val
2464
+ identifier = id.to_sym
2359
2465
  self.env[identifier] = :lvar
2360
2466
 
2361
- result = identifier
2467
+ result = [identifier, line]
2362
2468
  }
2363
2469
 
2364
2470
  f_arg_asgn: f_norm_arg
@@ -2366,22 +2472,14 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2366
2472
  f_arg_item: f_arg_asgn
2367
2473
  | tLPAREN f_margs rparen
2368
2474
  {
2369
- result = val[1]
2475
+ _, margs, _ = val
2476
+
2477
+ result = margs
2370
2478
  }
2371
2479
 
2372
2480
  f_arg: f_arg_item
2373
2481
  {
2374
- arg, = val
2375
-
2376
- case arg
2377
- when Symbol then
2378
- result = s(:args, arg).line lexer.lineno
2379
- when Sexp then
2380
- result = arg
2381
- else
2382
- debug20 32
2383
- raise "Unknown f_arg type: #{val.inspect}"
2384
- end
2482
+ result = new_arg val
2385
2483
  }
2386
2484
  | f_arg tCOMMA f_arg_item
2387
2485
  {
@@ -2393,7 +2491,7 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2393
2491
  result = s(:args, list).line list.line
2394
2492
  end
2395
2493
 
2396
- result << item
2494
+ result << (Sexp === item ? item : item.first)
2397
2495
  }
2398
2496
 
2399
2497
  f_label: tLABEL
@@ -2454,26 +2552,33 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2454
2552
  kwrest_mark: tPOW
2455
2553
  | tDSTAR
2456
2554
 
2555
+
2457
2556
  f_kwrest: kwrest_mark tIDENTIFIER
2458
2557
  {
2459
- name = val[1].to_sym
2460
- self.assignable name
2461
- result = :"**#{name}"
2558
+ _, (id, line) = val
2559
+
2560
+ name = id.to_sym
2561
+ self.assignable [name, line]
2562
+ result = [:"**#{name}", line]
2462
2563
  }
2463
2564
  | kwrest_mark
2464
2565
  {
2465
- result = :"**"
2566
+ id = :"**"
2567
+ self.env[id] = :lvar # TODO: needed?!?
2568
+ result = [id, lexer.lineno] # TODO: tPOW/tDSTAR include lineno
2466
2569
  }
2467
2570
 
2468
2571
  f_opt: f_arg_asgn tEQL arg_value
2469
2572
  {
2470
- result = self.assignable val[0], val[2]
2573
+ lhs, _, rhs = val
2574
+ result = self.assignable lhs, rhs
2471
2575
  # TODO: detect duplicate names
2472
2576
  }
2473
2577
 
2474
2578
  f_block_opt: f_arg_asgn tEQL primary_value
2475
2579
  {
2476
- result = self.assignable val[0], val[2]
2580
+ lhs, _, rhs = val
2581
+ result = self.assignable lhs, rhs
2477
2582
  }
2478
2583
 
2479
2584
  f_block_optarg: f_block_opt
@@ -2503,30 +2608,33 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2503
2608
  f_rest_arg: restarg_mark tIDENTIFIER
2504
2609
  {
2505
2610
  # TODO: differs from parse.y - needs tests
2506
- name = val[1].to_sym
2507
- self.assignable name
2508
- result = :"*#{name}"
2611
+ _, (id, line) = val
2612
+ name = id.to_sym
2613
+ self.assignable [name, line]
2614
+ result = [:"*#{name}", line]
2509
2615
  }
2510
2616
  | restarg_mark
2511
2617
  {
2512
2618
  name = :"*"
2513
2619
  self.env[name] = :lvar
2514
- result = name
2620
+ result = [name, lexer.lineno] # FIX: tSTAR to include lineno
2515
2621
  }
2516
2622
 
2517
2623
  blkarg_mark: tAMPER2 | tAMPER
2518
2624
 
2519
2625
  f_block_arg: blkarg_mark tIDENTIFIER
2520
2626
  {
2521
- identifier = val[1].to_sym
2627
+ _, (id, line) = val
2628
+ identifier = id.to_sym
2522
2629
 
2523
2630
  self.env[identifier] = :lvar
2524
- result = "&#{identifier}".to_sym
2631
+ result = ["&#{identifier}".to_sym, line]
2525
2632
  }
2526
2633
 
2527
2634
  opt_f_block_arg: tCOMMA f_block_arg
2528
2635
  {
2529
- result = val[1]
2636
+ _, arg = val
2637
+ result = arg
2530
2638
  }
2531
2639
  |
2532
2640
  {
@@ -2575,9 +2683,11 @@ keyword_variable: kNIL { result = s(:nil).line lexer.lineno }
2575
2683
  }
2576
2684
  | tSTRING_BEG string_contents tLABEL_END arg_value
2577
2685
  {
2578
- _, sym, _, value = val
2686
+ (_, line), sym, _, value = val
2687
+
2579
2688
  sym.sexp_type = :dsym
2580
- result = s(:array, sym, value).line sym.line
2689
+
2690
+ result = s(:array, sym, value).line line
2581
2691
  }
2582
2692
  | tDSTAR arg_value
2583
2693
  {