expressir 0.2.19-arm64-darwin → 0.2.27-arm64-darwin

data/lib/expressir/model/remark_item.rb

@@ -0,0 +1,15 @@
+module Expressir
+  module Model
+    class RemarkItem < ModelElement
+      model_attr_accessor :id
+      model_attr_accessor :remarks
+
+      def initialize(options = {})
+        @id = options[:id]
+        @remarks = options[:remarks] || []
+
+        super
+      end
+    end
+  end
+end

data/lib/expressir/model/repository.rb

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

data/lib/expressir/model/rule.rb

@@ -3,34 +3,35 @@ module Expressir
     class Rule < ModelElement
       include Identifier
 
-      attr_accessor :applies_to
-      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
-      attr_accessor :where
-      attr_accessor :informal_propositions
+      model_attr_accessor :applies_to
+      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
+      model_attr_accessor :where
+      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]
 
-        @applies_to = options.fetch(:applies_to, [])
-        @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, [])
-        @where = options.fetch(:where, [])
-        @informal_propositions = options.fetch(:informal_propositions, [])
+        @applies_to = options[:applies_to] || []
+        @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] || []
+        @where = options[:where] || []
+        @informal_propositions = options[:informal_propositions] || []
 
         super
       end
@@ -50,7 +51,8 @@ module Expressir
           *constants,
           *variables,
           *where,
-          *informal_propositions
+          *informal_propositions,
+          *remark_items
         ]
       end
     end

data/lib/expressir/model/schema.rb

@@ -1,36 +1,37 @@
 module Expressir
   module Model
     class Schema < ModelElement
-      attr_accessor :file
+      model_attr_accessor :file
 
       include Identifier
 
-      attr_accessor :version
-      attr_accessor :interfaces
-      attr_accessor :constants
-      attr_accessor :types
-      attr_accessor :entities
-      attr_accessor :subtype_constraints
-      attr_accessor :functions
-      attr_accessor :rules
-      attr_accessor :procedures
+      model_attr_accessor :version
+      model_attr_accessor :interfaces
+      model_attr_accessor :constants
+      model_attr_accessor :types
+      model_attr_accessor :entities
+      model_attr_accessor :subtype_constraints
+      model_attr_accessor :functions
+      model_attr_accessor :rules
+      model_attr_accessor :procedures
 
       def initialize(options = {})
         @file = options[:file]
 
         @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
         @version = options[:version]
-        @interfaces = options.fetch(:interfaces, [])
-        @constants = options.fetch(:constants, [])
-        @types = options.fetch(:types, [])
-        @entities = options.fetch(:entities, [])
-        @subtype_constraints = options.fetch(:subtype_constraints, [])
-        @functions = options.fetch(:functions, [])
-        @rules = options.fetch(:rules, [])
-        @procedures = options.fetch(:procedures, [])
+        @interfaces = options[:interfaces] || []
+        @constants = options[:constants] || []
+        @types = options[:types] || []
+        @entities = options[:entities] || []
+        @subtype_constraints = options[:subtype_constraints] || []
+        @functions = options[:functions] || []
+        @rules = options[:rules] || []
+        @procedures = options[:procedures] || []
 
         super
       end
@@ -45,6 +46,8 @@ module Expressir
       end
 
       def interfaced_items
+        return [] unless parent
+
         interfaces.flat_map do |interface|
           schema = parent.children_by_id[interface.schema.id.downcase]
           if schema
@@ -81,7 +84,8 @@ module Expressir
           *subtype_constraints,
           *functions,
           *rules,
-          *procedures
+          *procedures,
+          *remark_items
         ]
       end
 

data/lib/expressir/model/schema_version.rb

@@ -0,0 +1,15 @@
+module Expressir
+  module Model
+    class SchemaVersion < ModelElement
+      model_attr_accessor :value
+      model_attr_accessor :items
+
+      def initialize(options = {})
+        @value = options[:value]
+        @items = options[:items] || []
+
+        super
+      end
+    end
+  end
+end

data/lib/expressir/model/schema_version_item.rb

@@ -0,0 +1,15 @@
+module Expressir
+  module Model
+    class SchemaVersionItem < ModelElement
+      model_attr_accessor :name
+      model_attr_accessor :value
+
+      def initialize(options = {})
+        @name = options[:name]
+        @value = options[:value]
+
+        super
+      end
+    end
+  end
+end

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

@@ -4,23 +4,25 @@ module Expressir
       class Alias < ModelElement
         include Identifier
 
-        attr_accessor :expression
-        attr_accessor :statements
+        model_attr_accessor :expression
+        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]
 
           @expression = options[:expression]
-          @statements = options.fetch(:statements, [])
+          @statements = options[:statements] || []
 
           super
         end
 
         def children
           [
-            self
+            self,
+            *remark_items
           ]
         end
       end

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,12 +2,12 @@ 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]
-          @parameters = options.fetch(:parameters, [])
+          @parameters = options[:parameters] || []
 
           super
         end

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

@@ -2,13 +2,13 @@ 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]
-          @actions = options.fetch(:actions, [])
+          @actions = options[:actions] || []
           @otherwise_statement = options[:otherwise_statement]
 
           super

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

@@ -2,11 +2,11 @@ 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, [])
+          @labels = options[:labels] || []
           @statement = options[:statement]
 
           super

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

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

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

@@ -2,14 +2,14 @@ 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]
-          @statements = options.fetch(:statements, [])
-          @else_statements = options.fetch(:else_statements, [])
+          @statements = options[:statements] || []
+          @else_statements = options[:else_statements] || []
 
           super
         end

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, [])
+          @remarks = options[:remarks] || []
+          @remark_items = options[:remark_items] || []
           @source = options[:source]
 
           @bound1 = options[:bound1]
@@ -21,14 +22,15 @@ module Expressir
           @increment = options[:increment]
           @while_expression = options[:while_expression]
           @until_expression = options[:until_expression]
-          @statements = options.fetch(:statements, [])
+          @statements = options[:statements] || []
 
           super
         end
 
         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,23 +3,30 @@ 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, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
         @applies_to = options[:applies_to]
         @abstract = options[:abstract]
-        @total_over = options.fetch(:total_over, [])
+        @total_over = options[:total_over] || []
         @supertype_expression = options[:supertype_expression]
 
         super
       end
+
+      def children
+        [
+          *remark_items
+        ]
+      end
     end
   end
 end

data/lib/expressir/model/type.rb

@@ -3,18 +3,19 @@ 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, [])
+        @remarks = options[:remarks] || []
+        @remark_items = options[:remark_items] || []
         @source = options[:source]
 
         @type = options[:type]
-        @where = options.fetch(:where, [])
-        @informal_propositions = options.fetch(:informal_propositions, [])
+        @where = options[:where] || []
+        @informal_propositions = options[:informal_propositions] || []
 
         super
       end
@@ -27,7 +28,8 @@ module Expressir
         [
           *enumeration_items,
           *where,
-          *informal_propositions
+          *informal_propositions,
+          *remark_items
         ]
       end
     end