expressir 0.2.21-arm64-darwin → 0.2.24-arm64-darwin

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

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

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

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

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

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

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