parser 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 126ed67c12d5d057262636b6c422560a131e5163
-  data.tar.gz: b1e624ccb5d937b3655ac97cd281a75dd3d94bc1
+  metadata.gz: f90753aea951ab24c817278f94b4e1844151e496
+  data.tar.gz: 49a0cd6eb5dbf0fec9900f1d927ac20bdd8b90fd
 SHA512:
-  metadata.gz: c2b4262dbce1ca86cbce53800a164ec23c71c976191421978500c6b58151e026716b7975916ac1b7b5fac5b72061f7ea3872e02cc4ed3adc39cd91f2df769e64
-  data.tar.gz: 730b931cdb766441f165778ce4bf2def697298ebdda55e7d3d1d96c5f26d0a703f6345c4ee26cdaf22acd1bf41d2b059162fb91dd350714693866d724e9524b9
+  metadata.gz: 01192b4d7d2b63f8348b2af97b567796f5aedfbb6562843dfce4590f1b15479997693e2b3d688ad3969d542ead2e4ab69389e6b5060da9f0b332ac165ee73c40
+  data.tar.gz: fdcbb3072c1c66d2d1ab3f54eb05f595eeab30860f9b59b5d1e472dc3ae681fdf3cb9376b2fd0945ef97cbabfb10a4f1959b4231ba9e0b8c9ee426625b5a14b5

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 lib/parser/lexer.rb
 lib/parser/ruby18.rb
 lib/parser/ruby19.rb
+lib/parser/ruby20.rb

data/Rakefile

@@ -13,7 +13,8 @@ task :build => :generate_release
 
 GENERATED_FILES = %w(lib/parser/lexer.rb
                      lib/parser/ruby18.rb
-                     lib/parser/ruby19.rb)
+                     lib/parser/ruby19.rb
+                     lib/parser/ruby20.rb)
 
 CLEAN.include(GENERATED_FILES)
 

data/TODO.md

@@ -0,0 +1,20 @@
+# 2.0
+
+1. test for "** interpreted as argument prefix" diagnostic
+6. https://github.com/ruby/ruby/commit/c46bda
+7. https://github.com/ruby/ruby/commit/1ab3974b0efea5155da005ec08a1feee90023d98
+9. https://github.com/ruby/ruby/commit/d6a977f667f9d824cfe95976f3afc31e55580edb
+10. https://github.com/ruby/ruby/commit/8fe3fb4c0f69535b302e124f3afc58dce4be5dbb
+11. https://github.com/ruby/ruby/commit/3380974143d3fdf1721d9e28d6b2d42036f03bd2
+
+# 2.1
+
+1. https://github.com/ruby/ruby/commit/7ea675732ac1dac72f07756498706678d8725719
+2. https://github.com/ruby/ruby/commit/38da1a5398f146a36910fde34b72dc9b3aa7918f
+3. https://github.com/ruby/ruby/commit/e489dc1ff42ad3027319d7d01f4885164fdb410a
+4. https://github.com/ruby/ruby/commit/c07d78eb0e8e9d3a8f9e8c860b362964157ff43a
+5. https://github.com/ruby/ruby/commit/34a95669dad8843e3e9a4af683682ab2f50856dd
+
+# All versions
+
+1. https://github.com/ruby/ruby/commit/9150340b9bcbe305c2647a8d6f6f8e754769f3e7

data/bin/explain-parse

@@ -11,4 +11,4 @@ class Parser::Base
   end
 end
 
-Parser::Ruby18.parse(ARGF.read)
+p Parser::Ruby20.parse(ARGF.read)

data/lib/parser/all.rb

@@ -1,2 +1,3 @@
 require 'parser/ruby18'
 require 'parser/ruby19'
+require 'parser/ruby20'

data/lib/parser/builders/default.rb

@@ -91,10 +91,34 @@ module Parser
       end
     end
 
+    def word(parts)
+      if parts.one?
+        parts.first
+      else
+        s(:dstr, *parts)
+      end
+    end
+
     def words_compose(begin_t, parts, end_t)
       s(:array, *parts)
     end
 
+    def symbols_compose(begin_t, parts, end_t)
+      parts = parts.map do |part|
+        case part.type
+        when :str
+          value, = *part
+          part.updated(:sym, [ value.to_sym ])
+        when :dstr
+          part.updated(:dsym)
+        else
+          part
+        end
+      end
+
+      s(:array, *parts)
+    end
+
     # Hashes
 
     def pair(key, assoc_t, value)
@@ -133,7 +157,11 @@ module Parser
     #
 
     def parenthesize(begin_t, expr, end_t)
