expressir 0.2.9-x86-mingw32 → 0.2.10-x86-mingw32

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Assignment
+      class Assignment < ModelElement
         attr_accessor :ref
         attr_accessor :expression
 

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

@@ -1,13 +1,13 @@
 module Expressir
   module Model
     module Statements
-      class Call
+      class Call < ModelElement
         attr_accessor :ref
         attr_accessor :parameters
 
         def initialize(options = {})
           @ref = options[:ref]
-          @parameters = options[:parameters]
+          @parameters = options.fetch(:parameters, [])
         end
       end
     end

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

@@ -1,14 +1,14 @@
 module Expressir
   module Model
     module Statements
-      class Case
+      class Case < ModelElement
         attr_accessor :expression
         attr_accessor :actions
         attr_accessor :otherwise_statement
 
         def initialize(options = {})
           @expression = options[:expression]
-          @actions = options[:actions]
+          @actions = options.fetch(:actions, [])
           @otherwise_statement = options[:otherwise_statement]
         end
       end

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

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

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

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

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Escape
+      class Escape < ModelElement
       end
     end
   end

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

@@ -1,15 +1,15 @@
 module Expressir
   module Model
     module Statements
-      class If
+      class If < ModelElement
         attr_accessor :expression
         attr_accessor :statements
         attr_accessor :else_statements
 
         def initialize(options = {})
           @expression = options[:expression]
-          @statements = options[:statements]
-          @else_statements = options[:else_statements]
+          @statements = options.fetch(:statements, [])
+          @else_statements = options.fetch(:else_statements, [])
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Null
+      class Null < ModelElement
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Repeat
+      class Repeat < ModelElement
         include Scope
         include Identifier
 
@@ -14,13 +14,15 @@ module Expressir
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
 
           @bound1 = options[:bound1]
           @bound2 = options[:bound2]
           @increment = options[:increment]
           @while_expression = options[:while_expression]
           @until_expression = options[:until_expression]
-          @statements = options[:statements]
+          @statements = options.fetch(:statements, [])
         end
 
         def children

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

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

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Statements
-      class Skip
+      class Skip < ModelElement
       end
     end
   end

data/lib/expressir/model/subtype_constraint.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class SubtypeConstraint
+    class SubtypeConstraint < ModelElement
       include Scope
       include Identifier
 
@@ -11,6 +11,8 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @applies_to = options[:applies_to]
         @abstract = options[:abstract]

data/lib/expressir/model/type.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Type
+    class Type < ModelElement
       include Scope
       include Identifier
 
@@ -10,10 +10,12 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @type = options[:type]
-        @where = options[:where]
-        @informal_propositions = options[:informal_propositions]
+        @where = options.fetch(:where, [])
+        @informal_propositions = options.fetch(:informal_propositions, [])
       end
 
       def children
@@ -23,8 +25,8 @@ module Expressir
             @type.items
           end
         ])
-        items.push(*@where) if @where
-        items.push(*@informal_propositions) if @informal_propositions
+        items.push(*@where)
+        items.push(*@informal_propositions)
         items
       end
     end

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

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Types
-      class Aggregate
+      class Aggregate < ModelElement
         include Identifier
 
         attr_accessor :base_type
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
 
           @base_type = options[:base_type]
         end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Array
+      class Array < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :optional

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Bag
+      class Bag < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :base_type

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Binary
+      class Binary < ModelElement
         attr_accessor :width
         attr_accessor :fixed
 

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Boolean
+      class Boolean < ModelElement
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Enumeration
+      class Enumeration < ModelElement
         attr_accessor :extensible
         attr_accessor :items
         attr_accessor :extension_type
@@ -9,9 +9,9 @@ module Expressir
 
         def initialize(options = {})
           @extensible = options[:extensible]
-          @items = options[:items]
+          @items = options.fetch(:items, [])
           @extension_type = options[:extension_type]
-          @extension_items = options[:extension_items]
+          @extension_items = options.fetch(:extension_items, [])
         end
       end
     end

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

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Types
-      class Generic
+      class Generic < ModelElement
         include Identifier
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
         end
       end
     end

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

@@ -1,11 +1,13 @@
 module Expressir
   module Model
     module Types
-      class GenericEntity
+      class GenericEntity < ModelElement
         include Identifier
 
         def initialize(options = {})
           @id = options[:id]
+          @remarks = options.fetch(:remarks, [])
+          @source = options[:source]
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Integer
+      class Integer < ModelElement
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class List
+      class List < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :unique

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Logical
+      class Logical < ModelElement
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Number
+      class Number < ModelElement
       end
     end
   end

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

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

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Select
+      class Select < ModelElement
         attr_accessor :extensible
         attr_accessor :generic_entity
         attr_accessor :items
@@ -11,9 +11,9 @@ module Expressir
         def initialize(options = {})
           @extensible = options[:extensible]
           @generic_entity = options[:generic_entity]
-          @items = options[:items]
+          @items = options.fetch(:items, [])
           @extension_type = options[:extension_type]
-          @extension_items = options[:extension_items]
+          @extension_items = options.fetch(:extension_items, [])
         end
       end
     end

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class Set
+      class Set < ModelElement
         attr_accessor :bound1
         attr_accessor :bound2
         attr_accessor :base_type

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

@@ -1,7 +1,7 @@
 module Expressir
   module Model
     module Types
-      class String
+      class String < ModelElement
         attr_accessor :width
         attr_accessor :fixed
 

data/lib/expressir/model/unique.rb

@@ -1,14 +1,16 @@
 module Expressir
   module Model
-    class Unique
+    class Unique < ModelElement
       include Identifier
 
       attr_accessor :attributes
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
-        @attributes = options[:attributes]
+        @attributes = options.fetch(:attributes, [])
       end
     end
   end

data/lib/expressir/model/variable.rb

@@ -1,6 +1,6 @@
 module Expressir
   module Model
-    class Variable
+    class Variable < ModelElement
       include Identifier
 
       attr_accessor :type
@@ -8,6 +8,8 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @type = options[:type]
         @expression = options[:expression]