expressir 0.2.15-x64-mingw32 → 0.2.21-x64-mingw32

data/lib/expressir/model/procedure.rb

@@ -31,18 +31,22 @@ module Expressir
         super
       end
 
+      def enumeration_items
+        types.flat_map{|x| x.enumeration_items}
+      end
+
       def children
-        items = []
-        items.push(*@parameters)
-        items.push(*@types)
-        items.push(*@types.flat_map{|x| x.type.is_a?(Types::Enumeration) ? x.type.items : []})
-        items.push(*@entities)
-        items.push(*@subtype_constraints)
-        items.push(*@functions)
-        items.push(*@procedures)
-        items.push(*@constants)
-        items.push(*@variables)
-        items
+        [
+          *parameters,
+          *types,
+          *enumeration_items,
+          *entities,
+          *subtype_constraints,
+          *functions,
+          *procedures,
+          *constants,
+          *variables
+        ]
       end
     end
   end

data/lib/expressir/model/repository.rb

@@ -10,9 +10,9 @@ module Expressir
       end
 
       def children
-        items = []
-        items.push(*@schemas)
-        items
+        [
+          *schemas
+        ]
       end
     end
   end

data/lib/expressir/model/rule.rb

@@ -35,19 +35,23 @@ module Expressir
         super
       end
 
+      def enumeration_items
+        types.flat_map{|x| x.enumeration_items}
+      end
+
       def children
-        items = []
-        items.push(*@types)
-        items.push(*@types.flat_map{|x| x.type.is_a?(Types::Enumeration) ? x.type.items : []})
-        items.push(*@entities)
-        items.push(*@subtype_constraints)
-        items.push(*@functions)
-        items.push(*@procedures)
-        items.push(*@constants)
-        items.push(*@variables)
-        items.push(*@where)
-        items.push(*@informal_propositions)
-        items
+        [
+          *types,
+          *enumeration_items,
+          *entities,
+          *subtype_constraints,
+          *functions,
+          *procedures,
+          *constants,
+          *variables,
+          *where,
+          *informal_propositions
+        ]
       end
     end
   end

data/lib/expressir/model/schema.rb

@@ -5,8 +5,6 @@ module Expressir
 
       include Identifier
 
-      attr_accessor :head_source
-
       attr_accessor :version
       attr_accessor :interfaces
       attr_accessor :constants
@@ -14,8 +12,8 @@ module Expressir
       attr_accessor :entities
       attr_accessor :subtype_constraints
       attr_accessor :functions
-      attr_accessor :procedures
       attr_accessor :rules
+      attr_accessor :procedures
 
       def initialize(options = {})
         @file = options[:file]
@@ -23,7 +21,6 @@ module Expressir
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
         @source = options[:source]
-        @head_source = options[:head_source]
 
         @version = options[:version]
         @interfaces = options.fetch(:interfaces, [])
@@ -32,60 +29,67 @@ module Expressir
         @entities = options.fetch(:entities, [])
         @subtype_constraints = options.fetch(:subtype_constraints, [])
         @functions = options.fetch(:functions, [])
-        @procedures = options.fetch(:procedures, [])
         @rules = options.fetch(:rules, [])
+        @procedures = options.fetch(:procedures, [])
 
         super
       end
 
-      def children(skip_references = false)
-        items = []
-        unless skip_references
-          items.push(*@interfaces.flat_map do |interface|
-            schema_id = interface.schema.id.downcase
-            schema = parent.schemas.find{|x| x.id.downcase == schema_id}
-            if schema
-              schema_children = schema.children(true) # prevent infinite recursion
-              if interface.items.length > 0
-                interface.items.map do |item|
-                  ref_id = item.ref.id.downcase
-                  id = item.id || ref_id
-                  base_item = schema_children.find{|x| x.id and x.id.downcase == ref_id}
-
-                  interfaced_item = InterfacedItem.new({
-                    id: id
-                  })
-                  interfaced_item.base_item = base_item # skip overriding parent
-                  interfaced_item.parent = self
-                  interfaced_item
-                end
-              else
-                schema_children.map do |item|
-                  id = item.id
-                  base_item = item
+      def create_interfaced_item(id, base_item)
+        interfaced_item = InterfacedItem.new({
+          id: id
+        })
+        interfaced_item.base_item = base_item # skip overriding parent
+        interfaced_item.parent = self
+        interfaced_item
+      end
 
-                  interfaced_item = InterfacedItem.new({
-                    id: id
-                  })
-                  interfaced_item.base_item = base_item # skip overriding parent
-                  interfaced_item.parent = self
-                  interfaced_item
+      def interfaced_items
+        interfaces.flat_map do |interface|
+          schema = parent.children_by_id[interface.schema.id.downcase]
+          if schema
+            schema_safe_children = schema.safe_children
+            schema_safe_children_by_id = schema_safe_children.select{|x| x.id}.map{|x| [x.id.downcase, x]}.to_h
+            if interface.items.length > 0
+              interface.items.map do |interface_item|
+                base_item = schema_safe_children_by_id[interface_item.ref.id.downcase]
+                if base_item
+                  id = interface_item.id || base_item.id
+                  create_interfaced_item(id, base_item)
                 end
               end
             else
-              []
+              schema_safe_children.map do |base_item|
+                id = base_item.id
+                create_interfaced_item(id, base_item)
+              end
             end
-          end)
-        end
-        items.push(*@constants)
-        items.push(*@types)
-        items.push(*@types.flat_map{|x| x.type.is_a?(Types::Enumeration) ? x.type.items : []})
-        items.push(*@entities)
-        items.push(*@subtype_constraints)
-        items.push(*@functions)
-        items.push(*@procedures)
-        items.push(*@rules)
-        items
+          end
+        end.select{|x| x}
+      end
+
+      def enumeration_items
+        types.flat_map{|x| x.enumeration_items}
+      end
+
+      def safe_children
+        [
+          *constants,
+          *types,
+          *enumeration_items,
+          *entities,
+          *subtype_constraints,
+          *functions,
+          *rules,
+          *procedures
+        ]
+      end
+
+      def children
+        [
+          *interfaced_items,
+          *safe_children
+        ]
       end
     end
   end

