expressir 0.2.16 → 0.2.24

data/lib/expressir/model/procedure.rb

@@ -3,19 +3,20 @@ module Expressir
     class Procedure < ModelElement
       include Identifier
 
-      attr_accessor :parameters
-      attr_accessor :types
-      attr_accessor :entities
-      attr_accessor :subtype_constraints
-      attr_accessor :functions
-      attr_accessor :procedures
-      attr_accessor :constants
-      attr_accessor :variables
-      attr_accessor :statements
+      model_attr_accessor :parameters
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :procedures
+      model_attr_accessor :constants
+      model_attr_accessor :variables
+      model_attr_accessor :statements
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @parameters = options.fetch(:parameters, [])
@@ -31,18 +32,23 @@ 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,
+          *remark_items
+        ]
       end
     end
   end

data/lib/expressir/model/{informal_proposition.rb → remark_item.rb}

@@ -1,12 +1,12 @@
 module Expressir
   module Model
-    class InformalProposition < ModelElement
-      include Identifier
+    class RemarkItem < ModelElement
+      model_attr_accessor :id
+      model_attr_accessor :remarks
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
-        @source = options[:source]
 
         super
       end

data/lib/expressir/model/repository.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     class Repository < ModelElement
-      attr_accessor :schemas
+      model_attr_accessor :schemas
 
       def initialize(options = {})
         @schemas = options.fetch(:schemas, [])
@@ -10,9 +10,9 @@ module Expressir
       end
 
       def children
-        items = []
-        items.push(*@schemas)
-        items
+        [
+          *schemas
+        ]
       end
     end
   end

data/lib/expressir/model/rule.rb

@@ -3,21 +3,22 @@ module Expressir
     class Rule < ModelElement
       include Identifier
 
-      attr_accessor :applies_to
-      attr_accessor :types
-      attr_accessor :entities
-      attr_accessor :subtype_constraints
-      attr_accessor :functions
-      attr_accessor :procedures
-      attr_accessor :constants
-      attr_accessor :variables
-      attr_accessor :statements
-      attr_accessor :where
-      attr_accessor :informal_propositions
+      model_attr_accessor :applies_to
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :procedures
+      model_attr_accessor :constants
+      model_attr_accessor :variables
+      model_attr_accessor :statements
+      model_attr_accessor :where
+      model_attr_accessor :informal_propositions
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @applies_to = options.fetch(:applies_to, [])
@@ -35,19 +36,24 @@ 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,
+          *remark_items
+        ]
       end
     end
   end

data/lib/expressir/model/schema.rb

@@ -1,25 +1,26 @@
 module Expressir
   module Model
     class Schema < ModelElement
-      attr_accessor :file
+      model_attr_accessor :file
 
       include Identifier
 
-      attr_accessor :version
-      attr_accessor :interfaces
-      attr_accessor :constants
-      attr_accessor :types
-      attr_accessor :entities
-      attr_accessor :subtype_constraints
-      attr_accessor :functions
-      attr_accessor :procedures
-      attr_accessor :rules
+      model_attr_accessor :version
+      model_attr_accessor :interfaces
+      model_attr_accessor :constants
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :rules
+      model_attr_accessor :procedures
 
       def initialize(options = {})
         @file = options[:file]
 
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @version = options[:version]
@@ -29,60 +30,68 @@ 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,
+          *remark_items
+        ]
+      end
+
+      def children
+        [
+          *interfaced_items,
+          *safe_children
+        ]
       end
     end
   end

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

@@ -4,12 +4,13 @@ module Expressir
       class Alias < ModelElement
         include Identifier
 
-        attr_accessor :expression
-        attr_accessor :statements
+        model_attr_accessor :expression
+        model_attr_accessor :statements
 
         def initialize(options = {})
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
+          @remark_items = options.fetch(:remark_items, [])
           @source = options[:source]
 
           @expression = options[:expression]
@@ -19,9 +20,10 @@ module Expressir
         end
 
         def children
-          items = []
-          items.push(self)
-          items
+          [
+            self,
+            *remark_items
+          ]
         end
       end
     end

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Statements
       class Assignment < ModelElement
-        attr_accessor :ref
-        attr_accessor :expression
+        model_attr_accessor :ref
+        model_attr_accessor :expression
 
         def initialize(options = {})
           @ref = options[:ref]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Statements
       class Call < ModelElement
-        attr_accessor :ref
-        attr_accessor :parameters
+        model_attr_accessor :ref
+        model_attr_accessor :parameters
 
         def initialize(options = {})
           @ref = options[:ref]

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

@@ -2,9 +2,9 @@ module Expressir
   module Model
     module Statements
       class Case < ModelElement
-        attr_accessor :expression
-        attr_accessor :actions
-        attr_accessor :otherwise_statement
+        model_attr_accessor :expression
+        model_attr_accessor :actions
+        model_attr_accessor :otherwise_statement
 
         def initialize(options = {})
           @expression = options[:expression]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Statements
       class CaseAction < ModelElement
-        attr_accessor :labels
-        attr_accessor :statement
+        model_attr_accessor :labels
+        model_attr_accessor :statement
 
         def initialize(options = {})
           @labels = options.fetch(:labels, [])

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Statements
       class Compound < ModelElement
-        attr_accessor :statements
+        model_attr_accessor :statements
 
         def initialize(options = {})
           @statements = options.fetch(:statements, [])

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

@@ -2,9 +2,9 @@ module Expressir
   module Model
     module Statements
       class If < ModelElement
-        attr_accessor :expression
-        attr_accessor :statements
-        attr_accessor :else_statements
+        model_attr_accessor :expression
+        model_attr_accessor :statements
+        model_attr_accessor :else_statements
 
         def initialize(options = {})
           @expression = options[:expression]

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

@@ -4,16 +4,17 @@ module Expressir
       class Repeat < ModelElement
         include Identifier
 
-        attr_accessor :bound1
-        attr_accessor :bound2
-        attr_accessor :increment
-        attr_accessor :while_expression
-        attr_accessor :until_expression
-        attr_accessor :statements
+        model_attr_accessor :bound1
+        model_attr_accessor :bound2
+        model_attr_accessor :increment
+        model_attr_accessor :while_expression
+        model_attr_accessor :until_expression
+        model_attr_accessor :statements
 
         def initialize(options = {})
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
+          @remark_items = options.fetch(:remark_items, [])
           @source = options[:source]
 
           @bound1 = options[:bound1]
@@ -27,9 +28,10 @@ module Expressir
         end
 
         def children
-          items = []
-          items.push(self)
-          items
+          [
+            self,
+            *remark_items
+          ]
         end
       end
     end