jruby-parser 0.4.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1a8e7fce9790155c3de58d121b229d94dae09c80
+  data.tar.gz: 29e91b679491ee3e139e57cb68a3a0679367c045
+SHA512:
+  metadata.gz: 23453af440f18474847c8ac0ee69cecec9dd82fa6c70b481349e73636a9b31d8af718fd5a1e9f457487d0b5f5a2cfa5e299229ff79a5d41e115d3a7f8db8ce33
+  data.tar.gz: 9ff515f22b2116e0d03702612308fa3748ad5e5c84ddf3e37a552c81626973a4f326cca65da0f797ab1ff11d7290d0f53ce5272e25407fc835b49041e7f41768

data/lib/jruby-parser/util/coercer.rb

@@ -3,10 +3,11 @@ module JRubyParser
     def self.included(cls)
       cls.class_eval do
         def receiver=(value)
-           value = value.to_ast_node if value.respond_to? :to_ast_node
-           old_value = getReceiver
-           value.position = old_value.position unless value.position    
-           setReceiver(value)
+          old_value = getReceiver
+          if value.respond_to? :to_ast_node
+            value = value.to_ast_node(old_value.position) 
+          end
+          setReceiver(value)
         end
       end
     end
@@ -16,10 +17,12 @@ module JRubyParser
     def self.included(cls)
       cls.class_eval do
         def value=(value)
-           value = value.to_ast_node if value.respond_to? :to_ast_node
-           old_value = getValue
-           value.position = old_value.position unless value.position    
-           setValue(value)
+          old_value = getValue
+          if value.respond_to? :to_ast_node
+            value = value.to_ast_node(old_value.position) 
+          end
+
+          setValue(value)
         end
       end
     end
@@ -29,16 +32,19 @@ module JRubyParser
     def self.included(cls)
       cls.class_eval do
         def args=(value)
-           value = value.to_ast_node if value.respond_to? :to_ast_node
-           old_value = getArgs
-           unless value.position
-             value.position = old_value.position 
-             value.each { |e| e.position = old_value.position } #if value.respond_to? :each
-           end
+          old_value = getArgs
+          if value.respond_to? :to_ast_node
+            value = value.to_ast_node(old_value.position) 
+          end
+
+          unless value.position
+            value.position = old_value.position 
+            value.each { |e| e.position = old_value.position } #if value.respond_to? :each
+          end
            
-           setArgs(value)
+          setArgs(value)
         end
       end
     end
   end
-end
+end

data/lib/jruby-parser/version.rb

@@ -1,3 +1,3 @@
 module JRubyParser
-  VERSION = "0.4.2"
+  VERSION = "0.5.0"
 end

data/spec/ast/node/array_spec.rb

@@ -0,0 +1,24 @@
+require_relative '../../helpers'
+
+tnode, fnode = org.jrubyparser.ast.TrueNode, org.jrubyparser.ast.FalseNode
+inil = org.jrubyparser.ast.ImplicitNilNode
+
+describe org.jrubyparser.ast.ArrayNode do
+  VERSIONS.each do |v|
+    it "can have multiple elements [#{v}]" do
+      parse("[true, false]", v).find_node(:array).tap do |list|
+        list.should have_position(0, 0, 0, 13)
+        list.size.should == 2
+        list.child_nodes.to_a.map(&:class).should == [tnode, fnode]
+      end
+    end
+
+    it "can have nasty implcit nil elements [#{v}]" do
+      parse("[()]", v).find_node(:array).tap do |list|
+        list.should have_position(0, 0, 0, 4)
+        list.size.should == 1
+        list.child_nodes.to_a.map(&:class).should == [inil]
+      end
+    end
+  end
+end

data/spec/ast/node/break_spec.rb

@@ -0,0 +1,19 @@
+require_relative '../../helpers'
+
+describe org.jrubyparser.ast.BreakNode do
+  VERSIONS.each do |v|
+    it "can accept a single value [#{v}]" do
+      rparse("break true", v).find_node(:break).tap do |b|
+        b.should have_position(0, 0, 0, 10)
+        b.value_node.class.should == org.jrubyparser.ast.TrueNode
+      end
+    end
+
+    it "can accept no value [#{v}]" do
+      rparse("break", v).find_node(:break).tap do |b|
+        b.should have_position(0, 0, 0, 5)
+        b.value_node.should == nil
+      end
+    end
+  end
+end

data/spec/ast/node/comments_spec.rb

