expressir 0.2.19-x86-mingw32 → 0.2.27-x86-mingw32

data/original/examples/syntax/multiple_schema_head_hyperlink_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 
 REFERENCE FROM {{{<<express:multiple_schema2,multiple_schema2>>}}};
 REFERENCE FROM {{{<<express:multiple_schema3,multiple_schema3>>}}}

data/original/examples/syntax/remark.exp

@@ -14,8 +14,8 @@ CONSTANT remark_constant : STRING := 'xxx'; END_CONSTANT;
 TYPE remark_type = ENUMERATION OF (remark_enumeration_item);
   WHERE WR1: TRUE;
   --"WR1" type scope - type where
-  --"IP1" type scope - type informal proposition
   --"wr:WR1" type scope - type where, with prefix
+  --"IP1" type scope - type informal proposition
   --"ip:IP1" type scope - type informal proposition, with prefix
 END_TYPE;
 ENTITY remark_entity;
@@ -29,8 +29,8 @@ ENTITY remark_entity;
   --"remark_inverse_attribute" entity scope - entity inverse attribute
   --"UR1" entity scope - entity unique
   --"WR1" entity scope - entity where
-  --"IP1" entity scope - entity informal proposition
   --"wr:WR1" entity scope - entity where, with prefix
+  --"IP1" entity scope - entity informal proposition
   --"ip:IP1" entity scope - entity informal proposition, with prefix
 END_ENTITY;
 SUBTYPE_CONSTRAINT remark_subtype_constraint FOR remark_entity; END_SUBTYPE_CONSTRAINT;
@@ -74,8 +74,8 @@ RULE remark_rule FOR (remark_entity);
   --"remark_constant" rule scope - rule constant
   --"remark_variable" rule scope - rule variable
   --"WR1" rule scope - rule where
-  --"IP1" rule scope - rule informal proposition
   --"wr:WR1" rule scope - rule where, with prefix
+  --"IP1" rule scope - rule informal proposition
   --"ip:IP1" rule scope - rule informal proposition, with prefix
 END_RULE;
 PROCEDURE remark_procedure(remark_parameter : STRING);
@@ -102,8 +102,8 @@ END_PROCEDURE;
 --"remark_constant" schema scope - constant
 --"remark_type" schema scope - type
 --"remark_type.WR1" schema scope - type where
---"remark_type.IP1" schema scope - type informal proposition
 --"remark_type.wr:WR1" schema scope - type where, with prefix
+--"remark_type.IP1" schema scope - type informal proposition
 --"remark_type.ip:IP1" schema scope - type informal proposition, with prefix
 --"remark_type.remark_enumeration_item" schema scope - enumeration item
 --"remark_enumeration_item" schema scope - enumeration item, on the same level as the type
@@ -113,8 +113,8 @@ END_PROCEDURE;
 --"remark_entity.remark_inverse_attribute" schema scope - entity inverse attribute
 --"remark_entity.UR1" schema scope - entity unique
 --"remark_entity.WR1" schema scope - entity where
---"remark_entity.IP1" schema scope - entity informal proposition
 --"remark_entity.wr:WR1" schema scope - entity where, with prefix
+--"remark_entity.IP1" schema scope - entity informal proposition
 --"remark_entity.ip:IP1" schema scope - entity informal proposition, with prefix
 --"remark_subtype_constraint" schema scope - subtype constraint
 --"remark_function" schema scope - function
@@ -131,8 +131,8 @@ END_PROCEDURE;
 --"remark_rule.remark_constant" schema scope - rule constant
 --"remark_rule.remark_variable" schema scope - rule variable
 --"remark_rule.WR1" schema scope - rule where
---"remark_rule.IP1" schema scope - rule informal proposition
 --"remark_rule.wr:WR1" schema scope - rule where, with prefix
+--"remark_rule.IP1" schema scope - rule informal proposition
 --"remark_rule.ip:IP1" schema scope - rule informal proposition, with prefix
 --"remark_procedure" schema scope - procedure
 --"remark_procedure.remark_parameter" schema scope - procedure parameter
