parser 0.9.1 → 0.9.2

data/parser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'parser'
-  spec.version       = '0.9.1'
+  spec.version       = '0.9.2'
   spec.authors       = ['Peter Zotov']
   spec.email         = ['whitequark@whitequark.org']
   spec.description   = %q{A Ruby parser written in pure Ruby.}
@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
                           lib/parser/lexer.rb
                           lib/parser/ruby18.rb
                           lib/parser/ruby19.rb
+                          lib/parser/ruby20.rb
                        )
   spec.executables   = %w()
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/test/helper.rb

@@ -7,7 +7,7 @@ if SimpleCov.usable?
   if defined?(TracePoint)
     require_relative 'racc_coverage_helper'
 
-    RaccCoverage.start(%w(ruby18.y ruby19.y),
+    RaccCoverage.start(%w(ruby18.y ruby19.y ruby20.y),
                        File.expand_path('../../lib/parser', __FILE__))
 
     # Report results faster.

data/test/parse_helper.rb

@@ -3,7 +3,7 @@ require 'parser/all'
 module ParseHelper
   include AST::Sexp
 
-  ALL_VERSIONS = %w(1.8 1.9)
+  ALL_VERSIONS = %w(1.8 1.9 2.0)
 
   def setup
     @diagnostics = []
@@ -15,7 +15,7 @@ module ParseHelper
     case version
     when '1.8'; parser = Parser::Ruby18.new
     when '1.9'; parser = Parser::Ruby19.new
-    # when '2.0'; parser = Parser::Ruby20.new # not yet
+    when '2.0'; parser = Parser::Ruby20.new
     else raise "Unrecognized Ruby version #{version}"
     end
 

data/test/test_lexer.rb

@@ -1640,6 +1640,13 @@ class TestLexer < MiniTest::Unit::TestCase
     assert_equal :expr_beg, @lex.state
   end
 
+  def test_star2_beg
+    util_lex_token("** ",
+                   :tDSTAR, "**")
+
+    assert_equal :expr_beg, @lex.state
+  end
+
   def test_star_arg
     @lex.state = :expr_arg
 
@@ -1785,6 +1792,16 @@ class TestLexer < MiniTest::Unit::TestCase
                    :tSTRING_END,     "\"")
   end
 
+  def test_string_double_interp_label
+    util_lex_token('"#{foo:bar}"',
+                   :tSTRING_BEG,   '"',
+                   :tSTRING_DBEG,  '#{',
+                   :tIDENTIFIER,   'foo',
+                   :tSYMBOL,       'bar',
+                   :tRCURLY,       '}',
+                   :tSTRING_END,   '"')
+  end
+
   def test_string_double_nested_curlies
     util_lex_token('%{nest{one{two}one}nest}',
                    :tSTRING, "nest{one{two}one}nest")
@@ -1809,7 +1826,7 @@ class TestLexer < MiniTest::Unit::TestCase
   end
 
   def test_string_pct_W