-      expr
+      if expr.nil?
+        s(:nil)
+      else
+        expr
+      end
     end
 
     #
@@ -511,7 +539,7 @@ module Parser
     # Logical operations: and, or
 
     def logical_op(type, lhs, token, rhs)
-      s(type, lhs, rhs)
+      s(type, check_condition(lhs), check_condition(rhs))
     end
 
     # Conditionals

data/lib/parser/lexer/literal.rb

@@ -5,25 +5,28 @@ module Parser
     MONOLITHIC = { :tSTRING_BEG => :tSTRING, :tSYMBEG => :tSYMBOL }
 
     TYPES = {
-    # type      start token    interpolate?
-      "'"  => [ :tSTRING_BEG,  false ],
-      '%q' => [ :tSTRING_BEG,  false ],
-      '"'  => [ :tSTRING_BEG,  true  ],
-      '%'  => [ :tSTRING_BEG,  true  ],
-      '%Q' => [ :tSTRING_BEG,  true  ],
+    # type      start token     interpolate?
+      "'"  => [ :tSTRING_BEG,   false ],
+      '%q' => [ :tSTRING_BEG,   false ],
+      '"'  => [ :tSTRING_BEG,   true  ],
+      '%'  => [ :tSTRING_BEG,   true  ],
+      '%Q' => [ :tSTRING_BEG,   true  ],
 
-      '%w' => [ :tQWORDS_BEG,  false ],
-      '%W' => [ :tWORDS_BEG,   true  ],
+      '%w' => [ :tQWORDS_BEG,   false ],
+      '%W' => [ :tWORDS_BEG,    true  ],
 
-      ":'" => [ :tSYMBEG,      false ],
-      '%s' => [ :tSYMBEG,      false ],
-      ':"' => [ :tSYMBEG,      true  ],
+      '%i' => [ :tQSYMBOLS_BEG, false ],
+      '%I' => [ :tSYMBOLS_BEG,  true  ],
 
-      '/'  => [ :tREGEXP_BEG,  true  ],
-      '%r' => [ :tREGEXP_BEG,  true  ],
+      ":'" => [ :tSYMBEG,       false ],
+      '%s' => [ :tSYMBEG,       false ],
+      ':"' => [ :tSYMBEG,       true  ],
 
-      '%x' => [ :tXSTRING_BEG, true  ],
-      '`'  => [ :tXSTRING_BEG, true  ],
+      '/'  => [ :tREGEXP_BEG,   true  ],
+      '%r' => [ :tREGEXP_BEG,   true  ],
+
+      '%x' => [ :tXSTRING_BEG,  true  ],
+      '`'  => [ :tXSTRING_BEG,  true  ],
     }
 
     attr_reader   :heredoc_e, :str_s
@@ -57,6 +60,8 @@ module Parser
 
       @interp_braces = 0
 
+      @space_emitted = true
+
       # Monolithic strings are glued into a single token, e.g.
       # tSTRING_BEG tSTRING_CONTENT tSTRING_END -> tSTRING.
       @monolithic  = (
@@ -77,7 +82,8 @@ module Parser
     end
 
     def words?
-      type == :tWORDS_BEG || type == :tQWORDS_BEG
+      type == :tWORDS_BEG || type == :tQWORDS_BEG ||
+        type == :tSYMBOLS_BEG || type == :tQSYMBOLS_BEG
     end
 
     def regexp?
@@ -117,6 +123,10 @@ module Parser
 
       # Finalize if last matching delimiter is closed.
       if @nesting == 0
+        if words?
+          extend_space(ts, ts)
+        end
+
         # Emit the string as a single token if it's applicable.
         if @monolithic
           emit(MONOLITHIC[@start_tok], @buffer, @str_s, te)
@@ -160,13 +170,24 @@ module Parser
       unless @buffer.empty?
         emit(:tSTRING_CONTENT, @buffer, @buffer_s, @buffer_e)
 
-        if words?
-          emit(:tSPACE, nil, @buffer_e, @buffer_e + 1)
-        end
-
         @buffer   = ''
         @buffer_s = nil
         @buffer_e = nil
+        extend_content
+      end
+    end
+
+    def extend_content
+      @space_emitted = false
+    end
+
+    def extend_space(ts, te)
+      flush_string
+
+      unless @space_emitted
+        emit(:tSPACE, nil, ts, te)
+
+        @space_emitted = true
       end
     end
 

data/lib/parser/lexer/stack_state.rb

@@ -3,6 +3,10 @@ module Parser
   class Lexer::StackState
     def initialize(name)
       @name  = name.freeze
+      clear
+    end
+
+    def clear
       @stack = 0
     end