ibex 0.2.0 → 0.3.0

data/sig/ibex/ir/validator/base.rbs

@@ -3,56 +3,60 @@
 module Ibex
   module IR
     module Validator
-      # Shared JSON-shape checks for the two version-1 IR documents.
+      type json_value = String | Integer | Float | bool | nil | Array[json_value] | Hash[String, json_value]
+
+      type json_object = Hash[String, json_value]
+
+      # Shared JSON-shape checks for current IR documents.
       class Base
         POSITION: ::String
 
         private
 
-        # @rbs (untyped value, String path, Array[String] required, ?Array[String] optional) -> Hash[String, untyped]
-        def record: (untyped value, String path, Array[String] required, ?Array[String] optional) -> Hash[String, untyped]
+        # @rbs (json_value value, String path, Array[String] required, ?Array[String] optional) -> json_object
+        def record: (json_value value, String path, Array[String] required, ?Array[String] optional) -> json_object
 
-        # @rbs (untyped value, String path) -> Hash[String, untyped]
-        def object: (untyped value, String path) -> Hash[String, untyped]
+        # @rbs (json_value value, String path) -> json_object
+        def object: (json_value value, String path) -> json_object
 
-        # @rbs (untyped value, String path) -> Array[untyped]
-        def array: (untyped value, String path) -> Array[untyped]
+        # @rbs (json_value value, String path) -> Array[json_value]
+        def array: (json_value value, String path) -> Array[json_value]
 
-        # @rbs (untyped value, String path) -> String
-        def string: (untyped value, String path) -> String
+        # @rbs (json_value value, String path) -> String
+        def string: (json_value value, String path) -> String
 
-        # @rbs (untyped value, String path) -> String
-        def nonempty_string: (untyped value, String path) -> String
+        # @rbs (json_value value, String path) -> String
+        def nonempty_string: (json_value value, String path) -> String
 
-        # @rbs (untyped value, String path) -> Integer
-        def integer: (untyped value, String path) -> Integer
+        # @rbs (json_value value, String path) -> Integer
+        def integer: (json_value value, String path) -> Integer
 
-        # @rbs (untyped value, String path) -> Integer
-        def nonnegative_integer: (untyped value, String path) -> Integer
+        # @rbs (json_value value, String path) -> Integer
+        def nonnegative_integer: (json_value value, String path) -> Integer
 
-        # @rbs (untyped value, String path) -> bool
-        def boolean: (untyped value, String path) -> bool
+        # @rbs (json_value value, String path) -> bool
+        def boolean: (json_value value, String path) -> bool
 
-        # @rbs (untyped value, String path, untyped expected) -> void
-        def literal: (untyped value, String path, untyped expected) -> void
+        # @rbs (json_value value, String path, json_value expected) -> void
+        def literal: (json_value value, String path, json_value expected) -> void
 
-        # @rbs (untyped value, String path, Array[String] values) -> String
-        def enum: (untyped value, String path, Array[String] values) -> String
+        # @rbs (json_value value, String path, Array[String] values) -> String
+        def enum: (json_value value, String path, Array[String] values) -> String
 
-        # @rbs (untyped value, String path, ?nullable: bool) -> void
-        def location: (untyped value, String path, ?nullable: bool) -> void
+        # @rbs (json_value value, String path, ?nullable: bool) -> void
+        def location: (json_value value, String path, ?nullable: bool) -> void
 
-        # @rbs (untyped value, String path) -> Integer
-        def positive_integer: (untyped value, String path) -> Integer
+        # @rbs (json_value value, String path) -> Integer
+        def positive_integer: (json_value value, String path) -> Integer
 
-        # @rbs (untyped value, String path) -> String?
-        def nullable_string: (untyped value, String path) -> String?
+        # @rbs (json_value value, String path) -> String?
+        def nullable_string: (json_value value, String path) -> String?
 
-        # @rbs (untyped value, String path) -> void
-        def metadata: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def metadata: (json_value value, String path) -> void
 
-        # @rbs (Hash[String, untyped] value, String key, String path) -> untyped
-        def field: (Hash[String, untyped] value, String key, String path) -> untyped
+        # @rbs (json_object value, String key, String path) -> json_value
+        def field: (json_object value, String key, String path) -> json_value
 
         # @rbs (String path, String key) -> String
         def child_path: (String path, String key) -> String

data/sig/ibex/ir/validator/grammar.rbs

@@ -3,53 +3,61 @@
 module Ibex
   module IR
     module Validator
-      # Structural and referential validation for a versioned Grammar IR JSON object.
+      # Structural and referential validation for a current Grammar IR JSON object.
       # rubocop:disable Metrics/ClassLength -- inline type contracts accompany one cohesive document validator.
       class GrammarDocument < Base
         ROOT_REQUIRED: Array[String]
 
         ROOT_OPTIONAL: Array[String]
 
-        V2_ROOT_REQUIRED: Array[String]
-
-        V2_ROOT_OPTIONAL: Array[String]
-
         SYMBOL_REQUIRED: Array[String]
 
         SYMBOL_OPTIONAL: Array[String]
 
-        V2_SYMBOL_REQUIRED: Array[String]
+        SYMBOL_METADATA_REQUIRED: Array[String]
 
         PRODUCTION_REQUIRED: Array[String]
 
-        V2_PRODUCTION_REQUIRED: Array[String]
+        PRODUCTION_METADATA_REQUIRED: Array[String]
 
-        V2_ACTION_REQUIRED: Array[String]
+        ACTION_COMPOSITION_REQUIRED: Array[String]
 
         ORIGIN_KINDS: Array[String]
 
         RUBY_KEYWORDS: Array[String]
 
-        attr_reader symbols_by_id: Hash[Integer, Hash[String, untyped]]
+        attr_reader symbols_by_id: Hash[Integer, json_object]
 
-        attr_reader symbols_by_name: Hash[String, Hash[String, untyped]]
+        attr_reader symbols_by_name: Hash[String, json_object]
 
-        attr_reader productions_by_id: Hash[Integer, Hash[String, untyped]]
+        attr_reader productions_by_id: Hash[Integer, json_object]
 
         @version: Integer
 
         @path: String
 
-        @data: Hash[String, untyped]
+        @data: json_object
 
-        # @rbs (Hash[String, untyped] data, ?path: String, ?version: Integer) -> void
-        def initialize: (Hash[String, untyped] data, ?path: String, ?version: Integer) -> void
+        # @rbs (json_object data, ?path: String, ?version: Integer) -> void
+        def initialize: (json_object data, ?path: String, ?version: Integer) -> void
 
         # @rbs () -> self
         def validate: () -> self
 
         private
 
+        # @rbs () -> void
+        def validate_root_record: () -> void
+
+        # @rbs () -> void
+        def validate_optional_parser_metadata: () -> void
+
+        # @rbs () -> void
+        def validate_parser_parameters_if_present: () -> void
+
+        # @rbs () -> void
+        def validate_optional_source_metadata: () -> void
+
         # @rbs () -> void
         def validate_envelope: () -> void
 
@@ -71,11 +79,11 @@ module Ibex
         # @rbs () -> void
         def validate_symbols: () -> void
 
-        # @rbs (untyped value, Integer index) -> void
-        def validate_symbol: (untyped value, Integer index) -> void
+        # @rbs (json_value value, Integer index) -> void
+        def validate_symbol: (json_value value, Integer index) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_precedence: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_precedence: (json_value value, String path) -> void
 
         # @rbs () -> void
         def validate_reserved_symbols: () -> void
@@ -92,53 +100,53 @@ module Ibex
         # @rbs () -> void
         def validate_recovery: () -> void
 
-        # @rbs (untyped values, String path, kind: String) -> void
-        def validate_recovery_symbols: (untyped values, String path, kind: String) -> void
+        # @rbs (json_value values, String path, kind: String) -> void
+        def validate_recovery_symbols: (json_value values, String path, kind: String) -> void
 
-        # @rbs (untyped value, String path, kind: String, seen: Hash[String, bool]) -> void
-        def validate_recovery_symbol: (untyped value, String path, kind: String, seen: Hash[String, bool]) -> void
+        # @rbs (json_value value, String path, kind: String, seen: Hash[String, bool]) -> void
+        def validate_recovery_symbol: (json_value value, String path, kind: String, seen: Hash[String, bool]) -> void
 
         # @rbs () -> void
         def validate_productions: () -> void
 
-        # @rbs (untyped value, Integer index) -> void
-        def validate_production: (untyped value, Integer index) -> void
+        # @rbs (json_value value, Integer index) -> void
+        def validate_production: (json_value value, Integer index) -> void
 
-        # @rbs (untyped value, String path, rhs_length: Integer) -> void
-        def validate_node_annotation: (untyped value, String path, rhs_length: Integer) -> void
+        # @rbs (json_value value, String path, rhs_length: Integer) -> void
+        def validate_node_annotation: (json_value value, String path, rhs_length: Integer) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_lhs: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_lhs: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_rhs: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_rhs: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path, rhs_length: Integer) -> void
-        def validate_action: (untyped value, String path, rhs_length: Integer) -> void
+        # @rbs (json_value value, String path, rhs_length: Integer) -> void
+        def validate_action: (json_value value, String path, rhs_length: Integer) -> void
 
-        # @rbs (untyped value, String path, limit: Integer) -> void
-        def validate_named_refs: (untyped value, String path, limit: Integer) -> void
+        # @rbs (json_value value, String path, limit: Integer) -> void
+        def validate_named_refs: (json_value value, String path, limit: Integer) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_precedence_override: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_precedence_override: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_origin: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_origin: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_string_map: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_string_map: (json_value value, String path) -> void
 
         # @rbs () -> void
         def validate_warnings: () -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_warning: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_warning: (json_value value, String path) -> void
 
-        # @rbs (Hash[String, untyped] warning, String path) -> void
-        def validate_warning_symbol: (Hash[String, untyped] warning, String path) -> void
+        # @rbs (json_object warning, String path) -> void
+        def validate_warning_symbol: (json_object warning, String path) -> void
 
-        # @rbs (Hash[String, untyped] warning, String field_name, String path) -> void
-        def validate_warning_production: (Hash[String, untyped] warning, String field_name, String path) -> void
+        # @rbs (json_object warning, String field_name, String path) -> void
+        def validate_warning_production: (json_object warning, String field_name, String path) -> void
 
         # @rbs () -> void
         def validate_lexer: () -> void
@@ -146,38 +154,41 @@ module Ibex
         # @rbs () -> void
         def validate_user_code_chunks: () -> void
 
-        # @rbs (untyped value, String path, ?nullable: bool) -> void
-        def validate_source_provenance: (untyped value, String path, ?nullable: bool) -> void
+        # @rbs (json_value value, String path, ?nullable: bool) -> void
+        def validate_source_provenance: (json_value value, String path, ?nullable: bool) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_byte_span: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_byte_span: (json_value value, String path) -> void
 
         # @rbs () -> void
-        def validate_migration: () -> void
+        def validate_parser_contract: () -> void
+
+        # @rbs (untyped value, String, Array[String]) -> Hash[String, untyped]
+        def validate_contract_entry: (untyped value, String, Array[String]) -> Hash[String, untyped]
 
-        # @rbs (untyped value, String path) -> void
-        def validate_expansion: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_expansion: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_parameter_expansion: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_parameter_expansion: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_inline_expansion: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_inline_expansion: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path, rhs_length: Integer) -> void
-        def validate_action_composition: (untyped value, String path, rhs_length: Integer) -> void
+        # @rbs (json_value value, String path, rhs_length: Integer) -> void
+        def validate_action_composition: (json_value value, String path, rhs_length: Integer) -> void
 
-        # @rbs (untyped value, String path, Integer rhs_length, Array[untyped] fragments) -> void
-        def validate_action_composition_plan: (untyped value, String path, Integer rhs_length, Array[untyped] fragments) -> void
+        # @rbs (json_value value, String path, Integer rhs_length, Array[json_value] fragments) -> void
+        def validate_action_composition_plan: (json_value value, String path, Integer rhs_length, Array[json_value] fragments) -> void
 
