expressir 0.2.16-x86-mingw32 → 0.2.24-x86-mingw32

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,27 +3,29 @@ 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]
         @abstract = options[:abstract]
-        @total_over = options[:total_over]
+        @total_over = options.fetch(:total_over, [])
         @supertype_expression = options[:supertype_expression]
 
         super
       end
 
       def children
-        items = []
-        items
+        [
+          *remark_items
+        ]
       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]
@@ -19,12 +20,17 @@ module Expressir
         super
       end
 
+      def enumeration_items
+        type.is_a?(Types::Enumeration) ? type.items : []
+      end
+
       def children
-        items = []
-        items.push(*@type.is_a?(Types::Enumeration) ? @type.items : [])
-        items.push(*@where)
-        items.push(*@informal_propositions)
-        items
+        [
+          *enumeration_items,
+          *where,
+          *informal_propositions,
+          *remark_items
+        ]
       end
     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.16".freeze
+  VERSION = "0.2.24".freeze
 end

data/original/examples/syntax/{hyperlink.exp → multiple.exp}

@@ -1,7 +1,7 @@
-SCHEMA hyperlink_schema;
-REFERENCE FROM hyperlink_schema2;
-REFERENCE FROM hyperlink_schema3 (attribute_entity3);
-REFERENCE FROM hyperlink_schema4 (attribute_entity AS attribute_entity4);
+SCHEMA multiple_schema1;
+REFERENCE FROM multiple_schema2;
+REFERENCE FROM multiple_schema3 (attribute_entity3);
+REFERENCE FROM multiple_schema4 (attribute_entity AS attribute_entity4);
 ENTITY test; END_ENTITY;
 ENTITY empty_entity; END_ENTITY;
 ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
@@ -12,12 +12,12 @@ ENTITY subtype_attribute_entity3 SUBTYPE OF (attribute_entity3); SELF\attribute_
 ENTITY subtype_attribute_entity4 SUBTYPE OF (attribute_entity4); SELF\attribute_entity4.test : BOOLEAN; END_ENTITY;
 ENTITY subtype_missing_entity SUBTYPE OF (missing_entity); END_ENTITY;
 END_SCHEMA;
-SCHEMA hyperlink_schema2;
+SCHEMA multiple_schema2;
 ENTITY attribute_entity2; test : BOOLEAN; END_ENTITY;
 END_SCHEMA;
-SCHEMA hyperlink_schema3;
+SCHEMA multiple_schema3;
 ENTITY attribute_entity3; test : BOOLEAN; END_ENTITY;
 END_SCHEMA;
-SCHEMA hyperlink_schema4;
+SCHEMA multiple_schema4;
 ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
-END_SCHEMA;
+END_SCHEMA;

data/original/examples/syntax/multiple.yaml

@@ -0,0 +1,184 @@
+---
+_class: Expressir::Model::Repository
+schemas:
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema1
+  interfaces:
+  - _class: Expressir::Model::Interface
+    kind: :REFERENCE
+    schema:
+      _class: Expressir::Model::Expressions::SimpleReference
+      id: multiple_schema2
+  - _class: Expressir::Model::Interface
+    kind: :REFERENCE
+    schema:
+      _class: Expressir::Model::Expressions::SimpleReference
+      id: multiple_schema3
+    items:
+    - _class: Expressir::Model::InterfaceItem
+      ref:
+        _class: Expressir::Model::Expressions::SimpleReference
+        id: attribute_entity3
+  - _class: Expressir::Model::Interface
+    kind: :REFERENCE
+    schema:
+      _class: Expressir::Model::Expressions::SimpleReference
+      id: multiple_schema4
+    items:
+    - _class: Expressir::Model::InterfaceItem
+      ref:
+        _class: Expressir::Model::Expressions::SimpleReference
+        id: attribute_entity
+      id: attribute_entity4
+  entities:
+  - _class: Expressir::Model::Entity
+    id: test
+  - _class: Expressir::Model::Entity
+    id: empty_entity
+  - _class: Expressir::Model::Entity
+    id: attribute_entity
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_empty_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: empty_entity
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity2
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity2
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity2
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity3
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity3
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity3
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_attribute_entity4
+    subtype_of:
+    - _class: Expressir::Model::Expressions::SimpleReference
+      id: attribute_entity4
+    attributes:
+    - _class: Expressir::Model::Attribute
+      kind: :EXPLICIT
+      supertype_attribute:
+        _class: Expressir::Model::Expressions::AttributeReference
+        ref:
+          _class: Expressir::Model::Expressions::GroupReference
+          ref:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: SELF
+          entity:
+            _class: Expressir::Model::Expressions::SimpleReference
+            id: attribute_entity4
+        attribute:
+          _class: Expressir::Model::Expressions::SimpleReference
+          id: test
+      type:
+        _class: Expressir::Model::Types::Boolean
+  - _class: Expressir::Model::Entity
+    id: subtype_missing_entity
+    subtype_of:
+    - _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
+    id: attribute_entity2
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema3
+  entities:
+  - _class: Expressir::Model::Entity
+    id: attribute_entity3
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean
+- _class: Expressir::Model::Schema
+  file: original/examples/syntax/multiple.exp
+  id: multiple_schema4
+  entities:
+  - _class: Expressir::Model::Entity
+    id: attribute_entity
+    attributes:
+    - _class: Expressir::Model::Attribute
+      id: test
+      kind: :EXPLICIT
+      type:
+        _class: Expressir::Model::Types::Boolean