ibex 0.1.0 → 0.2.0

data/sig/ibex/lsp/server.rbs

@@ -0,0 +1,55 @@
+# Generated from lib/ibex/lsp/server.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Coordinates JSON-RPC lifecycle, request responses, and protocol-safe logging.
+    class Server
+      include RequestHandlers
+
+      REQUEST_METHODS: Array[String]
+
+      NOTIFICATION_METHODS: Array[String]
+
+      # @rbs (stdin: untyped, stdout: untyped, stderr: untyped) -> void
+      def initialize: (stdin: untyped, stdout: untyped, stderr: untyped) -> void
+
+      # @rbs () -> Integer
+      def run: () -> Integer
+
+      private
+
+      # @rbs () -> Hash[String, untyped]?
+      def read_message: () -> Hash[String, untyped]?
+
+      # @rbs (Hash[String, untyped] message) -> void
+      def process_message: (Hash[String, untyped] message) -> void
+
+      # @rbs (Hash[String, untyped] message) -> (String | Integer)?
+      def safe_request_id: (Hash[String, untyped] message) -> (String | Integer)?
+
+      # @rbs (Hash[String, untyped] message) -> bool
+      def notification_envelope?: (Hash[String, untyped] message) -> bool
+
+      # @rbs (String method, bool request) -> void
+      def validate_message_kind!: (String method, bool request) -> void
+
+      # @rbs (Hash[String, untyped] message) -> (String | Integer)?
+      def validate_envelope: (Hash[String, untyped] message) -> (String | Integer)?
+
+      # @rbs (untyped value) -> bool
+      def valid_request_id?: (untyped value) -> bool
+
+      # @rbs (String method) -> void
+      def validate_lifecycle!: (String method) -> void
+
+      # @rbs (String | Integer request_id, untyped result) -> void
+      def send_result: (String | Integer request_id, untyped result) -> void
+
+      # @rbs (String | Integer | nil request_id, ProtocolError error) -> void
+      def send_error: (String | Integer | nil request_id, ProtocolError error) -> void
+
+      # @rbs (String message) -> void
+      def log: (String message) -> void
+    end
+  end
+end

data/sig/ibex/lsp/symbol_index.rbs

