expressir 0.2.11-x86-mingw32 → 0.2.12-x86-mingw32

data/lib/expressir/model.rb

@@ -1,6 +1,5 @@
 require 'expressir/model/model_element'
 
-require 'expressir/model/scope'
 require 'expressir/model/identifier'
 
 require 'expressir/model/attribute'

data/lib/expressir/model/attribute.rb

@@ -23,6 +23,8 @@ module Expressir
         @optional = options[:optional]
         @type = options[:type]
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/model/constant.rb

@@ -13,6 +13,8 @@ module Expressir
 
         @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 < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :abstract
@@ -19,11 +18,13 @@ module Expressir
 
         @abstract = options[:abstract]
         @supertype_expression = options[:supertype_expression]
-        @subtype_of = options[:subtype_of]
+        @subtype_of = options.fetch(:subtype_of, [])
         @attributes = options.fetch(:attributes, [])
         @unique = options.fetch(:unique, [])
         @where = options.fetch(:where, [])
         @informal_propositions = options.fetch(:informal_propositions, [])
+
+        super
       end
 
       def children

data/lib/expressir/model/enumeration_item.rb

@@ -7,6 +7,8 @@ module Expressir
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
         @source = options[:source]
+
+        super
       end
     end
   end

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

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @items = options.fetch(:items, [])
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @expression = options[:expression]
           @repetition = options[:repetition]
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @ref = options[:ref]
           @attribute = options[:attribute]
+
+          super
         end
       end
     end

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

@@ -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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @ref = options[:ref]
           @parameters = options.fetch(:parameters, [])
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @entity = options[:entity]
           @parameters = options.fetch(:parameters, [])
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @ref = options[:ref]
           @entity = options[:entity]
+
+          super
         end
       end
     end

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

@@ -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

@@ -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

@@ -2,7 +2,6 @@ module Expressir
   module Model
     module Expressions
       class QueryExpression < ModelElement
-        include Scope
         include Identifier
 
         attr_accessor :aggregate_source
@@ -15,6 +14,8 @@ module Expressir
 
           @aggregate_source = options[:aggregate_source]
           @expression = options[:expression]
+
+          super
         end
 
         def children

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

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @id = options[:id]
+
+          super
         end
       end
     end

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

@@ -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,7 +1,6 @@
 module Expressir
   module Model
     class Function < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :parameters
@@ -30,19 +29,15 @@ module Expressir
         @constants = options.fetch(:constants, [])
         @variables = options.fetch(:variables, [])
         @statements = options.fetch(:statements, [])
+
+        super
       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(*@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)

data/lib/expressir/model/identifier.rb

@@ -2,7 +2,6 @@ module Expressir
   module Model
     module Identifier
       attr_accessor :id
-      attr_accessor :parent
       attr_accessor :remarks
       attr_accessor :source
     end

data/lib/expressir/model/informal_proposition.rb

@@ -7,6 +7,8 @@ module Expressir
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
         @source = options[:source]
+
+        super
       end
     end
   end

data/lib/expressir/model/interface.rb

@@ -12,6 +12,8 @@ module Expressir
         @kind = options[:kind]
         @schema = options[:schema]
         @items = options.fetch(:items, [])
+
+        super
       end
     end
   end

data/lib/expressir/model/literals/binary.rb

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/integer.rb

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/logical.rb

@@ -10,6 +10,8 @@ module Expressir
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/real.rb

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @value = options[:value]
+
+          super
         end
       end
     end

data/lib/expressir/model/literals/string.rb

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @value = options[:value]
           @encoded = options[:encoded]
+
+          super
         end
       end
     end

data/lib/expressir/model/model_element.rb

@@ -4,6 +4,77 @@ module Expressir
       CLASS_KEY = '_class'
       SOURCE_KEY = 'source'
 
+      attr_accessor :parent
+
+      def initialize(options = {})
+        attach_parent_to_children
+      end
+
+      def path
+        return id if is_a? Statements::Alias or is_a? Statements::Repeat or is_a? Expressions::QueryExpression
+
+        current_node = self
+        path_parts = []
+        loop do
+          if current_node.class.method_defined? :id
+            path_parts << current_node.id
+          end
+
+          current_node = current_node.parent
+          break unless current_node
+        end
+
+        path_parts.reverse.join(".")
+      end
+
+      def attach_parent_to_children
+        instance_variables.select{|x| x != :@parent}.each do |variable|
+          value = instance_variable_get(variable)
+
+          if value.is_a? Array
+            value.each do |value|
+              if value.is_a? ModelElement
+                value.parent = self
+              end
+            end
+          elsif value.is_a? ModelElement
+            value.parent = self
+          end
+        end
+      end
+
+      def find(path)
+        return self if path.empty?
+
+        path_parts = path.downcase.split(/\./).map do |current_path|
+          _, _, current_path = current_path.rpartition(":") # ignore prefix
+          current_path
+        end
+
+        current_scope = self
+        target_node = nil
+        loop do
+          # find in current scope
+          current_node = current_scope
+          path_parts.each do |current_path|
+            current_node = current_node.children.find{|x| x.id and x.id.downcase == current_path}
+            break unless current_node
+          end
+          target_node = current_node
+          break if target_node
+
+          # retry search in parent scope
+          current_scope = current_scope.parent
+          break unless current_scope
+        end
+
+        target_node
+      end
+
+      def children
+        []
+      end
+
       def to_hash(options = {})
         skip_empty = options[:skip_empty]
         formatter = options[:formatter]
@@ -62,10 +133,6 @@ module Expressir
 
         node = Object.const_get(node_class).new(node_options)
 
-        if node.class.method_defined? :attach_parent_to_children
-          node.attach_parent_to_children
-        end
-
         node
       end
     end

data/lib/expressir/model/parameter.rb

@@ -13,6 +13,8 @@ module Expressir
 
         @var = options[:var]
         @type = options[:type]
+
+        super
       end
     end
   end

data/lib/expressir/model/procedure.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
     class Procedure < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :parameters
@@ -28,19 +27,15 @@ module Expressir
         @constants = options.fetch(:constants, [])
         @variables = options.fetch(:variables, [])
         @statements = options.fetch(:statements, [])
+
+        super
       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(*@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)

data/lib/expressir/model/renamed_ref.rb

@@ -7,6 +7,8 @@ module Expressir
       def initialize(options = {})
         @ref = options[:ref]
         @id = options[:id]
+
+        super
       end
     end
   end

data/lib/expressir/model/repository.rb

@@ -1,12 +1,12 @@
 module Expressir
   module Model
     class Repository < ModelElement
-      include Scope
-
       attr_accessor :schemas
 
       def initialize(options = {})
         @schemas = options.fetch(:schemas, [])
+
+        super
       end
 
       def children