jievro-ast-visitor 0.1.1 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417ba2423590d8422e67cec2e3a51dba8516cc68
-  data.tar.gz: 7e676a51505dd9777067c724025a83b08a09aacb
+  metadata.gz: 073fda3c6d00da4b30b19ddbabb283704db398ef
+  data.tar.gz: 8afd13c7c44ff3b4d47f7a6bba60a3e46c60b53f
 SHA512:
-  metadata.gz: 6195727fa0ed101ea0d8f23ffa42dc386c44cb21ca5bc1ba2951f802e0d7515cf8c7fe018084ada224c15f6780031a16d2a77f38717dc96ffa2150bf2c0d18c6
-  data.tar.gz: aaa815e585a4aa74285677e0dfd5fa09f6d007453c19487267e27cf25c76b6fd1918a06353a4747d2d07da86560d4ec321f09c03bef151a35c118da380cda5eb
+  metadata.gz: 2a988e4e31065dd0e79037aeabdca76bd5ef785d40a4f2cd08bcddba8265c937590f6510715534e6dcfe6ac5670f9ce25ed8dbf7edd268df61b1b5009623e828
+  data.tar.gz: e98406d645f4b62ee89c5093c91982da77f708f34881281220916b71f16084f7dcd2773135a73d4498cd2794b3db0ee66b718fc73748fcc5ca915c144caa3ee5

data/Gemfile.lock

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

data/jievro-ast-visitor.gemspec

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

data/lib/jievro/ast_visitor/ast_visitor.rb

@@ -4,14 +4,24 @@ module Jievro
       def visit(node, preorder = nil, postorder = nil)
         preorder.call(node) unless preorder.nil?
 
-        unless node.type == Jievro::Ast::Node::TYPE_LITERAL
-          node.each do |n|
-            visit(n, preorder, postorder)
+        node.each do |n|
+          if n.is_a?(Array)
+            n.each do |m|
+              visit(m, preorder, postorder) if to_be_visited?(m)
+            end
+          else
+            visit(n, preorder, postorder) if to_be_visited?(n)
           end
         end
 
         postorder.call(node) unless postorder.nil?
       end
+
+      private
+
+      def to_be_visited?(node)
+        node.is_a?(Jievro::Ast::Node)
+      end
     end
   end
 end

data/lib/jievro/ast_visitor/version.rb

@@ -1,5 +1,5 @@
 module Jievro
   module AstVisitor
-    VERSION = '0.1.1'
+    VERSION = '0.1.4'
   end
 end

data/spec/ast_visitor_spec.rb

@@ -7,40 +7,31 @@ describe Jievro::AstVisitor::Visitor do
     @visitor = described_class.new
 
     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'
-            },
-            {
-              __type: 'type_k6[1]',
-              k9: 'v9'
-            },
-            {
-              __type: 'type_k6[2]',
-              k10: {
-                __type: 'type_k10',
-                k11: 'v11'
+      __type: 'program',
+      body: [
+        {
+          __type: 'closure-expression',
+          signature: {
+            __type: 'closure-expression-signature',
+            capture: {
+              __type: 'closure-expression-capture-specifier',
+              specifier: 'unowned-unsafe',
+              expression: {
+                __type: 'self-expression'
               }
             }
+          },
+          body: [
+            {
+              __type: 'literal-boolean',
+              value: true
+            }
           ]
         }
-      }
+      ]
     }
 
-    @ast = Jievro::Ast::Node.new(hash)
+    @ast = Jievro::Ast::Node.new(hash, nil, 1)
 
     @hooked = []
 
@@ -51,25 +42,14 @@ describe Jievro::AstVisitor::Visitor do
 
   it 'should visit in preorder' do
     @visitor.visit(@ast, @hook)
-
     expected = [
       @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]
+      @ast[:body][0],
+      @ast[:body][0][:signature],
+      @ast[:body][0][:signature][:capture],
+      @ast[:body][0][:signature][:capture][:expression],
+      @ast[:body][0][:body][0]
     ]
-
     expect(@hooked).to match(expected)
   end
 
@@ -77,20 +57,11 @@ describe Jievro::AstVisitor::Visitor do
     @visitor.visit(@ast, nil, @hook)
 
     expected = [
-      @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[:body][0][:signature][:capture][:expression],
+      @ast[:body][0][:signature][:capture],
+      @ast[:body][0][:signature],
+      @ast[:body][0][:body][0],
+      @ast[:body][0],
       @ast
     ]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jievro-ast-visitor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
 platform: ruby
 authors:
 - Stefano Azzalini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-08 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jievro-ast
@@ -16,54 +16,54 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.8.1
 - !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: 
@@ -72,8 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -94,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.0.14
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: jievro AST visitor