@@ -0,0 +1,78 @@
+# Generated from lib/ibex/lsp/symbol_index.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Answers source navigation and guarded workspace rename operations.
+    class SymbolIndex
+      IDENTIFIER: Regexp
+
+      RESERVED: Array[String]
+
+      # @rbs (DocumentStore store, String path) -> void
+      def initialize: (DocumentStore store, String path) -> void
+
+      # @rbs (String path, Hash[String, untyped] position) -> Array[Hash[String, untyped]]
+      def definition: (String path, Hash[String, untyped] position) -> Array[Hash[String, untyped]]
+
+      # @rbs (String path, Hash[String, untyped] position, ?include_declaration: bool) ->
+      #   Array[Hash[String, untyped]]
+      def references: (String path, Hash[String, untyped] position, ?include_declaration: bool) -> Array[Hash[String, untyped]]
+
+      # @rbs (String path, Hash[String, untyped] position) -> Hash[String, untyped]?
+      def prepare_rename: (String path, Hash[String, untyped] position) -> Hash[String, untyped]?
+
+      # @rbs (String path, Hash[String, untyped] position, String new_name) -> Hash[String, untyped]
+      def rename: (String path, Hash[String, untyped] position, String new_name) -> Hash[String, untyped]
+
+      # @rbs (String path, Hash[String, untyped] position) -> Hash[String, untyped]?
+      def hover: (String path, Hash[String, untyped] position) -> Hash[String, untyped]?
+
+      private
+
+      # @rbs (String path, Hash[String, untyped] position) -> SymbolOccurrence?
+      def occurrence_at: (String path, Hash[String, untyped] position) -> SymbolOccurrence?
+
+      # @rbs (Array[untyped] key, ?role: Symbol?) -> Array[SymbolOccurrence]
+      def matching: (Array[untyped] key, ?role: Symbol?) -> Array[SymbolOccurrence]
+
+      # @rbs (SymbolOccurrence occurrence) -> Hash[String, untyped]
+      def location: (SymbolOccurrence occurrence) -> Hash[String, untyped]
+
+      # @rbs (SymbolOccurrence occurrence) -> Hash[String, untyped]
+      def include_target_location: (SymbolOccurrence occurrence) -> Hash[String, untyped]
+
+      # @rbs (SymbolOccurrence occurrence) -> Hash[String, Hash[String, Integer]]
+      def range: (SymbolOccurrence occurrence) -> Hash[String, Hash[String, Integer]]
+
+      # @rbs (String path, Hash[String, untyped] position) -> SymbolOccurrence
+      def renameable_occurrence: (String path, Hash[String, untyped] position) -> SymbolOccurrence
+
+      # @rbs (SymbolOccurrence occurrence, String new_name) -> void
+      def validate_new_name: (SymbolOccurrence occurrence, String new_name) -> void
+
+      # @rbs (SymbolOccurrence candidate, SymbolOccurrence occurrence) -> bool
+      def collision_scope?: (SymbolOccurrence candidate, SymbolOccurrence occurrence) -> bool
+
+      # @rbs (Array[SymbolOccurrence] entries) -> void
+      def validate_nonoverlapping: (Array[SymbolOccurrence] entries) -> void
+
+      # @rbs (Array[SymbolOccurrence] entries) -> void
+      def validate_unshared: (Array[SymbolOccurrence] entries) -> void
+
+      # @rbs () -> void
+      def ensure_fresh!: () -> void
+
+      # @rbs (Array[SymbolOccurrence] entries, String new_name) -> Hash[String, String]
+      def changed_sources: (Array[SymbolOccurrence] entries, String new_name) -> Hash[String, String]
+
+      # @rbs (SymbolOccurrence occurrence) -> String?
+      def hover_value: (SymbolOccurrence occurrence) -> String?
+
+      # @rbs (SymbolOccurrence occurrence) -> String
+      def rule_hover: (SymbolOccurrence occurrence) -> String
+
+      # @rbs (SymbolOccurrence occurrence) -> String
+      def terminal_hover: (SymbolOccurrence occurrence) -> String
+    end
+  end
+end

data/sig/ibex/lsp/symbol_index_builder.rbs