@@ -141,6 +141,7 @@ END_PROCEDURE;
 --"remark_procedure.remark_enumeration_item" schema scope - procedure enumeration item, on the same level as the type
 --"remark_procedure.remark_constant" schema scope - procedure constant
 --"remark_procedure.remark_variable" schema scope - procedure variable
+--"remark_item" schema scope - schema remark item
 
 END_SCHEMA;
 
@@ -148,8 +149,8 @@ END_SCHEMA;
 --"remark_schema.remark_constant" universal scope - constant
 --"remark_schema.remark_type" universal scope - type
 --"remark_schema.remark_type.WR1" universal scope - type where
---"remark_schema.remark_type.IP1" universal scope - type informal proposition
 --"remark_schema.remark_type.wr:WR1" universal scope - type where, with prefix
+--"remark_schema.remark_type.IP1" universal scope - type informal proposition
 --"remark_schema.remark_type.ip:IP1" universal scope - type informal proposition, with prefix
 --"remark_schema.remark_type.remark_enumeration_item" universal scope - enumeration item
 --"remark_schema.remark_enumeration_item" universal scope - enumeration item, on the same level as the type
@@ -159,8 +160,8 @@ END_SCHEMA;
 --"remark_schema.remark_entity.remark_inverse_attribute" universal scope - entity inverse attribute
 --"remark_schema.remark_entity.UR1" universal scope - entity unique
 --"remark_schema.remark_entity.WR1" universal scope - entity where
---"remark_schema.remark_entity.IP1" universal scope - entity informal proposition
 --"remark_schema.remark_entity.wr:WR1" universal scope - entity where, with prefix
+--"remark_schema.remark_entity.IP1" universal scope - entity informal proposition
 --"remark_schema.remark_entity.ip:IP1" universal scope - entity informal proposition, with prefix
 --"remark_schema.remark_subtype_constraint" universal scope - subtype constraint
 --"remark_schema.remark_function" universal scope - function
@@ -177,8 +178,8 @@ END_SCHEMA;
 --"remark_schema.remark_rule.remark_constant" universal scope - rule constant
 --"remark_schema.remark_rule.remark_variable" universal scope - rule variable
 --"remark_schema.remark_rule.WR1" universal scope - rule where
---"remark_schema.remark_rule.IP1" universal scope - rule informal proposition
 --"remark_schema.remark_rule.wr:WR1" universal scope - rule where, with prefix
+--"remark_schema.remark_rule.IP1" universal scope - rule informal proposition
 --"remark_schema.remark_rule.ip:IP1" universal scope - rule informal proposition, with prefix
 --"remark_schema.remark_procedure" universal scope - procedure
 --"remark_schema.remark_procedure.remark_parameter" universal scope - procedure parameter
@@ -186,4 +187,5 @@ END_SCHEMA;
 --"remark_schema.remark_procedure.remark_type.remark_enumeration_item" universal scope - procedure enumeration item
 --"remark_schema.remark_procedure.remark_enumeration_item" universal scope - procedure enumeration item, on the same level as the type
 --"remark_schema.remark_procedure.remark_constant" universal scope - procedure constant
---"remark_schema.remark_procedure.remark_variable" universal scope - procedure variable
+--"remark_schema.remark_procedure.remark_variable" universal scope - procedure variable
+--"remark_schema.remark_item" universal scope - schema remark item

data/original/examples/syntax/remark.yaml

@@ -13,6 +13,12 @@ schemas:
   - 'UTF8 test: Příliš žluťoučký kůň úpěl ďábelské ódy.'
   - universal scope - schema before
   - universal scope - schema
+  remark_items:
+  - _class: Expressir::Model::RemarkItem
+    id: remark_item
+    remarks:
+    - schema scope - schema remark item
+    - universal scope - schema remark item
   constants:
   - _class: Expressir::Model::Constant
     id: remark_constant
@@ -54,7 +60,7 @@ schemas:
         _class: Expressir::Model::Literals::Logical
         value: :TRUE
     informal_propositions:
-    - _class: Expressir::Model::InformalProposition
+    - _class: Expressir::Model::RemarkItem
       id: IP1
       remarks:
       - type scope - type informal proposition
@@ -101,9 +107,11 @@ schemas:
       type:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_entity