-    util_lex_token("%W[s1 s2\ns3]", # TODO: add interpolation to these
+    util_lex_token("%W[s1 s2\ns3]",
                    :tWORDS_BEG,      "%W[",
                    :tSTRING_CONTENT, "s1",
                    :tSPACE,              nil,
@@ -1821,7 +1838,7 @@ class TestLexer < MiniTest::Unit::TestCase
   end
 
   def test_string_pct_W_bs_nl
-    util_lex_token("%W[s1 \\\ns2]", # TODO: add interpolation to these
+    util_lex_token("%W[s1 \\\ns2]",
                    :tWORDS_BEG,      "%W[",
                    :tSTRING_CONTENT, "s1",
                    :tSPACE,              nil,
@@ -1830,6 +1847,32 @@ class TestLexer < MiniTest::Unit::TestCase
                    :tSTRING_END,     ']')
   end
 
+  def test_string_pct_W_interp
+    util_lex_token('%W[#{1}#{2} #@a]',
+                   :tWORDS_BEG,    '%W[',
+                   :tSTRING_DBEG,  '#{',
+                   :tINTEGER,      1,
+                   :tRCURLY,       '}',
+                   :tSTRING_DBEG,  '#{',
+                   :tINTEGER,      2,
+                   :tRCURLY,       '}',
+                   :tSPACE,        nil,
+                   :tSTRING_DVAR,  nil,
+                   :tIVAR,         '@a',
+                   :tSPACE,        nil,
+                   :tSTRING_END,   ']')
+  end
+
+  def test_string_pct_I
+    util_lex_token("%I(s1 s2)",
+                   :tSYMBOLS_BEG,    "%I(",
+                   :tSTRING_CONTENT, "s1",
+                   :tSPACE,          nil,
+                   :tSTRING_CONTENT, "s2",
+                   :tSPACE,          nil,
+                   :tSTRING_END,     ')')
+  end
+
   def test_string_pct_angle
     util_lex_token("%<blah>",
                    :tSTRING, "blah")
@@ -1841,12 +1884,20 @@ class TestLexer < MiniTest::Unit::TestCase
   end
 
   def test_string_pct_w
-    util_bad_token("%w[s1 s2 ",
+    util_lex_token("%w[s1 s2 ]",
                    :tQWORDS_BEG,     "%w[",
                    :tSTRING_CONTENT, "s1",
-                   :tSPACE,              nil,
+                   :tSPACE,          nil,
                    :tSTRING_CONTENT, "s2",
-                   :tSPACE,              nil)
+                   :tSPACE,          nil,
+                   :tSTRING_END,     "]")
+  end
+
+  def test_string_pct_w_incomplete
+    util_bad_token("%w[s1 ",
+                   :tQWORDS_BEG,     "%w[",
+                   :tSTRING_CONTENT, "s1",
+                   :tSPACE,          nil)
   end
 
   def test_string_pct_w_bs_nl
@@ -1879,6 +1930,16 @@ class TestLexer < MiniTest::Unit::TestCase
                    :tSTRING_END,     ']')
   end
 
+  def test_string_pct_i
+    util_lex_token("%i(s1 s2)",
+                   :tQSYMBOLS_BEG,   "%i(",
+                   :tSTRING_CONTENT, "s1",
+                   :tSPACE,          nil,
+                   :tSTRING_CONTENT, "s2",
+                   :tSPACE,          nil,
+                   :tSTRING_END,     ')')
+  end
+
   def test_string_single
     util_lex_token("'string'",
                    :tSTRING, "string")
@@ -1996,10 +2057,29 @@ class TestLexer < MiniTest::Unit::TestCase
                    :kEND,         "end")
   end
 
+  def test_sclass_label
+    setup_lexer 20
+    util_lex_token("class << a:b",
+                   :kCLASS,      'class',
+                   :tLSHFT,      '<<',
+                   :tIDENTIFIER, 'a',
+                   :tSYMBOL,     'b')
+  end
+
   def test_static_env
     env = Parser::StaticEnvironment.new
     env.declare "a"
 
+    setup_lexer(18)
+    @lex.static_env = env
+
+    util_lex_token("a [42]",
+                   :tIDENTIFIER, "a",
+                   :tLBRACK,     "[",
+                   :tINTEGER,    42,
+                   :tRBRACK,     "]")
+
+    setup_lexer(19)
     @lex.static_env = env
 
     util_lex_token("a [42]",
@@ -2204,6 +2284,16 @@ class TestLexer < MiniTest::Unit::TestCase
                    :tNL,     nil)
   end
 
+  def test_bug_expr_beg_heredoc
+    util_lex_token("<<EOL % [\nfoo\nEOL\n]",
+                   :tSTRING_BEG,      '"',
+                   :tSTRING_CONTENT,  "foo\n",
+                   :tSTRING_END,      'EOL',
+                   :tPERCENT,         '%',
+                   :tLBRACK,          '[',
+                   :tRBRACK,          ']')
+  end
+
   def test_bug_ragel_stack
     util_lex_token("\"\#{$2 ? $2 : 1}\"",
                    :tSTRING_BEG,      "\"",

data/test/test_lexer_stack_state.rb

@@ -15,6 +15,13 @@ class TestLexerStackState < MiniTest::Unit::TestCase
     refute @state.active?
   end
 
+  def test_clear
+    @state.push true
+    @state.clear
+
+    refute @state.active?
+  end
+
   def test_pop
     @state.push(true)
 

data/test/test_parser.rb

@@ -323,6 +323,12 @@ class TestParser < MiniTest::Unit::TestCase
         |   ~~~ expression (str)
         |         ~~~ expression (lvar)
         |~~~~~~~~~~~~~~ expression})