@@ -0,0 +1,87 @@
+# Generated from lib/ibex/lsp/symbol_index_builder.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Builds source occurrences and hover metadata from lossless frontend documents.
+    class SymbolIndexBuilder
+      include SymbolIndexSourceQueries
+
+      include SymbolIndexPrecedenceReferences
+
+      # @rbs (DocumentStore store, Array[String] files) -> void
+      def initialize: (DocumentStore store, Array[String] files) -> void
+
+      # @rbs () -> [Array[SymbolOccurrence], Hash[String, Frontend::SourceDocument]]
+      def build: () -> [ Array[SymbolOccurrence], Hash[String, Frontend::SourceDocument] ]
+
+      private
+
+      # @rbs () -> void
+      def collect_documents: () -> void
+
+      # @rbs (String path, Frontend::SourceDocument document) -> void
+      def collect_definitions: (String path, Frontend::SourceDocument document) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document, Frontend::AST::declaration declaration,
+      #   Frontend::Location? following) -> void
+      def collect_declaration: (String path, Frontend::SourceDocument document, Frontend::AST::declaration declaration, Frontend::Location? following) -> void
+
+      # @rbs (Frontend::AST::Precedence declaration) -> void
+      def collect_precedence: (Frontend::AST::Precedence declaration) -> void
+
+      # @rbs (String path, Array[Frontend::Token] tokens, Frontend::AST::Include declaration) -> void
+      def collect_include: (String path, Array[Frontend::Token] tokens, Frontend::AST::Include declaration) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document, Frontend::AST::Rule rule) -> void
+      def collect_rule_definition: (String path, Frontend::SourceDocument document, Frontend::AST::Rule rule) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document, Frontend::AST::Rule rule,
+      #   Frontend::Token lhs_token) -> void
+      def collect_parameters: (String path, Frontend::SourceDocument document, Frontend::AST::Rule rule, Frontend::Token lhs_token) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document) -> void
+      def collect_references: (String path, Frontend::SourceDocument document) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document, Frontend::AST::declaration declaration,
+      #   Frontend::Location? following) -> void
+      def collect_declaration_references: (String path, Frontend::SourceDocument document, Frontend::AST::declaration declaration, Frontend::Location? following) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document, Frontend::AST::Rule rule,
+      #   Frontend::Location? following_rule) -> void
+      def collect_rule_references: (String path, Frontend::SourceDocument document, Frontend::AST::Rule rule, Frontend::Location? following_rule) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document, Frontend::AST::item item,
+      #   Frontend::AST::Rule rule, Integer rule_id) -> void
+      def collect_item: (String path, Frontend::SourceDocument document, Frontend::AST::item item, Frontend::AST::Rule rule, Integer rule_id) -> void
+
+      # @rbs (String path, Frontend::SourceDocument document,
+      #   Frontend::AST::SymbolReference | Frontend::AST::ParameterizedReference item,
+      #   Frontend::AST::Rule rule, Integer rule_id) -> void
+      def collect_named_item: (String path, Frontend::SourceDocument document, Frontend::AST::SymbolReference | Frontend::AST::ParameterizedReference item, Frontend::AST::Rule rule, Integer rule_id) -> void
+
+      # @rbs (String path, Frontend::Token token, String name) -> void
+      def add_global_reference: (String path, Frontend::Token token, String name) -> void
+
+      # @rbs (Symbol kind, String name) -> Hash[Symbol, untyped]
+      def symbol_data: (Symbol kind, String name) -> Hash[Symbol, untyped]
+
+      # @rbs (String path, Array[Frontend::Token] tokens, Array[String] names, Symbol kind, Symbol role) -> void
+      def add_named_tokens: (String path, Array[Frontend::Token] tokens, Array[String] names, Symbol kind, Symbol role) -> void
+
+      # @rbs (**untyped attributes) -> void
+      def add_occurrence: (**untyped attributes) -> void
+
+      # @rbs (String name) -> Array[untyped]
+      def global_key: (String name) -> Array[untyped]
+
+      # @rbs (String path, Integer rule_id, String name) -> Array[untyped]
+      def parameter_key: (String path, Integer rule_id, String name) -> Array[untyped]
+
+      # @rbs (Array[String] parameters) -> String
+      def parameter_signature: (Array[String] parameters) -> String
+
+      # @rbs (Frontend::AST::Include declaration) -> String?
+      def canonical_include_target: (Frontend::AST::Include declaration) -> String?
+    end
+  end
+end

data/sig/ibex/lsp/symbol_index_precedence_references.rbs

@@ -0,0 +1,18 @@
+# Generated from lib/ibex/lsp/symbol_index_precedence_references.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Indexes rule-scoped item and alternative precedence references.
+    module SymbolIndexPrecedenceReferences
+      private
+
+      # @rbs (String path, Frontend::SourceDocument document, Frontend::AST::Alternative alternative,
+      #   Frontend::Location? following, Frontend::AST::Rule rule, Integer rule_id) -> void
+      def collect_alternative_precedence: (String path, Frontend::SourceDocument document, Frontend::AST::Alternative alternative, Frontend::Location? following, Frontend::AST::Rule rule, Integer rule_id) -> void
+
+      # @rbs (String path, Frontend::Token token, String name, Frontend::AST::Rule rule,
+      #   Integer rule_id) -> void
+      def add_rule_reference: (String path, Frontend::Token token, String name, Frontend::AST::Rule rule, Integer rule_id) -> void
+    end
+  end
+end

data/sig/ibex/lsp/symbol_index_source_queries.rbs

@@ -0,0 +1,26 @@
+# Generated from lib/ibex/lsp/symbol_index_source_queries.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Locates lossless frontend tokens used by the symbol index.
+    module SymbolIndexSourceQueries
+      private
+
+      # @rbs (Frontend::SourceDocument document, Frontend::Location start,
+      #   Frontend::Location? finish) -> Array[Frontend::Token]
+      def tokens_between: (Frontend::SourceDocument document, Frontend::Location start, Frontend::Location? finish) -> Array[Frontend::Token]
+
+      # @rbs (Frontend::SourceDocument document, Frontend::Location location, String value) -> Frontend::Token?
+      def token_at: (Frontend::SourceDocument document, Frontend::Location location, String value) -> Frontend::Token?
+
+      # @rbs (Frontend::SourceDocument document, Frontend::Token lhs_token) -> Array[Frontend::Token]
+      def parameter_tokens: (Frontend::SourceDocument document, Frontend::Token lhs_token) -> Array[Frontend::Token]
+
+      # @rbs (Frontend::AST::declaration declaration) -> Array[String]
+      def declaration_reference_names: (Frontend::AST::declaration declaration) -> Array[String]
+
+      # @rbs (Frontend::Location left, Frontend::Location right) -> bool
+      def location_before?: (Frontend::Location left, Frontend::Location right) -> bool
+    end
+  end
+end

