parser 2.2.0.1 → 2.2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f269b1e2401ffe3b9b35319fec5accc3378dfe5e
-  data.tar.gz: 66bff4c72a39532d0a008dc2c45bf597ec9a397a
+  metadata.gz: a7ee3b62efb93509bd26984f67ccef404ed4436a
+  data.tar.gz: 3997b9e8dfa9ad2acd372d363e4e30094889bda1
 SHA512:
-  metadata.gz: c05ff7923a950a07a0b202a2a393e4bdc7bf4b8235d5e5517599fbc634b544b82fd24b1ce74e34ae0131d68c982fb7044af6428acd3f62aa580d1a038bb03b63
-  data.tar.gz: 19e74008c7cc99b59811266fd590db6870f6e52ce44077f0430d8a065efc44f0c5bab8b64b77ca3dc52cf431f8e59db7329be2f70dbf191a375e189be06bec11
+  metadata.gz: faf5d3ced213d86629ab6bc357a97d32e9fda555e8077743abfe9c340d85608362dd2ff2ca61e6ebf6a990d7d64d5130c5f89dd7feb33b9cf1ac85979d76728d
+  data.tar.gz: d36bbe80d4b3d150a408db67765f154eaee25fd44b49b969e2d54a4d0b4bd7b702f8116836f21f6923952ace7539c8ed504e985bfc5dae9c725567882b983b43

data/README.md

@@ -1,6 +1,6 @@
 # Parser
 
-[![Gem Version](https://badge.fury.io/rb/parser.png)](http://badge.fury.io/rb/parser)
+[![Gem Version](https://badge.fury.io/rb/parser.png)](https://badge.fury.io/rb/parser)
 [![Build Status](https://travis-ci.org/whitequark/parser.png?branch=master)](https://travis-ci.org/whitequark/parser)
 [![Code Climate](https://codeclimate.com/github/whitequark/parser.png)](https://codeclimate.com/github/whitequark/parser)
 [![Coverage Status](https://coveralls.io/repos/whitequark/parser/badge.png?branch=master)](https://coveralls.io/r/whitequark/parser)
@@ -41,7 +41,7 @@ Access the AST's source map:
     p Parser::CurrentRuby.parse("2 + 2").loc.selector.source
     # "+"
 
-Traverse the AST: see the documentation for [gem ast](http://whitequark.github.io/ast/).
+Traverse the AST: see the documentation for [gem ast](https://whitequark.github.io/ast/).
 
 Parse a chunk of code and display all diagnostics:
 
@@ -98,27 +98,26 @@ with Parser:
 * Precise source location reporting.
 * [Documented](doc/AST_FORMAT.md) AST format which is convenient to work with.
 * A simple interface and a powerful, tweakable one.
-* Parses 1.8, 1.9, 2.0, 2.1 and 2.2 (preliminary) syntax with backwards-compatible
+* Parses 1.8, 1.9, 2.0, 2.1 and 2.2 syntax with backwards-compatible
   AST formats.
 * [Rewriting][rewriting] support.
 * Parsing error recovery.
 * Improved [clang-like][] diagnostic messages with location information.
 * Written in pure Ruby, runs on MRI 1.8.7 or >=1.9.2, JRuby and Rubinius in 1.8
   and 1.9 mode.
-* Only two runtime dependencies: the gems [ast][] and [slop][].
+* Only one runtime dependency: the [ast][] gem.
 * [Insane][insane-lexer] Ruby lexer rewritten from scratch in Ragel.
 * 100% test coverage for Bison grammars (except error recovery).
 * Readable, commented source code.
 
 [clang-like]: http://clang.llvm.org/diagnostics.html
-[ast]: http://rubygems.org/gems/ast
-[slop]: http://rubygems.org/gems/slop
+[ast]: https://rubygems.org/gems/ast
 [insane-lexer]: http://whitequark.org/blog/2013/04/01/ruby-hacking-guide-ch-11-finite-state-lexer/
 [rewriting]: http://whitequark.org/blog/2013/04/26/lets-play-with-ruby-code/
 
 ## Documentation
 
-Documentation for parser is available [online](http://whitequark.github.io/parser/).
+Documentation for parser is available [online](https://whitequark.github.io/parser/).
 
 ### Node names
 
@@ -210,7 +209,7 @@ Adding support for the following Ruby MRI features in Parser would needlessly co
 
 Parser has been extensively tested; in particular, it parses almost entire [Rubygems][rg] corpus. For every issue, a breakdown of affected gems is offered.
 
- [rg]: http://rubygems.org
+ [rg]: https://rubygems.org
 
 ### Void value expressions
 
@@ -264,9 +263,9 @@ No known code is affected by this issue.
 ## Acknowledgements
 
 The lexer testsuite is derived from
-[ruby\_parser](http://github.com/seattlerb/ruby_parser).
+[ruby\_parser](https://github.com/seattlerb/ruby_parser).
 
-The Bison parser rules are derived from [Ruby MRI](http://github.com/ruby/ruby)
+The Bison parser rules are derived from [Ruby MRI](https://github.com/ruby/ruby)
 parse.y.
 
 ## Contributing

data/lib/parser/runner.rb

@@ -1,6 +1,6 @@
 require 'benchmark'
 require 'find'
-require 'slop'
+require 'optparse'
 
 require 'parser'
 
@@ -12,16 +12,16 @@ module Parser
     end
 
     def initialize
-      @slop         = Slop.new(:strict => true)
-      @parser_class = nil
-      @parser       = nil
-      @files        = []
-      @fragments    = []
+      @option_parser = OptionParser.new { |opts| setup_option_parsing(opts) }
+      @parser_class  = nil
+      @parser        = nil
+      @files         = []
+      @fragments     = []
+      @warnings      = false
+      @benchmark     = false
 
       @source_count = 0
       @source_size  = 0
-
-      setup_option_parsing
     end
 
     def execute(options)
@@ -37,11 +37,11 @@ module Parser
       raise NotImplementedError, "implement #{self.class}##{__callee__}"
     end
 
-    def setup_option_parsing
-      @slop.banner "Usage: #{runner_name} [options] FILE|DIRECTORY..."
+    def setup_option_parsing(opts)
+      opts.banner = "Usage: #{runner_name} [options] FILE|DIRECTORY..."
 
-      @slop.on 'h', 'help', 'Display this help message and exit', :tail => true do
-        puts @slop.help
+      opts.on_tail '-h', '--help', 'Display this help message and exit' do
+        puts opts.help
         puts <<-HELP
 
   If you specify a DIRECTORY, then all *.rb files are fetched
@@ -52,47 +52,51 @@ module Parser
         exit
       end
 
-      @slop.on 'V', 'version', 'Output version information and exit', :tail => true do
+      opts.on_tail '-V', '--version', 'Output version information and exit' do
         puts "#{runner_name} based on parser version #{Parser::VERSION}"
         exit
       end
 
-      @slop.on '18', 'Parse as Ruby 1.8.7 would' do
+      opts.on '--18', 'Parse as Ruby 1.8.7 would' do
         require 'parser/ruby18'
         @parser_class = Parser::Ruby18
       end
 
-      @slop.on '19', 'Parse as Ruby 1.9.3 would' do
+      opts.on '--19', 'Parse as Ruby 1.9.3 would' do
         require 'parser/ruby19'
         @parser_class = Parser::Ruby19
       end
 
-      @slop.on '20', 'Parse as Ruby 2.0 would' do
+      opts.on '--20', 'Parse as Ruby 2.0 would' do
         require 'parser/ruby20'
         @parser_class = Parser::Ruby20
       end
 
-      @slop.on '21', 'Parse as Ruby 2.1 would' do
+      opts.on '--21', 'Parse as Ruby 2.1 would' do
         require 'parser/ruby21'
         @parser_class = Parser::Ruby21
       end
 
-      @slop.on '22', 'Parse as Ruby 2.2 would' do
+      opts.on '--22', 'Parse as Ruby 2.2 would' do
         require 'parser/ruby22'
         @parser_class = Parser::Ruby22
       end
 
-      @slop.on 'w',  'warnings',  'Enable warnings'
+      opts.on '-w', '--warnings', 'Enable warnings' do |w|
+        @warnings = w
+      end
 
-      @slop.on 'B',  'benchmark', 'Benchmark the processor'
+      opts.on '-B',  '--benchmark', 'Benchmark the processor' do |b|
+        @benchmark = b
+      end
 
-      @slop.on 'e=', 'Process a fragment of Ruby code' do |fragment|
+      opts.on '-e fragment', 'Process a fragment of Ruby code' do |fragment|
         @fragments << fragment
       end
     end
 
     def parse_options(options)
-      @slop.parse!(options)
+      @option_parser.parse!(options)
 
       # Slop has just removed recognized options from `options`.
       options.each do |file_or_dir|
@@ -120,7 +124,7 @@ module Parser
       @parser = @parser_class.new
 
       @parser.diagnostics.all_errors_are_fatal = true
-      @parser.diagnostics.ignore_warnings      = !@slop.warnings?
+      @parser.diagnostics.ignore_warnings      = !@warnings
 
       @parser.diagnostics.consumer = lambda do |diagnostic|
         puts(diagnostic.render)
@@ -138,7 +142,7 @@ module Parser
           process_files
         end
 
-      if @slop.benchmark?
+      if @benchmark
         report_with_time(parsing_time)
       end
     end

data/lib/parser/runner/ruby_parse.rb

@@ -89,18 +89,26 @@ module Parser
       end
     end
 
+    def initialize
+      super
+
+      @locate = false
+    end
+
     private
 
     def runner_name
       'ruby-parse'
     end
 
-    def setup_option_parsing
-      super
+    def setup_option_parsing(opts)
+      super(opts)
 
-      @slop.on 'L', 'locate',  'Explain how source maps for AST nodes are laid out'
+      opts.on '-L', '--locate', 'Explain how source maps for AST nodes are laid out' do |v|
+        @locate = v
+      end
 
-      @slop.on 'E', 'explain', 'Explain how the source is tokenized' do
+      opts.on '-E', '--explain', 'Explain how the source is tokenized' do
         ENV['RACC_DEBUG'] = '1'
 
         Lexer.send :include, Lexer::Explanation
@@ -118,9 +126,9 @@ module Parser
     def process(buffer)
       ast = @parser.parse(buffer)
 
-      if @slop.locate?
+      if @locate
         LocationProcessor.new.process(ast)
-      elsif !@slop.benchmark?
+      elsif !@benchmark
         p ast
       end
     end

data/lib/parser/runner/ruby_rewrite.rb

@@ -17,14 +17,14 @@ module Parser
       'ruby-rewrite'
     end
 
-    def setup_option_parsing
-      super
+    def setup_option_parsing(opts)
+      super(opts)
 
-      @slop.on 'l=', 'load=', 'Load a rewriter' do |file|
+      opts.on '-l file', '--load', 'Load a rewriter' do |file|
         load_and_discover(file)
       end
 
-      @slop.on 'm', 'modify', 'Assume rewriters normally modify AST' do
+      opts.on '-m', '--modify', 'Assume rewriters normally modify AST' do
         @modify = true
       end
     end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.2.0.1'
+  VERSION = '2.2.0.2'
 end

data/parser.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['whitequark@whitequark.org']
   spec.description   = 'A Ruby parser written in pure Ruby.'
   spec.summary       = spec.description
-  spec.homepage      = 'http://github.com/whitequark/parser'
+  spec.homepage      = 'https://github.com/whitequark/parser'
   spec.license       = 'MIT'
   spec.has_rdoc      = 'yard'
 
@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency             'ast',       ['>= 1.1', '< 3.0']
-  spec.add_dependency             'slop',      ['~> 3.4', '>= 3.4.5']
 
   spec.add_development_dependency 'bundler',   '~> 1.2'
   spec.add_development_dependency 'rake',      '~> 10.0'

data/test/test_current.rb

@@ -14,8 +14,10 @@ class TestCurrent < Minitest::Test
       assert_equal Parser::Ruby21, Parser::CurrentRuby
     when /^2\.2\.\d+/
       assert_equal Parser::Ruby22, Parser::CurrentRuby
+    when /^2\.3\.\d+/
+      assert_equal Parser::Ruby22, Parser::CurrentRuby
     else
-      flunk "Update test_parser_current for #{RUBY_VERSION}"
+      flunk "Update test_current for #{RUBY_VERSION}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.2.0.1
+  version: 2.2.0.2
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2015-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -30,26 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: slop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.4.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -351,7 +331,7 @@ files:
 - test/test_source_rewriter.rb
 - test/test_source_rewriter_action.rb
 - test/test_static_environment.rb
-homepage: http://github.com/whitequark/parser
+homepage: https://github.com/whitequark/parser
 licenses:
 - MIT
 metadata: {}
@@ -371,7 +351,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.