parser 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd417cce73823b5c02700b31b2ddc3364453aaf
-  data.tar.gz: 143425da0cc95ae994b1068807561968afb43267
+  metadata.gz: aeb1a643a1e50280d971697fce43dd37ef01179a
+  data.tar.gz: f50c9ceeba38d5fdcf3b5d9c13fcd2c32425d805
 SHA512:
-  metadata.gz: 1f55f2a694de612a9f9c71c428a91fa210134523b2377c4d5b2fe1276f64ddee27f4a702df979128d1b93172654fd7f684e9cbe3e297ccfcec53f00a29d90c8b
-  data.tar.gz: 634c5ce4b572ee896d4eb82443b43c6f91af5542121f1525eff684259f24f8d59fc23920d8ec3e93b47d46014baabd18ff9b6563e5f5102a9f55d1f832971ae1
+  metadata.gz: 1d75b85fd7a2628ef8eac25c419b8c313e6983d431e9afe40050449d99d15f48509d8f1b4e08b8b1a1659abd089d2f9111046b8afb2ada27e3897643a98ed8a6
+  data.tar.gz: 98a3cbf81cbd31ea822a29c6f87ba544c397955befb74f86a611a943447eb13a1708d2fd0e52f2c00bbf748f5d1808f18008e8b3a1c0c78d744048a81df1b963

data/lib/parser/base.rb

@@ -115,7 +115,6 @@ module Parser
       token_name = token_to_str(error_token_id)
       _, location = error_value
 
-      # TODO add "expected: ..." here
       message = ERRORS[:unexpected_token] % { :token => token_name }
       @diagnostics.process(
           Diagnostic.new(:error, message, location))

data/lib/parser/builders/default.rb

@@ -544,16 +544,16 @@ module Parser
                     lparen_t=nil, args=[], rparen_t=nil)
       if selector_t.nil?
         n(:send, [ receiver, :call, *args ],
-          send_map(receiver, nil, lparen_t, args, rparen_t))
+          send_map(receiver, dot_t, nil, lparen_t, args, rparen_t))
       else
         n(:send, [ receiver, value(selector_t).to_sym, *args ],
-          send_map(receiver, selector_t, lparen_t, args, rparen_t))
+          send_map(receiver, dot_t, selector_t, lparen_t, args, rparen_t))
       end
     end
 
     def call_lambda(lambda_t)
       n(:send, [ nil, :lambda ],
-        send_map(nil, lambda_t))
+        send_map(nil, nil, lambda_t))
     end
 
     def block(method_call, begin_t, args, body, end_t)
@@ -579,7 +579,7 @@ module Parser
 
       # Incomplete method call.
       n(:send, [ receiver, method_name ],
-        send_map(receiver, selector_t))
+        send_map(receiver, dot_t, selector_t))
     end
 
     def index(receiver, lbrack_t, indexes, rbrack_t)
@@ -994,7 +994,7 @@ module Parser
                                   loc(end_t))
     end
 
-    def send_map(receiver_e, selector_t, begin_t=nil, args=[], end_t=nil)
+    def send_map(receiver_e, dot_t, selector_t, begin_t=nil, args=[], end_t=nil)
       if receiver_e
         begin_l = receiver_e.src.expression
       elsif selector_t
@@ -1009,17 +1009,20 @@ module Parser
         end_l   = loc(selector_t)
       end
 
-      Source::Map::Send.new(loc(selector_t), loc(begin_t), loc(end_t),
+      Source::Map::Send.new(loc(dot_t),   loc(selector_t),
+                            loc(begin_t), loc(end_t),
                             begin_l.join(end_l))
     end
 
     def var_send_map(variable_e)
-      Source::Map::Send.new(variable_e.src.expression, nil, nil,
+      Source::Map::Send.new(nil, variable_e.src.expression,
+                            nil, nil,
                             variable_e.src.expression)
     end
 
     def send_binary_op_map(lhs_e, selector_t, rhs_e)
-      Source::Map::Send.new(loc(selector_t), nil, nil,
+      Source::Map::Send.new(nil, loc(selector_t),
+                            nil, nil,
                             join_exprs(lhs_e, rhs_e))
     end
 
@@ -1030,12 +1033,14 @@ module Parser
         expr_l = loc(selector_t).join(arg_e.src.expression)
       end
 
-      Source::Map::Send.new(loc(selector_t), nil, nil,
+      Source::Map::Send.new(nil, loc(selector_t),
+                            nil, nil,
                             expr_l)
     end
 
     def send_index_map(receiver_e, lbrack_t, rbrack_t)
-      Source::Map::Send.new(loc(lbrack_t).join(loc(rbrack_t)), nil, nil,
+      Source::Map::Send.new(nil, loc(lbrack_t).join(loc(rbrack_t)),
+                            nil, nil,
                             receiver_e.src.expression.join(loc(rbrack_t)))
     end
 

data/lib/parser/lexer.rl

@@ -1520,7 +1520,7 @@ class Parser::Lexer
   expr_value := |*
       # a:b: a(:b), a::B, A::B
       bareword ':' (c_any - ':')
-      => { p = @ts - 2
+      => { p = @ts - 1
            fgoto expr_end; };
 
       # TODO whitespace rule

data/lib/parser/source/map/send.rb

@@ -2,12 +2,14 @@ module Parser
   module Source
 
     class Map::Send < Map
+      attr_reader :dot
       attr_reader :selector
       attr_reader :operator
       attr_reader :begin
       attr_reader :end
 
-      def initialize(selector_l, begin_l, end_l, expression_l)
+      def initialize(dot_l, selector_l, begin_l, end_l, expression_l)
+        @dot         = dot_l
         @selector    = selector_l
         @begin, @end = begin_l, end_l
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '1.3.4'
+  VERSION = '1.4.0'
 end

data/test/test_parser.rb

@@ -2370,18 +2370,21 @@ class TestParser < MiniTest::Unit::TestCase
       s(:send, s(:lvar, :foo), :fun),
       %q{foo.fun},
       %q{    ~~~ selector
+        |   ^ dot
         |~~~~~~~ expression})
 
     assert_parses(
       s(:send, s(:lvar, :foo), :fun),
       %q{foo::fun},
       %q{     ~~~ selector
+        |   ^^ dot
         |~~~~~~~~ expression})
 
     assert_parses(
       s(:send, s(:lvar, :foo), :Fun),
       %q{foo::Fun()},
       %q{     ~~~ selector
+        |   ^^ dot
         |~~~~~~~~~~ expression})
   end
 
@@ -2390,18 +2393,21 @@ class TestParser < MiniTest::Unit::TestCase
       s(:send, s(:lvar, :foo), :fun, s(:lvar, :bar)),
       %q{foo.fun bar},
       %q{    ~~~ selector
+        |   ^ dot
         |~~~~~~~~~~~ expression})
 
     assert_parses(
       s(:send, s(:lvar, :foo), :fun, s(:lvar, :bar)),
       %q{foo::fun bar},
       %q{     ~~~ selector
+        |   ^^ dot
         |~~~~~~~~~~~~ expression})
 
     assert_parses(
       s(:send, s(:lvar, :foo), :Fun, s(:lvar, :bar)),
       %q{foo::Fun bar},
       %q{     ~~~ selector
+        |   ^^ dot
         |~~~~~~~~~~~~ expression})
   end
 
@@ -2442,6 +2448,7 @@ class TestParser < MiniTest::Unit::TestCase
         :fun, s(:lvar, :bar)),
       %q{meth 1 do end.fun bar},
       %q{              ~~~ selector
+        |             ^ dot
         |~~~~~~~~~~~~~~~~~~~~~ expression})
 
     assert_parses(
@@ -2452,6 +2459,7 @@ class TestParser < MiniTest::Unit::TestCase
         :fun, s(:lvar, :bar)),
       %q{meth 1 do end.fun(bar)},
       %q{              ~~~ selector
+        |             ^ dot
         |                 ^ begin
         |                     ^ end
         |~~~~~~~~~~~~~~~~~~~~~~ expression})
@@ -2464,6 +2472,7 @@ class TestParser < MiniTest::Unit::TestCase
         :fun, s(:lvar, :bar)),
       %q{meth 1 do end::fun bar},
       %q{               ~~~ selector
+        |             ^^ dot
         |~~~~~~~~~~~~~~~~~~~~~~ expression})
 
     assert_parses(
@@ -2476,6 +2485,7 @@ class TestParser < MiniTest::Unit::TestCase
       %q{               ~~~ selector
         |                  ^ begin
         |                      ^ end
+        |             ^^ dot
         |~~~~~~~~~~~~~~~~~~~~~~~ expression})
 
     assert_parses(
@@ -2739,20 +2749,33 @@ class TestParser < MiniTest::Unit::TestCase
       s(:send, s(:lvar, :foo), :a=, s(:int, 1)),
       %q{foo.a = 1},
       %q{    ~ selector
+        |   ^ dot
         |      ^ operator
         |~~~~~~~~~ expression})
 
     assert_parses(
       s(:send, s(:lvar, :foo), :a=, s(:int, 1)),
-      "foo::a = 1")
+      %q{foo::a = 1},
+      %q{     ~ selector
+        |   ^^ dot
+        |       ^ operator
+        |~~~~~~~~~~ expression})
 
     assert_parses(
       s(:send, s(:lvar, :foo), :A=, s(:int, 1)),
-      "foo.A = 1")
+      %q{foo.A = 1},
+      %q{    ~ selector
+        |   ^ dot
+        |      ^ operator
+        |~~~~~~~~~ expression})
 
     assert_parses(
       s(:cdecl, s(:lvar, :foo), :A, s(:int, 1)),
-      "foo::A = 1")
+      %q{foo::A = 1},
+      %q{     ~ name
+        |   ^^ double_colon
+        |       ^ operator
+        |~~~~~~~~~~ expression})
   end
 
   def test_send_index
@@ -2848,6 +2871,7 @@ class TestParser < MiniTest::Unit::TestCase
       %q{foo.(1)},
       %q{    ^ begin
         |      ^ end
+        |   ^ dot
         |~~~~~~~ expression},
       ALL_VERSIONS - %w(1.8))
 
@@ -2857,6 +2881,7 @@ class TestParser < MiniTest::Unit::TestCase
       %q{foo::(1)},
       %q{     ^ begin
         |       ^ end
+        |   ^^ dot
         |~~~~~~~~ expression},
       ALL_VERSIONS - %w(1.8))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast