jievro-ast-visitor 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185db79d7f392d92c58b5feadd8ee70eaed31581
-  data.tar.gz: 20af7a5c3557d773211836a21141ef98807f9793
+  metadata.gz: 7330289c3f61493889fba1231b46b813e5805b2f
+  data.tar.gz: 896e73ab16d7508067b36f4ddeffe4b2d8f2e0cf
 SHA512:
-  metadata.gz: 9d142ef74ba14bc35a6a1878c46f56b7b10abeb249e3b548635b5bdede92a84923af0a1cc45f2ce211ed91ebf8c7a98c99f28bdef64435393c5bfdfded2485c7
-  data.tar.gz: 12391a5ef65b347e3c0c9e85ab24b4cc22eba62a036f8c701ddc1023c44bb115f03a5562e95974d2e1e989c32f0ab8679fe0b42edc2dce8acda84cb532e854fb
+  metadata.gz: 43cf4471919fc6542f26581237c1ae53730fa50b16fc74e515b740cf5d9e4180746133e629eb57411d1e8f5b60694b134e881e4622df918e396c1f7eb3b2fbfb
+  data.tar.gz: 1b16f29cca92c86f4aa456458b49869094e638615b9badcdf81fd3695bbdddc013074d3970b500c985b9700b72d58483a3c88ef0ac3669d6e7c4e56ee973ffda

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    jievro-ast-visitor (0.0.4)
+    jievro-ast-visitor (0.1.0)
+      jievro-ast (= 0.3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
+    jievro-ast (0.3.2)
     rake (10.4.2)
     rspec (3.2.0)
       rspec-core (~> 3.2.0)

data/jievro-ast-visitor.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.0'
 
+  spec.add_runtime_dependency 'jievro-ast', '0.3.2'
+
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.2'

data/lib/jievro/ast_visitor/ast_visitor.rb

@@ -1,32 +1,16 @@
 module Jievro
   module AstVisitor
     class Visitor
-      def visit(ast, preorder = nil, postorder = nil)
-        visit_node(ast, nil, nil, nil, preorder, postorder)
-      end
-
-      private
+      def visit(node, preorder = nil, postorder = nil)
+        preorder.call(node) unless preorder.nil?
 
-      def visit_node(node, parent, property, index, preorder, postorder)
-
-        unless preorder.nil?
-          preorder.call(node, parent, property, index)
-        end
-
-        node.keys.each { |p|
-          child = node[p]
-          if child.kind_of?(Array)
-            child.each_with_index { |e, i|
-              visit_node(e, node, p, i, preorder, postorder)
-            }
-          elsif child.kind_of?(Hash)
-            visit_node(child, node, p, nil, preorder, postorder)
+        unless node.type == Jievro::Ast::Node::TYPE_LITERAL
+          node.each do |n|
+            visit(n, preorder, postorder)
           end
-        }
-
-        unless postorder.nil?
-          postorder.call(node, parent, property, index)
         end
+
+        postorder.call(node) unless postorder.nil?
       end
     end
   end

data/lib/jievro/ast_visitor/version.rb

@@ -1,5 +1,5 @@
 module Jievro
   module AstVisitor
-    VERSION = '0.0.4'
+    VERSION = '0.1.0'
   end
 end

data/spec/ast_visitor_spec.rb

@@ -1,31 +1,38 @@
 require 'rspec'
 require 'jievro/ast_visitor/ast_visitor'
+require 'jievro/ast/node'
 
 describe 'AstVisitor' do
-
   before(:each) do
-
     @visitor = Jievro::AstVisitor::Visitor.new
 
-    @ast = {
+    hash = {
+      __type: 'type_root',
       k1: 'v1',
       k2: {
+        __type: 'type_k2',
         k3: 'v3',
         k4: {
+          __type: 'type_k4',
           # left empty
         },
         k5: {
+          __type: 'type_k5',
           k6: [
             {
+              __type: 'type_k6[0]',
               k7: 'v7',
               k8: 'v8'
             },
             {
-              k10: 'v10'
+              __type: 'type_k6[1]',
+              k9: 'v9'
             },
             {
-              k11: {
-                k12: 'v12'
+              __type: 'type_k6[2]',
+              k10: {
+                __type: 'type_k10',
+                k11: 'v11'
               }
             }
           ]
@@ -33,43 +40,58 @@ describe 'AstVisitor' do
       }
     }
 
+    @ast = Jievro::Ast::Node.new(hash)
+
     @hooked = []
-    @hook = lambda { |node, parent, property, index|
-      @hooked.push [node.keys, parent.nil? ? nil : parent.keys, property, index]
-    }
+
+    @hook = lambda do |node|
+      @hooked.push(node)
+    end
   end
 
   it 'should visit in preorder' do
-
     @visitor.visit(@ast, @hook)
 
     expected = [
-      [[:k1, :k2], nil, nil, nil],
-      [[:k3, :k4, :k5], [:k1, :k2], :k2, nil],
-      [[], [:k3, :k4, :k5], :k4, nil],
-      [[:k6], [:k3, :k4, :k5], :k5, nil],
-      [[:k7, :k8], [:k6], :k6, 0],
-      [[:k10], [:k6], :k6, 1],
-      [[:k11], [:k6], :k6, 2],
-      [[:k12], [:k11], :k11, nil]
+      @ast,
+      @ast[:k1],
+      @ast[:k2],
+      @ast[:k2][:k3],
+      @ast[:k2][:k4],
+      @ast[:k2][:k5],
+      @ast[:k2][:k5][:k6],
+      @ast[:k2][:k5][:k6][0],
+      @ast[:k2][:k5][:k6][0][:k7],
+      @ast[:k2][:k5][:k6][0][:k8],
+      @ast[:k2][:k5][:k6][1],
+      @ast[:k2][:k5][:k6][1][:k9],
+      @ast[:k2][:k5][:k6][2],
+      @ast[:k2][:k5][:k6][2][:k10],
+      @ast[:k2][:k5][:k6][2][:k10][:k11]
     ]
 
     expect(@hooked).to match(expected)
   end
 
   it 'should visit in postorder' do
-
     @visitor.visit(@ast, nil, @hook)
 
     expected = [
-      [[], [:k3, :k4, :k5], :k4, nil],
-      [[:k7, :k8], [:k6], :k6, 0],
-      [[:k10], [:k6], :k6, 1],
-      [[:k12], [:k11], :k11, nil],
-      [[:k11], [:k6], :k6, 2],
-      [[:k6], [:k3, :k4, :k5], :k5, nil],
-      [[:k3, :k4, :k5], [:k1, :k2], :k2, nil],
-      [[:k1, :k2], nil, nil, nil]
+      @ast[:k1],
+      @ast[:k2][:k3],
+      @ast[:k2][:k4],
+      @ast[:k2][:k5][:k6][0][:k7],
+      @ast[:k2][:k5][:k6][0][:k8],
+      @ast[:k2][:k5][:k6][0],
+      @ast[:k2][:k5][:k6][1][:k9],
+      @ast[:k2][:k5][:k6][1],
+      @ast[:k2][:k5][:k6][2][:k10][:k11],
+      @ast[:k2][:k5][:k6][2][:k10],
+      @ast[:k2][:k5][:k6][2],
+      @ast[:k2][:k5][:k6],
+      @ast[:k2][:k5],
+      @ast[:k2],
+      @ast
     ]
 
     expect(@hooked).to match(expected)

metadata

@@ -1,55 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: jievro-ast-visitor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Stefano Azzalini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: jievro-ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
 description: 
@@ -58,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -80,17 +94,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ~>
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: jievro AST visitor