jruby-parser 0.4.2 → 0.5.0

data/spec/parser/alias_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "should parse alias with quotationmarks" do
       parse(%Q{alias :'<==>' :"foo"}, v).find_node(:alias).tap do |aliasn|
         aliasn.new_name.find_node(:symbol).name.should == "<==>"

data/spec/parser/broken_spec.rb

@@ -1,15 +1,11 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 import org.jrubyparser.lexer.StringTerm
 import org.jrubyparser.lexer.SyntaxException
 
 # tests for broken files
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "should raise an unterminated string exception" do
       lambda {
         parse('str = "', v)

data/spec/parser/calls_spec.rb

@@ -0,0 +1,100 @@
+require_relative '../helpers'
+
+describe Parser do
+  VERSIONS.each do |v|
+    # Parsing normal forms of Ruby method calls.
+
+    it "should parse a call" do
+      parse("def foo; end; self.foo", v).find_node(:call).tap do |call|
+        call.name.should == "foo"
+      end
+
+      parse("def foo; end; self.foo()", v).find_node(:call).tap do |call|
+        call.name.should == "foo"
+      end
+    end
+
+    it "should parse a vcall" do
+      parse("def foo; end; foo", v).find_node(:vcall).tap do |vcall|
+        vcall.name.should == "foo"
+      end
+    end
+
+    it "should parse a fcall" do
+      parse("def foo; end; foo()", v).find_node(:fcall).tap do |fcall|
+        fcall.name.should == "foo"
+      end
+    end
+
+    # Parsing - and + as operator calls, which are unique in that they have
+    # both binary and unary forms.
+
+    it "should parse unary plus and minus expressed as an operator" do
+      ["+", "-"].each do |op|
+        parse("#{op}x", v).find_node(:unarycall).tap do |unarycall|
+          unarycall.name.should == "#{op}@"
+          unarycall.lexical_name.should == op
+        end
+      end
+    end
+
+    # Parsing the unary form of - and + as an explicit call.
+
+    it "should parse unary plus and minus expressed as an call without parens" do
+      ["+", "-"].each do |op|
+        parse("x.#{op}@", v).find_node(:call).tap do |call|
+          call.name.should == "#{op}@"
+        end
+      end
+    end
+
+    it "should parse unary plus and minus expressed as an call with parens" do
+      ["+", "-"].each do |op|
+        parse("x.#{op}@()", v).find_node(:call).tap do |call|
+          call.name.should == "#{op}@"
+        end
+      end
+    end
+
+    # Unlike - and +, other unary operators such as ~ are not decorated.
+
+    it "should not decorate ~" do
+      parse("~x", v).find_node(:call).tap do |call|
+        call.name.should == "~"
+      end
+    end
+
+    if v == 1.8
+      # 'not' and '!' in 1.8 were both simply a not node
+
+      it "should parse 'not' as a node" do
+        parse("not x", 1.8).find_node(:not).tap do |notn|
+          notn.should_not == nil
+        end
+      end
+
+      it "should parse '!' as a node" do
+        parse("! x", 1.8).find_node(:not).tap do |notn|
+          notn.should_not == nil
+        end
+      end
+    else
+      # In 1.9 and 2.0 'not' was a call to '!', but we annotate the name of the
+      # method as lexically being 'not'. '!' is still just a call.
+
+      it "should parse 'not' as a call to '!' with lexical name 'not'" do
+        parse("not x", v).find_node(:call).tap do |call|
+          call.name.should == "!"
+          call.lexical_name.should == "not"
+        end
+      end
+
+      it "should parse '!' as a call" do
+        parse("! x", v).find_node(:call).tap do |call|
+          call.name.should == "!"
+          call.lexical_name.should == "!"
+        end
+      end
+    end
+  end
+end

data/spec/positions/alias_spec.rb

@@ -0,0 +1,23 @@
+require_relative '../helpers'
+
+describe Parser do
+  VERSIONS.each do |v|
+    it "Should parse alias node of symbols" do
+      parse("alias :new_name :old_name", v).find_node(:alias).tap do |a|
+        a.new_name_string.should == "new_name"
+        a.old_name_string.should == "old_name"
+        a.new_name.should have_position(0, 0, 6, 15)
+        a.old_name.should have_position(0, 0, 16, 25)
+      end
+    end
+
+    it "Should parse alias node of CONSTANTS" do
+      parse("alias NEW OLD", v).find_node(:alias).tap do |a|
+        a.new_name_string.should == "NEW"
+        a.old_name_string.should == "OLD"
+        a.new_name.should have_position(0, 0, 6, 9)
+        a.old_name.should have_position(0, 0, 10, 13)
+      end
+    end
+  end
+end

data/spec/positions/arg_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "parses a 0-arg method sans parens [#{v}]" do
       parse("def foo\nend\n", v).find_node(:defn).tap do |defn|
         defn.should have_name_and_position("foo", 0, 1, 0, 11)

data/spec/positions/attr_asgn_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "Should parse attr assign" do
       parse("a[1] = 2", v).find_node(:attrassign).tap do |asgn|
         asgn.should_not == nil

data/spec/positions/call_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "parses a 0-arg method call sans parens +extra line [#{v}]" do
       parse("\nblock_given?\n", v).find_node(:fcall).tap do |call|
         call.should have_name_and_position("block_given?", 1, 1, 1, 13)
@@ -130,9 +126,5 @@ describe Parser do
         # FIXME: Need arg tests
       end
     end
-
-    it "parses an nil receiver [#{v}]" do
-      parse("().foo", v).find_node(:call).receiver_node.should_not be_nil
-    end
   end
 end

data/spec/positions/conditionals_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "should parse an unless on alias [#{v}]" do
       ast = parse("alias p ** unless method_defined? :p", v)
       ast.find_node(:alias).tap { |a| a.should have_position(0, 0, 0, 10) }

data/spec/positions/hash_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "should parse a hash literal (a=>b) [#{v}]" do
       parse("{:one => 1, :two => 2}", v).find_node(:hash).tap do |hash|
         hash.should have_position(0, 0, 0, 22)

data/spec/positions/heredoc_spec.rb

@@ -1,15 +1,11 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 # Notes:
 # 1. All heredocs include end newline right after end marker because that whitespace is part of
 #    the markers definition.
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "parses a heredoc with marker at beginning of line[#{v}]" do
     ast = parse(<<-EOF, v)
 <<END

data/spec/positions/name_spec.rb

@@ -0,0 +1,56 @@
+require_relative '../helpers'
+
+describe Parser do
+  VERSIONS.each do |v|
+    it "should get name position for lvars [#{v}]" do
+      carets_parse("^foo = 1; ^foo", v).tap do |_, (asgn, var)|
+        asgn.should have_name_position(0, 0, 0, 3)
+        var.should have_name_position(0, 0, 9, 12)
+      end
+    end
+    it "should get name position for ivars [#{v}]" do
+      carets_parse("^@foo = 1; ^@foo", v).tap do |_, (asgn, var)|
+        asgn.should have_name_position(0, 0, 1, 4)
+        var.should have_name_position(0, 0, 11, 14)
+      end
+    end
+    it "should get name position for cvars [#{v}]" do
+      carets_parse("^@@foo = 1; ^@@foo", v).tap do |_, (asgn, var)|
+        asgn.should have_name_position(0, 0, 2, 5)
+        var.should have_name_position(0, 0, 13, 16)
+      end
+    end
+    it "should get name position for gvars [#{v}]" do
+      carets_parse("^$foo = 1; ^$foo", v).tap do |_, (asgn, var)|
+        asgn.should have_name_position(0, 0, 1, 4)
+        var.should have_name_position(0, 0, 11, 14)
+      end
+    end
+    it "should get name position for constants [#{v}]" do
+      carets_parse("^FOO = 1; ^FOO", v).tap do |_, (asgn, var)|
+        asgn.should have_name_position(0, 0, 0, 3)
+        var.should have_name_position(0, 0, 9, 12)
+      end
+    end
+    it "should get name position for method parameters [#{v}]" do
+      carets_parse("def foo(^a, ^b=1, *^c, &^d);end", v).tap do |_, (a, b, c, d)|
+        a.should have_name_position(0, 0, 8, 9)
+        b.should have_name_position(0, 0, 11, 12)
+        c.should have_name_position(0, 0, 17, 18)
+        d.should have_name_position(0, 0, 21, 22)
+      end
+      if v != 1.8
+        carets_parse("def foo(^a, ^b=1, ^c);end", v).tap do |_, (a, b, c)|
+          c.should have_name_position(0, 0, 16,17)
+        end
+      end
+    end
+    it "should get name position for block parameters [#{v}]" do
+      carets_parse("proc {|^a, *^b, &^c|}", v).tap do |_, (a, b, c)|
+        a.should have_name_position(0, 0, 7, 8)
+        b.should have_name_position(0, 0, 11, 12)
+        c.should have_name_position(0, 0, 15, 16)
+      end
+    end
+  end
+end

data/spec/positions/op_asgn_or_spec.rb

@@ -0,0 +1,15 @@
+require_relative '../helpers'
+
+describe Parser do
+  VERSIONS.each do |v|
+    it "Should parse attr assign" do
+      parse("foo ||= bar", v).find_node(:opasgnor).tap do |opasgn|
+        opasgn.should have_position(0, 0, 0, 11)
+        reference, assignment = opasgn.first, opasgn.second
+        reference.should have_name_and_position("foo", 0, 0, 0, 3)
+#        assignment.should have_name_and_position("foo", 0, 0, 0, 11)
+        assignment.value.should have_name_and_position("bar", 0, 0, 8, 11)
+      end
+    end
+  end
+end

data/spec/positions/str_spec.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../helpers"
-$LOAD_PATH.unshift File.dirname(__FILE__) + "/../../lib"
-require 'jruby-parser'
-require 'parser_helpers'
-require 'node_helpers'
+require_relative '../helpers'
 
 describe Parser do
-  [1.8, 1.9].each do |v|
+  VERSIONS.each do |v|
     it "should parse a string value [#{v}]" do
       parse('str = "my str"', v).find_node(:str).value.should == "my str"
     end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-parser
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Thomas E. Enebo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies: []
 description: A Gem for syntactically correct parse trees of Ruby source
 email: tom.enebo@gmail.com
@@ -34,69 +33,100 @@ files:
 - lib/jruby-parser/version.rb
 - lib/yydebug.jar
 - sample/simple.rb
+- spec/ast/node/array_spec.rb
+- spec/ast/node/break_spec.rb
+- spec/ast/node/comments_spec.rb
+- spec/ast/node/find_scopes_spec.rb
+- spec/ast/node/get_declaration_spec.rb
+- spec/ast/node/get_defined_scope_spec.rb
+- spec/ast/node/get_node_at_spec.rb
+- spec/ast/node/get_occurences_spec.rb
+- spec/ast/node/is_block_parameter_spec.rb
+- spec/ast/node/is_method_parameter_spec.rb
+- spec/ast/node/next_spec.rb
+- spec/ast/node/op_element_asgn_and_spec.rb
+- spec/ast/node/op_element_asgn_or_spec.rb
+- spec/ast/node/op_element_asgn_spec.rb
+- spec/ast/node/return_spec.rb
 - spec/ast/node_path.rb
+- spec/helpers.rb
 - spec/helpers/node_helpers.rb
 - spec/helpers/parser_helpers.rb
-- spec/jruby-parser/find_scopes_spec.rb
 - spec/jruby-parser/find_spec.rb
-- spec/jruby-parser/get_node_at_spec.rb
-- spec/jruby-parser/is_block_parameter_spec.rb
-- spec/jruby-parser/is_method_parameter_spec.rb
+- spec/jruby-parser/parse_spec.rb
 - spec/jruby-parser/rewriting_spec.rb
 - spec/jruby-parser/static_analysis_spec.rb
 - spec/parser/alias_spec.rb
 - spec/parser/broken_spec.rb
+- spec/parser/calls_spec.rb
+- spec/positions/alias_spec.rb
 - spec/positions/arg_spec.rb
 - spec/positions/attr_asgn_spec.rb
 - spec/positions/call_spec.rb
 - spec/positions/conditionals_spec.rb
 - spec/positions/hash_spec.rb
 - spec/positions/heredoc_spec.rb
+- spec/positions/name_spec.rb
+- spec/positions/op_asgn_or_spec.rb
 - spec/positions/str_spec.rb
 - lib/jruby-parser.jar
 homepage: http://github.com/jruby/jruby-parser
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project: jruby-parser
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: A Gem for syntactically correct parse trees of Ruby source
 test_files:
+- spec/ast/node/array_spec.rb
+- spec/ast/node/break_spec.rb
+- spec/ast/node/comments_spec.rb
+- spec/ast/node/find_scopes_spec.rb
+- spec/ast/node/get_declaration_spec.rb
+- spec/ast/node/get_defined_scope_spec.rb
+- spec/ast/node/get_node_at_spec.rb
+- spec/ast/node/get_occurences_spec.rb
+- spec/ast/node/is_block_parameter_spec.rb
+- spec/ast/node/is_method_parameter_spec.rb
+- spec/ast/node/next_spec.rb
+- spec/ast/node/op_element_asgn_and_spec.rb
+- spec/ast/node/op_element_asgn_or_spec.rb
+- spec/ast/node/op_element_asgn_spec.rb
+- spec/ast/node/return_spec.rb
 - spec/ast/node_path.rb
+- spec/helpers.rb
 - spec/helpers/node_helpers.rb
 - spec/helpers/parser_helpers.rb
-- spec/jruby-parser/find_scopes_spec.rb
 - spec/jruby-parser/find_spec.rb
-- spec/jruby-parser/get_node_at_spec.rb
-- spec/jruby-parser/is_block_parameter_spec.rb
-- spec/jruby-parser/is_method_parameter_spec.rb
+- spec/jruby-parser/parse_spec.rb
 - spec/jruby-parser/rewriting_spec.rb
 - spec/jruby-parser/static_analysis_spec.rb
 - spec/parser/alias_spec.rb
 - spec/parser/broken_spec.rb
+- spec/parser/calls_spec.rb
+- spec/positions/alias_spec.rb
 - spec/positions/arg_spec.rb
 - spec/positions/attr_asgn_spec.rb
 - spec/positions/call_spec.rb
 - spec/positions/conditionals_spec.rb
 - spec/positions/hash_spec.rb
 - spec/positions/heredoc_spec.rb
+- spec/positions/name_spec.rb
+- spec/positions/op_asgn_or_spec.rb
 - spec/positions/str_spec.rb