-        # @rbs (untyped value, String path, Integer physical, Integer step_index) -> void
-        def validate_action_composition_step: (untyped value, String path, Integer physical, Integer step_index) -> void
+        # @rbs (json_value value, String path, Integer physical, Integer step_index) -> void
+        def validate_action_composition_step: (json_value value, String path, Integer physical, Integer step_index) -> void
 
-        # @rbs (Array[untyped] inputs, String path, Integer limit) -> void
-        def validate_action_slots: (Array[untyped] inputs, String path, Integer limit) -> void
+        # @rbs (Array[json_value] inputs, String path, Integer limit) -> void
+        def validate_action_slots: (Array[json_value] inputs, String path, Integer limit) -> void
 
-        # @rbs (untyped value, String path, Integer physical) -> void
-        def validate_action_lookahead: (untyped value, String path, Integer physical) -> void
+        # @rbs (json_value value, String path, Integer physical) -> void
+        def validate_action_lookahead: (json_value value, String path, Integer physical) -> void
       end
     end
   end

data/sig/ibex/ir/validator/lexer.rbs

@@ -9,8 +9,8 @@ module Ibex
 
         RULE_REQUIRED: Array[String]
 
-        # @rbs (Hash[String, untyped] data, ?path: String) -> void
-        def initialize: (Hash[String, untyped] data, ?path: String) -> void
+        # @rbs (json_object data, ?path: String) -> void
+        def initialize: (json_object data, ?path: String) -> void
 
         # @rbs () -> self
         def validate: () -> self
@@ -23,8 +23,8 @@ module Ibex
         # @rbs () -> void
         def validate_rules: () -> void
 
-        # @rbs (Hash[String, untyped] rule, String path, String options) -> void
-        def validate_pattern: (Hash[String, untyped] rule, String path, String options) -> void
+        # @rbs (json_object rule, String path, String options) -> void
+        def validate_pattern: (json_object rule, String path, String options) -> void
 
         # @rbs () -> void
         def validate_warnings: () -> void

data/sig/ibex/ir.rbs

@@ -2,6 +2,8 @@
 
 module Ibex
   module IR
+    type serialized_value = untyped
+
     type location = { file: String, line: Integer, column: Integer }
 
     type precedence = { associativity: Symbol, level: Integer }
@@ -24,6 +26,10 @@ module Ibex
 
     type lexer_warning = { type: :redos, rule: Integer, loc: location }
 
+    type lexer_rule_document_value = Integer | String | Symbol | nil | location
+
+    type lexer_document_value = String | Integer | Array[String] | Array[Hash[Symbol, lexer_rule_document_value]] | Array[lexer_warning] | source_provenance?
+
     type parameter_expansion = { rule: String, arguments: Array[String] }
 
     type inline_expansion = { rule: String }
@@ -38,8 +44,6 @@ module Ibex
 
     type action_composition = { strategy: String, fragments: Array[action_fragment], ?plan: action_composition_plan }
 
-    type migration_metadata = { from_schema_version: Integer, unavailable: Array[String] }
-
     type user_code_chunks = Hash[String, Array[UserCodeChunk]]
 
     type grammar_options = { result_var: bool, omit_action_call: bool, ?cst: bool }
@@ -70,7 +74,9 @@ module Ibex
 
     type conflict_summary = { sr: Integer, resolved_sr: Integer, rr: Integer, expected_sr: Integer, expectation_met: bool, ?expected_rr: Integer, ?rr_expectation_met: bool }
 
-    type interpretation = Hash[Symbol, untyped]
+    type derivation_node = { symbol: String, ?token: String, ?production: Integer, ?children: Array[derivation_node] }
+
+    type interpretation = { kind: Symbol, tree: derivation_node?, ?state: Integer, ?production: Integer }
 
     type counterexample = { state: Integer, type: Symbol, symbol_path: Array[String], sentence: Array[String], lookahead_index: Integer, unifying: bool, interpretations: Array[interpretation] }
   end

data/sig/ibex/lalr/build_metrics.rbs

@@ -2,6 +2,8 @@
 
 module Ibex
   module LALR
+    # Optional measurements are kept explicit for schema stability.
+    # rubocop:disable Metrics/ParameterLists
     # Immutable structural measurements from one automaton build. These counts
     # are intended for diagnostics and benchmarks, not parser behavior.
     class BuildMetrics
@@ -13,8 +15,46 @@ module Ibex
 
       attr_reader strategy: Symbol
 
-      # @rbs (construction_states: Integer, canonical_states: Integer?, final_states: Integer, strategy: Symbol) -> void
-      def initialize: (construction_states: Integer, canonical_states: Integer?, final_states: Integer, strategy: Symbol) -> void
+      attr_reader lr0_states: Integer?
+
+      attr_reader lr0_items: Integer?
+
+      attr_reader canonical_items: Integer?
+
+      attr_reader final_items: Integer?
+
+      attr_reader final_lookahead_items: Integer?
+
+      attr_reader propagation_edges: Integer?
+
+      attr_reader ielr_initial_partitions: Integer?
+
+      attr_reader ielr_final_partitions: Integer?
+
+      attr_reader ielr_annotations: Integer?
+
+      attr_reader ielr_annotated_states: Integer?
+
+      attr_reader ielr_inadequacies: Integer?
+
+      attr_reader ielr_split_stable_discarded: Integer?
+
+      attr_reader ielr_lalr_states: Integer?
+
+      attr_reader ielr_split_states: Integer?
+
+      attr_reader ielr_unreachable_removed: Integer?
+
+      attr_reader ielr_remergeable_candidates: Integer?
+
+      # @rbs (construction_states: Integer, canonical_states: Integer?, final_states: Integer, strategy: Symbol,
+      #   ?lr0_states: Integer?, ?lr0_items: Integer?, ?canonical_items: Integer?, ?final_items: Integer?,
+      #   ?final_lookahead_items: Integer?, ?propagation_edges: Integer?, ?ielr_initial_partitions: Integer?,
+      #   ?ielr_final_partitions: Integer?, ?ielr_annotations: Integer?, ?ielr_annotated_states: Integer?,
+      #   ?ielr_inadequacies: Integer?, ?ielr_split_stable_discarded: Integer?, ?ielr_lalr_states: Integer?,
+      #   ?ielr_split_states: Integer?, ?ielr_unreachable_removed: Integer?,
+      #   ?ielr_remergeable_candidates: Integer?) -> void
+      def initialize: (construction_states: Integer, canonical_states: Integer?, final_states: Integer, strategy: Symbol, ?lr0_states: Integer?, ?lr0_items: Integer?, ?canonical_items: Integer?, ?final_items: Integer?, ?final_lookahead_items: Integer?, ?propagation_edges: Integer?, ?ielr_initial_partitions: Integer?, ?ielr_final_partitions: Integer?, ?ielr_annotations: Integer?, ?ielr_annotated_states: Integer?, ?ielr_inadequacies: Integer?, ?ielr_split_stable_discarded: Integer?, ?ielr_lalr_states: Integer?, ?ielr_split_states: Integer?, ?ielr_unreachable_removed: Integer?, ?ielr_remergeable_candidates: Integer?) -> void
     end
   end
 end

data/sig/ibex/lalr/builder.rbs

@@ -11,48 +11,87 @@ module Ibex
 
       LALR_STRATEGIES: Array[Symbol]
 
-      @canonical_key_radices: [ Integer, Integer, Integer ]?
+      IELR_STRATEGIES: Array[Symbol]
 
-      @canonical_item_cache: Hash[Integer, Array[Array[lr_item?]?]]?
+      @grammar: IR::Grammar
 
-      @canonical_suffix_lookahead_cache: Hash[Integer, Hash[Integer, Hash[Integer, Array[Integer]]]]
+      @algorithm: Symbol
 
-      @attribute_entries: bool
+      @lalr_strategy: Symbol
 
-      @entry_isolation: bool
+      @ielr_strategy: Symbol
 
-      @start_names: Array[String]
+      @sets: Analysis::Sets
 
-      @metrics: BuildMetrics?
+      @productions_by_lhs: Hash[Integer, Array[IR::Production]]
 
       @resolver: ConflictResolver
 
-      @productions_by_lhs: Hash[Integer, Array[IR::Production]]
+      @metrics: BuildMetrics?
 
