expressir 0.2.21-x64-mingw32 → 1.0.0-x64-mingw32

data/lib/expressir/model/entity.rb

@@ -3,26 +3,27 @@ module Expressir
     class Entity < ModelElement
       include Identifier
 
-      attr_accessor :abstract
-      attr_accessor :supertype_expression
-      attr_accessor :subtype_of
-      attr_accessor :attributes
-      attr_accessor :unique
-      attr_accessor :where
-      attr_accessor :informal_propositions
+      model_attr_accessor :abstract
+      model_attr_accessor :supertype_expression
+      model_attr_accessor :subtype_of
+      model_attr_accessor :attributes
+      model_attr_accessor :unique_rules
+      model_attr_accessor :where_rules
+      model_attr_accessor :informal_propositions
 
       def initialize(options = {})
         @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
         @abstract = options[:abstract]
         @supertype_expression = options[:supertype_expression]
-        @subtype_of = options.fetch(:subtype_of, [])
-        @attributes = options.fetch(:attributes, [])
-        @unique = options.fetch(:unique, [])
-        @where = options.fetch(:where, [])
-        @informal_propositions = options.fetch(:informal_propositions, [])
+        @subtype_of = options[:subtype_of] || []
+        @attributes = options[:attributes] || []
+        @unique_rules = options[:unique_rules] || []
+        @where_rules = options[:where_rules] || []
+        @informal_propositions = options[:informal_propositions] || []
 
         super
       end
@@ -30,9 +31,10 @@ module Expressir
       def children
         [
           *attributes,
-          *unique,
-          *where,
-          *informal_propositions
+          *unique_rules,
+          *where_rules,
+          *informal_propositions,
+          *remark_items
         ]
       end
     end

data/lib/expressir/model/enumeration_item.rb

@@ -5,11 +5,18 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

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

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

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Expressions
       class AggregateItem < ModelElement
-        attr_accessor :expression
-        attr_accessor :repetition
+        model_attr_accessor :expression
+        model_attr_accessor :repetition
 
         def initialize(options = {})
           @expression = options[:expression]

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

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

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

@@ -25,9 +25,9 @@ module Expressir
         SUBTRACTION = :SUBTRACTION
         XOR = :XOR
 
-        attr_accessor :operator
-        attr_accessor :operand1
-        attr_accessor :operand2
+        model_attr_accessor :operator
+        model_attr_accessor :operand1
+        model_attr_accessor :operand2
 
         def initialize(options = {})
           @operator = options[:operator]

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

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

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

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

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

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

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

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

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

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

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

@@ -4,12 +4,13 @@ module Expressir
       class QueryExpression < ModelElement
         include Identifier
 
-        attr_accessor :aggregate_source
-        attr_accessor :expression
+        model_attr_accessor :aggregate_source
+        model_attr_accessor :expression
 
         def initialize(options = {})
           @id = options[:id]
-          @remarks = options.fetch(:remarks, [])
+          @remarks = options[:remarks] || []
+          @remark_items = options[:remark_items] || []
           @source = options[:source]
 
           @aggregate_source = options[:aggregate_source]
@@ -20,7 +21,8 @@ module Expressir
 
         def children
           [
-            self
+            self,
+            *remark_items
           ]
         end
       end

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

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

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

@@ -6,8 +6,8 @@ module Expressir
         NOT = :NOT
         PLUS = :PLUS
 
-        attr_accessor :operator
-        attr_accessor :operand
+        model_attr_accessor :operator
+        model_attr_accessor :operand
 
         def initialize(options = {})
           @operator = options[:operator]

data/lib/expressir/model/function.rb

@@ -3,32 +3,33 @@ module Expressir
     class Function < ModelElement
       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
+      model_attr_accessor :parameters
+      model_attr_accessor :return_type
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :procedures
+      model_attr_accessor :constants
+      model_attr_accessor :variables
+      model_attr_accessor :statements
 
       def initialize(options = {})
         @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
-        @parameters = options.fetch(:parameters, [])
+        @parameters = options[: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, [])
+        @types = options[:types] || []
+        @entities = options[:entities] || []
+        @subtype_constraints = options[:subtype_constraints] || []
+        @functions = options[:functions] || []
+        @procedures = options[:procedures] || []
+        @constants = options[:constants] || []
+        @variables = options[:variables] || []
+        @statements = options[:statements] || []
 
         super
       end
@@ -47,7 +48,8 @@ module Expressir
           *functions,
           *procedures,
           *constants,
-          *variables
+          *variables,
+          *remark_items
         ]
       end
     end

data/lib/expressir/model/identifier.rb

@@ -1,9 +1,12 @@
 module Expressir
   module Model
     module Identifier
-      attr_accessor :id
-      attr_accessor :remarks
-      attr_accessor :source
+      def self.included(mod)
+        mod.model_attr_accessor :id
+        mod.model_attr_accessor :remarks
+        mod.model_attr_accessor :remark_items
+        mod.model_attr_accessor :source
+      end
     end
   end
 end

data/lib/expressir/model/interface.rb

@@ -4,14 +4,14 @@ module Expressir
       USE = :USE
       REFERENCE = :REFERENCE
 
-      attr_accessor :kind
-      attr_accessor :schema
-      attr_accessor :items
+      model_attr_accessor :kind
+      model_attr_accessor :schema
+      model_attr_accessor :items
 
       def initialize(options = {})
         @kind = options[:kind]
         @schema = options[:schema]
-        @items = options.fetch(:items, [])
+        @items = options[:items] || []
 
         super
       end

data/lib/expressir/model/interface_item.rb

@@ -1,8 +1,8 @@
 module Expressir
   module Model
     class InterfaceItem < ModelElement
-      attr_accessor :ref
-      attr_accessor :id
+      model_attr_accessor :ref
+      model_attr_accessor :id
 
       def initialize(options = {})
         @ref = options[:ref] 

data/lib/expressir/model/interfaced_item.rb

@@ -1,25 +1,26 @@
 module Expressir
   module Model
     class InterfacedItem < ModelElement
-      include Identifier
+      model_attr_accessor :id
+      model_attr_accessor :remarks
+      model_attr_accessor :remark_items
 
-      undef :source
-      undef :source=
-
-      attr_accessor :base_item
+      model_attr_accessor :base_item
 
       def initialize(options = {})
         @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
-        # @source = options[:source]
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
 
         @base_item = options[:base_item]
 
         super
       end
 
-      def path
-        base_item.path
+      def children
+        [
+          *remark_items
+        ]
       end
     end
   end

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Literals
       class Binary < ModelElement
-        attr_accessor :value
+        model_attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Literals
       class Integer < ModelElement
-        attr_accessor :value
+        model_attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]

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

@@ -6,7 +6,7 @@ module Expressir
         FALSE = :FALSE
         UNKNOWN = :UNKNOWN
 
-        attr_accessor :value
+        model_attr_accessor :value
 
         def initialize(options = {})
           @value = options[:value]