+
+    assert_parses(
+      s(:array,
+        s(:str, "foo"),
+        s(:dstr, s(:lvar, :bar), s(:str, 'foo'), s(:ivar, :@baz))),
+      %q{%W[foo #{bar}foo#@baz]})
   end
 
   def test_array_words_empty
@@ -338,6 +344,51 @@ class TestParser < MiniTest::Unit::TestCase
       %q{%W()})
   end
 
+  def test_array_symbols
+    assert_parses(
+      s(:array, s(:sym, :foo), s(:sym, :bar)),
+      %q{%i[foo bar]},
+      %q{^^^ begin
+        |          ^ end
+        |   ~~~ expression (sym)
+        |~~~~~~~~~~~ expression},
+      ALL_VERSIONS - %w(1.8 1.9))
+  end
+
+  def test_array_symbols_interp
+    assert_parses(
+      s(:array, s(:sym, :foo), s(:lvar, :bar)),
+      %q{%I[foo #{bar}]},
+      %q{^^^ begin
+        |             ^ end
+        |   ~~~ expression (sym)
+        |         ~~~ expression (lvar)
+        |~~~~~~~~~~~~~~ expression},
+      ALL_VERSIONS - %w(1.8 1.9))
+
+    assert_parses(
+      s(:array, s(:dsym, s(:str, "foo"),  s(:lvar, :bar))),
+      %q{%I[foo#{bar}]},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9))
+  end
+
+  def test_array_symbols_empty
+    assert_parses(
+      s(:array),
+      %q{%i[]},
+      %q{^^^ begin
+        |   ^ end
+        |~~~~ expression},
+      ALL_VERSIONS - %w(1.8 1.9))
+
+    assert_parses(
+      s(:array),
+      %q{%I()},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9))
+  end
+
   # Hashes
 
   def test_hash_empty
@@ -1233,6 +1284,18 @@ class TestParser < MiniTest::Unit::TestCase
         |                      ~~~ end})
   end
 
+  def test_class_super_label
+    assert_parses(
+      s(:class,
+        s(:const, nil, :Foo),
+        s(:send, nil, :a,
+          s(:sym, :b)),
+        s(:nil)),
+      %q{class Foo < a:b; end},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9))
+  end
+
   def test_class_invalid
     assert_diagnoses(
       [:error, :class_in_def],
@@ -1666,6 +1729,11 @@ class TestParser < MiniTest::Unit::TestCase
       %q{|;a|},
       ALL_VERSIONS - %w(1.8))
 
+    assert_parses_blockargs(
+      s(:args, s(:shadowarg, :a)),
+      %Q{|;\na\n|},
+      ALL_VERSIONS - %w(1.8 1.9))
+
     # tOROP
     assert_parses_blockargs(
       s(:args),
@@ -1915,6 +1983,32 @@ class TestParser < MiniTest::Unit::TestCase
       %q{        ~~~~~ location})
   end
 
+  def test_arg_label
+    assert_parses(
+      s(:def, :foo, s(:args),
+        s(:send, nil, :a, s(:sym, :b))),
+      %q{def foo() a:b end},
+      %q{},
+      ALL_VERSIONS - %w(1.8))
+
+    assert_parses(
+      s(:def, :foo, s(:args),
+        s(:send, nil, :a, s(:sym, :b))),
+      %Q{def foo\n a:b end},
+      %q{},
+      ALL_VERSIONS - %w(1.8))
+
+    assert_parses(
+      s(:block,
+        s(:send, nil, :f),
+        s(:args),
+        s(:send, nil, :a,
+          s(:sym, :b))),
+      %Q{f { || a:b }},
+      %q{},
+      ALL_VERSIONS - %w(1.8))
+  end
+
   # def test_kwoptarg
   #   flunk
   # end
@@ -2372,6 +2466,15 @@ class TestParser < MiniTest::Unit::TestCase
         |        ^ end
         |~~~~~ expression},
       ALL_VERSIONS - %w(1.8))
+
+    assert_parses(
+      s(:block, s(:send, nil, :lambda),
+        s(:args,
+          s(:arg, :a)),
+        s(:nil)),
+      %q{-> (a) { }},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9))
   end
 
   def test_send_lambda_args_shadow
