expressir 0.2.18 → 0.2.26

data/lib/expressir/model/where.rb

@@ -3,17 +3,24 @@ module Expressir
     class Where < ModelElement
       include Identifier
 
-      attr_accessor :expression
+      model_attr_accessor :expression
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @expression = options[:expression]
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.18".freeze
+  VERSION = "0.2.26".freeze
 end

data/original/examples/syntax/multiple.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 REFERENCE FROM multiple_schema2;
 REFERENCE FROM multiple_schema3 (attribute_entity3);
 REFERENCE FROM multiple_schema4 (attribute_entity AS attribute_entity4);

data/original/examples/syntax/multiple.yaml

@@ -2,34 +2,39 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
-  file: multiple.exp
-  id: multiple_schema1
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema
   interfaces:
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema2
+      base_path: multiple_schema2
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema3
+      base_path: multiple_schema3
     items:
     - _class: Expressir::Model::InterfaceItem
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity3
+        base_path: multiple_schema3.attribute_entity3
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema4
+      base_path: multiple_schema4
     items:
     - _class: Expressir::Model::InterfaceItem
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity
+        base_path: multiple_schema4.attribute_entity
       id: attribute_entity4
   entities:
   - _class: Expressir::Model::Entity
@@ -49,11 +54,13 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: multiple_schema.empty_entity
   - _class: Expressir::Model::Entity
     id: subtype_attribute_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: multiple_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -67,6 +74,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: multiple_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -77,6 +85,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity2
+      base_path: multiple_schema2.attribute_entity2
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -90,6 +99,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity2
+            base_path: multiple_schema2.attribute_entity2
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -100,6 +110,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity3
+      base_path: multiple_schema3.attribute_entity3
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -113,6 +124,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity3
+            base_path: multiple_schema3.attribute_entity3
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -123,6 +135,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity4
+      base_path: multiple_schema4.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -136,6 +149,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity4
+            base_path: multiple_schema4.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -147,7 +161,7 @@ schemas:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: missing_entity
 - _class: Expressir::Model::Schema
-  file: multiple.exp
+  file: original/examples/syntax/multiple.exp
   id: multiple_schema2
   entities:
   - _class: Expressir::Model::Entity
@@ -159,7 +173,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
-  file: multiple.exp
+  file: original/examples/syntax/multiple.exp
   id: multiple_schema3
   entities:
   - _class: Expressir::Model::Entity
@@ -171,7 +185,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
-  file: multiple.exp
+  file: original/examples/syntax/multiple.exp
   id: multiple_schema4
   entities:
   - _class: Expressir::Model::Entity

data/original/examples/syntax/multiple_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 
 REFERENCE FROM multiple_schema2;
 REFERENCE FROM multiple_schema3

data/original/examples/syntax/multiple_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>>}}}
@@ -17,12 +17,12 @@ ENTITY attribute_entity;
 END_ENTITY;
 
 ENTITY subtype_empty_entity
-  SUBTYPE OF ({{{<<express:multiple_schema1.empty_entity,empty_entity>>}}});
+  SUBTYPE OF ({{{<<express:multiple_schema.empty_entity,empty_entity>>}}});
 END_ENTITY;
 
 ENTITY subtype_attribute_entity
-  SUBTYPE OF ({{{<<express:multiple_schema1.attribute_entity,attribute_entity>>}}});
-  SELF\{{{<<express:multiple_schema1.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
+  SUBTYPE OF ({{{<<express:multiple_schema.attribute_entity,attribute_entity>>}}});
+  SELF\{{{<<express:multiple_schema.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
 END_ENTITY;
 
 ENTITY subtype_attribute_entity2

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

@@ -2,7 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
-  file: remark.exp
+  file: original/examples/syntax/remark.exp
   id: remark_schema
   remarks:
   - |-
@@ -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