Migrate to Prism parser.

Author: ioquatix

decode.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
 
 	spec.required_ruby_version = ">= 3.2"
 
-	spec.add_dependency "parser"
+	spec.add_dependency "prism"
 end

lib/decode/definition.rb

@@ -13,16 +13,18 @@ class Definition
 		# @parameter parent [Symbol] The parent lexical scope.
 		# @parameter language [Language] The language in which the symbol is defined in.
 		# @parameter comments [Array(String)] The comments associated with the definition.
-		def initialize(name, parent: nil, language: parent.language, comments: nil)
-			@name = name
+		def initialize(path, parent: nil, language: parent.language, comments: nil, visibility: :public)
+			@path = Array(path).map(&:to_sym)
 
 			@parent = parent
 			@language = language
 
 			@comments = comments
+			@visibility = visibility
 
-			@path = nil
+			@full_path = nil
 			@qualified_name = nil
+			@nested_name = nil
 		end
 
 		def inspect
@@ -34,7 +36,24 @@ def inspect
 		# The symbol name.
 		# e.g. `:Decode`.
 		# @attribute [Symbol]
-		attr :name
+		def name
+			@path.last
+		end
+		
+		# The path to the definition, relative to the parent.
+		# @attribute [Array(Symbol)]
+		attr :path
+		
+		# The full path to the definition.
+		def full_path
+			@full_path ||= begin
+				if @parent
+					@parent.full_path + @path
+				else
+					@path
+				end
+			end
+		end
 
 		# The parent definition, defining lexical scope.
 		# @attribute [Definition | Nil]
@@ -62,17 +81,17 @@ def public?
 		def qualified_name
 			@qualified_name ||= begin
 				if @parent
-					@parent.qualified_name + self.nested_name
+					[@parent.qualified_name, self.nested_name].join("::")
 				else
-					@name.to_s
+					self.nested_name
 				end
 			end
 		end
 
-		# The name of this definition plus the nesting prefix.
+		# The name relative to the parent.
 		# @returns [String]
 		def nested_name
-			"::#{@name}"
+			@nested_name ||= "#{@path.join("::")}"
 		end
 
 		# Does the definition name match the specified prefix?
@@ -86,28 +105,6 @@ def convert(kind)
 			raise ArgumentError, "Unable to convert #{self} into #{kind}!"
 		end
 
-		# The lexical scope as an array of names.
-		# e.g. `[:Decode, :Definition]`
-		# @returns [Array]
-		def path
-			if @path
-				# Cached version:
-				@path
-			elsif @parent
-				# Merge with parent:
-				@path = [*@parent.path, *path_name].freeze
-			else
-				# At top:
-				@path = path_name.freeze
-			end
-		end
-		
-		def path_name
-			[@name]
-		end
-		
-		alias lexical_path path
-		
 		# A short form of the definition.
 		# e.g. `def short_form`.
 		#
@@ -173,5 +170,9 @@ def documentation
 		def location
 			nil
 		end
+		
+		# The visibility of the definition.
+		# @attribute [Symbol] :public, :private, :protected
+		attr_accessor :visibility
 	end
 end

lib/decode/index.rb

@@ -57,7 +57,7 @@ def update(paths)
 						# $stderr.puts "Adding #{symbol.qualified_name} to #{symbol.lexical_path.join(' -> ')}"
 
 						@definitions[symbol.qualified_name] = symbol
-						@trie.insert(symbol.path, symbol)
+						@trie.insert(symbol.full_path, symbol)
 					end
 				end
 			end
@@ -71,7 +71,7 @@ def lookup(reference, relative_to: nil)
 			if reference.absolute? || relative_to.nil?
 				lexical_path = []
 			else
-				lexical_path = relative_to.path.dup
+				lexical_path = relative_to.full_path.dup
 			end
 
 			path = reference.path

lib/decode/language/ruby/alias.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2020-2024, by Samuel Williams.
+
+require_relative "definition"
+
+module Decode
+	module Language
+		module Ruby
+			# Represents an alias statement, e.g., `alias new_name old_name` or `alias_method :new_name, :old_name`
+			class Alias < Definition
+				def initialize(new_name, old_name, **options)
+					super(new_name, **options)
+					@old_name = old_name
+				end
+				
+				attr :old_name
+				
+				def short_form
+					"alias #{self.name} #{@old_name}"
+				end
+				
+				def long_form
+					"alias #{self.name} #{@old_name}"
+				end
+				
+				def to_s
+					"#{self.class.name} #{self.name} -> #{@old_name}"
+				end
+			end
+		end
+	end
+end

lib/decode/language/ruby/attribute.rb

@@ -13,17 +13,17 @@ class Attribute < Definition
 				# The short form of the attribute.
 				# e.g. `attr :value`.
 				def short_form
-					case @node.type
-					when :block
+					case @node&.type
+					when :block_node
 						"#{@name} { ... }"
 					else
-						@node.location.expression.source
+						@node&.location&.slice || @name
 					end
 				end
 
 				def long_form
-					if @node.location.line == @node.location.last_line
-						@node.location.expression.source
+					if @node&.location&.start_line == @node&.location&.end_line
+						@node.location.slice
 					else
 						short_form
 					end