+        base_path: remark_schema.remark_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_attribute
+        base_path: remark_schema.remark_entity.remark_attribute
     unique:
     - _class: Expressir::Model::Unique
       id: UR1
@@ -114,6 +122,7 @@ schemas:
       attributes:
       - _class: Expressir::Model::Expressions::SimpleReference
         id: remark_attribute
+        base_path: remark_schema.remark_entity.remark_attribute
     where:
     - _class: Expressir::Model::Where
       id: WR1
@@ -128,7 +137,7 @@ schemas:
         _class: Expressir::Model::Literals::Logical
         value: :TRUE
     informal_propositions:
-    - _class: Expressir::Model::InformalProposition
+    - _class: Expressir::Model::RemarkItem
       id: IP1
       remarks:
       - entity scope - entity informal proposition
@@ -146,6 +155,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: remark_entity
+      base_path: remark_schema.remark_entity
   functions:
   - _class: Expressir::Model::Function
     id: remark_function
@@ -212,6 +222,7 @@ schemas:
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_function.remark_variable
       statements:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Repeat
@@ -230,6 +241,7 @@ schemas:
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_function.remark_variable
       expression:
         _class: Expressir::Model::Expressions::QueryExpression
         id: remark_query
@@ -238,6 +250,7 @@ schemas:
         aggregate_source:
           _class: Expressir::Model::Expressions::SimpleReference
           id: remark_variable
+          base_path: remark_schema.remark_function.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE
@@ -250,6 +263,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: remark_entity
+      base_path: remark_schema.remark_entity
     types:
     - _class: Expressir::Model::Type
       id: remark_type
@@ -298,6 +312,7 @@ schemas:
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_rule.remark_variable
       statements:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Repeat
@@ -316,6 +331,7 @@ schemas:
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_rule.remark_variable
       expression:
         _class: Expressir::Model::Expressions::QueryExpression
         id: remark_query
@@ -324,6 +340,7 @@ schemas:
         aggregate_source:
           _class: Expressir::Model::Expressions::SimpleReference
           id: remark_variable
+          base_path: remark_schema.remark_rule.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE
@@ -341,7 +358,7 @@ schemas:
         _class: Expressir::Model::Literals::Logical
         value: :TRUE
     informal_propositions:
-    - _class: Expressir::Model::InformalProposition
+    - _class: Expressir::Model::RemarkItem
       id: IP1
       remarks:
       - rule scope - rule informal proposition
@@ -415,6 +432,7 @@ schemas:
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_procedure.remark_variable
       statements:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Repeat
@@ -433,6 +451,7 @@ schemas:
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: remark_variable
+        base_path: remark_schema.remark_procedure.remark_variable
       expression:
         _class: Expressir::Model::Expressions::QueryExpression
         id: remark_query
@@ -441,6 +460,7 @@ schemas:
         aggregate_source:
           _class: Expressir::Model::Expressions::SimpleReference
           id: remark_variable
+          base_path: remark_schema.remark_procedure.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE

data/original/examples/syntax/remark_formatted.exp

@@ -222,4 +222,6 @@ several physical lines.
 --"remark_schema.remark_procedure.remark_constant" universal scope - procedure constant
 --"remark_schema.remark_procedure.remark_variable" procedure scope - procedure variable
 --"remark_schema.remark_procedure.remark_variable" schema scope - procedure variable
---"remark_schema.remark_procedure.remark_variable" universal scope - procedure variable
+--"remark_schema.remark_procedure.remark_variable" universal scope - procedure variable
+--"remark_schema.remark_item" schema scope - schema remark item
+--"remark_schema.remark_item" universal scope - schema remark item

data/original/examples/syntax/single.exp

@@ -1,3 +1,4 @@
-SCHEMA single_schema;
+SCHEMA single_schema 'version';
 ENTITY empty_entity; END_ENTITY;
+ENTITY subtype_empty_entity SUBTYPE OF (empty_entity); END_ENTITY;
 END_SCHEMA;

data/original/examples/syntax/single.yaml

@@ -4,6 +4,15 @@ schemas:
 - _class: Expressir::Model::Schema
   file: original/examples/syntax/single.exp
   id: single_schema