data/lib/expressir/model/statements/alias.rb

@@ -19,9 +19,9 @@ module Expressir
         end
 
         def children
-          items = []
-          items.push(self)
-          items
+          [
+            self
+          ]
         end
       end
     end

data/lib/expressir/model/statements/repeat.rb

@@ -27,9 +27,9 @@ module Expressir
         end
 
         def children
-          items = []
-          items.push(self)
-          items
+          [
+            self
+          ]
         end
       end
     end

data/lib/expressir/model/subtype_constraint.rb

@@ -15,16 +15,11 @@ module Expressir
 
         @applies_to = options[:applies_to]
         @abstract = options[:abstract]
-        @total_over = options[:total_over]
+        @total_over = options.fetch(:total_over, [])
         @supertype_expression = options[:supertype_expression]
 
         super
       end
-
-      def children
-        items = []
-        items
-      end
     end
   end
 end

data/lib/expressir/model/type.rb

@@ -19,12 +19,16 @@ module Expressir
         super
       end
 
+      def enumeration_items
+        type.is_a?(Types::Enumeration) ? type.items : []
+      end
+
       def children
-        items = []
-        items.push(*@type.is_a?(Types::Enumeration) ? @type.items : [])
-        items.push(*@where)
-        items.push(*@informal_propositions)
-        items
+        [
+          *enumeration_items,
+          *where,
+          *informal_propositions
+        ]
       end
     end
   end

data/lib/expressir/version.rb

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

data/original/examples/syntax/{hyperlink.exp → multiple.exp}

@@ -1,7 +1,7 @@
-SCHEMA hyperlink_schema;
-REFERENCE FROM hyperlink_schema2;
-REFERENCE FROM hyperlink_schema3 (attribute_entity3);
-REFERENCE FROM hyperlink_schema4 (attribute_entity AS attribute_entity4);
+SCHEMA multiple_schema1;
+REFERENCE FROM multiple_schema2;
+REFERENCE FROM multiple_schema3 (attribute_entity3);
+REFERENCE FROM multiple_schema4 (attribute_entity AS attribute_entity4);
 ENTITY test; END_ENTITY;
 ENTITY empty_entity; END_ENTITY;
 ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
@@ -12,12 +12,12 @@ ENTITY subtype_attribute_entity3 SUBTYPE OF (attribute_entity3); SELF\attribute_
 ENTITY subtype_attribute_entity4 SUBTYPE OF (attribute_entity4); SELF\attribute_entity4.test : BOOLEAN; END_ENTITY;
 ENTITY subtype_missing_entity SUBTYPE OF (missing_entity); END_ENTITY;
 END_SCHEMA;
-SCHEMA hyperlink_schema2;
+SCHEMA multiple_schema2;
 ENTITY attribute_entity2; test : BOOLEAN; END_ENTITY;
 END_SCHEMA;
-SCHEMA hyperlink_schema3;
+SCHEMA multiple_schema3;
 ENTITY attribute_entity3; test : BOOLEAN; END_ENTITY;
 END_SCHEMA;
-SCHEMA hyperlink_schema4;
+SCHEMA multiple_schema4;
 ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
-END_SCHEMA;
+END_SCHEMA;

data/original/examples/syntax/multiple.yaml

@@ -0,0 +1,184 @@
+---
+_class: Expressir::Model::Repository
+schemas:
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema1
+  interfaces:
+  - _class: Expressir::Model::Interface
+    kind: :REFERENCE
+    schema:
+      _class: Expressir::Model::Expressions::SimpleReference
+      id: multiple_schema2
+  - _class: Expressir::Model::Interface
+    kind: :REFERENCE
+    schema:
+      _class: Expressir::Model::Expressions::SimpleReference
+      id: multiple_schema3
+    items:
+    - _class: Expressir::Model::InterfaceItem
+      ref:
+        _class: Expressir::Model::Expressions::SimpleReference
+        id: attribute_entity3
+  - _class: Expressir::Model::Interface
+    kind: :REFERENCE
+    schema:
+      _class: Expressir::Model::Expressions::SimpleReference
+      id: multiple_schema4
+    items:
+    - _class: Expressir::Model::InterfaceItem
+      ref:
+        _class: Expressir::Model::Expressions::SimpleReference
+        id: attribute_entity
+      id: attribute_entity4
+  entities:
+  - _class: Expressir::Model::Entity
+    id: test
+  - _class: Expressir::Model::Entity
+    id: empty_entity
+  - _class: Expressir::Model::Entity
+    id: attribute_entity
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_empty_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: empty_entity
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity2
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity2
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity2
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity3
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity3
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity3
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity4
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity4
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity4
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_missing_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: missing_entity
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema2
+  entities:
+  - _class: Expressir::Model::Entity
+    id: attribute_entity2
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema3
+  entities:
+  - _class: Expressir::Model::Entity
+    id: attribute_entity3
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema4
+  entities:
+  - _class: Expressir::Model::Entity
+    id: attribute_entity
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean