iro 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 686a0dda0a6894ecb60779c7edd25ca607420d5dae8926b10c62f3f154e12800
-  data.tar.gz: ffa3d305e3fda921d93dcd54d176c20d7067c6758015c6a7188dc5fe19774836
+  metadata.gz: 52a338f817e801fbc24f5b19f6ac5568407f3d7bf61784279870a1b64dce5d76
+  data.tar.gz: c737d5ba10ccaaf542c40418126d9297895d14183767632b39c6114339f54848
 SHA512:
-  metadata.gz: 25e868cf787492742908ee15cf7eee5a142c64a8f28cd8e367b5b77083bb0c04480beab5e9aef4ae70c92ede00b63977d997368f49fc427f9e7d9037474560b0
-  data.tar.gz: '049870b8a281cc7df26bc623cea6787e724db5d70e416450fc9171e690a2dd8926411e77ef4812f238462353fe80f6bce636d1508b3ca0a55250458406f56033'
+  metadata.gz: 8bb961b4fec7adc8c85f4a6db274736f2e6839140430f304895dac256ff5a85ae70b61cf9acda9c06603f72cd1d9ec84785c6ca2ef2c7f8dfafbe3944a11602e
+  data.tar.gz: 27810a642f837ca6fb88ba0268fd02c7d810c2f2269958bb680a43e14b171009634abcdf1f52b51e95a36bcd3e6618cb5775709c5ddff1429fef2050943c10ca

data/lib/iro/ruby/parser.rb

@@ -1,6 +1,16 @@
 module Iro
   module Ruby
-    class Parser < Ripper::SexpBuilderPP
+    class Base < Ripper
+      Ripper::SCANNER_EVENTS.each do |event|
+        module_eval(<<-End, __FILE__, __LINE__ + 1)
+          def on_#{event}(tok)
+            [:@#{event}, tok, [lineno(), column()]]
+          end
+        End
+      end
+    end
+
+    class Parser < Base
       using RipperWrapper
 
       EVENT_NAME_TO_HIGHLIGT_NAME = {
@@ -96,70 +106,52 @@ module Iro
       end
 
       def on_def(name, params, body)
-        super.tap do
-          register_scanner_event 'rubyFunction', name
-        end
+        unhighlight! name if name.kw_type?
+        register_scanner_event 'rubyFunction', name
+        nil
       end
 
       def on_defs(recv, period, name, params, body)
-        super.tap do
-          register_scanner_event 'rubyFunction', name
-        end
+        unhighlight! name if name.kw_type?
+        register_scanner_event 'rubyFunction', name
+        nil
       end
 
       def on_symbol(node)
-        super.tap do
-          unhighlight! node if node.gvar_type? || node.ivar_type? || node.cvar_type?
-          register_scanner_event 'rubySymbol', node
-        end
+        unhighlight! node if node.gvar_type? || node.ivar_type? || node.cvar_type? || node.kw_type?
+        register_scanner_event 'rubySymbol', node
+        nil
       end
 
       def on_var_ref(name)
-        super.tap do
-          case name.type
-          when :@ident
-            register_scanner_event 'rubyLocalVariable', name
-          when :@const
-            register_scanner_event 'Type', name
-          end
+        case name.type
+        when :@ident
+          register_scanner_event 'rubyLocalVariable', name
+        when :@const
+          register_scanner_event 'Type', name
         end
+        nil
       end
 
       def on_var_field(name)
-        super.tap do
-          register_scanner_event 'Type', name if name.const_type?
-        end
+        register_scanner_event 'Type', name if name.const_type?
+        nil
       end
 
       def on_top_const_ref(name)
-        super.tap do
-          register_scanner_event 'Type', name
-        end
+        register_scanner_event 'Type', name
+        nil
       end
       alias on_const_ref on_top_const_ref
 
       def on_const_path_ref(_base, name)
-        super.tap do
-          register_scanner_event 'Type', name
-        end
-      end
-
-      def traverse(node)
-        if node.kw_type?
-          unhighlight!(node)
-        end
-
-        return if node.scanner_event?
-
-        node.children.each do |child|
-          traverse(child) if child.is_a?(Array)
-        end
+        register_scanner_event 'Type', name
+        nil
       end
 
       def self.tokens(source)
         parser = self.new(source)
-        sexp = parser.parse
-        parser.traverse(sexp) unless parser.error?
+        parser.parse
         parser.tokens
       end
     end

data/lib/iro/version.rb

@@ -1,3 +1,3 @@
 module Iro
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iro
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Masataka Pocke Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-08 00:00:00.000000000 Z
+date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler