expressir 2.4.22 → 2.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d13825e04d0b4e04a06303c22a070f3ee27400563d8f10f1cf91b99ca3b1ab09
-  data.tar.gz: cb5330b94c1241d01d94987c04cabfce27345dca190a28719ff19993c2925261
+  metadata.gz: baecd11fc9e03ed51685a06825e68a232f3caae95fd26bbffa8f77ce48ffdc03
+  data.tar.gz: 04b02ab33defbc571c9a1d36284c53f04b847acecb7e54b67537983ebbf2a74e
 SHA512:
-  metadata.gz: b2b8d32dfd5c887dcd12dc6cf6ab1f10bdce4c23b2dbaa5ba902d205d3c3e072194722d5314acf41468b8655b10ea9eebdf5b4649dcbcc18f028cc2be6db2d53
-  data.tar.gz: 85fdae871deba71911bd661a7a4665f6d9344aea3c79ceeda2bb80091e745b4d0d469b6e787e814b0d82b4f18122efbd87ebc57b59c3e322156f2cd7c66eea4d
+  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/ext/expressir_core/extconf.rb

@@ -2,10 +2,21 @@
 
 require "mkmf"
 
+# mkmf's dummy_makefile emits no targets, which rubygems' `make` run
+# rejects ("No targets. Stop.") and fails the install; a real no-op
+# makefile keeps every fallback path installing cleanly.
+def write_noop_makefile
+  File.write("Makefile", <<~MK)
+    all:
+    install:
+    clean:
+  MK
+end
+
 # The Rust extension only builds against MRI's C API. Other engines
 # fall back to the pure-Ruby parser path and must install cleanly.
 if RUBY_ENGINE != "ruby" || ENV["EXPRESSIR_CORE"] == "0"
-  File.write("Makefile", dummy_makefile("").to_s)
+  write_noop_makefile
   warn "expressir: skipping the Rust core extension on #{RUBY_ENGINE}"
   exit 0
 end
@@ -14,7 +25,7 @@ end
 # toolchain; rb-sys cannot bridge the two, so skip there too (windows
 # installs fall back to the pure-Ruby parser).
 if RUBY_PLATFORM.include?("mingw")
-  File.write("Makefile", dummy_makefile("").to_s)
+  write_noop_makefile
   warn "expressir: skipping the Rust core extension on mingw (msvc " \
        "toolchain mismatch)"
   exit 0
@@ -25,7 +36,7 @@ end
 # (Expressir::Core::NATIVE_AVAILABLE stays false). Prebuilt platform
 # gems are the follow-up so cargo-less MRI installs get binaries too.
 unless find_executable("cargo")
-  File.write("Makefile", dummy_makefile("").to_s)
+  write_noop_makefile
   warn "expressir: cargo not found — skipping the Rust core extension " \
        "(Expressir::Core falls back to the Ruby parser)"
   exit 0

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.22".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.22
+  version: 2.4.24
 platform: ruby
 authors:
 - Ribose Inc.