masamune-ast 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3029256236d8953d9f258d370abb57d1dac4a425b9112f7f4a5a42e951634943
-  data.tar.gz: 123f4977244d1db7d1cbceebee495e6a7d8494401f1db86f4a8360de27b06f2e
+  metadata.gz: f599b770d8e12444bbb2c2bb6aad28d8d0b9673e99708d9d713af4186f96fb4f
+  data.tar.gz: 723f6ab17c2152f9ab92e6da6f0130bc1ab1aa1fd0174ee00a1d9bb7206df182
 SHA512:
-  metadata.gz: 3282cd14e7c591bff140c5d92d782a9724be2af32e9cc2542a0aab949fd469ad4c526c2a11255be267546cb2d1634e97ea7d950c8762c21635fc4274fe5f487c
-  data.tar.gz: d652c21b25b38d460045336d9dd330afb302470358a98f43a0eacb7f79128cdc26e8efe6d233f41067f2be28af3314585ba03b0df1f83e47f8f7d8419a018d98
+  metadata.gz: 622cfe88710212e12d4045fe39837dd9767b56b64abb62872f544b37d6ac286f85dfb9324ef709bb32ab4219e280eff7f4fc6a966ddb379b79b5a5b3b9c06dc3
+  data.tar.gz: 7db8c29128764c9c36f79a98156c68d4bc008a183ceeed351405a6377606721e33523b267362b0cf1f3a19119db3e1606d494869ec28f340680a8812a4e3868b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    masamune-ast (1.2.0)
+    masamune-ast (1.2.1)
       activesupport
 
 GEM
@@ -26,6 +26,7 @@ GEM
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
+  x86_64-darwin-21
   x86_64-linux
 
 DEPENDENCIES

data/lib/masamune/abstract_syntax_tree/data_node.rb

@@ -26,27 +26,11 @@ module Masamune
       # ]
       # TODO: Worry about using a faster sorting algorithm later.
       def self.order_results_by_position(results)
-        final_result = []
-
-        line_numbers = results.map {|result| result[:line_number]}.uniq.sort
-        line_numbers.each do |line_number|
-          # Group data together in an array if they're on the same line.
-          shared_line_data = results.select {|result| result[:line_number] == line_number}
-
-          # Sort the positions on each line number respectively.
-          indexes_on_line = shared_line_data.map {|data| data[:index_on_line]}.sort
-
-          # Apply to the final result.
-          indexes_on_line.each do |index_on_line|
-            shared_line_data.each do |data|
-              if data[:index_on_line] == index_on_line
-                final_result << data
-              end
-            end
-          end
+        results.sort do |a, b|
+          by_line = a[:line_number] <=> b[:line_number]
+          # If we're on the same line, refer to the inner index for order.
+          by_line.zero? ? a[:index_on_line] <=> b[:index_on_line] : by_line
         end
-
-        final_result
       end
 
       def line_data_and_token

data/lib/masamune/abstract_syntax_tree.rb

@@ -52,32 +52,22 @@ module Masamune
 
     # TODO: Add block_params: true to the arguments.
     def variables(name: nil, result_type: Hash)
-      var_classes = [
-        :var_field,
-        :var_ref,
-        :params
-      ].map {|type| get_node_class(type)}
-      results = find_nodes(var_classes, token: name, result_type: result_type)
+      results = find_nodes([VarField, VarRef, Params], token: name, result_type: result_type)
       order_results(results)
     end
 
     def strings(content: nil, result_type: Hash)
-      results = find_nodes(get_node_class(:string_content), token: content, result_type: result_type)
+      results = find_nodes(StringContent, token: content, result_type: result_type)
       order_results(results)
     end
 
     def method_definitions(name: nil, result_type: Hash)
-      results = find_nodes(get_node_class(:def), token: name, result_type: result_type)
+      results = find_nodes(Def, token: name, result_type: result_type)
       order_results(results)
     end
 
     def method_calls(name: nil, result_type: Hash)
-      method_classes = [
-        :vcall,
-        :call,
-        :command
-      ].map {|type| get_node_class(type)}
-      results = find_nodes(method_classes, token: name, result_type: result_type)
+      results = find_nodes([Vcall, Call, Command], token: name, result_type: result_type)
       order_results(results)
     end
 
@@ -95,17 +85,17 @@ module Masamune
     end
 
     def symbol_literals(content: nil, result_type: Hash)
-      results = find_nodes(get_node_class(:symbol_literal), token: content, result_type: result_type)
+      results = find_nodes(SymbolLiteral, token: content, result_type: result_type)
       order_results(results)
     end
 
     def string_symbols(content: nil, result_type: Hash)
-      results = find_nodes(get_node_class(:dyna_symbol), token: content, result_type: result_type)
+      results = find_nodes(DynaSymbol, token: content, result_type: result_type)
       order_results(results)
     end
 
     def comments(content: nil, result_type: Hash)
-      results = find_nodes(get_node_class(:comment), token: content, result_type: result_type)
+      results = find_nodes(Comment, token: content, result_type: result_type)
       order_results(results)
     end
 
@@ -116,17 +106,16 @@ module Masamune
 
     def block_params(content: nil, result_type: Hash)
       # TODO: do_block_params + brace_block_params
-      results = find_nodes(get_node_class(:params), token: content, result_type: result_type)
+      results = find_nodes(Params, token: content, result_type: result_type)
       order_results(results)
     end
 
     def find_nodes(token_classes, token: nil, result_type: Hash)
-      # Ensure the classes are in an array
-      token_classes = [token_classes].flatten
+      token_classes = Array(token_classes)
 
       nodes = []
       token_classes.each do |klass|
-        if klass == Masamune::AbstractSyntaxTree::Comment
+        if klass == Comment
           nodes = @comment_list.dup
         else
           nodes << @node_list.select {|node| node.class == klass}
@@ -149,7 +138,7 @@ module Masamune
       nodes.each do |node|
         # Data for symbols are housed within a nested node, so we handle those differently here.
         # Read the comments for `get_symbol_data` in the symbol node classes for details.
-        if node.class == Masamune::AbstractSyntaxTree::SymbolLiteral || node.class == Masamune::AbstractSyntaxTree::DynaSymbol
+        if node.class == SymbolLiteral || node.class == DynaSymbol
           final_result << node.get_symbol_data.line_data_and_token
         else
           node.data_nodes.each {|dn| final_result << dn.line_data_and_token} if node.data_nodes
@@ -176,13 +165,7 @@ module Masamune
     private
 
     def get_node_class(type)
-      begin
-        "Masamune::AbstractSyntaxTree::#{type.to_s.camelize}".constantize
-      rescue NameError
-        # For all other nodes that we haven't covered yet, we just make a general class.
-        # We can worry about adding the classes for other nodes as we go.
-        Node
-      end
+      "#{self.class}::#{type.to_s.camelize}".safe_constantize || Node # Return base Node class for any not-yet-covered nodes.
     end
 
     # We only order results when they are a Hash.

data/lib/masamune/version.rb

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

data/lib/masamune.rb

@@ -30,7 +30,6 @@ require "masamune/abstract_syntax_tree/nodes/symbol"
 require "masamune/abstract_syntax_tree/nodes/vcall"
 
 require "pp"
-require "pry"
 
 module Masamune
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune-ast
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Gabriel Zayas
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -71,7 +71,7 @@ metadata:
   homepage_uri: https://www.github.com/gazayas/masamune-ast
   source_code_uri: https://www.github.com/gazayas/masamune-ast
   changelog_uri: https://www.github.com/gazayas/masamune-ast
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,8 +86,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: Masamune
 test_files: []