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

data/lib/expressir/model.rb

@@ -1,4 +1,5 @@
-require 'expressir/model/scope'
+require 'expressir/model/model_element'
+
 require 'expressir/model/identifier'
 
 require 'expressir/model/attribute'
@@ -6,6 +7,7 @@ require 'expressir/model/constant'
 require 'expressir/model/entity'
 require 'expressir/model/enumeration_item'
 require 'expressir/model/function'
+require 'expressir/model/informal_proposition'
 require 'expressir/model/interface'
 require 'expressir/model/parameter'
 require 'expressir/model/procedure'

data/lib/expressir/model/attribute.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Attribute
+    class Attribute < ModelElement
       include Identifier
 
       EXPLICIT = :EXPLICIT
@@ -15,12 +15,16 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @kind = options[:kind]
         @supertype_attribute = options[:supertype_attribute]
         @optional = options[:optional]
         @type = options[:type]
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/model/constant.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Constant
+    class Constant < ModelElement
       include Identifier
 
       attr_accessor :type
@@ -8,9 +8,13 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @type = options[:type]
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/model/entity.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
-    class Entity
-      include Scope
+    class Entity < ModelElement
       include Identifier
 
       attr_accessor :abstract
@@ -10,35 +9,30 @@ module Expressir
       attr_accessor :attributes
       attr_accessor :unique
       attr_accessor :where
+      attr_accessor :informal_propositions
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @abstract = options[:abstract]
         @supertype_expression = options[:supertype_expression]
-        @subtype_of = options[:subtype_of]
-        @attributes = options[:attributes]
-        @unique = options[:unique]
-        @where = options[:where]
-      end
-
-      def explicit_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::EXPLICIT}
-      end
-
-      def derived_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::DERIVED}
-      end
+        @subtype_of = options.fetch(:subtype_of, [])
+        @attributes = options.fetch(:attributes, [])
+        @unique = options.fetch(:unique, [])
+        @where = options.fetch(:where, [])
+        @informal_propositions = options.fetch(:informal_propositions, [])
 
-      def inverse_attributes
-        @attributes.select{|x| x.kind == Expressir::Model::Attribute::INVERSE}
+        super
       end
 
       def children
         items = []
-        items.push(*@attributes) if @attributes
-        items.push(*@unique) if @unique
-        items.push(*@where) if @where
+        items.push(*@attributes)
+        items.push(*@unique)
+        items.push(*@where)
+        items.push(*@informal_propositions)
         items
       end
     end

data/lib/expressir/model/enumeration_item.rb

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

data/lib/expressir/model/expressions/aggregate_initializer.rb

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

data/lib/expressir/model/expressions/aggregate_item.rb

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

data/lib/expressir/model/expressions/attribute_reference.rb

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

data/lib/expressir/model/expressions/binary_expression.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Expressions
-      class BinaryExpression
+      class BinaryExpression < ModelElement
         ADDITION = :ADDITION
         AND = :AND
         ANDOR = :ANDOR
@@ -33,6 +33,8 @@ module Expressir
           @operator = options[:operator]
           @operand1 = options[:operand1]
           @operand2 = options[:operand2]
+
+          super
         end
       end
     end

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

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Expressions
-      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/expressions/entity_constructor.rb

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

data/lib/expressir/model/expressions/group_reference.rb

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

data/lib/expressir/model/expressions/index_reference.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Expressions
-      class IndexReference
+      class IndexReference < ModelElement
         attr_accessor :ref
         attr_accessor :index1
         attr_accessor :index2
@@ -10,6 +10,8 @@ module Expressir
           @ref = options[:ref]
           @index1 = options[:index1]
           @index2 = options[:index2]
+
+          super
         end
       end
     end

data/lib/expressir/model/expressions/interval.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Expressions
-      class Interval
+      class Interval < ModelElement
         attr_accessor :low
         attr_accessor :operator1
         attr_accessor :item
@@ -14,6 +14,8 @@ module Expressir
           @item = options[:item]
           @operator2 = options[:operator2]
           @high = options[:high]
+
+          super
         end
       end
     end

data/lib/expressir/model/expressions/query_expression.rb

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

data/lib/expressir/model/expressions/simple_reference.rb

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

data/lib/expressir/model/expressions/unary_expression.rb

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Expressions
-      class UnaryExpression
+      class UnaryExpression < ModelElement
         MINUS = :MINUS
         NOT = :NOT
         PLUS = :PLUS
@@ -12,6 +12,8 @@ module Expressir
         def initialize(options = {})
           @operator = options[:operator]
           @operand = options[:operand]
+
+          super
         end
       end
     end

data/lib/expressir/model/function.rb

@@ -1,60 +1,49 @@
 module Expressir
   module Model
-    class Function
-      include Scope
+    class Function < ModelElement
       include Identifier
 
       attr_accessor :parameters
       attr_accessor :return_type
-      attr_accessor :declarations
+      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
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
-        @parameters = options[:parameters]
+        @parameters = options.fetch(:parameters, [])
         @return_type = options[:return_type]
-        @declarations = options[:declarations]
-        @constants = options[:constants]
-        @variables = options[:variables]
-        @statements = options[:statements]
-      end
-
-      def types
-        @declarations.select{|x| x.instance_of? Expressir::Model::Type}
-      end
-
-      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}
+        @types = options.fetch(:types, [])
+        @entities = options.fetch(:entities, [])
+        @subtype_constraints = options.fetch(:subtype_constraints, [])
+        @functions = options.fetch(:functions, [])
+        @procedures = options.fetch(:procedures, [])
+        @constants = options.fetch(:constants, [])
+        @variables = options.fetch(:variables, [])
+        @statements = options.fetch(:statements, [])
+
+        super
       end
 
       def children
         items = []
-        items.push(*@parameters) if @parameters
-        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
-            end
-          ]
-        end) if @declarations
-        items.push(*@constants) if @constants
-        items.push(*@variables) if @variables
+        items.push(*@parameters)
+        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(*@constants)
+        items.push(*@variables)
         items
       end
     end