expressir 0.2.17-x64-mingw32 → 0.2.25-x64-mingw32

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

@@ -2,8 +2,8 @@ module Expressir
   module Model
     module Statements
       class CaseAction < ModelElement
-        attr_accessor :labels
-        attr_accessor :statement
+        model_attr_accessor :labels
+        model_attr_accessor :statement
 
         def initialize(options = {})
           @labels = options.fetch(:labels, [])

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

@@ -2,7 +2,7 @@ module Expressir
   module Model
     module Statements
       class Compound < ModelElement
-        attr_accessor :statements
+        model_attr_accessor :statements
 
         def initialize(options = {})
           @statements = options.fetch(:statements, [])

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

@@ -2,9 +2,9 @@ module Expressir
   module Model
     module Statements
       class If < ModelElement
-        attr_accessor :expression
-        attr_accessor :statements
-        attr_accessor :else_statements
+        model_attr_accessor :expression
+        model_attr_accessor :statements
+        model_attr_accessor :else_statements
 
         def initialize(options = {})
           @expression = options[:expression]

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

@@ -4,16 +4,17 @@ module Expressir
       class Repeat < ModelElement
         include Identifier
 
-        attr_accessor :bound1
-        attr_accessor :bound2
-        attr_accessor :increment
-        attr_accessor :while_expression
-        attr_accessor :until_expression
-        attr_accessor :statements
+        model_attr_accessor :bound1
+        model_attr_accessor :bound2
+        model_attr_accessor :increment
+        model_attr_accessor :while_expression
+        model_attr_accessor :until_expression
+        model_attr_accessor :statements
 
         def initialize(options = {})
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
+          @remark_items = options.fetch(:remark_items, [])
           @source = options[:source]
 
           @bound1 = options[:bound1]
@@ -28,7 +29,8 @@ module Expressir
 
         def children
           [
-            self
+            self,
+            *remark_items
           ]
         end
       end

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

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

data/lib/expressir/model/subtype_constraint.rb

@@ -3,14 +3,15 @@ module Expressir
     class SubtypeConstraint < ModelElement
       include Identifier
 
-      attr_accessor :applies_to
-      attr_accessor :abstract
-      attr_accessor :total_over
-      attr_accessor :supertype_expression
+      model_attr_accessor :applies_to
+      model_attr_accessor :abstract
+      model_attr_accessor :total_over
+      model_attr_accessor :supertype_expression
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @applies_to = options[:applies_to]
@@ -20,6 +21,12 @@ module Expressir
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/model/type.rb

@@ -3,13 +3,14 @@ module Expressir
     class Type < ModelElement
       include Identifier
 
-      attr_accessor :type
-      attr_accessor :where
-      attr_accessor :informal_propositions
+      model_attr_accessor :type
+      model_attr_accessor :where
+      model_attr_accessor :informal_propositions
 
       def initialize(options = {})
         @id = options[:id]
         @remarks = options.fetch(:remarks, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @type = options[:type]
@@ -27,7 +28,8 @@ module Expressir
         [
           *enumeration_items,
           *where,
-          *informal_propositions
+          *informal_propositions,
+          *remark_items
         ]
       end
     end

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, [])
+          @remark_items = options.fetch(: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,10 +2,10 @@ 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]

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

@@ -7,10 +7,17 @@ module Expressir
         def initialize(options = {})
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
+          @remark_items = options.fetch(:remark_items, [])
           @source = options[:source]
 
           super
         end
+
+        def children
+          [
+            *remark_items
+          ]
+        end
       end
     end
   end

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

@@ -7,11 +7,18 @@ module Expressir
         def initialize(options = {})
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
+          @remark_items = options.fetch(: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,11 +2,11 @@ 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]

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, [])
+        @remark_items = options.fetch(:remark_items, [])
         @source = options[:source]
 
         @attributes = options.fetch(: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, [])
+        @remark_items = options.fetch(: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, [])
+        @remark_items = options.fetch(: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.17".freeze
+  VERSION = "0.2.25".freeze
 end

data/original/examples/syntax/multiple.yaml

@@ -2,6 +2,7 @@
 _class: Expressir::Model::Repository
 schemas:
 - _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
   id: multiple_schema1
   interfaces:
   - _class: Expressir::Model::Interface
@@ -9,26 +10,31 @@ schemas:
     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
@@ -48,11 +54,13 @@ schemas:
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: empty_entity
+      base_path: multiple_schema1.empty_entity
   - _class: Expressir::Model::Entity
     id: subtype_attribute_entity
     subtype_of:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: attribute_entity
+      base_path: multiple_schema1.attribute_entity
     attributes:
     - _class: Expressir::Model::Attribute
       kind: :EXPLICIT
@@ -66,6 +74,7 @@ schemas:
           entity:
             _class: Expressir::Model::Expressions::SimpleReference
             id: attribute_entity
+            base_path: multiple_schema1.attribute_entity
         attribute:
           _class: Expressir::Model::Expressions::SimpleReference
           id: test
@@ -76,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
@@ -89,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
@@ -99,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
@@ -112,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
@@ -122,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
@@ -135,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
@@ -146,6 +161,7 @@ schemas:
     - _class: Expressir::Model::Expressions::SimpleReference
       id: missing_entity
 - _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
   id: multiple_schema2
   entities:
   - _class: Expressir::Model::Entity
@@ -157,6 +173,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
   id: multiple_schema3
   entities:
   - _class: Expressir::Model::Entity
@@ -168,6 +185,7 @@ schemas:
       type:
         _class: Expressir::Model::Types::Boolean
 - _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
   id: multiple_schema4
   entities:
   - _class: Expressir::Model::Entity