expressir 0.2.26 → 1.2.0

data/{original/examples → spec}/syntax/remark.yaml

@@ -1,8 +1,8 @@
 ---
 _class: Expressir::Model::Repository
 schemas:
-- _class: Expressir::Model::Schema
-  file: original/examples/syntax/remark.exp
+- _class: Expressir::Model::Declarations::Schema
+  file: spec/syntax/remark.exp
   id: remark_schema
   remarks:
   - |-
@@ -14,40 +14,40 @@ schemas:
   - universal scope - schema before
   - universal scope - schema
   remark_items:
-  - _class: Expressir::Model::RemarkItem
+  - _class: Expressir::Model::Declarations::RemarkItem
     id: remark_item
     remarks:
     - schema scope - schema remark item
     - universal scope - schema remark item
   constants:
-  - _class: Expressir::Model::Constant
+  - _class: Expressir::Model::Declarations::Constant
     id: remark_constant
     remarks:
     - schema scope - constant
     - universal scope - constant
     type:
-      _class: Expressir::Model::Types::String
+      _class: Expressir::Model::DataTypes::String
     expression:
       _class: Expressir::Model::Literals::String
       value: xxx
   types:
-  - _class: Expressir::Model::Type
+  - _class: Expressir::Model::Declarations::Type
     id: remark_type
     remarks:
     - schema scope - type
     - universal scope - type
-    type:
-      _class: Expressir::Model::Types::Enumeration
+    underlying_type:
+      _class: Expressir::Model::DataTypes::Enumeration
       items:
-      - _class: Expressir::Model::EnumerationItem
+      - _class: Expressir::Model::DataTypes::EnumerationItem
         id: remark_enumeration_item
         remarks:
         - schema scope - enumeration item
         - schema scope - enumeration item, on the same level as the type
         - universal scope - enumeration item
         - universal scope - enumeration item, on the same level as the type
-    where:
-    - _class: Expressir::Model::Where
+    where_rules:
+    - _class: Expressir::Model::Declarations::WhereRule
       id: WR1
       remarks:
       - type scope - type where
@@ -60,7 +60,7 @@ schemas:
         _class: Expressir::Model::Literals::Logical
         value: :TRUE
     informal_propositions:
-    - _class: Expressir::Model::RemarkItem
+    - _class: Expressir::Model::Declarations::RemarkItem
       id: IP1
       remarks:
       - type scope - type informal proposition
@@ -70,13 +70,13 @@ schemas:
       - universal scope - type informal proposition
       - universal scope - type informal proposition, with prefix
   entities:
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: remark_entity
     remarks:
     - schema scope - entity
     - universal scope - entity
     attributes:
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       id: remark_attribute
       remarks:
       - entity scope - entity attribute
@@ -84,8 +84,8 @@ schemas:
       - universal scope - entity attribute
       kind: :EXPLICIT
       type:
-        _class: Expressir::Model::Types::String
-    - _class: Expressir::Model::Attribute
+        _class: Expressir::Model::DataTypes::String
+    - _class: Expressir::Model::Declarations::Attribute
       id: remark_derived_attribute
       remarks:
       - entity scope - entity derived attribute
@@ -93,11 +93,11 @@ schemas:
       - universal scope - entity derived attribute
       kind: :DERIVED
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
       expression:
         _class: Expressir::Model::Literals::String
         value: xxx
-    - _class: Expressir::Model::Attribute
+    - _class: Expressir::Model::Declarations::Attribute
       id: remark_inverse_attribute
       remarks:
       - entity scope - entity inverse attribute
@@ -105,26 +105,26 @@ schemas:
       - universal scope - entity inverse attribute
       kind: :INVERSE
       type:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_entity
         base_path: remark_schema.remark_entity
       expression:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_attribute
         base_path: remark_schema.remark_entity.remark_attribute
-    unique:
-    - _class: Expressir::Model::Unique
+    unique_rules:
+    - _class: Expressir::Model::Declarations::UniqueRule
       id: UR1
       remarks:
       - entity scope - entity unique
       - schema scope - entity unique
       - universal scope - entity unique
       attributes:
-      - _class: Expressir::Model::Expressions::SimpleReference
+      - _class: Expressir::Model::References::SimpleReference
         id: remark_attribute
         base_path: remark_schema.remark_entity.remark_attribute
-    where:
-    - _class: Expressir::Model::Where
+    where_rules:
+    - _class: Expressir::Model::Declarations::WhereRule
       id: WR1
       remarks:
       - entity scope - entity where
@@ -137,7 +137,7 @@ schemas:
         _class: Expressir::Model::Literals::Logical
         value: :TRUE
     informal_propositions:
-    - _class: Expressir::Model::RemarkItem
+    - _class: Expressir::Model::Declarations::RemarkItem
       id: IP1
       remarks:
       - entity scope - entity informal proposition
@@ -147,43 +147,43 @@ schemas:
       - universal scope - entity informal proposition
       - universal scope - entity informal proposition, with prefix
   subtype_constraints:
-  - _class: Expressir::Model::SubtypeConstraint
+  - _class: Expressir::Model::Declarations::SubtypeConstraint
     id: remark_subtype_constraint
     remarks:
     - schema scope - subtype constraint
     - universal scope - subtype constraint
     applies_to:
-      _class: Expressir::Model::Expressions::SimpleReference
+      _class: Expressir::Model::References::SimpleReference
       id: remark_entity
       base_path: remark_schema.remark_entity
   functions:
-  - _class: Expressir::Model::Function
+  - _class: Expressir::Model::Declarations::Function
     id: remark_function
     remarks:
     - schema scope - function
     - universal scope - function
     parameters:
-    - _class: Expressir::Model::Parameter
+    - _class: Expressir::Model::Declarations::Parameter
       id: remark_parameter
       remarks:
       - function scope - function parameter
       - schema scope - function parameter
       - universal scope - function parameter
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
     return_type:
-      _class: Expressir::Model::Types::Boolean
+      _class: Expressir::Model::DataTypes::Boolean
     types:
-    - _class: Expressir::Model::Type
+    - _class: Expressir::Model::Declarations::Type
       id: remark_type
       remarks:
       - function scope - function type
       - schema scope - function type
       - universal scope - function type
-      type:
-        _class: Expressir::Model::Types::Enumeration
+      underlying_type:
+        _class: Expressir::Model::DataTypes::Enumeration
         items:
-        - _class: Expressir::Model::EnumerationItem
+        - _class: Expressir::Model::DataTypes::EnumerationItem
           id: remark_enumeration_item
           remarks:
           - function scope - function enumeration item
@@ -194,33 +194,33 @@ schemas:
           - universal scope - function enumeration item, on the same level as the
             type
     constants:
-    - _class: Expressir::Model::Constant
+    - _class: Expressir::Model::Declarations::Constant
       id: remark_constant
       remarks:
       - function scope - function constant
       - schema scope - function constant
       - universal scope - function constant
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
       expression:
         _class: Expressir::Model::Literals::String
         value: xxx
     variables:
-    - _class: Expressir::Model::Variable
+    - _class: Expressir::Model::Declarations::Variable
       id: remark_variable
       remarks:
       - function scope - function variable
       - schema scope - function variable
       - universal scope - function variable
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
     statements:
     - _class: Expressir::Model::Statements::Alias
       id: remark_alias
       remarks:
       - function alias scope - function alias
       expression:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_variable
         base_path: remark_schema.remark_function.remark_variable
       statements:
@@ -239,7 +239,7 @@ schemas:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Assignment
       ref:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_variable
         base_path: remark_schema.remark_function.remark_variable
       expression:
@@ -248,33 +248,33 @@ schemas:
         remarks:
         - function query scope - function query
         aggregate_source:
-          _class: Expressir::Model::Expressions::SimpleReference
+          _class: Expressir::Model::References::SimpleReference
           id: remark_variable
           base_path: remark_schema.remark_function.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE
   rules:
-  - _class: Expressir::Model::Rule
+  - _class: Expressir::Model::Declarations::Rule
     id: remark_rule
     remarks:
     - schema scope - rule
     - universal scope - rule
     applies_to:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: remark_entity
       base_path: remark_schema.remark_entity
     types:
-    - _class: Expressir::Model::Type
+    - _class: Expressir::Model::Declarations::Type
       id: remark_type
       remarks:
       - rule scope - rule type
       - schema scope - rule type
       - universal scope - rule type
-      type:
-        _class: Expressir::Model::Types::Enumeration
+      underlying_type:
+        _class: Expressir::Model::DataTypes::Enumeration
         items:
-        - _class: Expressir::Model::EnumerationItem
+        - _class: Expressir::Model::DataTypes::EnumerationItem
           id: remark_enumeration_item
           remarks:
           - rule scope - rule enumeration item
@@ -284,33 +284,33 @@ schemas:
           - universal scope - rule enumeration item
           - universal scope - rule enumeration item, on the same level as the type
     constants:
-    - _class: Expressir::Model::Constant
+    - _class: Expressir::Model::Declarations::Constant
       id: remark_constant
       remarks:
       - rule scope - rule constant
       - schema scope - rule constant
       - universal scope - rule constant
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
       expression:
         _class: Expressir::Model::Literals::String
         value: xxx
     variables:
-    - _class: Expressir::Model::Variable
+    - _class: Expressir::Model::Declarations::Variable
       id: remark_variable
       remarks:
       - rule scope - rule variable
       - schema scope - rule variable
       - universal scope - rule variable
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
     statements:
     - _class: Expressir::Model::Statements::Alias
       id: remark_alias
       remarks:
       - rule alias scope - rule alias
       expression:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_variable
         base_path: remark_schema.remark_rule.remark_variable
       statements:
@@ -329,7 +329,7 @@ schemas:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Assignment
       ref:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_variable
         base_path: remark_schema.remark_rule.remark_variable
       expression:
@@ -338,14 +338,14 @@ schemas:
         remarks:
         - rule query scope - rule query
         aggregate_source:
-          _class: Expressir::Model::Expressions::SimpleReference
+          _class: Expressir::Model::References::SimpleReference
           id: remark_variable
           base_path: remark_schema.remark_rule.remark_variable
         expression:
           _class: Expressir::Model::Literals::Logical
           value: :TRUE
-    where:
-    - _class: Expressir::Model::Where
+    where_rules:
+    - _class: Expressir::Model::Declarations::WhereRule
       id: WR1
       remarks:
       - rule scope - rule where
@@ -358,7 +358,7 @@ schemas:
         _class: Expressir::Model::Literals::Logical
         value: :TRUE
     informal_propositions:
-    - _class: Expressir::Model::RemarkItem
+    - _class: Expressir::Model::Declarations::RemarkItem
       id: IP1
       remarks:
       - rule scope - rule informal proposition
@@ -368,31 +368,31 @@ schemas:
       - universal scope - rule informal proposition
       - universal scope - rule informal proposition, with prefix
   procedures:
-  - _class: Expressir::Model::Procedure
+  - _class: Expressir::Model::Declarations::Procedure
     id: remark_procedure
     remarks:
     - schema scope - procedure
     - universal scope - procedure
     parameters:
-    - _class: Expressir::Model::Parameter
+    - _class: Expressir::Model::Declarations::Parameter
       id: remark_parameter
       remarks:
       - procedure scope - procedure parameter
       - schema scope - procedure parameter
       - universal scope - procedure parameter
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
     types:
-    - _class: Expressir::Model::Type
+    - _class: Expressir::Model::Declarations::Type
       id: remark_type
       remarks:
       - procedure scope - procedure type
       - schema scope - procedure type
       - universal scope - procedure type
-      type:
-        _class: Expressir::Model::Types::Enumeration
+      underlying_type:
+        _class: Expressir::Model::DataTypes::Enumeration
         items:
-        - _class: Expressir::Model::EnumerationItem
+        - _class: Expressir::Model::DataTypes::EnumerationItem
           id: remark_enumeration_item
           remarks:
           - procedure scope - procedure enumeration item
@@ -404,33 +404,33 @@ schemas:
           - universal scope - procedure enumeration item, on the same level as the
             type
     constants:
-    - _class: Expressir::Model::Constant
+    - _class: Expressir::Model::Declarations::Constant
       id: remark_constant
       remarks:
       - procedure scope - procedure constant
       - schema scope - procedure constant
       - universal scope - procedure constant
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
       expression:
         _class: Expressir::Model::Literals::String
         value: xxx
     variables:
-    - _class: Expressir::Model::Variable
+    - _class: Expressir::Model::Declarations::Variable
       id: remark_variable
       remarks:
       - procedure scope - procedure variable
       - schema scope - procedure variable
       - universal scope - procedure variable
       type:
-        _class: Expressir::Model::Types::String
+        _class: Expressir::Model::DataTypes::String
     statements:
     - _class: Expressir::Model::Statements::Alias
       id: remark_alias
       remarks:
       - procedure alias scope - procedure alias
       expression:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_variable
         base_path: remark_schema.remark_procedure.remark_variable
       statements:
@@ -449,7 +449,7 @@ schemas:
       - _class: Expressir::Model::Statements::Null
     - _class: Expressir::Model::Statements::Assignment
       ref:
-        _class: Expressir::Model::Expressions::SimpleReference
+        _class: Expressir::Model::References::SimpleReference
         id: remark_variable
         base_path: remark_schema.remark_procedure.remark_variable
       expression:
@@ -458,7 +458,7 @@ schemas:
         remarks:
         - procedure query scope - procedure query
         aggregate_source:
-          _class: Expressir::Model::Expressions::SimpleReference
+          _class: Expressir::Model::References::SimpleReference
           id: remark_variable
           base_path: remark_schema.remark_procedure.remark_variable
         expression:

data/{original/examples → spec}/syntax/single.exp

@@ -1,4 +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/spec/syntax/single.yaml

@@ -0,0 +1,18 @@
+---
+_class: Expressir::Model::Repository
+schemas:
+- _class: Expressir::Model::Declarations::Schema
+  file: spec/syntax/single.exp
+  id: single_schema
+  version:
+    _class: Expressir::Model::Declarations::SchemaVersion
+    value: version
+  entities:
+  - _class: Expressir::Model::Declarations::Entity
+    id: empty_entity
+  - _class: Expressir::Model::Declarations::Entity
+    id: subtype_empty_entity
+    subtype_of:
+    - _class: Expressir::Model::References::SimpleReference
+      id: empty_entity
+      base_path: single_schema.empty_entity

data/{original/examples → spec}/syntax/single_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA single_schema;
+SCHEMA single_schema 'version';
 
 ENTITY empty_entity;
 END_ENTITY;

data/{original/examples → spec}/syntax/single_formatted.yaml

@@ -1,19 +1,22 @@
 ---
 _class: Expressir::Model::Repository
 schemas:
-- _class: Expressir::Model::Schema
-  file: original/examples/syntax/single.exp
+- _class: Expressir::Model::Declarations::Schema
+  file: spec/syntax/single.exp
   id: single_schema
+  version:
+    _class: Expressir::Model::Declarations::SchemaVersion
+    value: version
   entities:
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: empty_entity
     source: |-
       ENTITY empty_entity;
       END_ENTITY;
-  - _class: Expressir::Model::Entity
+  - _class: Expressir::Model::Declarations::Entity
     id: subtype_empty_entity
     subtype_of:
-    - _class: Expressir::Model::Expressions::SimpleReference
+    - _class: Expressir::Model::References::SimpleReference
       id: empty_entity
       base_path: single_schema.empty_entity
     source: |-
@@ -21,7 +24,7 @@ schemas:
         SUBTYPE OF (empty_entity);
       END_ENTITY;
   source: |-
-    SCHEMA single_schema;
+    SCHEMA single_schema 'version';
 
     ENTITY empty_entity;
     END_ENTITY;

data/{original/examples → spec}/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;
@@ -192,18 +192,18 @@ PROCEDURE types;
   TYPE select_type = SELECT; END_TYPE;
   TYPE select_extensible_type = EXTENSIBLE SELECT; END_TYPE;
   TYPE select_extensible_generic_entity_type = EXTENSIBLE GENERIC_ENTITY SELECT; END_TYPE;
-  TYPE select_list_type = SELECT (empty_type); END_TYPE;
-  TYPE select_list_multiple_type = SELECT (empty_type, empty_type); END_TYPE;
-  TYPE select_extension_type_ref_type = SELECT BASED_ON select_type; END_TYPE;
-  TYPE select_extension_type_ref_list_type = SELECT BASED_ON select_type WITH (empty_type); END_TYPE;
-  TYPE select_extension_type_ref_list_multiple_type = SELECT BASED_ON select_type WITH (empty_type, empty_type); END_TYPE;
+  TYPE select_item_type = SELECT (empty_type); END_TYPE;
+  TYPE select_multiple_item_type = SELECT (empty_type, empty_type); END_TYPE;
+  TYPE select_based_on_type = SELECT BASED_ON select_type; END_TYPE;
+  TYPE select_based_on_item_type = SELECT BASED_ON select_type WITH (empty_type); END_TYPE;
+  TYPE select_based_on_multiple_item_type = SELECT BASED_ON select_type WITH (empty_type, empty_type); END_TYPE;
   TYPE enumeration_type = ENUMERATION; END_TYPE;
   TYPE enumeration_extensible_type = EXTENSIBLE ENUMERATION; END_TYPE;
-  TYPE enumeration_list_type = ENUMERATION OF (test); END_TYPE;
-  TYPE enumeration_list_multiple_type = ENUMERATION OF (test, test2); END_TYPE;
-  TYPE enumeration_extension_type_ref_type = ENUMERATION BASED_ON enumeration_type; END_TYPE;
-  TYPE enumeration_extension_type_ref_list_type = ENUMERATION BASED_ON enumeration_type WITH (test); END_TYPE;
-  TYPE enumeration_extension_type_ref_list_multiple_type = ENUMERATION BASED_ON enumeration_type WITH (test, test2); END_TYPE;
+  TYPE enumeration_item_type = ENUMERATION OF (test); END_TYPE;
+  TYPE enumeration_multiple_item_type = ENUMERATION OF (test, test2); END_TYPE;
+  TYPE enumeration_based_on_type = ENUMERATION BASED_ON enumeration_type; END_TYPE;
+  TYPE enumeration_based_on_item_type = ENUMERATION BASED_ON enumeration_type WITH (test); END_TYPE;
+  TYPE enumeration_based_on_multiple_item_type = ENUMERATION BASED_ON enumeration_type WITH (test, test2); END_TYPE;
 
   -- generic types
   FUNCTION generic_type : GENERIC; ; END_FUNCTION;