expressir 0.2.19-x64-mingw32 → 0.2.27-x64-mingw32

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

@@ -4,17 +4,24 @@ module Expressir
       class Aggregate < ModelElement
         include Identifier
 
-        attr_accessor :base_type
+        model_attr_accessor :base_type
 
         def initialize(options = {})
           @id = options[:id]
-          @remarks = options.fetch(:remarks, [])
+          @remarks = options[:remarks] || []
+          @remark_items = options[:remark_items] || []
           @source = options[:source]
 
           @base_type = options[:base_type]
 
           super
         end
+
+        def children
+          [
+            *remark_items
+          ]
+        end
       end
     end
   end

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

@@ -2,11 +2,11 @@ module Expressir
   module Model
     module Types
       class Array < ModelElement
-        attr_accessor :bound1
-        attr_accessor :bound2
-        attr_accessor :optional
-        attr_accessor :unique
-        attr_accessor :base_type
+        model_attr_accessor :bound1
+        model_attr_accessor :bound2
+        model_attr_accessor :optional
+        model_attr_accessor :unique
+        model_attr_accessor :base_type
 
         def initialize(options = {})
           @bound1 = options[:bound1]

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

@@ -2,9 +2,9 @@ module Expressir
   module Model
     module Types
       class Bag < ModelElement
-        attr_accessor :bound1
-        attr_accessor :bound2
-        attr_accessor :base_type
+        model_attr_accessor :bound1
+        model_attr_accessor :bound2
+        model_attr_accessor :base_type
 
         def initialize(options = {})
           @bound1 = options[:bound1]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Types
       class Binary < ModelElement
-        attr_accessor :width
-        attr_accessor :fixed
+        model_attr_accessor :width
+        model_attr_accessor :fixed
 
         def initialize(options = {})
           @width = options[:width]

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

@@ -2,16 +2,16 @@ module Expressir
   module Model
     module Types
       class Enumeration < ModelElement
-        attr_accessor :extensible
-        attr_accessor :items
-        attr_accessor :extension_type
-        attr_accessor :extension_items
+        model_attr_accessor :extensible
+        model_attr_accessor :items
+        model_attr_accessor :extension_type
+        model_attr_accessor :extension_items
 
         def initialize(options = {})
           @extensible = options[:extensible]
-          @items = options.fetch(:items, [])
+          @items = options[:items] || []
           @extension_type = options[:extension_type]
-          @extension_items = options.fetch(:extension_items, [])
+          @extension_items = options[:extension_items] || []
 
           super
         end

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

@@ -6,11 +6,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/types/generic_entity.rb

@@ -6,12 +6,19 @@ 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
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

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

@@ -2,10 +2,10 @@ module Expressir
   module Model
     module Types
       class List < ModelElement
-        attr_accessor :bound1
-        attr_accessor :bound2
-        attr_accessor :unique
-        attr_accessor :base_type
+        model_attr_accessor :bound1
+        model_attr_accessor :bound2
+        model_attr_accessor :unique
+        model_attr_accessor :base_type
 
         def initialize(options = {})
           @bound1 = options[:bound1]

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

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

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

@@ -2,18 +2,18 @@ module Expressir
   module Model
     module Types
       class Select < ModelElement
-        attr_accessor :extensible
-        attr_accessor :generic_entity
-        attr_accessor :items
-        attr_accessor :extension_type
-        attr_accessor :extension_items
+        model_attr_accessor :extensible
+        model_attr_accessor :generic_entity
+        model_attr_accessor :items
+        model_attr_accessor :extension_type
+        model_attr_accessor :extension_items
 
         def initialize(options = {})
           @extensible = options[:extensible]
           @generic_entity = options[:generic_entity]
-          @items = options.fetch(:items, [])
+          @items = options[:items] || []
           @extension_type = options[:extension_type]
-          @extension_items = options.fetch(:extension_items, [])
+          @extension_items = options[:extension_items] || []
 
           super
         end

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

@@ -2,9 +2,9 @@ module Expressir
   module Model
     module Types
       class Set < ModelElement
-        attr_accessor :bound1
-        attr_accessor :bound2
-        attr_accessor :base_type
+        model_attr_accessor :bound1
+        model_attr_accessor :bound2
+        model_attr_accessor :base_type
 
         def initialize(options = {})
           @bound1 = options[:bound1]

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Types
       class String < ModelElement