data/sig/ibex/lsp/symbol_occurrence.rbs

@@ -0,0 +1,25 @@
+# Generated from lib/ibex/lsp/symbol_occurrence.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # A source-backed grammar symbol definition or reference.
+    class SymbolOccurrence < Struct[String | Symbol | Array[untyped] | Frontend::SourceSpan | Hash[Symbol, untyped]]
+      attr_accessor name(): String
+
+      attr_accessor kind(): Symbol
+
+      attr_accessor role(): Symbol
+
+      attr_accessor key(): Array[untyped]
+
+      attr_accessor path(): String
+
+      attr_accessor span(): Frontend::SourceSpan
+
+      attr_accessor data(): Hash[Symbol, untyped]
+
+      def self.new: (?name: String, ?kind: Symbol, ?role: Symbol, ?key: Array[untyped], ?path: String, ?span: Frontend::SourceSpan, ?data: Hash[Symbol, untyped]) -> instance
+                  | ({ ?name: String, ?kind: Symbol, ?role: Symbol, ?key: Array[untyped], ?path: String, ?span: Frontend::SourceSpan, ?data: Hash[Symbol, untyped] }) -> instance
+    end
+  end
+end

data/sig/ibex/lsp/transport.rbs

@@ -0,0 +1,35 @@
+# Generated from lib/ibex/lsp/transport.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Reads and writes bounded LSP JSON-RPC messages over Content-Length framing.
+    class Transport
+      HEADER_SEPARATOR: ::String
+
+      # @rbs (untyped input, untyped output) -> void
+      def initialize: (untyped input, untyped output) -> void
+
+      # @rbs () -> Hash[String, untyped]?
+      def read_message: () -> Hash[String, untyped]?
+
+      # @rbs (Hash[String, untyped] message) -> void
+      def write_message: (Hash[String, untyped] message) -> void
+
+      private
+
+      # @rbs () -> String?
+      def read_header: () -> String?
+
+      # @rbs (String header) -> Integer
+      def content_length: (String header) -> Integer
+
+      # @rbs (Integer length) -> String
+      def read_bytes: (Integer length) -> String
+
+      # IO#read(length) may wait for the entire length on a live pipe. readpartial
+      # lets the stdio server process the bytes that are already available.
+      # @rbs (Integer length) -> String?
+      def read_chunk: (Integer length) -> String?
+    end
+  end
+end

data/sig/ibex/lsp/workspace.rbs

@@ -0,0 +1,41 @@
+# Generated from lib/ibex/lsp/workspace.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Converts file URIs to canonical paths constrained to initialized workspace roots.
+    class Workspace
+      attr_reader roots: Array[String]
+
+      # @rbs (Array[String] root_uris, Frontend::SourceLoader loader) -> void
+      def initialize: (Array[String] root_uris, Frontend::SourceLoader loader) -> void
+
+      # @rbs (String uri, ?allow_missing: bool) -> String
+      def path: (String uri, ?allow_missing: bool) -> String
+
+      # @rbs (String path) -> String
+      def uri: (String path) -> String
+
+      # @rbs (String path) -> String?
+      def root_for: (String path) -> String?
+
+      private
+
+      # URI is a stdlib boundary whose implementation class varies by scheme.
+      # @rbs (String uri) -> untyped
+      def parse_file_uri: (String uri) -> untyped
+
+      # Ruby's URI::File may discard userinfo and port, so validate the raw authority first.
+      # @rbs (String uri) -> void
+      def validate_raw_authority!: (String uri) -> void
+
+      # @rbs (String uri) -> String
+      def canonical_root: (String uri) -> String
+
+      # @rbs (String encoded) -> String
+      def decode_path: (String encoded) -> String
+
+      # @rbs (String path, String root) -> bool
+      def inside?: (String path, String root) -> bool
+    end
+  end
+end