@@ -0,0 +1,59 @@
+require_relative '../../helpers'
+
+describe org.jrubyparser.ast.Node do
+  VERSIONS.each do |v|
+    it "can see a single previous comment [#{v}]" do
+      rparse("# c1\ndef foo; end", v).find_node(:defn).tap do |defn|
+        defn.previous_comments.to_a.map(&:content).should =~ ["# c1"]
+      end
+
+      rparse("# c1\ndef foo; end\nfoo\n", v).find_node(:defn).tap do |defn|
+        defn.previous_comments.to_a.map(&:content).should =~ ["# c1"]
+      end
+
+      rparse("# c1\ndef self.[]\nend", v).find_node(:defs).tap do |defs|
+        defs.previous_comments.to_a.map(&:content).should =~ ["# c1"]
+      end
+
+      rparse("# c1\nclass Foo\nend", v).find_node(:class).tap do |defn|
+        defn.previous_comments.to_a.map(&:content).should =~ ["# c1"]
+      end
+
+      rparse("# c1\nif 1; end", v).find_node(:if).tap do |ifn|
+        ifn.previous_comments.to_a.map(&:content).should =~ ["# c1"]
+      end
+    end
+
+    it "can see a multiple previous comments [#{v}]" do
+      rparse("# c1\n# c2\ndef foo; end", v).find_node(:defn).tap do |defn|
+        defn.previous_comments.to_a.map(&:content).should =~ ["# c1", "# c2"]
+      end
+
+      rparse("# c1\n# c2\nclass Foo\nend", v).find_node(:class).tap do |defn|
+        defn.previous_comments.to_a.map(&:content).should =~ ["# c1", "# c2"]
+      end
+
+      rparse("# c1\n# c2\nif 1\nend", v).find_node(:if).tap do |ifn|
+        ifn.previous_comments.to_a.map(&:content).should =~ ["# c1", "# c2"]
+      end
+    end
+
+    it "can see an inline comment [#{v}]" do
+      rparse("1 + 2 # inline").find_node(:call).tap do |call|
+        call.inline_comment.content.should == "# inline"
+      end
+    end
+
+    it "places trailing comments as last element in root [#{v}]" do
+      rparse("def foo\n end\n #trailing").child_nodes.to_a.last.tap do |child|
+        child.content.should =~ /#trailing/
+      end
+    end
+
+    it "handles a lone comment [#{v}]" do
+      rparse("#trailing").child_nodes.to_a.last.tap do |child|
+        child.content.should =~ /#trailing/
+      end
+    end
+  end
+end

data/spec/{jruby-parser → ast/node}/find_scopes_spec.rb

@@ -1,11 +1,8 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-require 'java'
-require 'jruby-parser'
-require 'parser_helpers'
+require_relative '../../helpers'
 
-describe JRubyParser do
-  [JRubyParser::Compat::RUBY1_8, JRubyParser::Compat::RUBY1_9].each do |v|
+# FIXME: Move each of these methods into their respective spec files (e.g method_for_spec.rb)
+describe org.jrubyparser.ast.Node do
+  VERSIONS.each do |v|
     it "children can ask for the method it is contained in [#{v}]" do
       parse("def foo; true if false; end").find_node(:defn) do |defn|
         defn.find_node(:true).method_for.should == defn

data/spec/ast/node/get_declaration_spec.rb

