masamune-ast 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d1bcf1f5fc587393f5ded22b65afb26d64217253dcea0d83ea483574988326
-  data.tar.gz: 21f726e99d53494fb50c08012962156245a37920425fae2ab338946d463f2721
+  metadata.gz: cde8e5ad304fc141ebf9a19a2b14ca11bdb5a582f37946e7190888a142cbf800
+  data.tar.gz: 79cfd7151f94c22f78efd3fcfda3be6321b68a76ea5d5175b73ecd96b2ae2331
 SHA512:
-  metadata.gz: 2cca246c5770392976a5b9b9a577ac90a7363c8972bbf954f76493b13dfebbc16e3c3eeb3230238e348fa77f11accadf326fb774d11a40d03aaf172e15f9a946
-  data.tar.gz: 9da6db975cdd75e0a3fc57056bcb2908054a54f90da996660d4fca46e967e64aa5431a78e118b8a264ca4749f421fc7dc667626da5b6e28b7d724656d7bca241
+  metadata.gz: 071e318a82a6c9df04ca33746f2f1e97ff2a49362e054621d7ff490bf727574bcd55648c6fcdd63ec6f49c5962eea009fbdce1acd6bc98d0f5d9bc35f3336d9e
+  data.tar.gz: 7bfd78af1aa7e621f343ef77521a2895921b449f944487518746b201ff3d925fe9e22645b17d7bd8fd83fcaf89463870f339bb2fa0a654c9bc9c9cf194bb2183

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    masamune-ast (1.1.4)
+    masamune-ast (1.1.5)
       activesupport
 
 GEM

data/README.md

@@ -1,6 +1,6 @@
 # Masamune
 
-## A Ruby source code analyzer based on Ripper’s Abstract Syntax Tree generator (`Ripper#sexp`).
+## A Ruby source code analyzer based on Ripper’s Abstract Syntax Tree generator.
 
 ## Installation
 
@@ -90,6 +90,7 @@ msmn = Masamune::AbstractSyntaxTree.new(code)
 msmn.all_methods
 #=> [{:position=>[2, 4], :token=>"sum"},
 #=> {:position=>[2, 8], :token=>"times"},
+#=> {:position=>[3, 2], :token=>"puts"},
 #=> {:position=>[6, 4], :token=>"foo"},
 #=> {:position=>[8, 0], :token=>"foo"},
 #=> {:position=>[9, 0], :token=>"foo"}]
@@ -97,6 +98,7 @@ msmn.all_methods
 msmn.method_calls
 #=> [{:position=>[2, 4], :token=>"sum"},
 #=> {:position=>[2, 8], :token=>"times"},
+#=> {:position=>[3, 2], :token=>"puts"},
 #=> {:position=>[8, 0], :token=>"foo"},
 #=> {:position=>[9, 0], :token=>"foo"}]
 

data/lib/masamune/abstract_syntax_tree/data_node.rb

@@ -11,8 +11,9 @@ module Masamune
     class DataNode < Node
       attr_reader :type, :token, :line_position
 
-      def initialize(contents, ast_id)
+      def initialize(contents, ast_id, parent)
         @type, @token, @line_position = contents
+        @parent = parent
         super(contents, ast_id)
       end
 
@@ -26,7 +27,7 @@ module Masamune
       def self.order_results_by_position(position_and_token_ary)
         # Extract the line numbers first, i.e - 4 from [4, 7]
         line_numbers = position_and_token_ary.map do |position_and_token|
-          line_number = position_and_token[:position].first
+          position_and_token[:position].first
         end.uniq.sort
 
         final_result = []

data/lib/masamune/abstract_syntax_tree/nodes/call.rb