-      @sets: Analysis::Sets
+      @start_names: Array[String]
 
-      @lalr_strategy: Symbol
+      @entry_isolation: bool
 
-      @algorithm: Symbol
+      @attribute_entries: bool
 
-      @grammar: IR::Grammar
+      @profile: bool
+
+      @remove_unreachable: bool
+
+      @canonical_suffix_lookahead_cache: Hash[Integer, Hash[Integer, Hash[Integer, Array[Integer]]]]
+
+      @canonical_item_cache: Hash[Integer, Array[Array[lr_item?]?]]?
+
+      @canonical_key_radices: [ Integer, Integer, Integer ]?
 
       attr_reader metrics: BuildMetrics?
 
       # @rbs (IR::Grammar grammar, ?algorithm: Symbol | String, ?lalr_strategy: Symbol | String,
-      #   ?entry_isolation: bool, ?starts: Array[String]?, ?attribute_entries: bool) -> void
-      def initialize: (IR::Grammar grammar, ?algorithm: Symbol | String, ?lalr_strategy: Symbol | String, ?entry_isolation: bool, ?starts: Array[String]?, ?attribute_entries: bool) -> void
+      #   ?ielr_strategy: Symbol | String,
+      #   ?entry_isolation: bool, ?starts: Array[String]?, ?attribute_entries: bool, ?profile: bool,
+      #   ?remove_unreachable: bool) -> void
+      def initialize: (IR::Grammar grammar, ?algorithm: Symbol | String, ?lalr_strategy: Symbol | String, ?ielr_strategy: Symbol | String, ?entry_isolation: bool, ?starts: Array[String]?, ?attribute_entries: bool, ?profile: bool, ?remove_unreachable: bool) -> void
 
       # @rbs () -> IR::Automaton
       def build: () -> IR::Automaton
 
       private
 
+      # @rbs (states: Array[IR::AutomatonState], conflict_summary: IR::conflict_summary,
+      #   entry_states: Hash[String, Integer]) -> IR::Automaton
+      def build_output_automaton: (states: Array[IR::AutomatonState], conflict_summary: IR::conflict_summary, entry_states: Hash[String, Integer]) -> IR::Automaton
+
       # @rbs (Array[IR::AutomatonState] states) -> IR::conflict_summary
       def conflict_summary: (Array[IR::AutomatonState] states) -> IR::conflict_summary
 
-      # @rbs () -> [Array[packed_items], transitions, Integer, Integer?, Symbol]
-      def automaton_collection: () -> [ Array[packed_items], transitions, Integer, Integer?, Symbol ]
+      # @rbs () -> [Array[packed_items], transitions, build_collection]
+      def automaton_collection: () -> [ Array[packed_items], transitions, build_collection ]
+
+      # @rbs () -> [Array[packed_items], transitions, build_collection]
+      def ielr_collection: () -> [ Array[packed_items], transitions, build_collection ]
+
+      # @rbs () -> [Array[packed_items], transitions, build_collection]
+      def ielr_direct_collection: () -> [ Array[packed_items], transitions, build_collection ]
+
+      # @rbs () -> [Array[packed_items], transitions, build_collection]
+      def canonical_lr1_collection: () -> [ Array[packed_items], transitions, build_collection ]
+
+      # @rbs (Symbol strategy) -> [Array[packed_items], transitions, build_collection]
+      def merged_canonical_collection: (Symbol strategy) -> [ Array[packed_items], transitions, build_collection ]
+
+      # @rbs () -> untyped
+      def direct_collection: () -> untyped
+
+      # @rbs (Array[item_set] states, strategy: Symbol) -> build_collection
+      def canonical_profile: (Array[item_set] states, strategy: Symbol) -> build_collection
+
+      # @rbs (Array[packed_items] items) -> [Integer?, Integer?]
+      def profiled_final_item_counts: (Array[packed_items] items) -> [ Integer?, Integer? ]
+
+      # @rbs (build_collection collection, Integer final_states, Integer? final_items,
+      #   Integer? final_lookahead_items) -> BuildMetrics
+      def build_metrics: (build_collection collection, Integer final_states, Integer? final_items, Integer? final_lookahead_items) -> BuildMetrics
 
       # @rbs () -> String
       def algorithm_name: () -> String
