parser 2.0.0.beta9 → 2.0.0.beta10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db31925f63c3bfa1d7dcd31e2da5a4d9093956cb
-  data.tar.gz: c320c20f73ae66ecd8264b69fbdbebe200e203ef
+  metadata.gz: a47e42f33d72ab96207e35566f56ad67703e7f5c
+  data.tar.gz: cb0f192cdb11da805eadfdead96876f391b8a061
 SHA512:
-  metadata.gz: b76ad89767945e8f83931e9968ff2a7f980498e29d0aba637ca6d1c6abf186deb2d75d50525ffba120c2fbd252a9b8fec3f988c17575414430d46f901bf1c515
-  data.tar.gz: 21b368d7bb373c2ee197b711ed80d659041a7220b79586d6a295889761604f2d50bc2558aba57325bd24e39fe37e2f8ea3df31a2c83e261f6eaf9f5fbfba34ee
+  metadata.gz: 7a4b9b8609df7899d0925461a44340b661ba412dd0c3faab434f3c2d46b79270cbd6daef4c564b5bbec613ff9fdbb9349390b8f9e5fd350f647a3190b34156a5
+  data.tar.gz: 655fbaa7bfa55cc55675f8be762bd4f1d4923265fbfe7a4fe0fcd9c1b844455646e635babc0713914c486f9e0c23dd0219c07c663a357b2ca7fcddf95f030ae5

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 Changelog
 =========
 
+v2.0.0.beta10 (2013-07-02)
+--------------------------
+
+Bugs fixed:
+ * ruby-parse, ruby-rewrite: fix require of removed compatibility shim. (Peter Zotov)
+ * lexer.rl: "def !@; end" unary bang. (Peter Zotov)
+
 v2.0.0.beta9 (2013-06-28)
 -------------------------
 

data/README.md

@@ -9,6 +9,8 @@ _Parser_ is a production-ready Ruby parser written in pure Ruby. It
 performs on par or better than Ripper, Melbourne, JRubyParser or
 ruby_parser.
 