data/sig/ibex/lsp/workspace_analyzer.rbs

@@ -0,0 +1,69 @@
+# Generated from lib/ibex/lsp/workspace_analyzer.rb with RBS::Inline
+
+module Ibex
+  module LSP
+    # Parses workspace sources, discovers safe include closures, and renders diagnostics.
+    class WorkspaceAnalyzer
+      GLOB_CHARACTERS: Regexp
+
+      WINDOWS_ABSOLUTE: Regexp
+
+      type lsp_diagnostic = Hash[String, untyped]
+
+      type analyzed_document = { source: String, document: Frontend::SourceDocument?, diagnostics: Array[lsp_diagnostic] }
+
+      # @rbs (Workspace workspace, Frontend::SourceLoader loader) -> void
+      def initialize: (Workspace workspace, Frontend::SourceLoader loader) -> void
+
+      # @rbs (String path) -> analyzed_document
+      def analyze: (String path) -> analyzed_document
+
+      # @rbs (String root) -> [Array[String], Hash[String, analyzed_document]]
+      def closure: (String root) -> [ Array[String], Hash[String, analyzed_document] ]
+
+      # @rbs (String root) -> [Frontend::Resolution?, Array[lsp_diagnostic]]
+      def resolve: (String root) -> [ Frontend::Resolution?, Array[lsp_diagnostic] ]
+
+      private
+
+      # @rbs (String path, String source) -> analyzed_document
+      def analyze_root: (String path, String source) -> analyzed_document
+
+      # @rbs (String path, String source) -> analyzed_document
+      def analyze_fragment: (String path, String source) -> analyzed_document
+
+      # @rbs (String source, String path) -> bool
+      def fragment_source?: (String source, String path) -> bool
+
+      # @rbs (Frontend::SourceDocument? document) -> Array[String]
+      def dependencies: (Frontend::SourceDocument? document) -> Array[String]
+
+      # @rbs (Frontend::AST::Include include_node) -> String
+      def canonical_include: (Frontend::AST::Include include_node) -> String
+
+      # @rbs (Frontend::AST::Include include_node) -> bot
+      def invalid_include: (Frontend::AST::Include include_node) -> bot
+
+      # @rbs (String message, String source, String fallback_path) -> lsp_diagnostic
+      def diagnostic: (String message, String source, String fallback_path) -> lsp_diagnostic
+
+      # @rbs (Frontend::Diagnostic diagnostic, String source) -> lsp_diagnostic
+      def frontend_diagnostic: (Frontend::Diagnostic diagnostic, String source) -> lsp_diagnostic
+
+      # @rbs (String message, String fallback_path) -> [String, Integer, Integer, String]
+      def diagnostic_parts: (String message, String fallback_path) -> [ String, Integer, Integer, String ]
+
+      # @rbs (String source, Integer line, Integer column) -> Hash[String, Hash[String, Integer]]
+      def diagnostic_range: (String source, Integer line, Integer column) -> Hash[String, Hash[String, Integer]]
+
+      # @rbs (String path) -> String
+      def readable_source: (String path) -> String
+
+      # @rbs (String message, String fallback) -> String
+      def file_for_error: (String message, String fallback) -> String
+
+      # @rbs (String message, String fallback) -> String
+      def source_for_error: (String message, String fallback) -> String
+    end
+  end
+end

data/sig/ibex/lsp.rbs

@@ -0,0 +1,7 @@
+# Generated from lib/ibex/lsp.rb with RBS::Inline
+
+module Ibex
+  # Language Server Protocol support for grammar workspaces.
+  module LSP
+  end
+end

data/sig/ibex/normalize/declarations.rbs

@@ -11,6 +11,37 @@ module Ibex
     # @rbs (Frontend::AST::declaration declaration) -> void
     def read_declaration: (Frontend::AST::declaration declaration) -> void
 