@@ -97,10 +136,9 @@ module Ibex
       def build_state: (Integer state_id, Array[IR::AutomatonItem] items, Hash[Integer, Integer] transitions) -> IR::AutomatonState
 
       # Conflict hashes are produced locally immediately before this boundary.
-      # Keeping the parameter untyped avoids duplicating both discriminated
-      # hash variants solely to add their common optional provenance field.
-      # @rbs (untyped conflict) -> IR::conflict
-      def attribute_midrule_conflict: (untyped conflict) -> IR::conflict
+      # Both conflict variants carry the same optional midrule provenance field.
+      # @rbs (IR::conflict conflict) -> IR::conflict
+      def attribute_midrule_conflict: (IR::conflict conflict) -> IR::conflict
 
       # @rbs (Array[IR::AutomatonItem] items, Hash[Integer, Array[IR::parser_action]] candidates) -> void
       def add_completed_actions: (Array[IR::AutomatonItem] items, Hash[Integer, Array[IR::parser_action]] candidates) -> void
@@ -133,6 +171,19 @@ module Ibex
       # @rbs () -> IR::Automaton
       def build_isolated_automaton: () -> IR::Automaton
 
+      # @rbs (Array[[String, IR::Automaton, BuildMetrics]] entries, Integer construction_states,
+      #   Integer? canonical_states, Integer final_states) -> BuildMetrics
+      def isolated_metrics: (Array[[ String, IR::Automaton, BuildMetrics ]] entries, Integer construction_states, Integer? canonical_states, Integer final_states) -> BuildMetrics
+
+      # @rbs (Array[[String, IR::Automaton, BuildMetrics]] entries, Symbol method) -> Integer?
+      def sum_optional_metric: (Array[[ String, IR::Automaton, BuildMetrics ]] entries, Symbol method) -> Integer?
+
+      # @rbs () -> Integer
+      def output_schema_version: () -> Integer
+
+      # @rbs () -> String?
+      def output_entry_construction: () -> String?
+
       # @rbs (String name) -> [String, IR::Automaton, BuildMetrics]
       def isolated_entry: (String name) -> [ String, IR::Automaton, BuildMetrics ]
 
@@ -155,11 +206,11 @@ module Ibex
       # @rbs (Array[IR::AutomatonState] states, Hash[String, Integer] entry_states) -> Array[Array[String]]
       def entry_reachability: (Array[IR::AutomatonState] states, Hash[String, Integer] entry_states) -> Array[Array[String]]
 
-      # @rbs () -> Set[Array[untyped]]
-      def isolated_conflict_fingerprints: () -> Set[Array[untyped]]
+      # @rbs () -> Set[conflict_fingerprint]
+      def isolated_conflict_fingerprints: () -> Set[conflict_fingerprint]
 
-      # @rbs (IR::conflict conflict) -> Array[untyped]
-      def conflict_fingerprint: (IR::conflict conflict) -> Array[untyped]
+      # @rbs (IR::conflict conflict) -> conflict_fingerprint
+      def conflict_fingerprint: (IR::conflict conflict) -> conflict_fingerprint
     end
   end
 end

data/sig/ibex/lalr/conflict_search.rbs

@@ -46,14 +46,17 @@ module Ibex
       #   ?max_tokens: Integer, ?max_configurations: Integer) -> void
       def initialize: (IR::Automaton automaton, IR::AutomatonState state, IR::conflict conflict, ?max_tokens: Integer, ?max_configurations: Integer) -> void
 
-      # @rbs () -> search_result?
-      def call: () -> search_result?
+      # @rbs () -> search_outcome
+      def call: () -> search_outcome
 
       # @rbs () -> bool
       def exhausted?: () -> bool
 
       private
 
+      # @rbs (:found | :not_found | :exhausted status, ?search_result? result) -> search_outcome
+      def outcome: (:found | :not_found | :exhausted status, ?search_result? result) -> search_outcome
+
       # @rbs (Configuration current) -> Array[Configuration]
       def conflict_configurations: (Configuration current) -> Array[Configuration]