@@ -0,0 +1,50 @@
+require_relative '../../helpers'
+
+describe org.jrubyparser.ast.Node do
+  VERSIONS.each do |v|
+    it "finds a variable's parameter declaration via get_declaration [#{v}]" do
+      carets_parse("def foo(^a); ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("def foo(^a); a = 1; ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("def foo(*^a); a = 1; ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("def foo(&^a); a = 1; ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("def foo(^a=1); a = 1; ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+    end
+    it "finds a variable's lvar declaration via get_declaration [#{v}]" do
+      carets_parse("def foo; ^a = 1; ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("def foo; ^a = 1; a = 2; ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+    end
+    it "finds a variable's parameter declaration via get_declaration [#{v}]" do
+      carets_parse("proc {|^a| ^a}", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("proc {|^a| a = 1; ^a}", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("proc {|*^a| a = 1; ^a}", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      carets_parse("proc {|&^a| a = 1; ^a}", v).tap do |_, caret_nodes|
+        caret_nodes[1].declaration.should == caret_nodes[0]
+      end
+      if v != 1.8
+        carets_parse("proc {|^a=1| a = 1; ^a}", v).tap do |_, caret_nodes|
+          caret_nodes[1].declaration.should == caret_nodes[0]
+        end
+      end
+    end
+  end
+end

data/spec/ast/node/get_defined_scope_spec.rb

@@ -0,0 +1,89 @@
+require_relative '../../helpers'
+
+describe org.jrubyparser.ast.Node do
+  VERSIONS.each do |v|
+    it "finds method via get_defined_scope [#{v}]" do
+      caret_parse("def foo(^a); end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+      caret_parse("def foo(); ^a = 1; end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+      caret_parse("def foo(a); ^a; end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+      caret_parse("def foo(*^a); end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+      caret_parse("def foo(&^a); end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+      caret_parse("def foo(^a=1); end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+
+      caret_parse("def foo(a); proc { ^a }end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+      caret_parse("def foo(a);proc{proc{^a}};end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+      caret_parse("def foo(a);proc{proc{^a=1}};end", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:defn)
+      end
+    end
+
+    it "finds iter via get_defined_scope [#{v}]" do
+      caret_parse("proc { |^a| }", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:iter)
+      end
+      caret_parse("proc { || ^a=1}", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:iter)
+      end
+      caret_parse("proc { |a| ^a}", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:iter)
+      end
+      caret_parse("proc { |*^a| }", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:iter)
+      end
+      caret_parse("proc { |&^a| }", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root.find_node(:iter)
+      end
+      if v != 1.8
+        caret_parse("proc { |^a=1| }", v).tap do |root, caret_node|
+          caret_node.defined_scope.should == root.find_node(:iter)
+        end
+      end
+      caret_parse("proc { |a| lambda { ^a }}", v).tap do |root, caret_node|
+        caret_node.defined_scope.parent.name.should == root.find_node(:iter).parent.name
+      end
+    end
+
+    it "finds root via get_defined_scope [#{v}]" do
+      caret_parse("^a = 1", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root
+      end
+      caret_parse("a = 1; ^a", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root
+      end
+      caret_parse("a = 1; proc { ^a }", v).tap do |root, caret_node|
+        caret_node.defined_scope.should == root
+      end
+    end
+
+    it "finds proper scope per 1.8/1.9 rules for block vars [#{v}]" do
+      if v == 1.8 
+        caret_parse("a = 1; proc { |a| ^a }", v).tap do |root, caret_node|
+          caret_node.defined_scope.should == root
+        end
+      else # 1.9+
+        caret_parse("a = 1; proc { |a| ^a }", v).tap do |root, caret_node|
+          caret_node.defined_scope.should == root.find_node(:iter)
+        end
+        caret_parse("a = 1; proc { |;a| ^a }", v).tap do |root, caret_node|
+          caret_node.defined_scope.should == root.find_node(:iter)
+        end
+      end
+    end
+  end
+end

data/spec/{jruby-parser → ast/node}/get_node_at_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-require 'java'
-require 'jruby-parser'
-require 'parser_helpers'
+require_relative '../../helpers'
 
-describe JRubyParser do
-  [1.8, 1.9].each do |v|
+describe org.jrubyparser.ast.Node do
+  VERSIONS.each do |v|
     it "finds fcall via simple getNodeAt search [#{v}]" do
       caret_parse("b = fo^o(1)", v).tap do |root, caret_node|
         root.find_node(:fcall).should == caret_node

data/spec/ast/node/get_occurences_spec.rb

@@ -0,0 +1,87 @@
+require_relative '../../helpers'
+
+describe org.jrubyparser.ast.Node do
+  VERSIONS.each do |v|
+    it "finds all def variable occurrences via get_occurrences [#{v}]" do
+      carets_parse("def foo(^a); ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      carets_parse("def foo(*^a); ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      carets_parse("def foo(^a=1); ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      if v != 1.8
+        carets_parse("def foo(a=1, ^b); ^b; end", v).tap do |_, caret_nodes|
+          caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+        end
+      end
+      carets_parse("def foo(&^a); ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      carets_parse("def foo(^a, b); p ^a; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      carets_parse("def foo(^a); proc { ^a }; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      if v == 1.8
+        carets_parse("def foo(^a); proc { |^a| ^a } end", v).tap do |_, caret_nodes|
+          caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+        end
+      else
+        carets_parse("def foo(^a); proc { |a| a } end", v).tap do |_, caret_nodes|
+          caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+        end
+      end
+      carets_parse("def foo(^a); ^a[:b] = 1; ^a[:b]; end", v).tap do |_, nodes|
+        nodes.first.occurrences.to_a.should =~ nodes
+      end
+      carets_parse("def foo(^a); b = ^a ? {} : []; end", v).tap do |_, nodes|
+        nodes.first.occurrences.to_a.should =~ nodes
+      end
+    end
+
+    it "finds all root variable occurrences via get_occurrences [#{v}]" do
+      carets_parse("^a=1; ^a; ^a if b", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      carets_parse("^a=1; def foo; a=1; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      carets_parse("a=1; def foo; ^a=1; end", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+    end
+
+    it "finds all block variable occurrences via get_occurrences [#{v}]" do
+      if v == 1.8
+        carets_parse("def foo(^a); proc { |^a| ^a } end", v).tap do |_, caret_nodes|
+          caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+        end
+      else
+        carets_parse("def foo(a); proc { |^a| ^a } end", v).tap do |_, caret_nodes|
+          caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+        end
+      end
+      carets_parse("proc { |^a| ^a }", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      if v != 1.8
+        carets_parse("proc { |^a=1| ^a }", v).tap do |_, caret_nodes|
+          caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+        end
+        carets_parse("proc { |a=1, ^b| ^b }", v).tap do |_, caret_nodes|
+          caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+        end
+      end
+      carets_parse("proc { |&^a| ^a }", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+      carets_parse("proc { |*^a| ^a }", v).tap do |_, caret_nodes|
+        caret_nodes.first.occurrences.to_a.should =~ caret_nodes
+      end
+    end
+  end
+end