ripper_ruby_parser 0.0.7 → 0.0.8

data/lib/ripper_ruby_parser/commenting_sexp_builder.rb

@@ -57,6 +57,16 @@ module RipperRubyParser
       super
     end
 
+    def on_embexpr_beg *args
+      @in_symbol = false
+      super
+    end
+
+    def on_dyna_symbol *args
+      @in_symbol = false
+      super
+    end
+
     def on_parse_error *args
       raise SyntaxError.new(*args)
     end
@@ -80,10 +90,9 @@ module RipperRubyParser
     private
 
     def commentize name, exp
+      raise "Comment stack empty in #{name} event" if @comment_stack.empty?
       tok, comment = @comment_stack.pop
       unless tok == name
-        p @comment_stack
-        p [tok, comment]
         raise "Expected on_#{tok} event, got on_#{name}"
       end
       if comment.nil?

data/lib/ripper_ruby_parser/version.rb

@@ -1,3 +1,3 @@
 module RipperRubyParser
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/unit/commenting_sexp_builder_test.rb

@@ -70,6 +70,44 @@ describe RipperRubyParser::CommentingSexpBuilder do
                            [:const_ref, [:@const, "Foo", [1, 7]]],
                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
     end
+
+    it "is not confused by a symbol containing a keyword" do
+      result = parse_with_builder ":class; def foo; end"
+      result.must_equal [:program,
+                         [[:symbol_literal, [:symbol, [:@kw, "class", [1, 1]]]],
+                          [:comment,
+                           "",
+                           [:def,
+                            [:@ident, "foo", [1, 12]],
+                            [:params, nil, nil, nil, nil, nil],
+                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
+    end
+
+    it "is not confused by a dynamic symbol" do
+      result = parse_with_builder ":'foo'; def bar; end"
+      result.must_equal [:program,
+                         [[:dyna_symbol, [[:@tstring_content, "foo", [1, 2]]]],
+                          [:comment,
+                           "",
+                           [:def,
+                            [:@ident, "bar", [1, 12]],
+                            [:params, nil, nil, nil, nil, nil],
+                            [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]
+    end
+
+    it "is not confused by a dynamic symbol containing a class definition" do
+      result = parse_with_builder ":\"foo\#{class Bar;end}\""
+      result.must_equal [:program,
+                         [[:dyna_symbol,
+                           [[:@tstring_content, "foo", [1, 2]],
+                            [:string_embexpr,
+                             [[:comment,
+                               "",
+                               [:class,
+                                [:const_ref, [:@const, "Bar", [1, 13]]],
+                                nil,
+                                [:bodystmt, [[:void_stmt]], nil, nil, nil]]]]]]]]]
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ripper_ruby_parser
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.2
+        version: 3.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.2
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement