expressir 2.4.36-arm-linux → 2.4.38-arm-linux

data/lib/expressir/p21/writer.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+module Expressir
+  module P21
+    # Emits a {Population} back to ISO 10303-21 text (TODO.instance/03).
+    # Deterministic: the same population always serializes to the same
+    # bytes — HEADER entities in insertion order, DATA instances in id
+    # order, anchors/references/named sections re-emitted when present.
+    module Writer
+      module_function
+
+      def emit(population)
+        lines = ["ISO-10303-21;", "HEADER;"]
+        population.header.each do |keyword, params|
+          lines << "#{keyword}(#{emit_params(params)});"
+        end
+        lines << "ENDSEC;"
+        unless population.anchors.empty?
+          lines << "ANCHOR;"
+          population.anchors.each do |label, value|
+            lines << "<#{label}> = #{emit_value(value)};"
+          end
+          lines << "ENDSEC;"
+        end
+        unless population.references.empty?
+          lines << "REFERENCE;"
+          population.references.each do |id, anchor|
+            lines << "#{id} = #{anchor};"
+          end
+          lines << "ENDSEC;"
+        end
+        emit_data_sections(population, lines)
+        lines << "END-ISO-10303-21;"
+        "#{lines.join("\n")}\n"
+      end
+
+      def emit_data_sections(population, lines)
+        if population.sections.empty?
+          lines << "DATA;"
+          emit_instances(population.instances, lines)
+          lines << "ENDSEC;"
+          return
+        end
+
+        population.sections.each do |section|
+          lines << named_data_line(section)
+          section.instance_ids.each do |id|
+            lines << "#{id}=#{emit_record(population.instances[id])};"
+          end
+          lines << "ENDSEC;"
+        end
+      end
+
+      def named_data_line(section)
+        return "DATA;" if section.name.nil?
+
+        contexts = section.contexts
+          .map { |context| "'#{context}'" }.join(", ")
+        "DATA ('#{section.name}', (#{contexts}));"
+      end
+
+      def emit_instances(instances, lines)
+        instances.each do |id, record|
+          lines << "#{id}=#{emit_record(record)};"
+        end
+      end
+
+      def emit_record(record)
+        if record.is_a?(ComplexRecord)
+          "(#{record.records.map { |part| emit_simple(part) }.join})"
+        else
+          emit_simple(record)
+        end
+      end
+
+      def emit_simple(record)
+        "#{record.keyword}(#{emit_params(record.params)})"
+      end
+
+      def emit_params(params)
+        params.map { |value| emit_value(value) }.join(",")
+      end
+
+      def emit_value(value)
+        case value
+        when Array then "(#{value.map { |item| emit_value(item) }.join(',')})"
+        when TypedValue
+          "#{value.keyword}(#{emit_params(value.value)})"
+        when Enumeration then ".#{value.name}."
+        when Binary then "\"#{value.hex}\""
+        when :unset then "$"
+        when :derived then "*"
+        when true then ".T."
+        when false then ".F."
+        when String then string_or_reference(value)
+        else value.to_s
+        end
+      end
+
+      def string_or_reference(value)
+        return value if value.match?(/\A#\d+\z/)
+
+        "'#{value.gsub("'", "''")}'"
+      end
+    end
+  end
+end

data/lib/expressir/p21.rb

@@ -12,6 +12,12 @@ module Expressir
     autoload :Grammar, "#{__dir__}/p21/grammar"
     autoload :Builder, "#{__dir__}/p21/builder"
     autoload :Validator, "#{__dir__}/p21/validator"
+    autoload :Typing, "#{__dir__}/p21/typing"
+    autoload :DatasetManifest, "#{__dir__}/p21/dataset_manifest"
+    autoload :Receipt, "#{__dir__}/p21/receipt"
+    autoload :Diff, "#{__dir__}/p21/diff"
     autoload :Parser, "#{__dir__}/p21/parser"
+    autoload :Writer, "#{__dir__}/p21/writer"
+    autoload :Json, "#{__dir__}/p21/json"
   end
 end

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.36".freeze
+    VERSION = "2.4.38".freeze
   end
 end

data/lib/expressir.rb

@@ -76,6 +76,7 @@ module Expressir
   autoload :Model, "#{__dir__}/expressir/model"
   autoload :Commands, "#{__dir__}/expressir/commands"
   autoload :Changes, "#{__dir__}/expressir/changes"
+  autoload :Eval, "#{__dir__}/expressir/eval"
   autoload :Conformance, "#{__dir__}/expressir/conformance"
   autoload :Package, "#{__dir__}/expressir/package"
   autoload :Manifest, "#{__dir__}/expressir/manifest"

data/lib/tasks/instance.rake

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+namespace :instance do
+  desc "Population rule-engine benchmark over a synthetic population " \
+       "(default 100000 instances; POPULATION_SIZE to override)"
+  task :benchmark do
+    require "expressir"
+    require "expressir/eval"
+    require "json"
+    require "tmpdir"
+
+    size = Integer(ENV.fetch("POPULATION_SIZE", "100 000").delete(" "), 10)
+    out = ENV["INSTANCE_BENCH_OUT"] || "instance-benchmark.json"
+
+    Dir.mktmpdir do |dir|
+      schema_path = File.join(dir, "bench.exp")
+      File.write(schema_path, <<~EXP)
+        SCHEMA bench;
+        ENTITY item;
+          code : INTEGER;
+          ref : item;
+        UNIQUE
+          u1 : code;
+        END_ENTITY;
+        RULE no_negative_codes FOR (item);
+          WHERE
+            ok : SIZEOF(QUERY(i <* item | i.code < 0)) = 0;
+        END_RULE;
+        END_SCHEMA;
+      EXP
+
+      population_path = File.join(dir, "bench.p21")
+      File.open(population_path, "w") do |file|
+        file.puts "ISO-10303-21;"
+        file.puts "HEADER;"
+        file.puts "FILE_NAME('bench','2026-01-01T00:00:00',('b'),('b')," \
+                  "'p','s','a');"
+        file.puts "FILE_SCHEMA(('bench'));"
+        file.puts "ENDSEC;"
+        file.puts "DATA;"
+        size.times do |i|
+          ref = i.zero? ? "$" : "##{i}"
+          file.puts "##{i + 1}=ITEM(#{i},#{ref});"
+        end
+        file.puts "ENDSEC;"
+        file.puts "END-ISO-10303-21;"
+      end
+
+      clock = Process.method(:clock_gettime)
+      mono = Process::CLOCK_MONOTONIC
+      t0 = clock.call(mono)
+      schema = Expressir::Express::Parser.from_file(schema_path).schemas.first
+      population = Expressir::P21::Parser.parse(File.read(population_path))
+      timings = { load: (clock.call(mono) - t0).round(2) }
+
+      engine = Expressir::Eval::Population.new(schema, population)
+      t1 = clock.call(mono)
+      first = engine.check
+      timings[:check_first] = (clock.call(mono) - t1).round(2)
+      t2 = clock.call(mono)
+      second = engine.check
+      timings[:check_second] = (clock.call(mono) - t2).round(2)
+
+      report = {
+        instances: size,
+        rules: { where: 0, unique: 1, global: 1 },
+        findings: first.size,
+        deterministic: first == second,
+        timings_seconds: timings,
+      }
+      File.write(out, "#{JSON.pretty_generate(report)}\n")
+      puts "wrote #{out} (#{size} instances, findings #{first.size}, " \
+           "check #{timings[:check_first]}s, " \
+           "deterministic=#{report[:deterministic]})"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.36
+  version: 2.4.38
 platform: arm-linux
 authors:
 - Ribose Inc.
@@ -299,6 +299,11 @@ files:
 - TODO.eengine/07-schema-compare-patch.md
 - TODO.eengine/08-official-corpus-gate.md
 - TODO.eengine/09-mim-mapping-parser.md
+- TODO.instance/00-overview.md
+- TODO.instance/01-instance-typing.md
+- TODO.instance/02-population-rules.md
+- TODO.instance/03-p21-ladder-and-population-management.md
+- TODO.instance/04-arm-mim-instance-mapping.md
 - TODO.max-perf/01-restore-ci-green.md
 - TODO.max-perf/02-streaming-parse-path.md
 - TODO.max-perf/03-cli-parallel-opt-in.md
@@ -479,6 +484,7 @@ files:
 - lib/expressir/commands/non_ascii_violation_collection.rb
 - lib/expressir/commands/package.rb
 - lib/expressir/commands/parity_inputs.rb
+- lib/expressir/commands/population.rb
 - lib/expressir/commands/smrl_xml_index.rb
 - lib/expressir/commands/validate.rb
 - lib/expressir/commands/validate_ascii.rb
@@ -500,6 +506,7 @@ files:
 - lib/expressir/eval/environment.rb
 - lib/expressir/eval/expression.rb
 - lib/expressir/eval/interpreter.rb
+- lib/expressir/eval/population.rb
 - lib/expressir/eval/rules.rb
 - lib/expressir/eval/values.rb
 - lib/expressir/express.rb
@@ -603,6 +610,7 @@ files:
 - lib/expressir/manifest/resolver.rb
 - lib/expressir/manifest/validator.rb
 - lib/expressir/mapping.rb
+- lib/expressir/mapping/instance_verification.rb
 - lib/expressir/mapping/refpath.rb
 - lib/expressir/model.rb
 - lib/expressir/model/cache.rb
@@ -702,10 +710,16 @@ files:
 - lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb
 - lib/expressir/p21.rb
 - lib/expressir/p21/builder.rb
+- lib/expressir/p21/dataset_manifest.rb
+- lib/expressir/p21/diff.rb
 - lib/expressir/p21/grammar.rb
+- lib/expressir/p21/json.rb
 - lib/expressir/p21/parser.rb
 - lib/expressir/p21/population.rb
+- lib/expressir/p21/receipt.rb
+- lib/expressir/p21/typing.rb
 - lib/expressir/p21/validator.rb
+- lib/expressir/p21/writer.rb
 - lib/expressir/package.rb
 - lib/expressir/package/builder.rb
 - lib/expressir/package/metadata.rb
@@ -718,6 +732,7 @@ files:
 - lib/expressir/schema_manifest_entry.rb
 - lib/expressir/version.rb
 - lib/tasks/conformance.rake
+- lib/tasks/instance.rake
 - lib/tasks/reference.rake
 - lib/tasks/verify_remarks.rake
 - rakelib/native.rake