masamune-ast 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cafe74abe55158e29178163ef544558f8e8d042d8adae0668a8625e1883c843
-  data.tar.gz: f0068f9e6783403ba0d17f65902c0ecfded0806424383c8d325168ce0b4c7a58
+  metadata.gz: ccb2d3e2f9229836db093e7d6e164a30a37302610835973bcba1bf63781d4869
+  data.tar.gz: afeba57c0b354caa8bb753c4dffdafc1aeca92b96997ec0345bd309c3c0cc33a
 SHA512:
-  metadata.gz: b6647c5ea9745d2e1f842a0d0eea3de05e795c7afa9a3241cf9d6a87dd802c4c62e7c9fdb266afcbc8e54ffe51af25d9bacc32830d4f28009f9c34b2a4f733a8
-  data.tar.gz: d7781f44d57a0bca23d7a61eaed10cdb687431a66540433ac0e01f43c6a625cd05aea2cd06168b1ea980d2fffaa827634ba3633ca8a94950df2110a60d4f9f5c
+  metadata.gz: 63c3961e42d7ae3264eac44d6d7c6b43f572f95daa2d4c56077eace0baf2fb1a7259f6f149ce0ab0dc11a00d463f463ae246ba1a563e5a4ef83405e3d5910641
+  data.tar.gz: c130f31c0d73a54af8775f538c928ae71d55a456b8f2d715b690ef9cf2b1de906fd808e47d3ad668630817d038d255feefd2cc309c221e5b4de5e693bc844f5c

data/Gemfile.lock

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

data/lib/masamune/abstract_syntax_tree/block_var.rb

@@ -11,7 +11,7 @@ module Masamune
 
       # :block_var has a lot of nil values within in.
       # I'm not sure what this represents, but it would be
-      # nice to find out and implement it document/implement it somewhere.
+      # nice to find out and document/implement it somewhere.
       def extract_data_nodes
         @contents[1][1].map do |content|
           DataNode.new(content, @ast_id)

data/lib/masamune/abstract_syntax_tree/dyna_symbol.rb

@@ -0,0 +1,20 @@
+# TODO: Add description.
+
+module Masamune
+  class AbstractSyntaxTree
+    class DynaSymbol < Node
+      def initialize(contents, ast_id)
+        super
+      end
+
+      # Dyna Symbols are symbols created from strings, i.e. - :"project".
+      # Since they have :@tstring_content inside of them, the data node
+      # is technically for a String, so instead of duplicating it here,
+      # 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)
+      end
+    end
+  end
+end

data/lib/masamune/abstract_syntax_tree/symbol.rb

@@ -0,0 +1,17 @@
+# TODO: Add description.
+
+module Masamune
+  class AbstractSyntaxTree
+    class Symbol < Node
+      def initialize(contents, ast_id)
+        super
+      end
+
+      def extract_data_nodes
+        [
+          DataNode.new(@contents[1], @ast_id)
+        ]
+      end
+    end
+  end
+end

data/lib/masamune/abstract_syntax_tree/symbol_literal.rb

@@ -0,0 +1,21 @@
+# TODO: Add description.
+
+module Masamune
+  class AbstractSyntaxTree
+    class SymbolLiteral < Node
+      def initialize(contents, ast_id)
+        super
+      end
+
+      # Symbol Literals are a node type of :symbol_literal,
+      # but have a node type of :symbol nested within them.
+      # For the reason, the data node is technically for :symbol
+      # and not :symbol_literal, so instead of duplicating it here,
+      # 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)
+      end
+    end
+  end
+end

data/lib/masamune/abstract_syntax_tree.rb

@@ -70,6 +70,18 @@ module Masamune
     def brace_block_params
     end
 
+    def symbols(content: nil)
+      symbol_literals + string_symbols
+    end
+
+    def symbol_literals(content: nil)
+      find_nodes(get_node_class(:symbol_literal), token: content)
+    end
+
+    def string_symbols(content: nil)
+      find_nodes(get_node_class(:dyna_symbol), token: content)
+    end
+
     # @tree only shows comments as a type of `:void_stmt` and
     # doesn't have a data node, so we get comments from @lex_nodes.
     def comments(content: nil)
@@ -109,7 +121,13 @@ module Masamune
 
       final_result = []
       nodes.each do |node|
-        node.data_nodes.each {|dn| final_result << dn.position_and_token} if node.data_nodes
+        # 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
+          final_result << node.get_symbol_data.position_and_token
+        else
+          node.data_nodes.each {|dn| final_result << dn.position_and_token} if node.data_nodes
+        end
       end
 
       DataNode.order_results_by_position(final_result)

data/lib/masamune/version.rb

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

data/lib/masamune.rb

@@ -16,9 +16,12 @@ require "masamune/abstract_syntax_tree/brace_block"
 require "masamune/abstract_syntax_tree/call"
 require "masamune/abstract_syntax_tree/def"
 require "masamune/abstract_syntax_tree/do_block"
+require "masamune/abstract_syntax_tree/dyna_symbol"
 require "masamune/abstract_syntax_tree/params"
 require "masamune/abstract_syntax_tree/program"
 require "masamune/abstract_syntax_tree/string_content"
+require "masamune/abstract_syntax_tree/symbol_literal"
+require "masamune/abstract_syntax_tree/symbol"
 require "masamune/abstract_syntax_tree/var_field"
 require "masamune/abstract_syntax_tree/var_ref"
 require "masamune/abstract_syntax_tree/vcall"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: masamune-ast
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Gabriel Zayas
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-06-03 00:00:00.000000000 Z
+date: 2023-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -47,10 +47,13 @@ files:
 - lib/masamune/abstract_syntax_tree/data_node.rb
 - lib/masamune/abstract_syntax_tree/def.rb
 - lib/masamune/abstract_syntax_tree/do_block.rb
+- lib/masamune/abstract_syntax_tree/dyna_symbol.rb
 - lib/masamune/abstract_syntax_tree/node.rb
 - lib/masamune/abstract_syntax_tree/params.rb
 - lib/masamune/abstract_syntax_tree/program.rb
 - lib/masamune/abstract_syntax_tree/string_content.rb
+- lib/masamune/abstract_syntax_tree/symbol.rb
+- lib/masamune/abstract_syntax_tree/symbol_literal.rb
 - lib/masamune/abstract_syntax_tree/var_field.rb
 - lib/masamune/abstract_syntax_tree/var_ref.rb
 - lib/masamune/abstract_syntax_tree/vcall.rb