parser 1.1.0 → 1.2.0

data/test/test_source_range.rb

@@ -8,8 +8,8 @@ class TestSourceRange < MiniTest::Unit::TestCase
 
   def test_initialize
     sr = Parser::Source::Range.new(@sfile, 1, 2)
-    assert_equal 1, sr.begin
-    assert_equal 2, sr.end
+    assert_equal 1, sr.begin_pos
+    assert_equal 2, sr.end_pos
     assert sr.frozen?
   end
 
@@ -23,8 +23,8 @@ class TestSourceRange < MiniTest::Unit::TestCase
     sr2 = Parser::Source::Range.new(@sfile, 5, 8)
     sr = sr1.join(sr2)
 
-    assert_equal 1, sr.begin
-    assert_equal 8, sr.end
+    assert_equal 1, sr.begin_pos
+    assert_equal 8, sr.end_pos
   end
 
   def test_line
@@ -39,11 +39,23 @@ class TestSourceRange < MiniTest::Unit::TestCase
 
   def test_columns
     sr = Parser::Source::Range.new(@sfile, 7, 8)
-    assert_equal 0, sr.begin_column
-    assert_equal 1, sr.end_column
+    assert_equal 0, sr.begin.column
+    assert_equal 1, sr.end.column
     assert_equal 0..1, sr.column_range
   end
 
+  def test_begin_end
+    sr = Parser::Source::Range.new(@sfile, 1, 5)
+
+    sr_beg = sr.begin
+    assert_equal 1, sr_beg.begin_pos
+    assert_equal 1, sr_beg.end_pos
+
+    sr_end = sr.end
+    assert_equal 5, sr_end.begin_pos
+    assert_equal 5, sr_end.end_pos
+  end
+
   def test_to_s
     sr = Parser::Source::Range.new(@sfile, 8, 9)
     assert_equal "(string):2:2", sr.to_s

metadata

@@ -1,121 +1,175 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: parser
-version: !ruby/object:Gem::Version 
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-18 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: racc
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id007 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 4.7.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: 4.7.0
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: coveralls
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: simplecov-sublime-ruby-coverage
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id007
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-sublime-ruby-coverage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby parser written in pure Ruby.
-email: 
+email:
 - whitequark@whitequark.org
-executables: []
-
+executables:
+- ruby-parse
+- ruby-rewrite
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
-- AST_FORMAT.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/benchmark
-- bin/explain-parse
-- bin/parse
+- bin/ruby-parse
+- bin/ruby-rewrite
+- doc/AST_FORMAT.md
+- doc/CUSTOMIZATION.md
+- doc/INTERNALS.md
 - lib/parser.rb
 - lib/parser/all.rb
 - lib/parser/ast/node.rb
@@ -123,6 +177,7 @@ files:
 - lib/parser/base.rb
 - lib/parser/builders/default.rb
 - lib/parser/compatibility/ruby1_8.rb
+- lib/parser/compatibility/slop.rb
 - lib/parser/current.rb
 - lib/parser/diagnostic.rb
 - lib/parser/diagnostic/engine.rb
@@ -134,13 +189,27 @@ files:
 - lib/parser/ruby19.y
 - lib/parser/ruby20.y
 - lib/parser/ruby21.y
+- lib/parser/runner.rb
+- lib/parser/runner/ruby_parse.rb
+- lib/parser/runner/ruby_rewrite.rb
 - lib/parser/source/buffer.rb
 - lib/parser/source/map.rb
+- lib/parser/source/map/block.rb
+- lib/parser/source/map/collection.rb
+- lib/parser/source/map/condition.rb
+- lib/parser/source/map/constant.rb
+- lib/parser/source/map/definition.rb
+- lib/parser/source/map/for.rb
+- lib/parser/source/map/keyword.rb
 - lib/parser/source/map/operator.rb
-- lib/parser/source/map/variable_assignment.rb
+- lib/parser/source/map/rescue_body.rb
+- lib/parser/source/map/send.rb
+- lib/parser/source/map/ternary.rb
+- lib/parser/source/map/variable.rb
 - lib/parser/source/range.rb
 - lib/parser/static_environment.rb
 - lib/parser/syntax_error.rb
+- lib/parser/version.rb
 - parser.gemspec
 - test/helper.rb
 - test/parse_helper.rb
@@ -162,29 +231,30 @@ files:
 - lib/parser/ruby20.rb
 - lib/parser/ruby21.rb
 homepage: http://github.com/whitequark/parser
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id007
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.
-test_files: 
+test_files:
 - test/helper.rb
 - test/parse_helper.rb
 - test/racc_coverage_helper.rb

data/bin/benchmark

@@ -1,47 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'benchmark'
-require 'ruby_parser'
-
-$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-require 'parser/all'
-
-def measure(what)
-  rp_failures = 0
-  p_failures  = 0
-
-  Benchmark.bm(10) do |x|
-    x.report "ruby_parser" do
-      what.each do |file, src|
-        begin
-          Ruby18Parser.new.parse(src)
-        rescue => e
-          puts file
-          puts "RP: #{e.class}: #{e.message}"
-          rp_failures += 1
-        end
-      end
-    end
-
-    x.report "parser" do
-      what.each do |file, src|
-        begin
-          Parser::Ruby20.parse(src, file)
-        rescue Parser::SyntaxError
-          p_failures += 1
-        rescue => e
-          puts file
-          puts "P:  #{e.class}: #{e.message}"
-          puts e.backtrace
-          p_failures += 1
-        end
-      end
-    end
-  end
-
-  puts
-  puts "Failures: RP: #{rp_failures} P: #{p_failures}"
-end
-
-files = Hash[ARGV.map { |f| [f, File.read(f)] }]
-measure(files)

data/bin/explain-parse

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
-require 'parser/all'
-
-ENV['RACC_DEBUG'] = '1'
-
-class Parser::Base
-  def next_token
-    @lexer.advance_and_explain
-  end
-end
-
-p Parser::Ruby20.parse(ARGF.read)

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

@@ -1,15 +0,0 @@
-module Parser
-  module Source
-
-    class Map::VariableAssignment < Map::Operator
-      attr_reader :name
-
-      def initialize(name, operator, expression)
-        @name = name
-
-        super(operator, expression)
-      end
-    end
-
-  end
-end