lib/decode/language/ruby/call.rb

@@ -12,22 +12,32 @@ module Ruby
 			class Call < Definition
 				# A block can sometimes be a container for other definitions.
 				def container?
-					false
+					@node&.block && @node.block.opening == "do"
 				end
 
 				# The short form of the class.
 				# e.g. `foo`.
 				def short_form
-					@name.to_s
+					if @node&.block && @node.block.opening == "{"
+						"#{name} { ... }"
+					else
+						name.to_s
+					end
 				end
 
 				# The long form of the class.
 				# e.g. `foo(:bar)`.
 				def long_form
-					if @node.location.line == @node.location.last_line
-						@node.location.expression.source
+					if @node.location.start_line == @node.location.end_line
+						@node.location.slice
 					else
-						self.short_form
+						# For multiline calls, use the actual call name with arguments
+						if @node.arguments && @node.arguments.arguments.any?
+							arg_text = @node.arguments.arguments.map { |arg| arg.location.slice }.join(", ")
+							"#{@node.name}(#{arg_text})"
+						else
+							@node.name.to_s
+						end
 					end
 				end
 

lib/decode/language/ruby/class.rb

@@ -10,19 +10,23 @@ module Language
 		module Ruby
 			# A Ruby-specific class.
 			class Class < Definition
+				def initialize(*arguments, super_class: nil, **options)
+					super(*arguments, **options)
+					
+					@super_class = super_class
+				end
+				
+				attr :super_class
+				
 				# A class is a container for other definitions.
 				def container?
 					true
 				end
 
-				def nested_name
-					"::#{name}"
-				end
-				
 				# The short form of the class.
 				# e.g. `class Animal`.
 				def short_form
-					"class #{path_name.last}"
+					"class #{self.name}"
 				end
 
 				# The long form of the class.
@@ -35,21 +39,11 @@ def long_form
 					end
 				end
 
-				def super_class
-					if super_node = @node.children[1]
-						super_node.location.expression.source
-					end
-				end
-				
 				# The fully qualified name of the class.
 				# e.g. `class ::Barnyard::Dog`.
 				def qualified_form
 					"class #{self.qualified_name}"
 				end
-				
-				def path_name
-					@name.to_s.split("::").map(&:to_sym)
-				end
 			end
 
 			# A Ruby-specific singleton class.
@@ -73,30 +67,14 @@ def nested?
 				# The short form of the class.
 				# e.g. `class << self`.
 				def short_form
-					"class << #{@name}"
+					"class << #{self.name}"
 				end
 
 				# The long form is the same as the short form.
 				alias long_form short_form
-
-				def path_name
-					[:class]
-				end
-
-				# The lexical scope as an array of names.
-				# e.g. `[:Decode, :Definition]`
-				# @returns [Array]
-				def path
-					if @path
-						# Cached version:
-						@path
-					else
-						@path = [*self.absolute_path, *self.path_name]
-					end
-				end
-
+				
 				private
-
+				
 				def absolute_path
 					if @parent
 						@parent.path

lib/decode/language/ruby/code.rb

@@ -6,7 +6,7 @@
 require_relative "definition"
 require_relative "../../syntax/link"
 
-require "parser/current"
+require "prism"
 
 module Decode
 	module Language
@@ -15,7 +15,7 @@ module Ruby
 			class Code
 				def initialize(text, index, relative_to: nil, language: relative_to&.language)
 					@text = text
-					@root = ::Parser::CurrentRuby.parse(text)
+					@root = ::Prism.parse(text)
 					@index = index
 					@relative_to = relative_to
 					@language = language
@@ -27,7 +27,7 @@ def initialize(text, index, relative_to: nil, language: relative_to&.language)
 
 				def extract(into = [])
 					if @index
-						traverse(@root, into)
+						traverse(@root.value, into)
 					end
 
 					return into
@@ -37,29 +37,34 @@ def extract(into = [])
 
 				def traverse(node, into)
 					case node&.type
-					when :send
+					when :program_node
+						traverse(node.statements, into)
+					when :call_node
 						if reference = Reference.from_const(node, @language)
 							if definition = @index.lookup(reference, relative_to: @relative_to)
-								expression = node.location.selector
-								range = expression.begin_pos...expression.end_pos
+								# Use message_loc for the method name, not the entire call
+								expression = node.message_loc
+								range = expression.start_offset...expression.end_offset
 								into << Syntax::Link.new(range, definition)
 							end
 						end
 
 						# Extract constants from arguments:
-						children = node.children[2..-1].each do |node|
-							traverse(node, into)
+						if node.arguments
+							node.arguments.arguments.each do |arg_node|
+								traverse(arg_node, into)
+							end
 						end
-					when :const
+					when :constant_read_node
 						if reference = Reference.from_const(node, @language)
 							if definition = @index.lookup(reference, relative_to: @relative_to)
-								expression = node.location.name
-								range = expression.begin_pos...expression.end_pos
+								expression = node.location
+								range = expression.start_offset...expression.end_offset
 								into << Syntax::Link.new(range, definition)
 							end
 						end
-					when :begin
-						node.children.each do |child|
+					when :statements_node
+						node.body.each do |child|
 							traverse(child, into)
 						end
 					end