+    # @rbs (Frontend::AST::Start declaration) -> void
+    def read_start_declaration: (Frontend::AST::Start declaration) -> void
+
+    # @rbs (Frontend::AST::symbol_metadata | Frontend::AST::Parameter | Frontend::AST::Printer declaration) -> void
+    def read_extended_declaration: (Frontend::AST::symbol_metadata | Frontend::AST::Parameter | Frontend::AST::Printer declaration) -> void
+
+    # @rbs (Frontend::AST::Printer declaration) -> void
+    def read_value_printer: (Frontend::AST::Printer declaration) -> void
+
+    # @rbs () -> void
+    def validate_value_printers: () -> void
+
+    # @rbs (Frontend::AST::Parameter declaration) -> void
+    def read_parser_parameter: (Frontend::AST::Parameter declaration) -> void
+
+    # @rbs (Frontend::AST::Tokens declaration) -> void
+    def read_tokens: (Frontend::AST::Tokens declaration) -> void
+
+    # @rbs (Frontend::AST::Options declaration) -> void
+    def read_options: (Frontend::AST::Options declaration) -> void
+
+    # @rbs (Frontend::AST::Convert declaration) -> void
+    def read_conversions: (Frontend::AST::Convert declaration) -> void
+
+    # @rbs (Frontend::AST::symbol_metadata declaration) -> void
+    def read_symbol_metadata_declaration: (Frontend::AST::symbol_metadata declaration) -> void
+
+    # @rbs (Frontend::AST::symbol_metadata declaration, Hash[String, String] values,
+    #   Hash[String, IR::location] locations, String label) -> void
+    def read_symbol_metadata: (Frontend::AST::symbol_metadata declaration, Hash[String, String] values, Hash[String, IR::location] locations, String label) -> void
+
     # @rbs (Frontend::AST::Precedence declaration) -> void
     def read_precedence: (Frontend::AST::Precedence declaration) -> void
 

data/sig/ibex/normalize/diagnostics.rbs

@@ -8,6 +8,9 @@ module Ibex
     # @rbs () -> void
     def validate_grammar: () -> void
 
+    # @rbs () -> void
+    def validate_symbol_metadata: () -> void
+
     # @rbs () -> void
     def warn_duplicate_productions: () -> void
 
@@ -20,6 +23,12 @@ module Ibex
     # @rbs () -> void
     def warn_unused_terminals: () -> void
 
+    # @rbs () -> void
+    def warn_unreachable_terminals: () -> void
+
+    # @rbs () -> void
+    def warn_unused_precedence: () -> void
+
     # @rbs () -> void
     def warn_empty_language: () -> void
 

data/sig/ibex/normalize/expander.rbs

@@ -11,6 +11,9 @@ module Ibex
     # @rbs (Frontend::AST::Rule rule, Frontend::AST::Alternative alternative) -> void
     def normalize_alternative: (Frontend::AST::Rule rule, Frontend::AST::Alternative alternative) -> void
 
+    # @rbs (Frontend::AST::Alternative alternative) -> Array[Frontend::AST::item]
+    def normalized_alternative_items: (Frontend::AST::Alternative alternative) -> Array[Frontend::AST::item]
+
     # @rbs (Frontend::AST::item item) -> String
     def normalize_item: (Frontend::AST::item item) -> String
 
@@ -20,27 +23,36 @@ module Ibex
     # @rbs (Frontend::AST::Optional item) -> String
     def expand_optional: (Frontend::AST::Optional item) -> String
 
+    # @rbs (Frontend::AST::Optional item, String base) -> String
+    def build_optional: (Frontend::AST::Optional item, String base) -> String
+
     # @rbs (Frontend::AST::Star item) -> String
     def expand_star: (Frontend::AST::Star item) -> String
 
+    # @rbs (Frontend::AST::Star item, String base) -> String
+    def build_star: (Frontend::AST::Star item, String base) -> String
+
     # @rbs (Frontend::AST::Plus item) -> String
     def expand_plus: (Frontend::AST::Plus item) -> String
 
+    # @rbs (Frontend::AST::Plus item, String base) -> String
+    def build_plus: (Frontend::AST::Plus item, String base) -> String
+
     # @rbs (Frontend::AST::SeparatedList item) -> String
     def expand_separated_list: (Frontend::AST::SeparatedList item) -> String
 