@@ -2651,11 +2754,6 @@ class TestParser < MiniTest::Unit::TestCase
       s(:send, nil, :fun,
         s(:send, s(:int, 1), :to_i)),
       %q{fun (1).to_i})
-
-    assert_diagnoses(
-      [:warning, :grouped_expression],
-      %q{fun (1).to_i},
-      %q{    ~~~ location})
   end
 
   def test_space_args_block_pass
@@ -2895,6 +2993,15 @@ class TestParser < MiniTest::Unit::TestCase
       %q{         ^ begin (send)
         |          ^ end (send)},
       %w(1.8))
+
+    assert_parses(
+      s(:block,
+        s(:send, nil, :fun,
+          s(:nil)),
+        s(:args), s(:nil)),
+      %q{fun () {}},
+      %q{    ~~ expression (send.nil)},
+      ALL_VERSIONS - %w(1.8 1.9))
   end
 
   #
@@ -2931,6 +3038,16 @@ class TestParser < MiniTest::Unit::TestCase
         |~~~~~~~~~~ expression})
   end
 
+  def test_and_or_masgn_invalid
+    assert_diagnoses(
+      [:error, :masgn_as_condition],
+      %q{foo && (a, b = bar)})
+
+    assert_diagnoses(
+      [:error, :masgn_as_condition],
+      %q{foo || (a, b = bar)})
+  end
+
   # Branching
 
   def test_if
@@ -3621,6 +3738,22 @@ class TestParser < MiniTest::Unit::TestCase
       %q{       ~~~ location})
   end
 
+  #
+  # Miscellanea
+  #
+
+  def test_begin_cmdarg
+    assert_parses(
+      s(:send, nil, :p,
+        s(:block,
+          s(:send, s(:int, 1), :times),
+          s(:args),
+          s(:int, 1))),
+      %q{p begin 1.times do 1 end end},
+      %{},
+      ALL_VERSIONS - %w(1.8 1.9))
+  end
+
   #
   # Error recovery
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -150,6 +150,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - bin/benchmark
 - bin/explain-parse
 - bin/parse
@@ -168,6 +169,7 @@ files:
 - lib/parser/lexer/stack_state.rb
 - lib/parser/ruby18.y
 - lib/parser/ruby19.y
+- lib/parser/ruby20.y
 - lib/parser/source/buffer.rb
 - lib/parser/source/map.rb
 - lib/parser/source/map/operator.rb
@@ -175,6 +177,7 @@ files:
 - lib/parser/source/range.rb
 - lib/parser/static_environment.rb
 - lib/parser/syntax_error.rb
+- parse.y.diff
 - parser.gemspec
 - test/helper.rb
 - test/parse_helper.rb
@@ -191,6 +194,7 @@ files:
 - lib/parser/lexer.rb
 - lib/parser/ruby18.rb
 - lib/parser/ruby19.rb
+- lib/parser/ruby20.rb
 homepage: http://github.com/whitequark/parser
 licenses:
 - MIT