expressir 0.2.8-x64-mingw32 → 0.2.13-x64-mingw32

data/lib/expressir/model/schema.rb

@@ -1,65 +1,63 @@
 module Expressir
   module Model
-    class Schema
-      include Scope
+    class Schema < ModelElement
       include Identifier
 
+      attr_accessor :head_source
+
       attr_accessor :version
       attr_accessor :interfaces
       attr_accessor :constants
-      attr_accessor :declarations
+      attr_accessor :types
+      attr_accessor :entities
+      attr_accessor :subtype_constraints
+      attr_accessor :functions
+      attr_accessor :procedures
+      attr_accessor :rules
 
       def initialize(options = {})
         @id = options[:id]
-        @version = options[:version]
-        @interfaces = options[:interfaces]
-        @constants = options[:constants]
-        @declarations = options[:declarations]
-      end
-
-      def use_interfaces
-        @interfaces.select{|x| x.kind == Expressir::Model::Interface::USE}
-      end
-
-      def reference_interfaces
-        @interfaces.select{|x| x.kind == Expressir::Model::Interface::REFERENCE}
-      end
-
-      def types
-        @declarations.select{|x| x.instance_of? Expressir::Model::Type}
-      end
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
+        @head_source = options[:head_source]
 
-      def entities
-        @declarations.select{|x| x.instance_of? Expressir::Model::Entity}
-      end
-
-      def subtype_constraints
-        @declarations.select{|x| x.instance_of? Expressir::Model::SubtypeConstraint}
-      end
-
-      def functions
-        @declarations.select{|x| x.instance_of? Expressir::Model::Function}
-      end
-
-      def procedures
-        @declarations.select{|x| x.instance_of? Expressir::Model::Procedure}
-      end
+        @version = options[:version]
+        @interfaces = options.fetch(:interfaces, [])
+        @constants = options.fetch(:constants, [])
+        @types = options.fetch(:types, [])
+        @entities = options.fetch(:entities, [])
+        @subtype_constraints = options.fetch(:subtype_constraints, [])
+        @functions = options.fetch(:functions, [])
+        @procedures = options.fetch(:procedures, [])
+        @rules = options.fetch(:rules, [])
 
-      def rules
-        @declarations.select{|x| x.instance_of? Expressir::Model::Rule}
+        super
       end
 
-      def children
+      def children(item_ids = nil)
         items = []
-        items.push(*@constants) if @constants
-        items.push(*@declarations.flat_map do |x|
-          [
-            x,
-            *if x.instance_of? Expressir::Model::Type and x.type.instance_of? Expressir::Model::Types::Enumeration
-              x.type.items
+        unless item_ids and item_ids.length > 0
+          items.push(*@interfaces.flat_map do |interface|
+            schema = parent.schemas.find{|y| interface.schema.id == y.id}
+            interface_item_ids = if interface.items
+              # TODO: support renamed references
+              interface.items.select{|x| x.is_a? Model::Expressions::SimpleReference}.map{|x| x.id}
             end
-          ]
-        end) if @declarations
+            schema_items = schema&.children(interface_item_ids) || []
+            schema_items
+          end)
+        end
+        items.push(*@constants)
+        items.push(*@types)
+        items.push(*@types.flat_map{|x| x.type.is_a?(Expressir::Model::Types::Enumeration) ? x.type.items : []})
+        items.push(*@entities)
+        items.push(*@subtype_constraints)
+        items.push(*@functions)
+        items.push(*@procedures)
+        items.push(*@rules)
+        if item_ids and item_ids.length > 0
+          items = items.select{|x| item_ids.include?(x.id)}
+        end
         items
       end
     end

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

@@ -1,8 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Alias
-        include Scope
+      class Alias < ModelElement
         include Identifier
 
         attr_accessor :expression
@@ -10,9 +9,13 @@ module Expressir
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
 
           @expression = options[:expression]
-          @statements = options[:statements]
+          @statements = options.fetch(:statements, [])
+
+          super
         end
 
         def children

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

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Statements
-      class Assignment
+      class Assignment < ModelElement
         attr_accessor :ref
         attr_accessor :expression
 
         def initialize(options = {})
           @ref = options[:ref]
           @expression = options[:expression]
+
+          super
         end
       end
     end

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

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Statements
-      class Call
+      class Call < ModelElement
         attr_accessor :ref
         attr_accessor :parameters
 
         def initialize(options = {})
           @ref = options[:ref]
