expressir 0.2.2 → 0.2.3

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

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

data/lib/expressir/model/expressions/{expression.rb → unary_expression.rb}

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

data/lib/expressir/model/function.rb

@@ -6,8 +6,10 @@ module Expressir
       attr_accessor :return_type
       attr_accessor :declarations
       attr_accessor :constants
-      attr_accessor :locals
+      attr_accessor :variables
       attr_accessor :statements
+
+      attr_accessor :parent
       attr_accessor :remarks
 
       def initialize(options = {})
@@ -16,9 +18,8 @@ module Expressir
         @return_type = options[:return_type]
         @declarations = options[:declarations]
         @constants = options[:constants]
-        @locals = options[:locals]
+        @variables = options[:variables]
         @statements = options[:statements]
-        @remarks = options[:remarks]
       end
 
       def types
@@ -41,12 +42,19 @@ module Expressir
         @declarations.select{|x| x.instance_of? Expressir::Model::Procedure}
       end
 
-      def scope_items
+      def children
         items = []
         items.push(*@parameters) if @parameters
-        items.push(*@declarations) if @declarations
+        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(*@locals) if @locals
+        items.push(*@variables) if @variables
         items
       end
     end

data/lib/expressir/model/{reference.rb → interface.rb}

@@ -1,10 +1,15 @@
 module Expressir
   module Model
-    class Reference
+    class Interface
+      USE = :USE
+      REFERENCE = :REFERENCE
+
+      attr_accessor :kind
       attr_accessor :schema
       attr_accessor :items
 
       def initialize(options = {})
+        @kind = options[:kind]
         @schema = options[:schema]
         @items = options[:items]
       end

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

@@ -2,6 +2,10 @@ module Expressir
   module Model
     module Literals
       class Logical
+        TRUE = :TRUE
+        FALSE = :FALSE
+        UNKNOWN = :UNKNOWN
+
         attr_accessor :value
 
         def initialize(options = {})

data/lib/expressir/model/parameter.rb

@@ -1,16 +1,17 @@
 module Expressir
   module Model
     class Parameter
+      attr_accessor :var
       attr_accessor :id
       attr_accessor :type
-      attr_accessor :var
+
+      attr_accessor :parent
       attr_accessor :remarks
 
       def initialize(options = {})
+        @var = options[:var]
         @id = options[:id]
         @type = options[:type]
-        @var = options[:var]
-        @remarks = options[:remarks]
       end
     end
   end

data/lib/expressir/model/procedure.rb

@@ -5,8 +5,10 @@ module Expressir
       attr_accessor :parameters
       attr_accessor :declarations
       attr_accessor :constants
-      attr_accessor :locals
+      attr_accessor :variables
       attr_accessor :statements
+
+      attr_accessor :parent
       attr_accessor :remarks
 
       def initialize(options = {})
@@ -14,9 +16,8 @@ module Expressir
         @parameters = options[:parameters]
         @declarations = options[:declarations]
         @constants = options[:constants]
-        @locals = options[:locals]
+        @variables = options[:variables]
         @statements = options[:statements]
-        @remarks = options[:remarks]
       end
 
       def types
@@ -39,12 +40,19 @@ module Expressir
         @declarations.select{|x| x.instance_of? Expressir::Model::Procedure}
       end
 
-      def scope_items
+      def children
         items = []
         items.push(*@parameters) if @parameters
-        items.push(*@declarations) if @declarations
+        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(*@locals) if @locals
+        items.push(*@variables) if @variables
         items
       end
     end

data/lib/expressir/model/repository.rb

@@ -7,7 +7,7 @@ module Expressir
         @schemas = options[:schemas]
       end
 
-      def scope_items
+      def children
         items = []
         items.push(*@schemas) if @schemas
         items

data/lib/expressir/model/rule.rb

@@ -5,9 +5,11 @@ module Expressir
       attr_accessor :applies_to
       attr_accessor :declarations
       attr_accessor :constants
-      attr_accessor :locals
-      attr_accessor :where
+      attr_accessor :variables
       attr_accessor :statements
+      attr_accessor :where
+
+      attr_accessor :parent
       attr_accessor :remarks
 
       def initialize(options = {})
@@ -15,10 +17,9 @@ module Expressir
         @applies_to = options[:applies_to]
         @declarations = options[:declarations]
         @constants = options[:constants]
-        @locals = options[:locals]
-        @where = options[:where]
+        @variables = options[:variables]
         @statements = options[:statements]
-        @remarks = options[:remarks]
+        @where = options[:where]
       end
 
       def types
@@ -41,11 +42,18 @@ module Expressir
         @declarations.select{|x| x.instance_of? Expressir::Model::Procedure}
       end
 
-      def scope_items
+      def children
         items = []
-        items.push(*@declarations) if @declarations
+        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(*@locals) if @locals
+        items.push(*@variables) if @variables
         items.push(*@where) if @where
         items
       end

data/lib/expressir/model/schema.rb

@@ -6,7 +6,7 @@ module Expressir
       attr_accessor :interfaces
       attr_accessor :constants
       attr_accessor :declarations