+  version:
+    _class: Expressir::Model::SchemaVersion
+    value: version
   entities:
   - _class: Expressir::Model::Entity
     id: empty_entity
+  - _class: Expressir::Model::Entity
+    id: subtype_empty_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: empty_entity
+      base_path: single_schema.empty_entity

data/original/examples/syntax/single_formatted.exp

@@ -1,6 +1,10 @@
-SCHEMA single_schema;
+SCHEMA single_schema 'version';
 
 ENTITY empty_entity;
 END_ENTITY;
 
+ENTITY subtype_empty_entity
+  SUBTYPE OF (empty_entity);
+END_ENTITY;
+
 END_SCHEMA;

data/original/examples/syntax/single_formatted.yaml

@@ -4,16 +4,33 @@ schemas:
 - _class: Expressir::Model::Schema
   file: original/examples/syntax/single.exp
   id: single_schema
+  version:
+    _class: Expressir::Model::SchemaVersion
+    value: version
   entities:
   - _class: Expressir::Model::Entity
     id: empty_entity
     source: |-
       ENTITY empty_entity;
       END_ENTITY;
+  - _class: Expressir::Model::Entity
+    id: subtype_empty_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: empty_entity
+      base_path: single_schema.empty_entity
+    source: |-
+      ENTITY subtype_empty_entity
+        SUBTYPE OF (empty_entity);
+      END_ENTITY;
   source: |-
-    SCHEMA single_schema;
+    SCHEMA single_schema 'version';
 
     ENTITY empty_entity;
     END_ENTITY;
 
+    ENTITY subtype_empty_entity
+      SUBTYPE OF (empty_entity);
+    END_ENTITY;
+
     END_SCHEMA;

data/original/examples/syntax/syntax.exp

@@ -1,5 +1,5 @@
 -- schema
-SCHEMA syntax_schema 'version';
+SCHEMA syntax_schema '{ISO standard 10303 part(41) object(1) version(8)}';
 
 -- interfaces
 USE FROM contract_schema;

data/original/examples/syntax/syntax.yaml

@@ -5,8 +5,24 @@ schemas:
   file: original/examples/syntax/syntax.exp
   id: syntax_schema
   version:
-    _class: Expressir::Model::Literals::String
-    value: version
+    _class: Expressir::Model::SchemaVersion
+    value: "{ISO standard 10303 part(41) object(1) version(8)}"
+    items:
+    - _class: Expressir::Model::SchemaVersionItem
+      name: ISO
+    - _class: Expressir::Model::SchemaVersionItem
+      name: standard
+    - _class: Expressir::Model::SchemaVersionItem
+      value: '10303'
+    - _class: Expressir::Model::SchemaVersionItem
+      name: part
+      value: '41'
+    - _class: Expressir::Model::SchemaVersionItem
+      name: object
+      value: '1'
+    - _class: Expressir::Model::SchemaVersionItem
+      name: version
+      value: '8'
   interfaces:
   - _class: Expressir::Model::Interface
     kind: :USE
@@ -135,24 +151,29 @@ schemas:
     supertype_expression:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
   - _class: Expressir::Model::Entity
     id: supertype_constraint_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
   - _class: Expressir::Model::Entity
     id: subtype_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
   - _class: Expressir::Model::Entity
     id: supertype_constraint_subtype_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
   - _class: Expressir::Model::Entity
     id: attribute_entity
     attributes:
@@ -201,6 +222,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -214,6 +236,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -224,6 +247,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       id: test2
@@ -238,6 +262,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -259,6 +284,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :DERIVED
@@ -272,6 +298,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -285,6 +312,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       id: test2
@@ -299,6 +327,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -316,9 +345,11 @@ schemas:
       type:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity
+        base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: test
+        base_path: syntax_schema.inverse_attribute_entity.test
   - _class: Expressir::Model::Entity
     id: inverse_attribute_entity_entity
     attributes:
@@ -328,6 +359,7 @@ schemas:
       type:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity
+        base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::AttributeReference
         ref:
@@ -347,9 +379,11 @@ schemas:
         base_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: attribute_entity
+          base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: test
+        base_path: syntax_schema.inverse_attribute_set_entity.test
   - _class: Expressir::Model::Entity
     id: inverse_attribute_set_bound_entity
     attributes:
@@ -367,9 +401,11 @@ schemas:
         base_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: attribute_entity
+          base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: test
+        base_path: syntax_schema.inverse_attribute_set_bound_entity.test
   - _class: Expressir::Model::Entity
     id: inverse_attribute_bag_entity
     attributes:
@@ -381,9 +417,11 @@ schemas:
         base_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: attribute_entity
+          base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: test
+        base_path: syntax_schema.inverse_attribute_bag_entity.test
   - _class: Expressir::Model::Entity
     id: inverse_attribute_bag_bound_entity
     attributes:
@@ -401,14 +439,17 @@ schemas:
         base_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: attribute_entity
+          base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: test
+        base_path: syntax_schema.inverse_attribute_bag_bound_entity.test
   - _class: Expressir::Model::Entity
     id: inverse_attribute_redeclared_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :INVERSE
@@ -422,12 +463,14 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
       type:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity
+        base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: test
@@ -436,6 +479,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       id: test2
@@ -450,12 +494,14 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
       type:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity
+        base_path: syntax_schema.attribute_entity
       expression:
         _class: Expressir::Model::Expressions::SimpleReference
         id: test
@@ -472,6 +518,7 @@ schemas:
       attributes:
       - _class: Expressir::Model::Expressions::SimpleReference
         id: test
+        base_path: syntax_schema.unique_entity.test
   - _class: Expressir::Model::Entity
     id: unique_label_entity
     attributes:
@@ -486,11 +533,13 @@ schemas:
       attributes:
       - _class: Expressir::Model::Expressions::SimpleReference
         id: test
+        base_path: syntax_schema.unique_label_entity.test
   - _class: Expressir::Model::Entity
     id: unique_redeclared_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     unique:
     - _class: Expressir::Model::Unique
       attributes:
@@ -503,6 +552,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -511,6 +561,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: syntax_schema.attribute_entity
     unique:
     - _class: Expressir::Model::Unique
       id: UR1
@@ -524,6 +575,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: syntax_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -548,17 +600,20 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
   - _class: Expressir::Model::SubtypeConstraint
     id: abstract_supertype_subtype_constraint
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     abstract: true
   - _class: Expressir::Model::SubtypeConstraint
     id: total_over_subtype_constraint
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     total_over:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: a
@@ -567,6 +622,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::SimpleReference
       id: a
@@ -575,6 +631,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :ANDOR
@@ -589,6 +646,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :AND
@@ -603,6 +661,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :ANDOR
@@ -623,6 +682,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :ANDOR
@@ -643,6 +703,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :AND
@@ -663,6 +724,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :AND
@@ -683,6 +745,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::Call
       ref:
@@ -698,6 +761,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :AND
@@ -719,6 +783,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :ANDOR
@@ -740,6 +805,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :AND
@@ -761,6 +827,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :ANDOR
@@ -782,6 +849,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :AND
@@ -810,6 +878,7 @@ schemas:
     applies_to:
       _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     supertype_expression:
       _class: Expressir::Model::Expressions::BinaryExpression
       operator: :ANDOR
@@ -1030,6 +1099,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     where:
     - _class: Expressir::Model::Where
       expression:
@@ -1040,6 +1110,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     types:
     - _class: Expressir::Model::Type
       id: test
@@ -1055,6 +1126,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     constants:
     - _class: Expressir::Model::Constant
       id: test
@@ -1073,6 +1145,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     constants:
     - _class: Expressir::Model::Constant
       id: test
@@ -1098,6 +1171,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     variables:
     - _class: Expressir::Model::Variable
       id: test
@@ -1113,6 +1187,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     variables:
     - _class: Expressir::Model::Variable
       id: test
@@ -1132,6 +1207,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     variables:
     - _class: Expressir::Model::Variable
       id: test
@@ -1151,6 +1227,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     variables:
     - _class: Expressir::Model::Variable
       id: test
@@ -1169,6 +1246,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     variables:
     - _class: Expressir::Model::Variable
       id: test
@@ -1194,6 +1272,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     variables:
     - _class: Expressir::Model::Variable
       id: test
@@ -1219,6 +1298,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     statements:
     - _class: Expressir::Model::Statements::Null
     where:
@@ -1231,6 +1311,7 @@ schemas:
     applies_to:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: syntax_schema.empty_entity
     where:
     - _class: Expressir::Model::Where
       id: WR1
@@ -1728,6 +1809,7 @@ schemas:
         ref:
           _class: Expressir::Model::Expressions::SimpleReference
           id: empty_procedure
+          base_path: syntax_schema.empty_procedure
     - _class: Expressir::Model::Procedure
       id: call_parameter_statement
       statements:
@@ -1735,6 +1817,7 @@ schemas:
         ref:
           _class: Expressir::Model::Expressions::SimpleReference
           id: empty_procedure
+          base_path: syntax_schema.empty_procedure
         parameters:
         - _class: Expressir::Model::Literals::Logical
           value: :TRUE
@@ -1745,6 +1828,7 @@ schemas:
         ref:
           _class: Expressir::Model::Expressions::SimpleReference
           id: empty_procedure
+          base_path: syntax_schema.empty_procedure
         parameters:
         - _class: Expressir::Model::Literals::Logical
           value: :TRUE
@@ -2054,6 +2138,7 @@ schemas:
         items:
         - _class: Expressir::Model::Expressions::SimpleReference
           id: empty_type
+          base_path: syntax_schema.empty_type
     - _class: Expressir::Model::Type
       id: select_list_multiple_type
       type:
@@ -2061,8 +2146,10 @@ schemas:
         items:
         - _class: Expressir::Model::Expressions::SimpleReference
           id: empty_type
+          base_path: syntax_schema.empty_type
         - _class: Expressir::Model::Expressions::SimpleReference
           id: empty_type
+          base_path: syntax_schema.empty_type
     - _class: Expressir::Model::Type
       id: select_extension_type_ref_type
       type:
@@ -2070,6 +2157,7 @@ schemas:
         extension_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: select_type
+          base_path: syntax_schema.types.select_type
     - _class: Expressir::Model::Type
       id: select_extension_type_ref_list_type
       type:
@@ -2077,9 +2165,11 @@ schemas:
         extension_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: select_type
+          base_path: syntax_schema.types.select_type
         extension_items:
         - _class: Expressir::Model::Expressions::SimpleReference
           id: empty_type
+          base_path: syntax_schema.empty_type
     - _class: Expressir::Model::Type
       id: select_extension_type_ref_list_multiple_type
       type:
@@ -2087,11 +2177,14 @@ schemas:
         extension_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: select_type
+          base_path: syntax_schema.types.select_type
         extension_items:
         - _class: Expressir::Model::Expressions::SimpleReference
           id: empty_type
+          base_path: syntax_schema.empty_type
         - _class: Expressir::Model::Expressions::SimpleReference
           id: empty_type
+          base_path: syntax_schema.empty_type
     - _class: Expressir::Model::Type
       id: enumeration_type
       type:
@@ -2124,6 +2217,7 @@ schemas:
         extension_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: enumeration_type
+          base_path: syntax_schema.types.enumeration_type
     - _class: Expressir::Model::Type
       id: enumeration_extension_type_ref_list_type
       type:
@@ -2131,6 +2225,7 @@ schemas:
         extension_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: enumeration_type
+          base_path: syntax_schema.types.enumeration_type
         extension_items:
         - _class: Expressir::Model::EnumerationItem
           id: test
@@ -2141,6 +2236,7 @@ schemas:
         extension_type:
           _class: Expressir::Model::Expressions::SimpleReference
           id: enumeration_type
+          base_path: syntax_schema.types.enumeration_type
         extension_items:
         - _class: Expressir::Model::EnumerationItem
           id: test
@@ -3295,6 +3391,7 @@ schemas:
         ref:
           _class: Expressir::Model::Expressions::SimpleReference
           id: parameter_function
+          base_path: syntax_schema.parameter_function
         parameters:
         - _class: Expressir::Model::Literals::Logical
           value: :TRUE