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

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,31 +3,33 @@ module Expressir
     class Type < ModelElement
       include Identifier
 
-      attr_accessor :type
-      attr_accessor :where
-      attr_accessor :informal_propositions
+      model_attr_accessor :underlying_type
+      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]
 
-        @type = options[:type]
-        @where = options.fetch(:where, [])
-        @informal_propositions = options.fetch(:informal_propositions, [])
+        @underlying_type = options[:underlying_type]
+        @where_rules = options[:where_rules] || []
+        @informal_propositions = options[:informal_propositions] || []
 
         super
       end
 
       def enumeration_items
-        type.is_a?(Types::Enumeration) ? type.items : []
+        underlying_type.is_a?(Types::Enumeration) ? underlying_type.items : []
       end
 
       def children
         [
           *enumeration_items,
-          *where,
-          *informal_propositions
+          *where_rules,
+          *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, [])
+          @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,14 @@ 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 :based_on
+        model_attr_accessor :items
 
         def initialize(options = {})
           @extensible = options[:extensible]
-          @items = options.fetch(:items, [])
-          @extension_type = options[:extension_type]
-          @extension_items = options.fetch(:extension_items, [])
+          @based_on = options[:based_on]
+          @items = options[: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]