expressir 2.4.23 → 2.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b017c6f0192b50004e75435290e108e8f9ba5292364dd6e79a1700b105d5250c
-  data.tar.gz: 6aeb6eb0bef71db56f10e54294442a9af2bf1dc64d54b439855cf1c245b61e5d
+  metadata.gz: baecd11fc9e03ed51685a06825e68a232f3caae95fd26bbffa8f77ce48ffdc03
+  data.tar.gz: 04b02ab33defbc571c9a1d36284c53f04b847acecb7e54b67537983ebbf2a74e
 SHA512:
-  metadata.gz: a978df09647cdc6c2803622f8117c7b3a7a3ee78d2a65b03f12156661427b8cd7fa0e760bbbb15cc44889017a683df9d66202e49be38e86b42f84dee6cda39ba
-  data.tar.gz: a821f8ea9c281465d3e95414182a60e3296b8e7f48c8417cec9e8026ff32e206e67215b9515c444c417a70b8da8391d756f04b585380cc5762a99fd360b09255
+  metadata.gz: 98ea8c39e0f462b7c6ecb7a2d24281cf3d159a79544b0b98feb89721011a066ff391343b0285816576f0007f9ede00d684629734fb5d29fefe2ef8af1f3c516f
+  data.tar.gz: c1bc94e1b7a73a79d93c7a1ae67b3f945f12ae7e3bcdcd161a6ea9f1d736ef74b0c2e39289301b31c558090c5f5fa7708b10d503c92b691ca5f1f90ff9ba0728

data/ext/expressir_core/Cargo.toml

@@ -13,7 +13,7 @@ magnus = { version = "0.9" }
 # Pinned core release (M1, TODO.parity-ee/19): the ext never floats
 # main — bump the tag per expressir release, alongside the validation
 # run that pins it.
-expressir-rs = { git = "https://github.com/lutaml/expressir-rs", tag = "v0.1.4" }
+expressir-rs = { git = "https://github.com/lutaml/expressir-rs", tag = "v0.1.6" }
 serde_json = "1.0"
 
 # Standalone workspace: the repo root workspace owns crates/, the ext

data/lib/expressir/express/formatters/declarations_formatter.rb

@@ -632,11 +632,11 @@ module Expressir
               format(node.applies_to),
               ";",
             ].join,
+            # ISO 10303-11: abstract_supertype_constraint = ABSTRACT ';' —
+            # the ABSTRACT SUPERTYPE form is entity-header syntax.
             *if node.abstract
                indent([
                  "ABSTRACT",
-                 " ",
-                 "SUPERTYPE",
                  ";",
                ].join)
              end,

data/lib/expressir/express/grammar/parser.rb

@@ -146,8 +146,15 @@ module Expressir
         rule(:abstractSupertypeDeclaration) do
           (tABSTRACT >> tSUPERTYPE >> subtypeConstraint.maybe).as(:abstractSupertypeDeclaration)
         end
+        # ISO 10303-11 abstract_supertype_constraint = ABSTRACT ';' —
+        # tolerated nonstandard variant: ABSTRACT SUPERTYPE ';' (real
+        # corpora ship it; longest-first so PEG stays deterministic).
+        # The entity-header forms live in abstractSupertypeDeclaration.
         rule(:abstractSupertype) do
-          (tABSTRACT >> tSUPERTYPE >> op_delim).as(:abstractSupertype)
+          (
+            (tABSTRACT >> tSUPERTYPE >> op_delim) |
+            (tABSTRACT >> op_delim)
+          ).as(:abstractSupertype)
         end
         rule(:actualParameterList) do
           (op_leftparen >> (parameter >> (op_comma >> parameter).repeat).as(:listOf_parameter).maybe >> op_rightparen)

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.23".freeze
+    VERSION = "2.4.24".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.23
+  version: 2.4.24
 platform: ruby
 authors:
 - Ribose Inc.