expressir 0.2.21-x86-mingw32 → 0.2.24-x86-mingw32

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.21".freeze
+  VERSION = "0.2.24".freeze
 end

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
@@ -128,7 +134,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
@@ -341,7 +347,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

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/spec/expressir/model/model_element_spec.rb

@@ -82,8 +82,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Type)
       expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(repo.find('remark_schema.remark_entity')).to be_instance_of(Expressir::Model::Entity)
       expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
@@ -92,8 +92,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
       expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
       expect(repo.find('remark_schema.remark_function')).to be_instance_of(Expressir::Model::Function)
       expect(repo.find('remark_schema.remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
@@ -114,8 +114,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
       expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # schema scope
       schema = repo.schemas.first
@@ -123,8 +123,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_type')).to be_instance_of(Expressir::Model::Type)
       expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(schema.find('remark_entity')).to be_instance_of(Expressir::Model::Entity)
       expect(schema.find('remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
@@ -133,8 +133,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
       expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
       expect(schema.find('remark_function')).to be_instance_of(Expressir::Model::Function)
       expect(schema.find('remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
@@ -155,15 +155,15 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
       expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # type scope
       type = schema.types.first
       expect(type.find('WR1')).to be_instance_of(Expressir::Model::Where)
       expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(type.find('IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(type.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # entity scope
       entity = schema.entities.first
@@ -173,8 +173,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(entity.find('UR1')).to be_instance_of(Expressir::Model::Unique)
       expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Where)
       expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(entity.find('IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(entity.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # function scope
       function = schema.functions.first
@@ -200,15 +200,15 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
       expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Where)
       expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(rule.find('IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(rule.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # retry search in parent scope
       expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Type)
       expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.24
 platform: x86-mingw32
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -242,7 +242,6 @@ files:
 - lib/expressir/model/expressions/unary_expression.rb
 - lib/expressir/model/function.rb
 - lib/expressir/model/identifier.rb
-- lib/expressir/model/informal_proposition.rb
 - lib/expressir/model/interface.rb
 - lib/expressir/model/interface_item.rb
 - lib/expressir/model/interfaced_item.rb
@@ -254,6 +253,7 @@ files:
 - lib/expressir/model/model_element.rb
 - lib/expressir/model/parameter.rb
 - lib/expressir/model/procedure.rb
+- lib/expressir/model/remark_item.rb
 - lib/expressir/model/repository.rb
 - lib/expressir/model/rule.rb
 - lib/expressir/model/schema.rb