ibex 0.2.0 → 0.4.0

data/sig/ibex/ir/grammar_ir.rbs

@@ -2,12 +2,15 @@
 
 module Ibex
   module IR
+    # Grammar IR has one active wire format.  A future incompatible format
+    # change may advance this number, but the runtime never treats old
+    # formats as an alternate compatibility surface.
     SCHEMA_VERSION: ::Integer
 
     SUPPORTED_SCHEMA_VERSIONS: Array[Integer]
 
-    # @rbs (untyped value) -> untyped
-    def self?.deep_freeze: (untyped value) -> untyped
+    # @rbs (Object? value) -> Object?
+    def self?.deep_freeze: (Object? value) -> Object?
 
     # An interned terminal or nonterminal.
     class GrammarSymbol
@@ -39,8 +42,8 @@ module Ibex
       # @rbs () -> bool
       def nonterminal?: () -> bool
 
-      # @rbs (?schema_version: Integer) -> Hash[Symbol, untyped]
-      def to_h: (?schema_version: Integer) -> Hash[Symbol, untyped]
+      # @rbs () -> Hash[Symbol, Object?]
+      def to_h: () -> Hash[Symbol, Object?]
     end
 
     # Opaque Ruby semantic action metadata.
@@ -59,8 +62,8 @@ module Ibex
       #   ?composition: action_composition?) -> void
       def initialize: (code: String, location: location, ?named_refs: Array[named_ref], ?context_length: Integer, ?composition: action_composition?) -> void
 
-      # @rbs (?schema_version: Integer) -> Hash[Symbol, untyped]
-      def to_h: (?schema_version: Integer) -> Hash[Symbol, untyped]
+      # @rbs () -> Hash[Symbol, Object?]
+      def to_h: () -> Hash[Symbol, Object?]
     end
 
     # A normalized BNF production using symbol ids.
@@ -75,7 +78,7 @@ module Ibex
 
       attr_reader precedence_override: Integer?
 
-      attr_reader origin: Hash[Symbol, untyped]
+      attr_reader origin: Hash[Symbol, Object?]
 
       attr_reader documentation: String?
 
@@ -84,12 +87,12 @@ module Ibex
       attr_reader node: node_annotation?
 
       # @rbs (id: Integer, lhs: Integer, rhs: Array[Integer], action: Action?, precedence_override: Integer?,
-      #   origin: Hash[Symbol, untyped], ?documentation: String?, ?expansion: production_expansion?,
+      #   origin: Hash[Symbol, Object?], ?documentation: String?, ?expansion: production_expansion?,
       #   ?node: node_annotation?) -> void
-      def initialize: (id: Integer, lhs: Integer, rhs: Array[Integer], action: Action?, precedence_override: Integer?, origin: Hash[Symbol, untyped], ?documentation: String?, ?expansion: production_expansion?, ?node: node_annotation?) -> void
+      def initialize: (id: Integer, lhs: Integer, rhs: Array[Integer], action: Action?, precedence_override: Integer?, origin: Hash[Symbol, Object?], ?documentation: String?, ?expansion: production_expansion?, ?node: node_annotation?) -> void
 
-      # @rbs (?schema_version: Integer) -> Hash[Symbol, untyped]
-      def to_h: (?schema_version: Integer) -> Hash[Symbol, untyped]
+      # @rbs () -> Hash[Symbol, Object?]
+      def to_h: () -> Hash[Symbol, Object?]
     end
 
     # One opaque user-code block and the location of its first code line.
@@ -101,8 +104,8 @@ module Ibex
       # @rbs (code: String, location: location) -> void
       def initialize: (code: String, location: location) -> void
 
-      # @rbs () -> Hash[Symbol, untyped]
-      def to_h: () -> Hash[Symbol, untyped]
+      # @rbs () -> Hash[Symbol, Object?]
+      def to_h: () -> Hash[Symbol, Object?]
     end
 
     # Immutable normalized grammar exchanged between pipeline stages.
@@ -149,20 +152,28 @@ module Ibex
 
       attr_reader source_provenance: source_provenance?
 
-      attr_reader migration: migration_metadata?
+      attr_reader parser_contract: ParserContract
 
       # @rbs (class_name: String, superclass: String?, start: String, expect: Integer, ?expect_rr: Integer?,
       #   options: grammar_options,
       #   symbols: Array[GrammarSymbol], productions: Array[Production], user_code: Hash[String, String],
       #   conversions: Hash[String, String], warnings: Array[grammar_warning], ?user_code_chunks: user_code_chunks?,
-      #   ?schema_version: Integer, ?source_provenance: source_provenance?,
-      #   ?migration: migration_metadata?, ?parser_parameters: Array[parser_parameter],
+      #   ?parser_parameters: Array[parser_parameter],
       #   ?value_printers: Array[value_printer], ?grammar_tests: Array[grammar_test],
       #   ?recovery: recovery_policy?, ?lexer: Lexer?,
-      #   ?mode: grammar_mode, ?starts: Array[String]?) -> void
+      #   ?mode: grammar_mode, ?starts: Array[String]?, ?parser_contract: ParserContract,
+      #   ?source_provenance: source_provenance?) -> void
       # rubocop:disable Metrics/AbcSize, Metrics/ParameterLists
-      # Immutable versioned IR is constructed from explicit public fields.
-      def initialize: (class_name: String, superclass: String?, start: String, expect: Integer, options: grammar_options, symbols: Array[GrammarSymbol], productions: Array[Production], user_code: Hash[String, String], conversions: Hash[String, String], warnings: Array[grammar_warning], ?expect_rr: Integer?, ?user_code_chunks: user_code_chunks?, ?schema_version: Integer, ?source_provenance: source_provenance?, ?migration: migration_metadata?, ?parser_parameters: Array[parser_parameter], ?value_printers: Array[value_printer], ?grammar_tests: Array[grammar_test], ?recovery: recovery_policy?, ?lexer: Lexer?, ?mode: grammar_mode, ?starts: Array[String]?) -> void
+      # Immutable current IR is constructed from explicit public fields.
+      def initialize: (class_name: String, superclass: String?, start: String, expect: Integer, options: grammar_options, symbols: Array[GrammarSymbol], productions: Array[Production], user_code: Hash[String, String], conversions: Hash[String, String], warnings: Array[grammar_warning], ?expect_rr: Integer?, ?user_code_chunks: user_code_chunks?, ?parser_parameters: Array[parser_parameter], ?value_printers: Array[value_printer], ?grammar_tests: Array[grammar_test], ?recovery: recovery_policy?, ?lexer: Lexer?, ?mode: grammar_mode, ?starts: Array[String]?, ?parser_contract: ParserContract, ?source_provenance: source_provenance?) -> void
+
+      # @rbs (class_name: String, superclass: String?, start: String, expect: Integer, options: grammar_options,
+      #   symbols: Array[GrammarSymbol], productions: Array[Production], user_code: Hash[String, String],
+      #   conversions: Hash[String, String], warnings: Array[grammar_warning], user_code_chunks: user_code_chunks?,
+      #   source_provenance: source_provenance?, expect_rr: Integer?, parser_parameters: Array[parser_parameter],
+      #   value_printers: Array[value_printer], grammar_tests: Array[grammar_test], recovery: recovery_policy?,
+      #   lexer: Lexer?, mode: grammar_mode, starts: Array[String]?, parser_contract: ParserContract) -> void
+      def initialize_current: (class_name: String, superclass: String?, start: String, expect: Integer, options: grammar_options, symbols: Array[GrammarSymbol], productions: Array[Production], user_code: Hash[String, String], conversions: Hash[String, String], warnings: Array[grammar_warning], user_code_chunks: user_code_chunks?, source_provenance: source_provenance?, expect_rr: Integer?, parser_parameters: Array[parser_parameter], value_printers: Array[value_printer], grammar_tests: Array[grammar_test], recovery: recovery_policy?, lexer: Lexer?, mode: grammar_mode, starts: Array[String]?, parser_contract: ParserContract) -> void
 
       # @rbs (String name) -> GrammarSymbol?
       def symbol: (String name) -> GrammarSymbol?
@@ -176,8 +187,8 @@ module Ibex
       # @rbs () -> Array[GrammarSymbol]
       def nonterminals: () -> Array[GrammarSymbol]
 
-      # @rbs () -> Hash[Symbol, untyped]
-      def to_h: () -> Hash[Symbol, untyped]
+      # @rbs () -> Hash[Symbol, Object?]
+      def to_h: () -> Hash[Symbol, Object?]
 
       private
 
@@ -187,17 +198,20 @@ module Ibex
       # @rbs (String start, Array[String]? starts, grammar_mode mode) -> Array[String]
       def validate_starts: (String start, Array[String]? starts, grammar_mode mode) -> Array[String]
 