-          @parameters = options[:parameters]
+          @parameters = options.fetch(:parameters, [])
+
+          super
         end
       end
     end

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

@@ -1,15 +1,17 @@
 module Expressir
   module Model
     module Statements
-      class Case
+      class Case < ModelElement
         attr_accessor :expression
         attr_accessor :actions
         attr_accessor :otherwise_statement
 
         def initialize(options = {})
           @expression = options[:expression]
-          @actions = options[:actions]
+          @actions = options.fetch(:actions, [])
           @otherwise_statement = options[:otherwise_statement]
+
+          super
         end
       end
     end

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

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Statements
-      class CaseAction
+      class CaseAction < ModelElement
         attr_accessor :labels
         attr_accessor :statement
 
         def initialize(options = {})
-          @labels = options[:labels]
+          @labels = options.fetch(:labels, [])
           @statement = options[:statement]
+
+          super
         end
       end
     end

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

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Statements
-      class Compound
+      class Compound < ModelElement
         attr_accessor :statements
 
         def initialize(options = {})
-          @statements = options[:statements]
+          @statements = options.fetch(:statements, [])
+
+          super
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Escape
+      class Escape < ModelElement
       end
     end
   end

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

@@ -1,15 +1,17 @@
 module Expressir
   module Model
     module Statements
-      class If
+      class If < ModelElement
         attr_accessor :expression
         attr_accessor :statements
         attr_accessor :else_statements
 
         def initialize(options = {})
           @expression = options[:expression]
-          @statements = options[:statements]
-          @else_statements = options[:else_statements]
+          @statements = options.fetch(:statements, [])
+          @else_statements = options.fetch(:else_statements, [])
+
+          super
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Null
+      class Null < ModelElement
       end
     end
   end

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

@@ -1,8 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Repeat
-        include Scope
+      class Repeat < ModelElement
         include Identifier
 
         attr_accessor :bound1
@@ -14,13 +13,17 @@ module Expressir
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
 
           @bound1 = options[:bound1]
           @bound2 = options[:bound2]
           @increment = options[:increment]
           @while_expression = options[:while_expression]
           @until_expression = options[:until_expression]
-          @statements = options[:statements]
+          @statements = options.fetch(:statements, [])
+
+          super
         end
 
         def children

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

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Statements
-      class Return
+      class Return < ModelElement
         attr_accessor :expression
 
         def initialize(options = {})
           @expression = options[:expression]
+
+          super
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Skip
+      class Skip < ModelElement
       end
     end
   end

data/lib/expressir/model/subtype_constraint.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
-    class SubtypeConstraint
-      include Scope
+    class SubtypeConstraint < ModelElement
       include Identifier
 
       attr_accessor :applies_to
@@ -11,11 +10,15 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @applies_to = options[:applies_to]
         @abstract = options[:abstract]
         @total_over = options[:total_over]
         @supertype_expression = options[:supertype_expression]
+
+        super
       end
 
       def children

data/lib/expressir/model/type.rb

@@ -1,22 +1,29 @@
 module Expressir
   module Model
-    class Type
-      include Scope
+    class Type < ModelElement
       include Identifier
 
       attr_accessor :type
       attr_accessor :where
+      attr_accessor :informal_propositions
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @type = options[:type]
-        @where = options[:where]
+        @where = options.fetch(:where, [])
+        @informal_propositions = options.fetch(:informal_propositions, [])
+
+        super
       end
 
       def children
         items = []
-        items.push(*@where) if @where
+        items.push(*@type.is_a?(Expressir::Model::Types::Enumeration) ? @type.items : [])
+        items.push(*@where)
+        items.push(*@informal_propositions)
         items
       end
     end

data/lib/expressir/model/types/aggregate.rb

@@ -1,15 +1,19 @@
 module Expressir
   module Model
     module Types
-      class Aggregate
+      class Aggregate < ModelElement
         include Identifier
 
         attr_accessor :base_type
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
 
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/array.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Array
+      class Array < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :optional
@@ -14,6 +14,8 @@ module Expressir
           @optional = options[:optional]
           @unique = options[:unique]
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

data/lib/expressir/model/types/bag.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Bag
+      class Bag < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :base_type
@@ -10,6 +10,8 @@ module Expressir
           @bound1 = options[:bound1]
           @bound2 = options[:bound2]
           @base_type = options[:base_type]
+
+          super
         end
       end
     end