-      attr_accessor :rules
+
       attr_accessor :remarks
 
       def initialize(options = {})
@@ -15,8 +15,14 @@ module Expressir
         @interfaces = options[:interfaces]
         @constants = options[:constants]
         @declarations = options[:declarations]
-        @rules = options[:rules]
-        @remarks = options[:remarks]
+      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
@@ -39,11 +45,21 @@ module Expressir
         @declarations.select{|x| x.instance_of? Expressir::Model::Procedure}
       end
 
-      def scope_items
+      def rules
+        @declarations.select{|x| x.instance_of? Expressir::Model::Rule}
+      end
+
+      def children
         items = []
         items.push(*@constants) if @constants
-        items.push(*@declarations) if @declarations
-        items.push(*@rules) if @rules
+        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
       end
     end

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

@@ -5,16 +5,17 @@ module Expressir
         attr_accessor :id
         attr_accessor :expression
         attr_accessor :statements
+
+        attr_accessor :parent
         attr_accessor :remarks
 
         def initialize(options = {})
           @id = options[:id]
           @expression = options[:expression]
           @statements = options[:statements]
-          @remarks = options[:remarks]
         end
 
-        def scope_items
+        def children
           items = []
           items.push(self)
           items

data/lib/expressir/model/statements/{procedure_call.rb → call.rb}

@@ -1,12 +1,12 @@
 module Expressir
   module Model
     module Statements
-      class ProcedureCall
-        attr_accessor :procedure
+      class Call
+        attr_accessor :ref
         attr_accessor :parameters
 
         def initialize(options = {})
-          @procedure = options[:procedure]
+          @ref = options[:ref]
           @parameters = options[:parameters]
         end
       end

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

@@ -2,12 +2,12 @@ module Expressir
   module Model
     module Statements
       class Case
-        attr_accessor :selector
+        attr_accessor :expression
         attr_accessor :actions
         attr_accessor :otherwise_statement
 
         def initialize(options = {})
-          @selector = options[:selector]
+          @expression = options[:expression]
           @actions = options[:actions]
           @otherwise_statement = options[:otherwise_statement]
         end

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

@@ -2,11 +2,11 @@ module Expressir
   module Model
     module Statements
       class CaseAction
-        attr_accessor :expression
+        attr_accessor :labels
         attr_accessor :statement
 
         def initialize(options = {})
-          @expression = options[:expression]
+          @labels = options[:labels]
           @statement = options[:statement]
         end
       end

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

@@ -9,6 +9,8 @@ module Expressir
         attr_accessor :while_expression
         attr_accessor :until_expression
         attr_accessor :statements
+
+        attr_accessor :parent
         attr_accessor :remarks
 
         def initialize(options = {})
@@ -19,10 +21,9 @@ module Expressir
           @while_expression = options[:while_expression]
           @until_expression = options[:until_expression]
           @statements = options[:statements]
-          @remarks = options[:remarks]
         end
 
-        def scope_items
+        def children
           items = []
           items.push(self)
           items

data/lib/expressir/model/subtype_constraint.rb

@@ -3,18 +3,19 @@ module Expressir
     class SubtypeConstraint
       attr_accessor :id
       attr_accessor :applies_to
-      attr_accessor :abstract_supertype
+      attr_accessor :abstract
       attr_accessor :total_over
-      attr_accessor :subtype_expression
+      attr_accessor :supertype_expression
+
+      attr_accessor :parent
       attr_accessor :remarks
 
       def initialize(options = {})
         @id = options[:id]
         @applies_to = options[:applies_to]
-        @abstract_supertype = options[:abstract_supertype]
+        @abstract = options[:abstract]
         @total_over = options[:total_over]
-        @subtype_expression = options[:subtype_expression]
-        @remarks = options[:remarks]
+        @supertype_expression = options[:supertype_expression]
       end
     end
   end

data/lib/expressir/model/type.rb

@@ -4,16 +4,17 @@ module Expressir
       attr_accessor :id
       attr_accessor :type
       attr_accessor :where
+
+      attr_accessor :parent
       attr_accessor :remarks
 
       def initialize(options = {})
         @id = options[:id]
         @type = options[:type]
         @where = options[:where]
-        @remarks = options[:remarks]
       end
 
-      def scope_items
+      def children
         items = []
         items.push(*@where) if @where
         items

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

@@ -4,12 +4,13 @@ module Expressir
       class Aggregate
         attr_accessor :label
         attr_accessor :base_type
+
+        attr_accessor :parent
         attr_accessor :remarks
 
         def initialize(options = {})
           @label = options[:label]
           @base_type = options[:base_type]
-          @remarks = options[:remarks]
         end
       end
     end

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

@@ -3,11 +3,12 @@ module Expressir
     module Types
       class Generic
         attr_accessor :label
+
+        attr_accessor :parent
         attr_accessor :remarks
 
         def initialize(options = {})
           @label = options[:label]
-          @remarks = options[:remarks]
         end
       end
     end