-      # @rbs (Hash[Symbol, untyped] value) -> void
-      def append_optional_metadata: (Hash[Symbol, untyped] value) -> void
+      # @rbs (Hash[Symbol, Object?] value) -> void
+      def append_optional_metadata: (Hash[Symbol, Object?] value) -> void
 
-      # @rbs (Hash[Symbol, untyped] value) -> void
-      def append_parser_metadata: (Hash[Symbol, untyped] value) -> void
+      # @rbs (Hash[Symbol, Object?] value) -> void
+      def append_parser_metadata: (Hash[Symbol, Object?] value) -> void
 
-      # @rbs (Hash[Symbol, untyped] value) -> void
-      def append_recovery_metadata: (Hash[Symbol, untyped] value) -> void
+      # @rbs (Hash[Symbol, Object?] value) -> void
+      def append_recovery_metadata: (Hash[Symbol, Object?] value) -> void
 
       # @rbs () -> void
       def validate_user_code_chunks: () -> void
+
+      # @rbs (ParserContract parser_contract) -> void
+      def validate_current_metadata: (ParserContract parser_contract) -> void
     end
   end
 end

data/sig/ibex/ir/lexer_ir.rbs

@@ -30,28 +30,28 @@ module Ibex
       #   options: String, action: String?, location: location) -> void
       def initialize: (id: Integer, state: String, kind: Symbol, token: String?, pattern: String, pattern_kind: Symbol, options: String, action: String?, location: location) -> void
 
-      # @rbs () -> Hash[Symbol, untyped]
-      def to_h: () -> Hash[Symbol, untyped]
+      # @rbs () -> Hash[Symbol, lexer_rule_document_value]
+      def to_h: () -> Hash[Symbol, lexer_rule_document_value]
     end
 
-    # Independently versioned lexer contract embedded by Grammar IR v2.
+    # Independently versioned lexer contract embedded by the current Grammar IR.
     class Lexer
       attr_reader states: Array[String]
 
       attr_reader rules: Array[LexerRule]
 
-      attr_reader warnings: Array[Hash[Symbol, untyped]]
+      attr_reader warnings: Array[lexer_warning]
 
       attr_reader schema_version: Integer
 
       attr_reader source_provenance: source_provenance?
 
-      # @rbs (states: Array[String], rules: Array[LexerRule], warnings: Array[Hash[Symbol, untyped]],
+      # @rbs (states: Array[String], rules: Array[LexerRule], warnings: Array[lexer_warning],
       #   ?schema_version: Integer, ?source_provenance: source_provenance?) -> void
-      def initialize: (states: Array[String], rules: Array[LexerRule], warnings: Array[Hash[Symbol, untyped]], ?schema_version: Integer, ?source_provenance: source_provenance?) -> void
+      def initialize: (states: Array[String], rules: Array[LexerRule], warnings: Array[lexer_warning], ?schema_version: Integer, ?source_provenance: source_provenance?) -> void
 
-      # @rbs () -> Hash[Symbol, untyped]
-      def to_h: () -> Hash[Symbol, untyped]
+      # @rbs () -> Hash[Symbol, lexer_document_value]
+      def to_h: () -> Hash[Symbol, lexer_document_value]
     end
   end
 end

data/sig/ibex/ir/parser_contract.rbs

@@ -0,0 +1,69 @@
+# Generated from lib/ibex/ir/parser_contract.rb with RBS::Inline
+
+module Ibex
+  module IR
+    # Root-owned parser configuration persisted by the current Grammar IR.
+    class ParserContract
+      type definition = { configuration: String, values: Array[Symbol] }
+
+      type entry_location = { file: String?, line: Integer, column: Integer }
+
+      type entry_value = String? | bool | entry_location?
+
+      DEFINITIONS: Hash[Symbol, definition]
+
+      # One specified or explicitly unspecified contract field.
+      class Entry
+        attr_reader key: Symbol
+
+        attr_reader value: Symbol?
+
+        attr_reader location: Location?
+
+        attr_reader explicit: bool
+
+        # @rbs (Symbol key, ?value: Symbol?, ?location: Location?, ?explicit: bool) -> void
+        def initialize: (Symbol key, ?value: Symbol?, ?location: Location?, ?explicit: bool) -> void
+
+        # @rbs () -> Hash[Symbol, entry_value]
+        def to_h: () -> Hash[Symbol, entry_value]
+
+        private
+
+        # @rbs (Symbol key, Array[Symbol] allowed, Symbol? value, Location? location, bool explicit) -> void
+        def validate_state!: (Symbol key, Array[Symbol] allowed, Symbol? value, Location? location, bool explicit) -> void
+
+        # @rbs () -> entry_location?
+        def serialized_location: () -> entry_location?
+      end
+
+      attr_reader algorithm: Entry
+
+      attr_reader entries: Entry
+
+      attr_reader cst_trivia: Entry
+
+      # @rbs (?algorithm: Entry?, ?entries: Entry?, ?cst_trivia: Entry?) -> void
+      def initialize: (?algorithm: Entry?, ?entries: Entry?, ?cst_trivia: Entry?) -> void
+
+      # @rbs () -> Hash[Symbol, Hash[Symbol, entry_value]]
+      def to_h: () -> Hash[Symbol, Hash[Symbol, entry_value]]
+
+      # Values supplied to the typed resolver; unspecified fields are absent.
+      # @rbs () -> Hash[String, Symbol]
+      def configuration_values: () -> Hash[String, Symbol]
+
+      # Source locations supplied to the typed resolver.
+      # @rbs () -> Hash[String, Location]
+      def configuration_locations: () -> Hash[String, Location]
+
+      private
+
+      # @rbs (Symbol key, Entry? entry) -> Entry
+      def normalize_entry: (Symbol key, Entry? entry) -> Entry
+
+      # @rbs () -> Array[Entry]
+      def specified_entries: () -> Array[Entry]
+    end
+  end
+end

data/sig/ibex/ir/serialize.rbs

@@ -2,66 +2,101 @@
 
 module Ibex
   module IR
-    # Stable JSON serialization for versioned pipeline IR.
-    # rubocop:disable Metrics/ModuleLength -- explicit versioned fields keep serialization changes auditable.
+    # Stable JSON serialization for the current pipeline IR.
+    # rubocop:disable Metrics/ModuleLength -- explicit fields keep serialization changes auditable.
+    # rubocop:disable Lint/SelfAssignment -- RBS inline assertions narrow schema-decoded values in place.
     module Serialize
-      private def validate_version: (untyped data) -> untyped
+      private def validate_version: (Hash[String, IR::serialized_value] data) -> void
 
-      private def self.validate_version: (untyped data) -> untyped
+      private def self.validate_version: (Hash[String, IR::serialized_value] data) -> void
 
-      private def load_grammar: (untyped data) -> untyped
+      private def load_grammar: (Hash[String, IR::serialized_value] data) -> Grammar
 
-      private def self.load_grammar: (untyped data) -> untyped
+      private def self.load_grammar: (Hash[String, IR::serialized_value] data) -> Grammar
 
-      private def load_automaton: (untyped data) -> untyped
+      private def load_symbols: (Hash[String, IR::serialized_value] data) -> Array[GrammarSymbol]
 
-      private def self.load_automaton: (untyped data) -> untyped
+      private def self.load_symbols: (Hash[String, IR::serialized_value] data) -> Array[GrammarSymbol]
 
-      private def load_lexer: (untyped data) -> untyped
+      private def load_productions: (Hash[String, IR::serialized_value] data) -> Array[Production]
 
-      private def self.load_lexer: (untyped data) -> untyped
+      private def self.load_productions: (Hash[String, IR::serialized_value] data) -> Array[Production]
 
-      private def load_state: (untyped state, untyped grammar) -> untyped
+      private def empty_chunks: () -> Hash[String, IR::serialized_value]
 
-      private def self.load_state: (untyped state, untyped grammar) -> untyped
+      private def self.empty_chunks: () -> Hash[String, IR::serialized_value]
 
-      private def symbol_keyed: (untyped values, untyped grammar, ?actions: untyped) -> untyped
+      private def empty_parameters: () -> Array[IR::serialized_value]
 
-      private def self.symbol_keyed: (untyped values, untyped grammar, ?actions: untyped) -> untyped
+      private def self.empty_parameters: () -> Array[IR::serialized_value]
 
-      private def normalize_action: (untyped value) -> untyped
+      private def empty_printers: () -> Array[IR::serialized_value]
 
-      private def self.normalize_action: (untyped value) -> untyped
+      private def self.empty_printers: () -> Array[IR::serialized_value]
 
-      private def load_production: (untyped production, Integer schema_version) -> untyped
+      private def empty_tests: () -> Array[IR::serialized_value]
 
-      private def self.load_production: (untyped production, Integer schema_version) -> untyped
+      private def self.empty_tests: () -> Array[IR::serialized_value]
 
-      private def load_user_code_chunks: (untyped chunks) -> untyped
+      private def empty_recovery: () -> Hash[String, IR::serialized_value]
 
-      private def self.load_user_code_chunks: (untyped chunks) -> untyped
+      private def self.empty_recovery: () -> Hash[String, IR::serialized_value]
 
-      private def load_symbol_metadata: (untyped symbol, String field) -> String?
+      private def load_automaton: (Hash[String, IR::serialized_value] data) -> Automaton
 
-      private def self.load_symbol_metadata: (untyped symbol, String field) -> String?
+      private def self.load_automaton: (Hash[String, IR::serialized_value] data) -> Automaton
 
-      private def load_grammar_tests: (untyped tests) -> untyped
+      private def load_lexer: (Hash[String, IR::serialized_value] data) -> Lexer
 
-      private def self.load_grammar_tests: (untyped tests) -> untyped
+      private def self.load_lexer: (Hash[String, IR::serialized_value] data) -> Lexer
 
-      private def symbol_source_position: (untyped symbol) -> String
+      private def load_state: (Hash[String, IR::serialized_value] state, Grammar grammar) -> AutomatonState
 
-      private def self.symbol_source_position: (untyped symbol) -> String
+      private def self.load_state: (Hash[String, IR::serialized_value] state, Grammar grammar) -> AutomatonState
 
-      private def symbolize: (untyped value) -> untyped
+      private def symbol_keyed: (Hash[String, IR::serialized_value] values, Grammar grammar, ?actions: bool) -> Hash[Integer, IR::serialized_value]
 
-      private def self.symbolize: (untyped value) -> untyped
+      private def self.symbol_keyed: (Hash[String, IR::serialized_value] values, Grammar grammar, ?actions: bool) -> Hash[Integer, IR::serialized_value]
+
+      private def normalize_action: (Hash[String, IR::serialized_value] value) -> parser_action?
+
+      private def self.normalize_action: (Hash[String, IR::serialized_value] value) -> parser_action?
+
+      private def load_production: (Hash[String, IR::serialized_value] production) -> Production
+
+      private def self.load_production: (Hash[String, IR::serialized_value] production) -> Production
+
+      private def load_user_code_chunks: (Hash[String, Array[Hash[String, IR::serialized_value]]] chunks) -> user_code_chunks
+
+      private def self.load_user_code_chunks: (Hash[String, Array[Hash[String, IR::serialized_value]]] chunks) -> user_code_chunks
+
+      private def load_symbol_metadata: (Hash[String, IR::serialized_value] symbol, String field) -> String?
+
+      private def self.load_symbol_metadata: (Hash[String, IR::serialized_value] symbol, String field) -> String?
+
+      private def load_grammar_tests: (Array[Hash[String, IR::serialized_value]] tests) -> Array[grammar_test]
+
+      private def self.load_grammar_tests: (Array[Hash[String, IR::serialized_value]] tests) -> Array[grammar_test]
+
+      private def symbol_source_position: (Hash[String, IR::serialized_value] symbol) -> String
+
+      private def self.symbol_source_position: (Hash[String, IR::serialized_value] symbol) -> String
+
+      private def load_parser_contract: (IR::serialized_value value) -> IR::serialized_value
+
+      private def self.load_parser_contract: (IR::serialized_value value) -> IR::serialized_value
+
+      private def symbolize: (IR::serialized_value value) -> IR::serialized_value
+
+      private def self.symbolize: (IR::serialized_value value) -> IR::serialized_value
 
       # @rbs (Grammar | Automaton | Lexer value) -> String
       def self?.dump: (Grammar | Automaton | Lexer value) -> String
 
       # @rbs (String source) -> (Grammar | Automaton | Lexer)
       def self?.load: (String source) -> (Grammar | Automaton | Lexer)
+
+      private
     end
   end
 end

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

@@ -3,12 +3,12 @@
 module Ibex
   module IR
     module Validator
-      # Structural and referential validation for a versioned Automaton IR JSON object.
+      # Structural and referential validation for a current Automaton IR JSON object.
       # rubocop:disable Metrics/ClassLength -- inline type contracts accompany one cohesive document validator.
       class AutomatonDocument < Base
         ROOT_REQUIRED: Array[String]
 
-        V2_ROOT_OPTIONAL: Array[String]
+        ROOT_OPTIONAL: Array[String]
 
         STATE_REQUIRED: Array[String]
 
@@ -20,12 +20,12 @@ module Ibex
 
         @grammar: GrammarDocument
 
