parser 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
----
-SHA1:
-  metadata.gz: 3192a05f45765370bae5e845962967a28d64d6fe
-  data.tar.gz: 38543a4c5abe950bb1bf984702e0823efa164af5
-SHA512:
-  metadata.gz: f4da4fa68c1ed37af9eb16442c6816da2943c6914e04f80cdd16d76c3cc7360eaba18861c6dc39984a08720ea7befa84b3fa9c8b311c69ab61ca8f9c89cc2e0c
-  data.tar.gz: cbdd62c1a300719540385b0965d014da25c31853a7ddc73eef375568ee91fad4344de3465d30e631f41e92013ccf549d909eb31d2a8e40031ed90f81878fde32
+--- 
+SHA512: 
+  metadata.gz: 9770aa1a6462f5becb021dd1273bb992ce984aa07f4d2ab3184f909b4c9d5b7bf207c62e1c2d1f6684dfbde36c2e12cad77824d9b2343c86569b8d37d8b40259
+  data.tar.gz: c84a8295a37621c885de2618f8fc514469c239b564ca29ca75a576e0a1133f396707382aeccc1b4d73347671b081c0162b84bed32546796ea1fae02d66968aad
+SHA1: 
+  metadata.gz: 4a29479081e4085c756ccbfe0841c4b8244ce7ac
+  data.tar.gz: b2bdbd92ecf63102deafdfe71be38930d2c33930

data/.gitignore

@@ -20,3 +20,4 @@ lib/parser/lexer.rb
 lib/parser/ruby18.rb
 lib/parser/ruby19.rb
 lib/parser/ruby20.rb
+lib/parser/ruby21.rb

data/README.md

@@ -46,7 +46,7 @@ p parser.parse(buffer)
  * Precise source location reporting (WIP, no, not really yet).
  * [Documented](AST_FORMAT.md) AST format which is convenient to work with.
  * A simple interface and a powerful, tweakable one.
- * Parses 1.8, 1.9 and 2.0 syntax with backwards-compatible AST formats.
+ * Parses 1.8, 1.9, 2.0 and 2.1 (preliminary) syntax with backwards-compatible AST formats.
  * 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.

data/Rakefile

@@ -14,12 +14,22 @@ task :build => :generate_release
 GENERATED_FILES = %w(lib/parser/lexer.rb
                      lib/parser/ruby18.rb
                      lib/parser/ruby19.rb
-                     lib/parser/ruby20.rb)
+                     lib/parser/ruby20.rb
+                     lib/parser/ruby21.rb)
 
 CLEAN.include(GENERATED_FILES)
 
 desc 'Generate the Ragel lexer and Bison parser.'
-task :generate => GENERATED_FILES
+task :generate => GENERATED_FILES do
+  GENERATED_FILES.each do |filename|
+    content = File.read(filename)
+    content = "# -*- encoding:utf-8; warn-indent:false -*-\n" + content
+
+    File.open(filename, 'w') do |io|
+      io.write content
+    end
+  end
+end
 
 task :regenerate => [:clean, :generate]
 

data/bin/benchmark

@@ -15,7 +15,7 @@ def measure(what)
       what.each do |file, src|
         begin
           Ruby18Parser.new.parse(src)
-        rescue Exception => e
+        rescue => e
           puts file
           puts "RP: #{e.class}: #{e.message}"
           rp_failures += 1
@@ -26,10 +26,10 @@ def measure(what)
     x.report "parser" do
       what.each do |file, src|
         begin
-          Parser::Ruby18.parse(src, file)
+          Parser::Ruby20.parse(src, file)
         rescue Parser::SyntaxError
           p_failures += 1
-        rescue Exception => e
+        rescue => e
           puts file
           puts "P:  #{e.class}: #{e.message}"
           puts e.backtrace

data/lib/parser/builders/default.rb

@@ -288,7 +288,9 @@ module Parser
 
     def op_assign(lhs, operator_t, rhs)
       case lhs.type
-      when :gvasgn, :ivasgn, :lvasgn, :cvasgn, :cvdecl, :send
+      when :gvasgn, :ivasgn, :lvasgn, :cvasgn, :cvdecl,
+           :cdecl,
+           :send
         operator = value(operator_t)[0..-1].to_sym
 
         case operator
@@ -393,7 +395,7 @@ module Parser
     #
 
     def args(begin_t, args, end_t)
-      s(:args, *args)
+      s(:args, *check_duplicate_args(args))
     end
 
     def arg(name_t)
@@ -482,7 +484,7 @@ module Parser
     end
 
     def block(method_call, begin_t, args, body, end_t)
-      receiver, selector, *call_args = *method_call
+      _receiver, _selector, *call_args = *method_call
       last_arg = call_args.last
 
       if last_arg && last_arg.type == :block_pass
@@ -667,6 +669,47 @@ module Parser
       cond
     end
 
+    def check_duplicate_args(args, map={})
+      args.each do |this_arg|
+        case this_arg.type
+        when :arg, :optarg, :restarg, :blockarg,
+             :kwarg, :kwoptarg, :kwrestarg,
+             :shadowarg
+
+          this_name, = *this_arg
+
+          that_arg   = map[this_name]
+          that_name, = *that_arg
+
+          if that_arg.nil?
+            map[this_name] = this_arg
+          elsif arg_name_collides?(this_name, that_name)
+            # TODO reenable when source maps are done
+            diagnostic :error, ERRORS[:duplicate_argument],
+                       nil # this_arg.src.expression, [ that_arg.src.expression ]
+          end
+
+        when :mlhs
+          check_duplicate_args(this_arg.children, map)
+        end
+      end
+    end
+
+    def arg_name_collides?(this_name, that_name)
+      case @parser.version
+      when 18
+        this_name == that_name
+      when 19
+        # Ignore underscore.
+        this_name != :_ &&
+          this_name == that_name
+      else
+        # Ignore everything beginning with underscore.
+        this_name[0] != '_' &&
+          this_name == that_name
+      end
+    end
+
     def collapse_string_parts?(parts)
       parts.one? &&
           [:str, :dstr].include?(parts.first.type)

data/lib/parser/current.rb

@@ -0,0 +1,34 @@
+module Parser
+  class << self
+    def warn_syntax_deviation(feature, version)
+      warn "warning: parser/current is loading #{feature}, which recognizes"
+      warn "warning: #{version}-compliant syntax, but you are running #{RUBY_VERSION}."
+    end
+    private :warn_syntax_deviation
+  end
+
+  case RUBY_VERSION
+  when /^1\.8\./
+    if RUBY_VERSION != '1.8.7'
+      warn_syntax_deviation 'parser/ruby18', '1.8.7'
+    end
+
+    require 'parser/ruby18'
+    CurrentRuby = Ruby18
+
+  when /^1\.9\./
+    if RUBY_VERSION != '1.9.3'
+      warn_syntax_deviation 'parser/ruby19', '1.9.3'
+    end
+
+    require 'parser/ruby19'
+    CurrentRuby = Ruby19
+
+  when /^2\.0\./
+    require 'parser/ruby20'
+    CurrentRuby = Ruby20
+
+  else # :nocov:
+    raise NotImplementedError, "Parser does not support parsing Ruby #{RUBY_VERSION}"
+  end
+end