expressir 2.4.45 → 2.4.47
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/conformance.yml +4 -0
- data/.github/workflows/performance-release.yml +3 -1
- data/Gemfile +5 -1
- data/expressir.gemspec +5 -2
- data/lib/expressir/model/data_types/enumeration.rb +1 -1
- data/lib/expressir/model/data_types/select.rb +1 -1
- data/lib/expressir/model/declarations/entity.rb +7 -7
- data/lib/expressir/model/declarations/function.rb +9 -9
- data/lib/expressir/model/declarations/interface.rb +1 -1
- data/lib/expressir/model/declarations/interfaced_item.rb +2 -2
- data/lib/expressir/model/declarations/procedure.rb +9 -9
- data/lib/expressir/model/declarations/remark_item.rb +1 -1
- data/lib/expressir/model/declarations/rule.rb +11 -11
- data/lib/expressir/model/declarations/schema.rb +8 -8
- data/lib/expressir/model/declarations/schema_version.rb +1 -1
- data/lib/expressir/model/declarations/subtype_constraint.rb +1 -1
- data/lib/expressir/model/declarations/type.rb +2 -2
- data/lib/expressir/model/declarations/unique_rule.rb +1 -1
- data/lib/expressir/model/expressions/aggregate_initializer.rb +1 -1
- data/lib/expressir/model/expressions/entity_constructor.rb +1 -1
- data/lib/expressir/model/expressions/function_call.rb +1 -1
- data/lib/expressir/model/identifier.rb +3 -3
- data/lib/expressir/model/model_element.rb +1 -1
- data/lib/expressir/model/statements/alias.rb +1 -1
- data/lib/expressir/model/statements/case.rb +1 -1
- data/lib/expressir/model/statements/case_action.rb +1 -1
- data/lib/expressir/model/statements/compound.rb +1 -1
- data/lib/expressir/model/statements/if.rb +2 -2
- data/lib/expressir/model/statements/procedure_call.rb +1 -1
- data/lib/expressir/model/statements/repeat.rb +1 -1
- data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb +1 -1
- data/lib/expressir/p28/configuration.rb +3 -1
- data/lib/expressir/version.rb +1 -1
- metadata +8 -8
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 486c4fa02296973812dd2d719f8989e7eed1b64febf8db5b0a2cbfe1419ce07f
|
|
4
|
+
data.tar.gz: a4794036f5e6e9f81d446ceb25559bc28584dee41bc032a5a20c42177be64290
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 3c50442079451c2eec2fb2e5315f8c78789f5ea57eef8e9bfd1206fbdecb4169ba8f5c87645f6cb02bd6a334af6b061f2d424ecd32aa3de6ae5e9c96dc84604f
|
|
7
|
+
data.tar.gz: cb03ad0f75ec61b435431a354a28803ca9c980095bfc2fe079e8654fe1ec5f7ebcd3e1459ecd2f8f3e3cb24a8373a1766c90c13321333891f1c50c34a45fca10
|
|
@@ -15,6 +15,10 @@ jobs:
|
|
|
15
15
|
repository: metanorma/iso-10303-stepmod
|
|
16
16
|
path: stepmod
|
|
17
17
|
sparse-checkout: data/resources
|
|
18
|
+
# the stepmod corpus is a PRIVATE metanorma repo; the default
|
|
19
|
+
# GITHUB_TOKEN is scoped to lutaml/expressir and got a 404 on
|
|
20
|
+
# every scheduled run since the workflow was added (2026-10-21)
|
|
21
|
+
token: ${{ secrets.LUTAML_CI_PAT_TOKEN }}
|
|
18
22
|
- uses: ruby/setup-ruby@v1
|
|
19
23
|
with:
|
|
20
24
|
ruby-version: "3.4"
|
|
@@ -105,7 +105,9 @@ jobs:
|
|
|
105
105
|
TAG=${TAG:-$(gh release view --json tagName --jq .tagName)}
|
|
106
106
|
echo "Reporting against $TAG"
|
|
107
107
|
gh release view "$TAG" --json body --jq .body > /tmp/body.md
|
|
108
|
-
|
|
108
|
+
# bundle exec: the expressir gem is linked through the Gemfile's
|
|
109
|
+
# gemspec — bare ruby cannot load it (LoadError, 2026-10-26+ runs)
|
|
110
|
+
bundle exec ruby -e '
|
|
109
111
|
require "json"
|
|
110
112
|
require "expressir"
|
|
111
113
|
require "expressir/scoreboard"
|
data/Gemfile
CHANGED
|
@@ -6,7 +6,11 @@ gemspec
|
|
|
6
6
|
|
|
7
7
|
gem "canon"
|
|
8
8
|
gem "irb"
|
|
9
|
-
|
|
9
|
+
# The suite's XML engine per #534 is moxml's leptris adapter; without this
|
|
10
|
+
# dev dependency moxml silently falls back to nokogiri and CI never
|
|
11
|
+
# exercises the mandated lane. moxml enforces the >= 1.9.386.0 binding
|
|
12
|
+
# floor at load; the pessimistic range follows it.
|
|
13
|
+
gem "leptris", "~> 1.9.386"
|
|
10
14
|
gem "openssl", "~> 3.0"
|
|
11
15
|
gem "rake"
|
|
12
16
|
gem "rake-compiler"
|
data/expressir.gemspec
CHANGED
|
@@ -47,8 +47,11 @@ Gem::Specification.new do |spec|
|
|
|
47
47
|
spec.add_dependency "benchmark-ips"
|
|
48
48
|
spec.add_dependency "csv"
|
|
49
49
|
spec.add_dependency "liquid", "~> 5"
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
# 0.8.151 is the first lutaml-model whose moxml constraint (>= 0.5.139,
|
|
51
|
+
# < 0.7) admits the moxml 0.6 line; earlier releases pin moxml
|
|
52
|
+
# ~> 0.5.139 and cannot co-resolve with the moxml floor below.
|
|
53
|
+
spec.add_dependency "lutaml-model", "~> 0.8.156"
|
|
54
|
+
spec.add_dependency "moxml", "~> 0.6.0"
|
|
52
55
|
spec.add_dependency "paint"
|
|
53
56
|
spec.add_dependency "parsanol", "~> 1.3.9", ">= 1.3.89"
|
|
54
57
|
spec.add_dependency "ruby-progressbar", "~> 1.11"
|
|
@@ -6,7 +6,7 @@ module Expressir
|
|
|
6
6
|
class Enumeration < ModelElement
|
|
7
7
|
attribute :extensible, :boolean
|
|
8
8
|
attribute :based_on, ModelElement
|
|
9
|
-
attribute :items, EnumerationItem, collection: true
|
|
9
|
+
attribute :items, EnumerationItem, collection: true, initialize_empty: true
|
|
10
10
|
attribute :_class, :string, default: -> { self.class.name }
|
|
11
11
|
|
|
12
12
|
key_value do
|
|
@@ -7,7 +7,7 @@ module Expressir
|
|
|
7
7
|
attribute :extensible, :boolean
|
|
8
8
|
attribute :generic_entity, :boolean
|
|
9
9
|
attribute :based_on, ModelElement
|
|
10
|
-
attribute :items, ModelElement, collection: true
|
|
10
|
+
attribute :items, ModelElement, collection: true, initialize_empty: true
|
|
11
11
|
attribute :_class, :string, default: -> { self.class.name }
|
|
12
12
|
|
|
13
13
|
key_value do
|
|
@@ -16,19 +16,19 @@ module Expressir
|
|
|
16
16
|
|
|
17
17
|
attribute :abstract, :boolean
|
|
18
18
|
attribute :supertype_expression, ModelElement
|
|
19
|
-
attribute :subtype_of, ModelElement, collection: true
|
|
19
|
+
attribute :subtype_of, ModelElement, collection: true, initialize_empty: true
|
|
20
20
|
# Heterogeneous by design: Attribute, DerivedAttribute, and
|
|
21
21
|
# InverseAttribute all live here (the builders concatenate the
|
|
22
22
|
# three clauses in declaration order). The ModelElement base
|
|
23
23
|
# keeps from_hash polymorphic via the _class marker, exactly
|
|
24
24
|
# like the Ruby-built model.
|
|
25
|
-
attribute :attributes, ModelElement, collection: true
|
|
26
|
-
attribute :derived_attributes, DerivedAttribute, collection: true
|
|
27
|
-
attribute :inverse_attributes, InverseAttribute, collection: true
|
|
28
|
-
attribute :unique_rules, UniqueRule, collection: true
|
|
29
|
-
attribute :where_rules, WhereRule, collection: true
|
|
25
|
+
attribute :attributes, ModelElement, collection: true, initialize_empty: true
|
|
26
|
+
attribute :derived_attributes, DerivedAttribute, collection: true, initialize_empty: true
|
|
27
|
+
attribute :inverse_attributes, InverseAttribute, collection: true, initialize_empty: true
|
|
28
|
+
attribute :unique_rules, UniqueRule, collection: true, initialize_empty: true
|
|
29
|
+
attribute :where_rules, WhereRule, collection: true, initialize_empty: true
|
|
30
30
|
attribute :informal_propositions, InformalPropositionRule,
|
|
31
|
-
collection: true
|
|
31
|
+
collection: true, initialize_empty: true
|
|
32
32
|
attribute :_class, :string, default: -> { self.class.name }
|
|
33
33
|
|
|
34
34
|
key_value do
|
|
@@ -12,16 +12,16 @@ module Expressir
|
|
|
12
12
|
:constants, :variables, :statements,
|
|
13
13
|
:remark_items
|
|
14
14
|
|
|
15
|
-
attribute :parameters, Parameter, collection: true
|
|
15
|
+
attribute :parameters, Parameter, collection: true, initialize_empty: true
|
|
16
16
|
attribute :return_type, ModelElement
|
|
17
|
-
attribute :types, ModelElement, collection: true
|
|
18
|
-
attribute :entities, Entity, collection: true
|
|
19
|
-
attribute :subtype_constraints, SubtypeConstraint, collection: true
|
|
20
|
-
attribute :functions, Function, collection: true
|
|
21
|
-
attribute :procedures, Procedure, collection: true
|
|
22
|
-
attribute :constants, Constant, collection: true
|
|
23
|
-
attribute :variables, Variable, collection: true
|
|
24
|
-
attribute :statements, ModelElement, collection: true
|
|
17
|
+
attribute :types, ModelElement, collection: true, initialize_empty: true
|
|
18
|
+
attribute :entities, Entity, collection: true, initialize_empty: true
|
|
19
|
+
attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
|
|
20
|
+
attribute :functions, Function, collection: true, initialize_empty: true
|
|
21
|
+
attribute :procedures, Procedure, collection: true, initialize_empty: true
|
|
22
|
+
attribute :constants, Constant, collection: true, initialize_empty: true
|
|
23
|
+
attribute :variables, Variable, collection: true, initialize_empty: true
|
|
24
|
+
attribute :statements, ModelElement, collection: true, initialize_empty: true
|
|
25
25
|
attribute :_class, :string, default: -> { self.class.name }
|
|
26
26
|
|
|
27
27
|
key_value do
|
|
@@ -12,7 +12,7 @@ module Expressir
|
|
|
12
12
|
|
|
13
13
|
attribute :kind, :string, values: %w[USE REFERENCE]
|
|
14
14
|
attribute :schema, ModelElement
|
|
15
|
-
attribute :items, InterfaceItem, collection: true
|
|
15
|
+
attribute :items, InterfaceItem, collection: true, initialize_empty: true
|
|
16
16
|
attribute :_class, :string, default: -> { self.class.name }
|
|
17
17
|
|
|
18
18
|
# Registers :items with the tree-walker registry: the position index
|
|
@@ -8,8 +8,8 @@ module Expressir
|
|
|
8
8
|
include HasRemarks
|
|
9
9
|
|
|
10
10
|
attribute :id, :string
|
|
11
|
-
attribute :remarks, :string, collection: true
|
|
12
|
-
attribute :remark_items, RemarkItem, collection: true
|
|
11
|
+
attribute :remarks, :string, collection: true, initialize_empty: true
|
|
12
|
+
attribute :remark_items, RemarkItem, collection: true, initialize_empty: true
|
|
13
13
|
attribute :base_item, ModelElement
|
|
14
14
|
attribute :_class, :string, default: -> { self.class.name }
|
|
15
15
|
|
|
@@ -12,15 +12,15 @@ module Expressir
|
|
|
12
12
|
:constants, :variables, :statements,
|
|
13
13
|
:remark_items
|
|
14
14
|
|
|
15
|
-
attribute :parameters, Parameter, collection: true
|
|
16
|
-
attribute :types, ModelElement, collection: true
|
|
17
|
-
attribute :entities, Entity, collection: true
|
|
18
|
-
attribute :subtype_constraints, SubtypeConstraint, collection: true
|
|
19
|
-
attribute :functions, Function, collection: true
|
|
20
|
-
attribute :procedures, Procedure, collection: true
|
|
21
|
-
attribute :constants, Constant, collection: true
|
|
22
|
-
attribute :variables, Variable, collection: true
|
|
23
|
-
attribute :statements, ModelElement, collection: true
|
|
15
|
+
attribute :parameters, Parameter, collection: true, initialize_empty: true
|
|
16
|
+
attribute :types, ModelElement, collection: true, initialize_empty: true
|
|
17
|
+
attribute :entities, Entity, collection: true, initialize_empty: true
|
|
18
|
+
attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
|
|
19
|
+
attribute :functions, Function, collection: true, initialize_empty: true
|
|
20
|
+
attribute :procedures, Procedure, collection: true, initialize_empty: true
|
|
21
|
+
attribute :constants, Constant, collection: true, initialize_empty: true
|
|
22
|
+
attribute :variables, Variable, collection: true, initialize_empty: true
|
|
23
|
+
attribute :statements, ModelElement, collection: true, initialize_empty: true
|
|
24
24
|
attribute :_class, :string, default: -> { self.class.name }
|
|
25
25
|
|
|
26
26
|
key_value do
|
|
@@ -7,7 +7,7 @@ module Expressir
|
|
|
7
7
|
include HasRemarks
|
|
8
8
|
|
|
9
9
|
attribute :id, :string
|
|
10
|
-
attribute :remarks, :string, collection: true
|
|
10
|
+
attribute :remarks, :string, collection: true, initialize_empty: true
|
|
11
11
|
attribute :_class, :string, default: -> { self.class.name }
|
|
12
12
|
|
|
13
13
|
key_value do
|
|
@@ -15,18 +15,18 @@ module Expressir
|
|
|
15
15
|
:where_rules, :informal_propositions,
|
|
16
16
|
:remark_items
|
|
17
17
|
|
|
18
|
-
attribute :applies_to, ModelElement, collection: true
|
|
19
|
-
attribute :types, ModelElement, collection: true
|
|
20
|
-
attribute :entities, Entity, collection: true
|
|
21
|
-
attribute :subtype_constraints, SubtypeConstraint, collection: true
|
|
22
|
-
attribute :functions, Function, collection: true
|
|
23
|
-
attribute :procedures, Procedure, collection: true
|
|
24
|
-
attribute :constants, Constant, collection: true
|
|
25
|
-
attribute :variables, Variable, collection: true
|
|
26
|
-
attribute :statements, ModelElement, collection: true
|
|
27
|
-
attribute :where_rules, WhereRule, collection: true
|
|
18
|
+
attribute :applies_to, ModelElement, collection: true, initialize_empty: true
|
|
19
|
+
attribute :types, ModelElement, collection: true, initialize_empty: true
|
|
20
|
+
attribute :entities, Entity, collection: true, initialize_empty: true
|
|
21
|
+
attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
|
|
22
|
+
attribute :functions, Function, collection: true, initialize_empty: true
|
|
23
|
+
attribute :procedures, Procedure, collection: true, initialize_empty: true
|
|
24
|
+
attribute :constants, Constant, collection: true, initialize_empty: true
|
|
25
|
+
attribute :variables, Variable, collection: true, initialize_empty: true
|
|
26
|
+
attribute :statements, ModelElement, collection: true, initialize_empty: true
|
|
27
|
+
attribute :where_rules, WhereRule, collection: true, initialize_empty: true
|
|
28
28
|
attribute :informal_propositions, InformalPropositionRule,
|
|
29
|
-
collection: true
|
|
29
|
+
collection: true, initialize_empty: true
|
|
30
30
|
attribute :_class, :string, default: -> { self.class.name }
|
|
31
31
|
|
|
32
32
|
key_value do
|
|
@@ -25,14 +25,14 @@ module Expressir
|
|
|
25
25
|
|
|
26
26
|
attribute :file, :string
|
|
27
27
|
attribute :version, SchemaVersion
|
|
28
|
-
attribute :interfaces, Interface, collection: true
|
|
29
|
-
attribute :constants, Constant, collection: true
|
|
30
|
-
attribute :types, ModelElement, collection: true
|
|
31
|
-
attribute :entities, Entity, collection: true
|
|
32
|
-
attribute :subtype_constraints, SubtypeConstraint, collection: true
|
|
33
|
-
attribute :functions, Function, collection: true
|
|
34
|
-
attribute :rules, Rule, collection: true
|
|
35
|
-
attribute :procedures, Procedure, collection: true
|
|
28
|
+
attribute :interfaces, Interface, collection: true, initialize_empty: true
|
|
29
|
+
attribute :constants, Constant, collection: true, initialize_empty: true
|
|
30
|
+
attribute :types, ModelElement, collection: true, initialize_empty: true
|
|
31
|
+
attribute :entities, Entity, collection: true, initialize_empty: true
|
|
32
|
+
attribute :subtype_constraints, SubtypeConstraint, collection: true, initialize_empty: true
|
|
33
|
+
attribute :functions, Function, collection: true, initialize_empty: true
|
|
34
|
+
attribute :rules, Rule, collection: true, initialize_empty: true
|
|
35
|
+
attribute :procedures, Procedure, collection: true, initialize_empty: true
|
|
36
36
|
attribute :header, :string
|
|
37
37
|
attribute :_class, :string, default: -> { self.class.name }
|
|
38
38
|
attribute :selected, :boolean, default: false
|
|
@@ -5,7 +5,7 @@ module Expressir
|
|
|
5
5
|
# - section 9.3 Schema
|
|
6
6
|
class SchemaVersion < ModelElement
|
|
7
7
|
attribute :value, :string
|
|
8
|
-
attribute :items, SchemaVersionItem, collection: true
|
|
8
|
+
attribute :items, SchemaVersionItem, collection: true, initialize_empty: true
|
|
9
9
|
attribute :_class, :string, default: -> { self.class.name }
|
|
10
10
|
|
|
11
11
|
key_value do
|
|
@@ -8,7 +8,7 @@ module Expressir
|
|
|
8
8
|
|
|
9
9
|
attribute :applies_to, ModelElement
|
|
10
10
|
attribute :abstract, :boolean
|
|
11
|
-
attribute :total_over, ModelElement, collection: true
|
|
11
|
+
attribute :total_over, ModelElement, collection: true, initialize_empty: true
|
|
12
12
|
attribute :supertype_expression, ModelElement
|
|
13
13
|
attribute :_class, :string, default: -> { self.class.name }
|
|
14
14
|
|
|
@@ -13,9 +13,9 @@ module Expressir
|
|
|
13
13
|
:remark_items
|
|
14
14
|
|
|
15
15
|
attribute :underlying_type, ModelElement
|
|
16
|
-
attribute :where_rules, WhereRule, collection: true
|
|
16
|
+
attribute :where_rules, WhereRule, collection: true, initialize_empty: true
|
|
17
17
|
attribute :informal_propositions, InformalPropositionRule,
|
|
18
|
-
collection: true
|
|
18
|
+
collection: true, initialize_empty: true
|
|
19
19
|
attribute :_class, :string, default: -> { self.class.name }
|
|
20
20
|
|
|
21
21
|
key_value do
|
|
@@ -6,7 +6,7 @@ module Expressir
|
|
|
6
6
|
class UniqueRule < ModelElement
|
|
7
7
|
include Identifier
|
|
8
8
|
|
|
9
|
-
attribute :attributes, ModelElement, collection: true
|
|
9
|
+
attribute :attributes, ModelElement, collection: true, initialize_empty: true
|
|
10
10
|
attribute :_class, :string, default: -> { self.class.name }
|
|
11
11
|
|
|
12
12
|
key_value do
|
|
@@ -5,7 +5,7 @@ module Expressir
|
|
|
5
5
|
# - section 12.9 Aggregate initializer
|
|
6
6
|
class AggregateInitializer < ModelElement
|
|
7
7
|
child_attributes :items
|
|
8
|
-
attribute :items, ModelElement, collection: true
|
|
8
|
+
attribute :items, ModelElement, collection: true, initialize_empty: true
|
|
9
9
|
attribute :_class, :string, default: -> { self.class.name }
|
|
10
10
|
|
|
11
11
|
key_value do
|
|
@@ -6,7 +6,7 @@ module Expressir
|
|
|
6
6
|
class EntityConstructor < ModelElement
|
|
7
7
|
child_attributes :parameters
|
|
8
8
|
attribute :entity, ModelElement
|
|
9
|
-
attribute :parameters, ModelElement, collection: true
|
|
9
|
+
attribute :parameters, ModelElement, collection: true, initialize_empty: true
|
|
10
10
|
attribute :_class, :string, default: -> { self.class.name }
|
|
11
11
|
|
|
12
12
|
key_value do
|
|
@@ -6,7 +6,7 @@ module Expressir
|
|
|
6
6
|
class FunctionCall < ModelElement
|
|
7
7
|
child_attributes :parameters
|
|
8
8
|
attribute :function, ModelElement
|
|
9
|
-
attribute :parameters, ModelElement, collection: true
|
|
9
|
+
attribute :parameters, ModelElement, collection: true, initialize_empty: true
|
|
10
10
|
attribute :_class, :string, default: -> { self.class.name }
|
|
11
11
|
|
|
12
12
|
key_value do
|
|
@@ -8,11 +8,11 @@ module Expressir
|
|
|
8
8
|
mod.include(HasRemarks)
|
|
9
9
|
|
|
10
10
|
mod.attribute :id, :string
|
|
11
|
-
mod.attribute :remarks, :string, collection: true
|
|
11
|
+
mod.attribute :remarks, :string, collection: true, initialize_empty: true
|
|
12
12
|
mod.attribute :remark_items,
|
|
13
|
-
::Expressir::Model::Declarations::RemarkItem, collection: true
|
|
13
|
+
::Expressir::Model::Declarations::RemarkItem, collection: true, initialize_empty: true
|
|
14
14
|
mod.attribute :untagged_remarks, ::Expressir::Model::RemarkInfo,
|
|
15
|
-
collection: true
|
|
15
|
+
collection: true, initialize_empty: true
|
|
16
16
|
|
|
17
17
|
mod.key_value do
|
|
18
18
|
map "id", to: :id
|
|
@@ -75,7 +75,7 @@ module Expressir
|
|
|
75
75
|
polymorphic_class: true
|
|
76
76
|
attribute :source, :string
|
|
77
77
|
attribute :source_offset, :integer
|
|
78
|
-
attribute :untagged_remarks, RemarkInfo, collection: true
|
|
78
|
+
attribute :untagged_remarks, RemarkInfo, collection: true, initialize_empty: true
|
|
79
79
|
|
|
80
80
|
POLYMORPHIC_CLASS_MAP = {
|
|
81
81
|
"Expressir::Model::Cache" => "Expressir::Model::Cache",
|
|
@@ -9,7 +9,7 @@ module Expressir
|
|
|
9
9
|
|
|
10
10
|
collection_attributes :statements
|
|
11
11
|
attribute :expression, ModelElement
|
|
12
|
-
attribute :statements, ModelElement, collection: true
|
|
12
|
+
attribute :statements, ModelElement, collection: true, initialize_empty: true
|
|
13
13
|
attribute :_class, :string, default: -> { self.class.name }
|
|
14
14
|
|
|
15
15
|
key_value do
|
|
@@ -15,7 +15,7 @@ module Expressir
|
|
|
15
15
|
|
|
16
16
|
child_attributes :expression
|
|
17
17
|
attribute :expression, ModelElement
|
|
18
|
-
attribute :actions, CaseAction, collection: true
|
|
18
|
+
attribute :actions, CaseAction, collection: true, initialize_empty: true
|
|
19
19
|
attribute :otherwise_statement, ModelElement
|
|
20
20
|
attribute :_class, :string, default: -> { self.class.name }
|
|
21
21
|
|
|
@@ -5,7 +5,7 @@ module Expressir
|
|
|
5
5
|
# - section 13.4 Case statement
|
|
6
6
|
class CaseAction < ModelElement
|
|
7
7
|
child_attributes :expression
|
|
8
|
-
attribute :labels, ModelElement, collection: true
|
|
8
|
+
attribute :labels, ModelElement, collection: true, initialize_empty: true
|
|
9
9
|
attribute :statement, ModelElement
|
|
10
10
|
attribute :_class, :string, default: -> { self.class.name }
|
|
11
11
|
|
|
@@ -7,7 +7,7 @@ module Expressir
|
|
|
7
7
|
include Statement
|
|
8
8
|
|
|
9
9
|
collection_attributes :statements
|
|
10
|
-
attribute :statements, ModelElement, collection: true
|
|
10
|
+
attribute :statements, ModelElement, collection: true, initialize_empty: true
|
|
11
11
|
attribute :_class, :string, default: -> { self.class.name }
|
|
12
12
|
|
|
13
13
|
key_value do
|
|
@@ -9,8 +9,8 @@ module Expressir
|
|
|
9
9
|
collection_attributes :statements, :else_statements
|
|
10
10
|
child_attributes :expression
|
|
11
11
|
attribute :expression, ModelElement
|
|
12
|
-
attribute :statements, ModelElement, collection: true
|
|
13
|
-
attribute :else_statements, ModelElement, collection: true
|
|
12
|
+
attribute :statements, ModelElement, collection: true, initialize_empty: true
|
|
13
|
+
attribute :else_statements, ModelElement, collection: true, initialize_empty: true
|
|
14
14
|
attribute :_class, :string, default: -> { self.class.name }
|
|
15
15
|
|
|
16
16
|
key_value do
|
|
@@ -7,7 +7,7 @@ module Expressir
|
|
|
7
7
|
include Statement
|
|
8
8
|
|
|
9
9
|
attribute :procedure, ModelElement
|
|
10
|
-
attribute :parameters, ModelElement, collection: true
|
|
10
|
+
attribute :parameters, ModelElement, collection: true, initialize_empty: true
|
|
11
11
|
attribute :_class, :string, default: -> { self.class.name }
|
|
12
12
|
|
|
13
13
|
key_value do
|
|
@@ -14,7 +14,7 @@ module Expressir
|
|
|
14
14
|
attribute :increment, ModelElement
|
|
15
15
|
attribute :while_expression, ModelElement
|
|
16
16
|
attribute :until_expression, ModelElement
|
|
17
|
-
attribute :statements, ModelElement, collection: true
|
|
17
|
+
attribute :statements, ModelElement, collection: true, initialize_empty: true
|
|
18
18
|
attribute :_class, :string, default: -> { self.class.name }
|
|
19
19
|
|
|
20
20
|
key_value do
|
|
@@ -4,7 +4,7 @@ module Expressir
|
|
|
4
4
|
# Specified in ISO 10303-11:2004
|
|
5
5
|
# - section 9.2.5.2 ONEOF
|
|
6
6
|
class OneofSupertypeExpression < ModelElement
|
|
7
|
-
attribute :operands, ModelElement, collection: true
|
|
7
|
+
attribute :operands, ModelElement, collection: true, initialize_empty: true
|
|
8
8
|
attribute :_class, :string, default: -> { self.class.name }
|
|
9
9
|
|
|
10
10
|
key_value do
|
|
@@ -114,7 +114,9 @@ module Expressir
|
|
|
114
114
|
return parent.attribute("select").value if parent.element? &&
|
|
115
115
|
parent.name == "entity"
|
|
116
116
|
|
|
117
|
-
|
|
117
|
+
# The walk stops at the document node: moxml 0.6 adapters do
|
|
118
|
+
# not answer #parent on it.
|
|
119
|
+
parent = parent.is_a?(Moxml::Document) ? nil : parent.parent
|
|
118
120
|
end
|
|
119
121
|
nil
|
|
120
122
|
end
|
data/lib/expressir/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: expressir
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.4.
|
|
4
|
+
version: 2.4.47
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2026-
|
|
11
|
+
date: 2026-11-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rb_sys
|
|
@@ -100,28 +100,28 @@ dependencies:
|
|
|
100
100
|
requirements:
|
|
101
101
|
- - "~>"
|
|
102
102
|
- !ruby/object:Gem::Version
|
|
103
|
-
version: 0.8.
|
|
103
|
+
version: 0.8.156
|
|
104
104
|
type: :runtime
|
|
105
105
|
prerelease: false
|
|
106
106
|
version_requirements: !ruby/object:Gem::Requirement
|
|
107
107
|
requirements:
|
|
108
108
|
- - "~>"
|
|
109
109
|
- !ruby/object:Gem::Version
|
|
110
|
-
version: 0.8.
|
|
110
|
+
version: 0.8.156
|
|
111
111
|
- !ruby/object:Gem::Dependency
|
|
112
112
|
name: moxml
|
|
113
113
|
requirement: !ruby/object:Gem::Requirement
|
|
114
114
|
requirements:
|
|
115
|
-
- - "
|
|
115
|
+
- - "~>"
|
|
116
116
|
- !ruby/object:Gem::Version
|
|
117
|
-
version: 0.
|
|
117
|
+
version: 0.6.0
|
|
118
118
|
type: :runtime
|
|
119
119
|
prerelease: false
|
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
|
121
121
|
requirements:
|
|
122
|
-
- - "
|
|
122
|
+
- - "~>"
|
|
123
123
|
- !ruby/object:Gem::Version
|
|
124
|
-
version: 0.
|
|
124
|
+
version: 0.6.0
|
|
125
125
|
- !ruby/object:Gem::Dependency
|
|
126
126
|
name: paint
|
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|