ruby_parser 2.0.4 → 2.0.5

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.0.5 / 2010-09-01
+
+* 1 minor enhancement:
+
+  * Started merging like lexical cases to try to squeeze some optimization out
+
 === 2.0.4 / 2009-08-18
 
 * 1 minor enhancement:

data/lib/ruby_lexer.rb

@@ -46,6 +46,20 @@ class RubyLexer
   STR_SSYM   = STR_FUNC_SYMBOL
   STR_DSYM   = STR_FUNC_SYMBOL | STR_FUNC_EXPAND
 
+  TOKENS = {
+    "!"   => :tBANG,
+    "!="  => :tNEQ,
+    "!~"  => :tNMATCH,
+    ","   => :tCOMMA,
+    ".."  => :tDOT2,
+    "..." => :tDOT3,
+    "="   => :tEQL,
+    "=="  => :tEQ,
+    "===" => :tEQQ,
+    "=>"  => :tASSOC,
+    "=~"  => :tMATCH,
+  }
+
   # How the parser advances to the next token.
   #
   # @return true if not at end of file (EOF).
@@ -633,7 +647,7 @@ class RubyLexer
     last_state = lex_state
 
     loop do # START OF CASE
-      if src.scan(/\ |\t|\r|\f|\13/) then # white spaces, 13 = '\v
+      if src.scan(/[\ \t\r\f\v]/) then # \s - \n + \v
         space_seen = true
         next
       elsif src.check(/[^a-zA-Z]/) then
@@ -674,29 +688,22 @@ class RubyLexer
             "}" => :tRCURLY
           }[src.matched]
           return result
+        elsif src.scan(/\.\.\.?|,|![=~]?/) then
+          self.lex_state = :expr_beg
+          tok = self.yacc_value = src.matched
+          return TOKENS[tok]
         elsif src.check(/\./) then
-          if src.scan(/\.\.\./) then
-            self.lex_state = :expr_beg
-            self.yacc_value = "..."
-            return :tDOT3
-          elsif src.scan(/\.\./) then
-            self.lex_state = :expr_beg
-            self.yacc_value = ".."
-            return :tDOT2
-          elsif src.scan(/\.\d/) then
+          if src.scan(/\.\d/) then
             rb_compile_error "no .<digit> floating literal anymore put 0 before dot"
           elsif src.scan(/\./) then
             self.lex_state = :expr_dot
             self.yacc_value = "."
             return :tDOT
           end
