ast_utils 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23ff9e3ff8b73a951d4e8b806cfe365efeb05b0c2eba54fbace486ffc1da08b9
-  data.tar.gz: 0c8f922226a0b684731bf1a847a8537cf815ae627faa8d6e2bd742e5b39ffc67
+  metadata.gz: 2dcd270ef11c2c8f91cc821dcc7cff592bfd719169c7c1096f7d06f1d3cfac5b
+  data.tar.gz: db15a5577fc9229b477ee9fd7a660278a31efbb48e4e2bcd6f230da756883f9d
 SHA512:
-  metadata.gz: fa21e113ab51dd2e37e9074130ddbe3715c55b524deeef575f158ed642b88db1d66616a268ea79b5d15e916ad889a3b1c5853a3872b5175eb1b3c7481e84a3f9
-  data.tar.gz: 30195cf9284d14db8233cde89dcb522cb9b790f2bdc4c4184cd9cdc9a76e483460df5d406d054daad0ac2064114daab45af5e55acc7b555515c56700cdae064a
+  metadata.gz: ab497bea22d86a24d481950b369550783ffc13aac4f55fa94d48bd6d71ec99fd18a2e2d1e1af63c62d01ce6821bafef4a9ecc1790dd29bbbe620c97bb0ee9301
+  data.tar.gz: 4746706461519e9cb7217f71f5ee4dd4454141ea42edc960979ff53f37d8e90920d58b254db9fbc82677ff7ac5115462e2b31c897c9d42d21fd0f066873a80b5

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request: {}
+
+jobs:
+  test:
+    runs-on: "ubuntu-latest"
+    strategy:
+      matrix:
+        container_tag:
+        - 3.0-focal
+        - 2.6-bionic
+        - 2.7-bionic
+    container:
+      image: rubylang/ruby:${{ matrix.container_tag }}
+    steps:
+    - uses: actions/checkout@v1
+    - name: Run test
+      run: |
+        ruby -v
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rake

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in ast_utils.gemspec
 gemspec
+
+gem "bundler"
+gem "rake"
+gem "minitest"
+gem "thor"

data/ast_utils.gemspec

@@ -20,10 +20,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_runtime_dependency "parser", "~> 2.4"
-  spec.add_runtime_dependency "thor", ">= 0.19"
+  spec.add_runtime_dependency "parser", ">= 2.7.0"
 end

data/exe/ast_utils

@@ -6,6 +6,14 @@ Parser::Builders::Default.emit_lambda = true
 Parser::Builders::Default.emit_procarg0 = true
 
 require "ast_utils"
-require "ast_utils/cli"
 
+begin
+  require "thor"
+rescue LoadError
+  puts "ast_utils command requires an optional `thor` gem:"
+  puts "Running `gem install thor` or having `gem 'thor'` in your Gemfile will solve the problem."
+  exit 1
+end
+
+require "ast_utils/cli"
 ASTUtils::CLI.start(ARGV)

data/lib/ast_utils.rb

@@ -3,7 +3,6 @@ require "ast_utils/version"
 require "pathname"
 require "set"
 
-require "ast_utils/node_set"
 require "ast_utils/node_helper"
 require "ast_utils/partial_map"
 require "ast_utils/labeling"

data/lib/ast_utils/cli.rb

@@ -1,5 +1,3 @@
-require "thor"
-
 module ASTUtils
   class CLI < Thor
     desc "label SCRIPTS...", "labeling Ruby scripts given as SCRIPTS..."

data/lib/ast_utils/navigation.rb

@@ -8,8 +8,8 @@ module ASTUtils
 
     def initialize(node:)
       @root = node
-      @nodes = NodeSet.new
-      @parents = {}
+      @nodes = Set[].compare_by_identity
+      @parents = {}.compare_by_identity
     end
 
     def construct
@@ -20,13 +20,13 @@ module ASTUtils
       nodes << node
 
       each_child_node(node) do |child|
-        parents[child.__id__] = node
+        parents[child] = node
         set_parent(child)
       end
     end
 
     def parent(node)
-      parents[node.__id__]
+      parents[node]
     end
 
     def self.from(node:)

data/lib/ast_utils/scope.rb

@@ -13,7 +13,7 @@ module ASTUtils
       end
 
       def eql?(other)
-        other.is_a?(Assignment) && other.node.__id__ == node.__id__ && other.variable == variable
+        other.is_a?(Assignment) && other.node.equal?(node) && other.variable == variable
       end
 
       def ==(other)
@@ -34,48 +34,48 @@ module ASTUtils
 
     def initialize(root:)
       @root = root
-      @all_scopes = NodeSet.new
-      @child_scopes = {}
-      @parent_scopes = {}
-      @sub_scopes = {}
-      @super_scopes = {}
-      @assignment_nodes = {}
-      @reference_nodes = {}
+      @all_scopes = Set.new.compare_by_identity
+      @child_scopes = {}.compare_by_identity
+      @parent_scopes = {}.compare_by_identity
+      @sub_scopes = {}.compare_by_identity
+      @super_scopes = {}.compare_by_identity
+      @assignment_nodes = {}.compare_by_identity
+      @reference_nodes = {}.compare_by_identity
     end
 
     def children(scope)
-      child_scopes[scope.__id__]
+      child_scopes[scope]
     end
 
     def parent(scope)
-      parent_scopes[scope.__id__]
+      parent_scopes[scope]
     end
 
     def subs(scope)
-      sub_scopes[scope.__id__]
+      sub_scopes[scope]
     end
 
     def sup(scope)
-      super_scopes[scope.__id__]
+      super_scopes[scope]
     end
 
     def assignments(scope, include_subs: false)
       if include_subs
-        subs(scope).inject(assignment_nodes[scope.__id__]) {|assignments, scope_|
+        subs(scope).inject(assignment_nodes[scope]) {|assignments, scope_|
           assignments + assignments(scope_, include_subst: true)
         }
       else
-        assignment_nodes[scope.__id__]
+        assignment_nodes[scope]
       end
     end
 
     def references(scope, include_subs: false)
       if include_subs
-        subs(scope).inject(reference_nodes[scope.__id__]) {|references, scope_|
+        subs(scope).inject(reference_nodes[scope]) {|references, scope_|
           references + references(scope_, include_subs: true)
         }
       else
-        reference_nodes[scope.__id__]
+        reference_nodes[scope]
       end
 
     end
@@ -95,18 +95,18 @@ module ASTUtils
 
     def add_scope(scope)
       all_scopes << scope
-      child_scopes[scope.__id__] = NodeSet.new
-      sub_scopes[scope.__id__] = NodeSet.new
-      assignment_nodes[scope.__id__] = Set.new
-      reference_nodes[scope.__id__] = Set.new
+      child_scopes[scope] = Set.new.compare_by_identity
+      sub_scopes[scope] = Set.new.compare_by_identity
+      assignment_nodes[scope] = Set.new.compare_by_identity
+      reference_nodes[scope] = Set.new.compare_by_identity
     end
 
     def child_scope!(scope, parent_scope)
       add_scope(scope)
 
       if parent_scope
-        parent_scopes[scope.__id__] = parent_scope
-        child_scopes[parent_scope.__id__] << scope
+        parent_scopes[scope] = parent_scope
+        child_scopes[parent_scope] << scope
       end
 
       each_child_node(scope) do |child|
@@ -118,10 +118,10 @@ module ASTUtils
       add_scope(scope)
 
       if super_scope
-        parent_scopes[scope.__id__] = super_scope
-        child_scopes[super_scope.__id__] << scope
-        super_scopes[scope.__id__] = super_scope
-        sub_scopes[super_scope.__id__] << scope
+        parent_scopes[scope] = super_scope
+        child_scopes[super_scope] << scope
+        super_scopes[scope] = super_scope
+        sub_scopes[super_scope] << scope
       end
 
       each_child_node(scope) do |child|
@@ -136,21 +136,21 @@ module ASTUtils
       when :block
         nested_scope!(node, current_scope)
       when :lvar
-        reference_nodes[current_scope.__id__] << node
+        reference_nodes[current_scope] << node
       when :lvasgn, :arg, :optarg, :restarg, :kwarg, :kwoptarg, :kwrestarg, :blockarg
-        assignment_nodes[current_scope.__id__] << Assignment.new(node: node, variable: node.children[0])
+        assignment_nodes[current_scope] << Assignment.new(node: node, variable: node.children[0])
         construct_children(node, current_scope)
       when :procarg0
         case node.children[0]
         when AST::Node
           construct_children(node, current_scope)
         else
-          assignment_nodes[current_scope.__id__] << Assignment.new(node: node, variable: node.children[0])
+          assignment_nodes[current_scope] << Assignment.new(node: node, variable: node.children[0])
           construct_children(node, current_scope)
         end
       when :match_with_lvasgn
         node.children[2].each do |var|
-          assignment_nodes[current_scope.__id__] << Assignment.new(node: node, variable: var)
+          assignment_nodes[current_scope] << Assignment.new(node: node, variable: var)
         end
 
         construct_children(node, current_scope)

data/lib/ast_utils/version.rb

@@ -1,3 +1,3 @@
 module ASTUtils
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,85 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ast_utils
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-09-22 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !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: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 2.7.0
 description: Ruby AST Utility
 email:
 - matsumoto@soutaro.com
@@ -88,6 +32,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
@@ -102,14 +47,13 @@ files:
 - lib/ast_utils/labeling.rb
 - lib/ast_utils/navigation.rb
 - lib/ast_utils/node_helper.rb
-- lib/ast_utils/node_set.rb
 - lib/ast_utils/partial_map.rb
 - lib/ast_utils/scope.rb
 - lib/ast_utils/version.rb
 homepage: https://github.com/soutaro/ast_utils
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +68,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Ruby AST Utility
 test_files: []

data/lib/ast_utils/node_set.rb

@@ -1,55 +0,0 @@
-module ASTUtils
-  class NodeSet
-    class Item
-      attr_reader :object
-
-      def initialize(object)
-        @object = object
-      end
-
-      def hash
-        object.__id__
-      end
-
-      def eql?(other)
-        other.is_a?(Item) && other.object.__id__ == object.__id__
-      end
-
-      def ==(other)
-        eql?(other)
-      end
-    end
-
-    attr_reader :set
-
-    def initialize(objects = [])
-      @set = Set.new(objects.map {|object| Item.new(object) })
-    end
-
-    def <<(node)
-      set << Item.new(node)
-    end
-
-    def delete(node)
-      set.delete Item.new(node)
-    end
-
-    def each(&block)
-      set.map(&:object).each(&block)
-    end
-
-    def empty?
-      size == 0
-    end
-
-    def size
-      set.size
-    end
-
-    include Enumerable
-
-    def +(other)
-      self.class.new(self.set + other.set)
-    end
-  end
-end