-        @states_by_id: Hash[Integer, Hash[String, untyped]]
+        @states_by_id: Hash[Integer, json_object]
 
-        @data: Hash[String, untyped]
+        @data: json_object
 
-        # @rbs (Hash[String, untyped] data, ?version: Integer) -> void
-        def initialize: (Hash[String, untyped] data, ?version: Integer) -> void
+        # @rbs (json_object data, ?version: Integer) -> void
+        def initialize: (json_object data, ?version: Integer) -> void
 
         # @rbs () -> self
         def validate: () -> self
@@ -35,6 +35,9 @@ module Ibex
         # @rbs () -> void
         def validate_entry_states: () -> void
 
+        # @rbs (Hash[String, untyped] grammar) -> void
+        def validate_construction_contract: (Hash[String, untyped] grammar) -> void
+
         # @rbs () -> void
         def validate_digest: () -> void
 
@@ -44,65 +47,65 @@ module Ibex
         # @rbs () -> void
         def validate_state_contents: () -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_items: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_items: (json_value value, String path) -> void
 
-        # @rbs (Integer production_id, untyped dot_value, String path) -> void
-        def validate_item_production: (Integer production_id, untyped dot_value, String path) -> void
+        # @rbs (Integer production_id, json_value dot_value, String path) -> void
+        def validate_item_production: (Integer production_id, json_value dot_value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_lookaheads: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_lookaheads: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_transitions: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_transitions: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_actions: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_actions: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_gotos: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_gotos: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path, ?kind: String?) { (untyped, String, Hash[String, untyped]) -> void } -> void
-        def symbol_map: (untyped value, String path, ?kind: String?) { (untyped, String, Hash[String, untyped]) -> void } -> void
+        # @rbs (json_value value, String path, ?kind: String?) { (json_value, String, json_object) -> void } -> void
+        def symbol_map: (json_value value, String path, ?kind: String?) { (json_value, String, json_object) -> void } -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_state_reference: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_state_reference: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path, ?nullable: bool) -> void
-        def validate_parser_action: (untyped value, String path, ?nullable: bool) -> void
+        # @rbs (json_value value, String path, ?nullable: bool) -> void
+        def validate_parser_action: (json_value value, String path, ?nullable: bool) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_production_reference: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_production_reference: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_conflicts: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_conflicts: (json_value value, String path) -> void
 
-        # @rbs (Hash[String, untyped] conflict, String path) -> void
-        def validate_shift_reduce: (Hash[String, untyped] conflict, String path) -> void
+        # @rbs (json_object conflict, String path) -> void
+        def validate_shift_reduce: (json_object conflict, String path) -> void
 
-        # @rbs (Hash[String, untyped] conflict, String path) -> void
-        def validate_reduce_reduce: (Hash[String, untyped] conflict, String path) -> void
+        # @rbs (json_object conflict, String path) -> void
+        def validate_reduce_reduce: (json_object conflict, String path) -> void
 
-        # @rbs (Hash[String, untyped] conflict, String path) -> void
-        def validate_conflict_entries: (Hash[String, untyped] conflict, String path) -> void
+        # @rbs (json_object conflict, String path) -> void
+        def validate_conflict_entries: (json_object conflict, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_midrule_origins: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_midrule_origins: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path) -> void
-        def validate_conflict_symbol: (untyped value, String path) -> void
+        # @rbs (json_value value, String path) -> void
+        def validate_conflict_symbol: (json_value value, String path) -> void
 
-        # @rbs (untyped value, String path, ?reductions: Array[Integer]?) -> void
-        def validate_resolution: (untyped value, String path, ?reductions: Array[Integer]?) -> void
+        # @rbs (json_value value, String path, ?reductions: Array[Integer]?) -> void
+        def validate_resolution: (json_value value, String path, ?reductions: Array[Integer]?) -> void
 
         # @rbs () -> void
         def validate_conflict_summary: () -> void
 
-        # @rbs (Hash[String, untyped] summary, String path) -> void
-        def validate_conflict_counts: (Hash[String, untyped] summary, String path) -> void
+        # @rbs (json_object summary, String path) -> void
+        def validate_conflict_counts: (json_object summary, String path) -> void
 
-        # @rbs (Hash[String, untyped] summary, String path) -> void
-        def validate_expectation: (Hash[String, untyped] summary, String path) -> void
+        # @rbs (json_object summary, String path) -> void
+        def validate_expectation: (json_object summary, String path) -> void
       end
     end
   end

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