-        elsif src.scan(/\,/) then
-          self.lex_state = :expr_beg
-          self.yacc_value = ","
-          return :tCOMMA
         elsif src.scan(/\(/) then
           result = :tLPAREN2
           self.command_start = true
+
           if lex_state == :expr_beg || lex_state == :expr_mid then
             result = :tLPAREN
           elsif space_seen then
@@ -712,39 +719,24 @@ class RubyLexer
 
           return result
         elsif src.check(/\=/) then
-          if src.scan(/\=\=\=/) then
-            self.fix_arg_lex_state
-            self.yacc_value = "==="
-            return :tEQQ
-          elsif src.scan(/\=\=/) then
-            self.fix_arg_lex_state
-            self.yacc_value = "=="
-            return :tEQ
-          elsif src.scan(/\=~/) then
-            self.fix_arg_lex_state
-            self.yacc_value = "=~"
-            return :tMATCH
-          elsif src.scan(/\=>/) then
+          if src.scan(/\=\=\=|\=\=|\=~|\=>|\=(?!begin\b)/) then
             self.fix_arg_lex_state
-            self.yacc_value = "=>"
-            return :tASSOC
-          elsif src.scan(/\=/) then
-            if src.was_begin_of_line and src.scan(/begin(?=\s)/) then
-              @comments << '=' << src.matched
-
-              unless src.scan(/.*?\n=end\s*(\n|\z)/m) then
-                @comments.clear
-                rb_compile_error("embedded document meets end of file")
-              end
+            tok = self.yacc_value = src.matched
+            return TOKENS[tok]
+          elsif src.was_begin_of_line and src.scan(/\=begin(?=\s)/) then
+            # @comments << '=' << src.matched
+            @comments << src.matched
+
+            unless src.scan(/.*?\n=end\s*(\n|\z)/m) then
+              @comments.clear
+              rb_compile_error("embedded document meets end of file")
+            end
 
-              @comments << src.matched
+            @comments << src.matched
 
-              next
-            else
-              self.fix_arg_lex_state
-              self.yacc_value = '='
-              return :tEQL
-            end
+            next
+          else
+            raise "you shouldn't be able to get here"
           end
         elsif src.scan(/\"(#{ESC_RE}|#(#{ESC_RE}|[^\{\#\@\$\"\\])|[^\"\\\#])*\"/o) then
           self.yacc_value = src.matched[1..-2].gsub(ESC_RE) { unescape $1 }
@@ -932,20 +924,6 @@ class RubyLexer
 
             return result
           end
-        elsif src.check(/\!/) then
-          if src.scan(/\!\=/) then
-            self.lex_state = :expr_beg
-            self.yacc_value = "!="
-            return :tNEQ
-          elsif src.scan(/\!~/) then
-            self.lex_state = :expr_beg
-            self.yacc_value = "!~"
-            return :tNMATCH
-          elsif src.scan(/\!/) then
-            self.lex_state = :expr_beg
-            self.yacc_value = "!"
-            return :tBANG
-          end
         elsif src.check(/\</) then
           if src.scan(/\<\=\>/) then
             self.fix_arg_lex_state

data/lib/ruby_parser_extras.rb

@@ -115,7 +115,7 @@ class RPStringScanner < StringScanner
 end
 
 class RubyParser < Racc::Parser
-  VERSION = '2.0.4' unless constants.include? "VERSION" # SIGH
+  VERSION = '2.0.5' unless constants.include? "VERSION" # SIGH
 
   attr_accessor :lexer, :in_def, :in_single, :file
   attr_reader :env, :comments

data.tar.gz.sig

@@ -0,0 +1,2 @@
+�e�z+��Ln@^�e����A��%5A�sUm0�w��aT��me��.?������u��[y��^��p�R���3%Ux�����C�*�gEj�fzM�U�gy�5��Vt1�T��T�	m�����
+<�ɘJ��*� �7���]S�r�p�wl����1�,r�<�Ia

metadata

@@ -1,47 +1,122 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_parser
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  hash: 5
+  prerelease: false
+  segments: 
+  - 2
+  - 0
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Ryan Davis
 autorequire: 
 bindir: bin
-cert_chain: []
+cert_chain: 
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDPjCCAiagAwIBAgIBADANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
+  GRYDY29tMB4XDTA5MDMwNjE4NTMxNVoXDTEwMDMwNjE4NTMxNVowRTETMBEGA1UE
+  AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
+  JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
+  b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
+  taCPaLmfYIaFcHHCSY4hYDJijRQkLxPeB3xbOfzfLoBDbjvx5JxgJxUjmGa7xhcT
+  oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
+  GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
+  qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
+  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
+  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
+  AQAY59gYvDxqSqgC92nAP9P8dnGgfZgLxP237xS6XxFGJSghdz/nI6pusfCWKM8m
+  vzjjH2wUMSSf3tNudQ3rCGLf2epkcU13/rguI88wO6MrE0wi4ZqLQX+eZQFskJb/
+  w6x9W1ur8eR01s397LSMexySDBrJOh34cm2AlfKr/jokKCTwcM0OvVZnAutaovC0
+  l1SVZ0ecg88bsWHA0Yhh7NFxK1utWoIhtB6AFC/+trM0FQEB/jZkIS8SaNzn96Rl
+  n0sZEf77FLf5peR8TP/PtmIg7Cyqz23sLM4mCOoTGIy5OcZ8TdyiyINUHtb5ej/T
+  FBHgymkyj/AOSqKRIpXPhjC6
+  -----END CERTIFICATE-----
 
-date: 2009-08-18 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ParseTree
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 7
+        - 1
+        version: 1.7.1
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
-    version: 
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
+        version: 2.6.2
+  type: :development
+  version_requirements: *id005
 description: |-
   ruby_parser (RP) is a ruby parser written in pure ruby (utilizing
   racc--which does by default use a C extension). RP's output is
@@ -104,21 +179,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: parsetree
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ruby_parser (RP) is a ruby parser written in pure ruby (utilizing racc--which does by default use a C extension)

metadata.gz.sig

@@ -0,0 +1 @@
+���Vcc?��"
��Is�D).W����)�P��bu<�E��U���EP�R0����?����+V.o��cw$IUE��g�%�6Q)�tŧ��iU�T������9���A�uX�4���#  p�e>�����L�`|er�e��'ЪA