+    # @rbs (Frontend::AST::SeparatedList item, String base, String separator) -> String
+    def build_separated_list: (Frontend::AST::SeparatedList item, String base, String separator) -> String
+
     # @rbs (Frontend::AST::Group item) -> String
     def expand_group: (Frontend::AST::Group item) -> String
 
+    # @rbs (String helper, Array[String] rhs, Frontend::AST::Group item) -> void
+    def add_group_production: (String helper, Array[String] rhs, Frontend::AST::Group item) -> void
+
     # @rbs (Integer length) -> String
     def group_value_expression: (Integer length) -> String
 
-    # @rbs (Frontend::AST::Group group) -> void
-    def reject_group_named_references: (Frontend::AST::Group group) -> void
-
-    # @rbs (Frontend::AST::item item) -> Frontend::AST::SymbolReference?
-    def named_reference_in: (Frontend::AST::item item) -> Frontend::AST::SymbolReference?
-
     # @rbs (String kind, Frontend::Location location) -> String
     def new_helper: (String kind, Frontend::Location location) -> String
 
@@ -53,14 +65,8 @@ module Ibex
     # @rbs (Frontend::AST::InlineAction? action, Array[IR::named_ref] named_refs) -> IR::Action?
     def normalize_action: (Frontend::AST::InlineAction? action, Array[IR::named_ref] named_refs) -> IR::Action?
 
-    # @rbs (Frontend::AST::item item, Array[IR::named_ref] refs, Integer index) -> void
-    def add_named_reference: (Frontend::AST::item item, Array[IR::named_ref] refs, Integer index) -> void
-
-    # @rbs (Frontend::AST::item item) -> Frontend::AST::SymbolReference?
-    def unwrap_reference: (Frontend::AST::item item) -> Frontend::AST::SymbolReference?
-
     # @rbs (String lhs_name, Array[String] rhs_names, IR::Action? action, String? precedence_name,
-    #   Hash[Symbol, untyped] origin) -> void
-    def add_production: (String lhs_name, Array[String] rhs_names, IR::Action? action, String? precedence_name, Hash[Symbol, untyped] origin) -> void
+    #   Hash[Symbol, untyped] origin, ?String? documentation, ?IR::node_annotation? node) -> void
+    def add_production: (String lhs_name, Array[String] rhs_names, IR::Action? action, String? precedence_name, Hash[Symbol, untyped] origin, ?String? documentation, ?IR::node_annotation? node) -> void
   end
 end

data/sig/ibex/normalize/expression.rbs

@@ -3,19 +3,19 @@
 module Ibex
   # Deterministically renders frontend EBNF items for production origin metadata.
   module NormalizeExpression
-    private def render_reference: (Frontend::AST::SymbolReference item) -> String
-
-    private def self.render_reference: (Frontend::AST::SymbolReference item) -> String
-
-    private def render_group: (Frontend::AST::Group item) -> String
+    # @rbs (Frontend::AST::item item) -> String
+    def self.render: (Frontend::AST::item item) -> String
 
-    private def self.render_group: (Frontend::AST::Group item) -> String
+    # @rbs (Array[untyped] pending, Frontend::AST::item item) -> void
+    private def self.push_render_item: (Array[untyped] pending, Frontend::AST::item item) -> void
 
-    private def render_separated_list: (Frontend::AST::SeparatedList item) -> String
+    # @rbs (Array[untyped] pending, Frontend::AST::ParameterizedReference item) -> void
+    private def self.push_render_parameterized_reference: (Array[untyped] pending, Frontend::AST::ParameterizedReference item) -> void
 
-    private def self.render_separated_list: (Frontend::AST::SeparatedList item) -> String
+    # @rbs (Array[untyped] pending, Frontend::AST::Group item) -> void
+    private def self.push_render_group: (Array[untyped] pending, Frontend::AST::Group item) -> void
 
-    # @rbs (Frontend::AST::item item) -> String
-    def self?.render: (Frontend::AST::item item) -> String
+    # @rbs (Array[untyped] pending, Array[Frontend::AST::item] items, String separator) -> void
+    private def self.push_render_items: (Array[untyped] pending, Array[Frontend::AST::item] items, String separator) -> void
   end
 end