-        attr_accessor :width
-        attr_accessor :fixed
+        model_attr_accessor :width
+        model_attr_accessor :fixed
 
         def initialize(options = {})
           @width = options[:width]

data/lib/expressir/model/unique.rb

@@ -3,17 +3,24 @@ module Expressir
     class Unique < ModelElement
       include Identifier
 
-      attr_accessor :attributes
+      model_attr_accessor :attributes
 
       def initialize(options = {})
         @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
-        @attributes = options.fetch(:attributes, [])
+        @attributes = options[:attributes] || []
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/model/variable.rb

@@ -3,12 +3,13 @@ module Expressir
     class Variable < ModelElement
       include Identifier
 
-      attr_accessor :type
-      attr_accessor :expression
+      model_attr_accessor :type
+      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]
 
         @type = options[:type]
@@ -16,6 +17,12 @@ module Expressir
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/model/where.rb

@@ -3,17 +3,24 @@ module Expressir
     class Where < ModelElement
       include Identifier
 
-      attr_accessor :expression
+      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]
 
         @expression = options[:expression]
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.19".freeze
+  VERSION = "0.2.27".freeze
 end

data/original/examples/syntax/multiple.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 REFERENCE FROM multiple_schema2;
 REFERENCE FROM multiple_schema3 (attribute_entity3);
 REFERENCE FROM multiple_schema4 (attribute_entity AS attribute_entity4);

data/original/examples/syntax/multiple.yaml

@@ -3,33 +3,38 @@ _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
   file: original/examples/syntax/multiple.exp
-  id: multiple_schema1
+  id: multiple_schema
   interfaces:
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema2
+      base_path: multiple_schema2
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema3
+      base_path: multiple_schema3
     items:
     - _class: Expressir::Model::InterfaceItem
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity3
+        base_path: multiple_schema3.attribute_entity3
   - _class: Expressir::Model::Interface
     kind: :REFERENCE
     schema:
       _class: Expressir::Model::Expressions::SimpleReference
       id: multiple_schema4
+      base_path: multiple_schema4
     items:
     - _class: Expressir::Model::InterfaceItem
       ref:
         _class: Expressir::Model::Expressions::SimpleReference
         id: attribute_entity
+        base_path: multiple_schema4.attribute_entity
       id: attribute_entity4
   entities:
   - _class: Expressir::Model::Entity
@@ -49,11 +54,13 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: multiple_schema.empty_entity
   - _class: Expressir::Model::Entity
     id: subtype_attribute_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: multiple_schema.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -67,6 +74,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: multiple_schema.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -77,6 +85,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity2
+      base_path: multiple_schema2.attribute_entity2
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -90,6 +99,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity2
+            base_path: multiple_schema2.attribute_entity2
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -100,6 +110,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity3
+      base_path: multiple_schema3.attribute_entity3
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -113,6 +124,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity3
+            base_path: multiple_schema3.attribute_entity3
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -123,6 +135,7 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity4
+      base_path: multiple_schema4.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -136,6 +149,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity4
+            base_path: multiple_schema4.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test

data/original/examples/syntax/multiple_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 
 REFERENCE FROM multiple_schema2;
 REFERENCE FROM multiple_schema3

data/original/examples/syntax/multiple_hyperlink_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA multiple_schema1;
+SCHEMA multiple_schema;
 
 REFERENCE FROM {{{<<express:multiple_schema2,multiple_schema2>>}}};
 REFERENCE FROM {{{<<express:multiple_schema3,multiple_schema3>>}}}
@@ -17,12 +17,12 @@ ENTITY attribute_entity;
 END_ENTITY;
 
 ENTITY subtype_empty_entity
-  SUBTYPE OF ({{{<<express:multiple_schema1.empty_entity,empty_entity>>}}});
+  SUBTYPE OF ({{{<<express:multiple_schema.empty_entity,empty_entity>>}}});
 END_ENTITY;
 
 ENTITY subtype_attribute_entity
-  SUBTYPE OF ({{{<<express:multiple_schema1.attribute_entity,attribute_entity>>}}});
-  SELF\{{{<<express:multiple_schema1.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
+  SUBTYPE OF ({{{<<express:multiple_schema.attribute_entity,attribute_entity>>}}});
+  SELF\{{{<<express:multiple_schema.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
 END_ENTITY;
 
 ENTITY subtype_attribute_entity2