@@ -9,7 +9,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new(@contents.last, @ast_id)
+          DataNode.new(@contents.last, @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/command.rb

@@ -0,0 +1,64 @@
+# Code example:
+# puts "hello"
+#
+# syntax_tree output:
+# SyntaxTree::Command[
+#   message: SyntaxTree::Ident[value: "puts"],
+#   arguments: SyntaxTree::Args[
+#     parts: [
+#       SyntaxTree::StringLiteral[
+#         parts: [SyntaxTree::TStringContent[value: "greetings"]]
+#       ]
+#     ]
+#   ]
+# ]
+
+# Code example:
+# namespace :project
+#   resources :pages
+# end
+#
+# syntax_tree output:
+# SyntaxTree::Command[
+#   message: SyntaxTree::Ident[value: "namespace"],
+#   arguments: SyntaxTree::Args[
+#     parts: [SyntaxTree::SymbolLiteral[value: SyntaxTree::Ident[value: "project"]]]
+#   ],
+#   block: SyntaxTree::BlockNode[
+#     bodystmt: SyntaxTree::BodyStmt[
+#       statements: SyntaxTree::Statements[
+#         body: [
+#           SyntaxTree::Command[
+#             message: SyntaxTree::Ident[value: "resources"],
+#             arguments: SyntaxTree::Args[
+#               parts: [
+#                 SyntaxTree::SymbolLiteral[
+#                   value: SyntaxTree::Ident[value: "pages"]
+#                 ]
+#               ]
+#             ]
+#           ]
+#         ]
+#       ]
+#     ]
+#   ]
+# ]
+
+
+# TODO: As you can see in the second example above, `command` can receive a
+# block, so we might want to have a way to access the block node in the future.
+module Masamune
+  class AbstractSyntaxTree
+    class Command < Node
+      def initialize(contents, ast_id)
+        super
+      end
+
+      def extract_data_nodes
+        [
+          DataNode.new(@contents[1], @ast_id, self)
+        ]
+      end
+    end
+  end
+end

data/lib/masamune/abstract_syntax_tree/nodes/def.rb

@@ -9,7 +9,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new(@contents[1], @ast_id)
+          DataNode.new(@contents[1], @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/params.rb

@@ -14,7 +14,7 @@ module Masamune
         # to ensure that it's being handled properly.
         unless @contents[1].nil?
           @contents[1].map do |content|
-            DataNode.new(content, @ast_id)
+            DataNode.new(content, @ast_id, self)
           end
         end
       end

data/lib/masamune/abstract_syntax_tree/nodes/string_content.rb

@@ -9,7 +9,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new(@contents[1], @ast_id)
+          DataNode.new(@contents[1], @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/support_nodes/comment.rb

@@ -17,7 +17,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new([contents.type, contents.token, contents.position], @ast_id)
+          DataNode.new([contents.type, contents.token, contents.position], @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/symbol.rb

@@ -9,7 +9,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new(@contents[1], @ast_id)
+          DataNode.new(@contents[1], @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/symbols/dyna_symbol.rb

@@ -13,7 +13,7 @@ module Masamune
       # we just use a method specifically for getting the symbol.
       # This should be the same as the :symbol_literal type.
       def get_symbol_data
-        DataNode.new(@contents[1][1], @ast_id)
+        DataNode.new(@contents[1][1], @ast_id, self)
       end
     end
   end

data/lib/masamune/abstract_syntax_tree/nodes/symbols/symbol_literal.rb

@@ -14,7 +14,7 @@ module Masamune
       # we just use a method specifically for getting the symbol.
       # This should be the same as the :dyna_symbol type.
       def get_symbol_data
-        DataNode.new(@contents[1][1], @ast_id)
+        DataNode.new(@contents[1][1], @ast_id, self)
       end
     end
   end

data/lib/masamune/abstract_syntax_tree/nodes/variables/block_var.rb

@@ -14,7 +14,7 @@ module Masamune
       # nice to find out and document/implement it somewhere.
       def extract_data_nodes
         @contents[1][1].map do |content|
-          DataNode.new(content, @ast_id)
+          DataNode.new(content, @ast_id, self)
         end
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/variables/var_field.rb

@@ -9,7 +9,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new(@contents[1], @ast_id)
+          DataNode.new(@contents[1], @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/variables/var_ref.rb

@@ -11,7 +11,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new(@contents[1], @ast_id)
+          DataNode.new(@contents[1], @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree/nodes/vcall.rb

@@ -9,7 +9,7 @@ module Masamune
 
       def extract_data_nodes
         [
-          DataNode.new(@contents[1], @ast_id)
+          DataNode.new(@contents[1], @ast_id, self)
         ]
       end
     end

data/lib/masamune/abstract_syntax_tree.rb

@@ -74,7 +74,8 @@ module Masamune
     def method_calls(name: nil, result_type: Hash)
       method_classes = [
         :vcall,
-        :call
+        :call,
+        :command
       ].map {|type| get_node_class(type)}
       results = find_nodes(method_classes, token: name, result_type: result_type)
       order_results(results)

data/lib/masamune/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Masamune
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/lib/masamune.rb

@@ -21,6 +21,7 @@ require "masamune/abstract_syntax_tree/nodes/variables/var_field"
 require "masamune/abstract_syntax_tree/nodes/variables/var_ref"
 require "masamune/abstract_syntax_tree/nodes/assign"
 require "masamune/abstract_syntax_tree/nodes/call"
+require "masamune/abstract_syntax_tree/nodes/command"
 require "masamune/abstract_syntax_tree/nodes/def"
 require "masamune/abstract_syntax_tree/nodes/params"
 require "masamune/abstract_syntax_tree/nodes/program"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune-ast
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Gabriel Zayas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-10 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -46,6 +46,7 @@ files:
 - lib/masamune/abstract_syntax_tree/nodes/blocks/brace_block.rb
 - lib/masamune/abstract_syntax_tree/nodes/blocks/do_block.rb
 - lib/masamune/abstract_syntax_tree/nodes/call.rb
+- lib/masamune/abstract_syntax_tree/nodes/command.rb
 - lib/masamune/abstract_syntax_tree/nodes/def.rb
 - lib/masamune/abstract_syntax_tree/nodes/params.rb
 - lib/masamune/abstract_syntax_tree/nodes/program.rb