expressir 0.2.4-x64-mingw32 → 0.2.10-x64-mingw32

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

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

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

@@ -1,40 +1,40 @@
-module Expressir
-  module Model
-    module Expressions
-      class BinaryExpression
-        ADDITION = :ADDITION
-        AND = :AND
-        ANDOR = :ANDOR
-        COMBINE = :COMBINE
-        EQUAL = :EQUAL
-        EXPONENTIATION = :EXPONENTIATION
-        GREATER_THAN = :GREATER_THAN
-        GREATER_THAN_OR_EQUAL = :GREATER_THAN_OR_EQUAL
-        IN = :IN
-        INSTANCE_EQUAL = :INSTANCE_EQUAL
-        INSTANCE_NOT_EQUAL = :INSTANCE_NOT_EQUAL
-        INTEGER_DIVISION = :INTEGER_DIVISION
-        LESS_THAN = :LESS_THAN
-        LESS_THAN_OR_EQUAL = :LESS_THAN_OR_EQUAL
-        LIKE = :LIKE
-        MODULO = :MODULO
-        MULTIPLICATION = :MULTIPLICATION
-        NOT_EQUAL = :NOT_EQUAL
-        OR = :OR
-        REAL_DIVISION = :REAL_DIVISION
-        SUBTRACTION = :SUBTRACTION
-        XOR = :XOR
-
-        attr_accessor :operator
-        attr_accessor :operand1
-        attr_accessor :operand2
-
-        def initialize(options = {})
-          @operator = options[:operator]
-          @operand1 = options[:operand1]
-          @operand2 = options[:operand2]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class BinaryExpression < ModelElement
+        ADDITION = :ADDITION
+        AND = :AND
+        ANDOR = :ANDOR
+        COMBINE = :COMBINE
+        EQUAL = :EQUAL
+        EXPONENTIATION = :EXPONENTIATION
+        GREATER_THAN = :GREATER_THAN
+        GREATER_THAN_OR_EQUAL = :GREATER_THAN_OR_EQUAL
+        IN = :IN
+        INSTANCE_EQUAL = :INSTANCE_EQUAL
+        INSTANCE_NOT_EQUAL = :INSTANCE_NOT_EQUAL
+        INTEGER_DIVISION = :INTEGER_DIVISION
+        LESS_THAN = :LESS_THAN
+        LESS_THAN_OR_EQUAL = :LESS_THAN_OR_EQUAL
+        LIKE = :LIKE
+        MODULO = :MODULO
+        MULTIPLICATION = :MULTIPLICATION
+        NOT_EQUAL = :NOT_EQUAL
+        OR = :OR
+        REAL_DIVISION = :REAL_DIVISION
+        SUBTRACTION = :SUBTRACTION
+        XOR = :XOR
+
+        attr_accessor :operator
+        attr_accessor :operand1
+        attr_accessor :operand2
+
+        def initialize(options = {})
+          @operator = options[:operator]
+          @operand1 = options[:operand1]
+          @operand2 = options[:operand2]
+        end
+      end
+    end
+  end
 end

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

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

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

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

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

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

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

@@ -1,17 +1,17 @@
-module Expressir
-  module Model
-    module Expressions
-      class IndexReference
-        attr_accessor :ref
-        attr_accessor :index1
-        attr_accessor :index2
-
-        def initialize(options = {})
-          @ref = options[:ref]
-          @index1 = options[:index1]
-          @index2 = options[:index2]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class IndexReference < ModelElement
+        attr_accessor :ref
+        attr_accessor :index1
+        attr_accessor :index2
+
+        def initialize(options = {})
+          @ref = options[:ref]
+          @index1 = options[:index1]
+          @index2 = options[:index2]
+        end
+      end
+    end
+  end
 end

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

@@ -1,21 +1,21 @@
-module Expressir
-  module Model
-    module Expressions
-      class Interval
-        attr_accessor :low
-        attr_accessor :operator1
-        attr_accessor :item
-        attr_accessor :operator2
-        attr_accessor :high
-
-        def initialize(options = {})
-          @low = options[:low]
-          @operator1 = options[:operator1]
-          @item = options[:item]
-          @operator2 = options[:operator2]
-          @high = options[:high]
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class Interval < ModelElement
+        attr_accessor :low
+        attr_accessor :operator1
+        attr_accessor :item
+        attr_accessor :operator2
+        attr_accessor :high
+
+        def initialize(options = {})
+          @low = options[:low]
+          @operator1 = options[:operator1]
+          @item = options[:item]
+          @operator2 = options[:operator2]
+          @high = options[:high]
+        end
+      end
+    end
+  end
 end

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

@@ -1,26 +1,28 @@
-module Expressir
-  module Model
-    module Expressions
-      class QueryExpression
-        include Scope
-        include Identifier
-
-        attr_accessor :source
-        attr_accessor :expression
-
-        def initialize(options = {})
-          @id = options[:id]
-
-          @source = options[:source]
-          @expression = options[:expression]
-        end
-
-        def children
-          items = []
-          items.push(self)
-          items
-        end
-      end
-    end
-  end
+module Expressir
+  module Model
+    module Expressions
+      class QueryExpression < ModelElement
+        include Scope
+        include Identifier
+
+        attr_accessor :aggregate_source
+        attr_accessor :expression
+
+        def initialize(options = {})
+          @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
+
+          @aggregate_source = options[:aggregate_source]
+          @expression = options[:expression]
+        end
+
+        def children
+          items = []
+          items.push(self)
+          items
+        end
+      end
+    end
+  end
 end

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

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

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

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

data/lib/expressir/model/function.rb

@@ -1,62 +1,56 @@
-module Expressir
-  module Model
-    class Function
-      include Scope
-      include Identifier
-
-      attr_accessor :parameters
-      attr_accessor :return_type
-      attr_accessor :declarations
-      attr_accessor :constants
-      attr_accessor :variables
-      attr_accessor :statements
-
-      def initialize(options = {})
-        @id = options[:id]
-
-        @parameters = options[: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}
-      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
-      end
-    end
-  end
+module Expressir
+  module Model
+    class Function < ModelElement
+      include Scope
+      include Identifier
+
+      attr_accessor :parameters
+      attr_accessor :return_type
+      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.fetch(:parameters, [])
+        @return_type = options[:return_type]
+        @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, [])
+      end
+
+      def children
+        items = []
+        items.push(*@parameters)
+        items.push(*@types)
+        items.push(*@types.flat_map do |x|
+          if x.type.instance_of? Expressir::Model::Types::Enumeration
+            x.type.items
+          else
+            []
+          end
+        end)
+        items.push(*@entities)
+        items.push(*@subtype_constraints)
+        items.push(*@functions)
+        items.push(*@procedures)
+        items.push(*@constants)
+        items.push(*@variables)
+        items
+      end
+    end
+  end
 end