+You can also use [unparser](https://github.com/mbj/unparser) to produce equivalent source code from Parser's ASTs.
+
 ## Installation
 
 Most recent version of Parser is 2.0; however, per [release schedule](https://github.com/whitequark/parser/issues/51), it stays in the beta status for a while. However, it handles much more input than stable 1.x branch, and for new work it is advisable to use the beta versions.

data/lib/parser/base.rb

@@ -1,6 +1,24 @@
 module Parser
 
+  ##
+  # @!attribute [r] diagnostics
+  #  @return [Parser::Diagnostic::Engine]
+  #
+  # @!attribute [r] static_env
+  #  @return [Parser::StaticEnvironment]
+  #
   class Base < Racc::Parser
+    ##
+    # Parses a string of Ruby code and returns the AST.
+    #
+    # @example
+    #  Parser::Base.parse('puts "hello"')
+    #
+    # @param [String] string The block of code to parse.
+    # @param [String] file The name of the file the code originated from.
+    # @param [Numeric] line The initial line number.
+    # @return [Parser::AST::Node]
+    #
     def self.parse(string, file='(string)', line=1)
       parser = new
 
@@ -20,6 +38,12 @@ module Parser
       parser.parse(source_buffer)
     end
 
+    ##
+    # Parses Ruby source code by reading it from a file.
+    #
+    # @param [String] filename Path to the file to parse.
+    # @see #parse
+    #
     def self.parse_file(filename)
       parse(File.read(filename), filename)
     end
@@ -30,6 +54,9 @@ module Parser
     # The source file currently being parsed.
     attr_reader :source_buffer
 
+    ##
+    # @param [Parser::Builders::Default] builder The AST builder to use.
+    #
     def initialize(builder=Parser::Builders::Default.new)
       @diagnostics = Diagnostic::Engine.new
 
@@ -49,6 +76,9 @@ module Parser
       reset
     end
 
+    ##
+    # Resets the state of the parser.
+    #
     def reset
       @source_buffer = nil
       @def_level     = 0 # count of nested def's.
@@ -59,6 +89,12 @@ module Parser
       self
     end
 
+    ##
+    # Parses a source buffer and returns the AST.
+    #
+    # @param [Parser::Source::Buffer] source_buffer The source buffer to parse.
+    # @return [Parser::AST::Node]
+    #
     def parse(source_buffer)
       @lexer.source_buffer = source_buffer
       @source_buffer       = source_buffer
@@ -70,6 +106,13 @@ module Parser
       @lexer.source_buffer = nil
     end
 
+    ##
+    # Parses a source buffer and returns the AST along with the comments of the
+    # Ruby source code.
+    #
+    # @see #parse
+    # @return [Array]
+    #
     def parse_with_comments(source_buffer)
       @lexer.comments = []
 
@@ -78,7 +121,8 @@ module Parser
       @lexer.comments = nil
     end
 
-    # Currently, token stream format returned by #lex is not documented,
+    ##
+    # Currently, token stream format returned by #tokenize is not documented,
     # but is considered part of a public API and only changed according
     # to Semantic Versioning.
     #
@@ -87,6 +131,9 @@ module Parser
     # by `:tSTRING_BEG " :tSTRING_CONTENT foo :tSTRING_END "` and
     # `:tSTRING "foo"`; such details must not be relied upon.
     #
+    # @param [Parser::Source::Buffer] source_buffer
+    # @return [Array]
+    #
     def tokenize(source_buffer)
       @lexer.tokens = []
 
@@ -97,7 +144,10 @@ module Parser
       @lexer.tokens = nil
     end
 
+    ##
     # @api internal
+    # @return [TrueClass|FalseClass]
+    #
     def in_def?
       @def_level > 0
     end

data/lib/parser/diagnostic.rb

@@ -1,11 +1,35 @@
 module Parser
 
+  ##
+  # @!attribute [r] level
+  #  @return [Symbol]
+  #
+  # @!attribute [r] message
+  #  @return [String]
+  #
+  # @!attribute [r] location
+  #  @return [Parser::Source::Map]
+  #
+  # @!attribute [r] highlights
+  #  @return [Array]
+  #
   class Diagnostic
+    ##
+    # Collection of the available diagnostic levels.
+    #
+    # @return [Array]
+    #
     LEVELS = [:note, :warning, :error, :fatal].freeze
 
     attr_reader :level, :message
     attr_reader :location, :highlights
 
+    ##
+    # @param [Symbol] level
+    # @param [String] message
+    # @param [Parser::Source::Range] location
+    # @param [Array<Parser::Source::Range>] highlights
+    #
     def initialize(level, message, location, highlights=[])
       unless LEVELS.include?(level)
         raise ArgumentError,
@@ -21,6 +45,11 @@ module Parser
       freeze
     end
 
+    ##
+    # Renders the diagnostic message as an array of three lines.
+    #
+    # @return [Array<String>]
+    #
     def render
       source_line    = @location.source_line
       highlight_line = ' ' * source_line.length

data/lib/parser/lexer.rl

@@ -329,6 +329,7 @@ class Parser::Lexer
     '=>'  => :tASSOC,   '::'  => :tCOLON2,  '===' => :tEQQ,
     '<=>' => :tCMP,     '[]'  => :tAREF,    '[]=' => :tASET,
     '{'   => :tLCURLY,  '}'   => :tRCURLY,  '`'   => :tBACK_REF2,
+    '!@'  => :tBANG,
   }
 
   PUNCTUATION_BEGIN = {
@@ -413,7 +414,7 @@ class Parser::Lexer
 
   # A list of operators which are valid in the function name context, but
   # have different semantics in others.
-  operator_fname      = '[]' | '[]=' | '`'  | '-@' | '+@' | '~@' ;
+  operator_fname      = '[]' | '[]=' | '`'  | '-@' | '+@' | '~@'  | '!@' ;
 
   # A list of operators which can occur within an assignment shortcut (+ → +=).
   operator_arithmetic = '&'  | '|'   | '&&' | '||' | '^'  | '+'   | '-'  |

data/lib/parser/runner.rb

@@ -3,7 +3,6 @@ require 'find'
 require 'slop'
 
 require 'parser'
-require 'parser/compatibility/slop'
 
 module Parser
 

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.0.0.beta9'
+  VERSION = '2.0.0.beta10'
 end

data/test/test_lexer.rb

@@ -346,6 +346,13 @@ class TestLexer < Minitest::Test
     util_lex_token "!~", :tNMATCH, "!~"
   end
 
+  def test_def_ubang
+    setup_lexer(20)
+
+    @lex.state = :expr_fname
+    util_lex_token '!@', :tBANG, '!@'
+  end
+
   def test_carat
     util_lex_token "^", :tCARET, "^"
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta9
+  version: 2.0.0.beta10
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast