expressir 0.2.8-x64-mingw32 → 0.2.13-x64-mingw32

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

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Types
-      class Binary
+      class Binary < ModelElement
         attr_accessor :width
         attr_accessor :fixed
 
         def initialize(options = {})
           @width = options[:width]
           @fixed = options[:fixed]
+
+          super
         end
       end
     end

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,11 @@ 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, [])
+
+          super
         end
       end
     end

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

@@ -1,11 +1,15 @@
 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]
+
+          super
         end
       end
     end

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

@@ -1,11 +1,15 @@
 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]
+
+          super
         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
@@ -12,6 +12,8 @@ module Expressir
           @bound2 = options[:bound2]
           @unique = options[:unique]
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

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,11 +1,13 @@
 module Expressir
   module Model
     module Types
-      class Real
+      class Real < ModelElement
         attr_accessor :precision
 
         def initialize(options = {})
           @precision = options[:precision]
+
+          super
         end
       end
     end

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,11 @@ 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, [])
+
+          super
         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
@@ -10,6 +10,8 @@ module Expressir
           @bound1 = options[:bound1]
           @bound2 = options[:bound2]
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

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

@@ -1,13 +1,15 @@
 module Expressir
   module Model
     module Types
-      class String
+      class String < ModelElement
         attr_accessor :width
         attr_accessor :fixed
 
         def initialize(options = {})
           @width = options[:width]
           @fixed = options[:fixed]
+
+          super
         end
       end
     end

data/lib/expressir/model/unique.rb

@@ -1,14 +1,18 @@
 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, [])
+
+        super
       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,9 +8,13 @@ module Expressir
 
       def initialize(options = {})
         @id = options[:id]
+        @remarks = options.fetch(:remarks, [])
+        @source = options[:source]
 
         @type = options[:type]
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/model/where.rb

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

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.8".freeze
+  VERSION = "0.2.13".freeze
 end

data/original/examples/syntax/hyperlink.exp

@@ -0,0 +1,8 @@
+SCHEMA hyperlink_schema;
+ENTITY test; END_ENTITY;
+ENTITY empty_entity; END_ENTITY;
+ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
+ENTITY subtype_empty_entity SUBTYPE OF (empty_entity); END_ENTITY;
+ENTITY subtype_attribute_entity SUBTYPE OF (attribute_entity); SELF\attribute_entity.test : BOOLEAN; END_ENTITY;
+ENTITY subtype_missing_entity SUBTYPE OF (missing_entity); END_ENTITY;
+END_SCHEMA;

data/original/examples/syntax/hyperlink_formatted.exp

@@ -0,0 +1,19 @@
+SCHEMA hyperlink_schema;
+ENTITY test;
+END_ENTITY;
+ENTITY empty_entity;
+END_ENTITY;
+ENTITY attribute_entity;
+  test : BOOLEAN;
+END_ENTITY;
+ENTITY subtype_empty_entity
+  SUBTYPE OF ({{{<<express:hyperlink_schema.empty_entity,empty_entity>>}}});
+END_ENTITY;
+ENTITY subtype_attribute_entity
+  SUBTYPE OF ({{{<<express:hyperlink_schema.attribute_entity,attribute_entity>>}}});
+  SELF\{{{<<express:hyperlink_schema.attribute_entity,attribute_entity>>}}}.test : BOOLEAN;
+END_ENTITY;
+ENTITY subtype_missing_entity
+  SUBTYPE OF (missing_entity);
+END_ENTITY;
+END_SCHEMA;

data/original/examples/syntax/remark.exp

@@ -11,18 +11,27 @@ several physical lines.
 SCHEMA remark_schema;
 
 CONSTANT remark_constant : STRING := 'xxx'; END_CONSTANT;
-TYPE remark_type = ENUMERATION OF (remark_enumeration_item); END_TYPE;
+TYPE remark_type = ENUMERATION OF (remark_enumeration_item);
+  WHERE WR1 : TRUE;
+  --"WR1" type scope - type where
+  --"IP1" type scope - type informal proposition
+  --"wr:WR1" type scope - type where, with prefix
+  --"ip:IP1" type scope - type informal proposition, with prefix
+END_TYPE;
 ENTITY remark_entity;
   remark_attribute : STRING;
   DERIVE remark_derived_attribute : STRING := 'xxx';
   INVERSE remark_inverse_attribute : remark_entity FOR remark_attribute;
   UNIQUE remark_unique : remark_attribute;
-  WHERE remark_where : TRUE;
+  WHERE WR1 : TRUE;
   --"remark_attribute" entity scope - entity attribute
   --"remark_derived_attribute" entity scope - entity derived attribute
   --"remark_inverse_attribute" entity scope - entity inverse attribute
   --"remark_unique" entity scope - entity unique
-  --"remark_where" entity scope - entity where
+  --"WR1" entity scope - entity where
+  --"IP1" entity scope - entity informal proposition
+  --"wr:WR1" entity scope - entity where, with prefix
+  --"ip:IP1" entity scope - entity informal proposition, with prefix
 END_ENTITY;
 SUBTYPE_CONSTRAINT remark_subtype_constraint FOR remark_entity; END_SUBTYPE_CONSTRAINT;
 FUNCTION remark_function(remark_parameter : STRING) : BOOLEAN;
@@ -40,7 +49,8 @@ FUNCTION remark_function(remark_parameter : STRING) : BOOLEAN;
   );
   --"remark_parameter" function scope - function parameter
   --"remark_type" function scope - function type
-  --"remark_enumeration_item" function scope - function enumeration item
+  --"remark_type.remark_enumeration_item" function scope - function enumeration item
+  --"remark_enumeration_item" function scope - function enumeration item, on the same level as the type
   --"remark_constant" function scope - function constant
   --"remark_variable" function scope - function variable
 END_FUNCTION;
@@ -59,7 +69,8 @@ PROCEDURE remark_procedure(remark_parameter : STRING);
   );
   --"remark_parameter" procedure scope - procedure parameter
   --"remark_type" procedure scope - procedure type
-  --"remark_enumeration_item" procedure scope - procedure enumeration item
+  --"remark_type.remark_enumeration_item" procedure scope - procedure enumeration item
+  --"remark_enumeration_item" procedure scope - procedure enumeration item, on the same level as the type
   --"remark_constant" procedure scope - procedure constant
   --"remark_variable" procedure scope - procedure variable
 END_PROCEDURE;
@@ -76,71 +87,103 @@ RULE remark_rule FOR (remark_entity);
   remark_variable := QUERY(remark_query <* remark_variable | TRUE
     --"remark_query" rule query scope - rule query
   );
-  WHERE remark_where : TRUE;
+  WHERE WR1 : TRUE;
   --"remark_type" rule scope - rule type
-  --"remark_enumeration_item" rule scope - rule enumeration item
+  --"remark_type.remark_enumeration_item" rule scope - rule enumeration item
+  --"remark_enumeration_item" rule scope - rule enumeration item, on the same level as the type
   --"remark_constant" rule scope - rule constant
   --"remark_variable" rule scope - rule variable
-  --"remark_where" rule scope - rule where
+  --"WR1" rule scope - rule where
+  --"IP1" rule scope - rule informal proposition
+  --"wr:WR1" rule scope - rule where, with prefix
+  --"ip:IP1" rule scope - rule informal proposition, with prefix
 END_RULE;
 
 --"remark_constant" schema scope - constant
 --"remark_type" schema scope - type
---"remark_enumeration_item" schema scope - enumeration item
+--"remark_type.WR1" schema scope - type where
+--"remark_type.IP1" schema scope - type informal proposition
+--"remark_type.wr:WR1" schema scope - type where, with prefix
+--"remark_type.ip:IP1" schema scope - type informal proposition, with prefix
+--"remark_type.remark_enumeration_item" schema scope - enumeration item
+--"remark_enumeration_item" schema scope - enumeration item, on the same level as the type
 --"remark_entity" schema scope - entity
 --"remark_entity.remark_attribute" schema scope - entity attribute
 --"remark_entity.remark_derived_attribute" schema scope - entity derived attribute
 --"remark_entity.remark_inverse_attribute" schema scope - entity inverse attribute
 --"remark_entity.remark_unique" schema scope - entity unique
---"remark_entity.remark_where" schema scope - entity where
+--"remark_entity.WR1" schema scope - entity where
+--"remark_entity.IP1" schema scope - entity informal proposition
+--"remark_entity.wr:WR1" schema scope - entity where, with prefix
+--"remark_entity.ip:IP1" schema scope - entity informal proposition, with prefix
 --"remark_subtype_constraint" schema scope - subtype constraint
 --"remark_function" schema scope - function
 --"remark_function.remark_parameter" schema scope - function parameter
 --"remark_function.remark_type" schema scope - function type
---"remark_function.remark_enumeration_item" schema scope - function enumeration item
+--"remark_function.remark_type.remark_enumeration_item" schema scope - function enumeration item
+--"remark_function.remark_enumeration_item" schema scope - function enumeration item, on the same level as the type
 --"remark_function.remark_constant" schema scope - function constant
 --"remark_function.remark_variable" schema scope - function variable
 --"remark_procedure" schema scope - procedure
 --"remark_procedure.remark_parameter" schema scope - procedure parameter
 --"remark_procedure.remark_type" schema scope - procedure type
---"remark_procedure.remark_enumeration_item" schema scope - procedure enumeration item
+--"remark_procedure.remark_type.remark_enumeration_item" schema scope - procedure enumeration item
+--"remark_procedure.remark_enumeration_item" schema scope - procedure enumeration item, on the same level as the type
 --"remark_procedure.remark_constant" schema scope - procedure constant
 --"remark_procedure.remark_variable" schema scope - procedure variable
 --"remark_rule" schema scope - rule
 --"remark_rule.remark_type" schema scope - rule type
---"remark_rule.remark_enumeration_item" schema scope - rule enumeration item
+--"remark_rule.remark_type.remark_enumeration_item" schema scope - rule enumeration item
+--"remark_rule.remark_enumeration_item" schema scope - rule enumeration item, on the same level as the type
 --"remark_rule.remark_constant" schema scope - rule constant
 --"remark_rule.remark_variable" schema scope - rule variable
---"remark_rule.remark_where" schema scope - rule where
+--"remark_rule.WR1" schema scope - rule where
+--"remark_rule.IP1" schema scope - rule informal proposition
+--"remark_rule.wr:WR1" schema scope - rule where, with prefix
+--"remark_rule.ip:IP1" schema scope - rule informal proposition, with prefix
 
 END_SCHEMA;
 
 --"remark_schema" universal scope - schema
 --"remark_schema.remark_constant" universal scope - constant
 --"remark_schema.remark_type" universal scope - type
---"remark_schema.remark_enumeration_item" universal scope - enumeration item
+--"remark_schema.remark_type.WR1" universal scope - type where
+--"remark_schema.remark_type.IP1" universal scope - type informal proposition
+--"remark_schema.remark_type.wr:WR1" universal scope - type where, with prefix
+--"remark_schema.remark_type.ip:IP1" universal scope - type informal proposition, with prefix
+--"remark_schema.remark_type.remark_enumeration_item" universal scope - enumeration item
+--"remark_schema.remark_enumeration_item" universal scope - enumeration item, on the same level as the type
 --"remark_schema.remark_entity" universal scope - entity
 --"remark_schema.remark_entity.remark_attribute" universal scope - entity attribute
 --"remark_schema.remark_entity.remark_derived_attribute" universal scope - entity derived attribute
 --"remark_schema.remark_entity.remark_inverse_attribute" universal scope - entity inverse attribute
 --"remark_schema.remark_entity.remark_unique" universal scope - entity unique
---"remark_schema.remark_entity.remark_where" universal scope - entity where
+--"remark_schema.remark_entity.WR1" universal scope - entity where
+--"remark_schema.remark_entity.IP1" universal scope - entity informal proposition
+--"remark_schema.remark_entity.wr:WR1" universal scope - entity where, with prefix
+--"remark_schema.remark_entity.ip:IP1" universal scope - entity informal proposition, with prefix
 --"remark_schema.remark_subtype_constraint" universal scope - subtype constraint
 --"remark_schema.remark_function" universal scope - function
 --"remark_schema.remark_function.remark_parameter" universal scope - function parameter
 --"remark_schema.remark_function.remark_type" universal scope - function type
---"remark_schema.remark_function.remark_enumeration_item" universal scope - function enumeration item
+--"remark_schema.remark_function.remark_type.remark_enumeration_item" universal scope - function enumeration item
+--"remark_schema.remark_function.remark_enumeration_item" universal scope - function enumeration item, on the same level as the type
 --"remark_schema.remark_function.remark_constant" universal scope - function constant
 --"remark_schema.remark_function.remark_variable" universal scope - function variable
 --"remark_schema.remark_procedure" universal scope - procedure
 --"remark_schema.remark_procedure.remark_parameter" universal scope - procedure parameter
 --"remark_schema.remark_procedure.remark_type" universal scope - procedure type
---"remark_schema.remark_procedure.remark_enumeration_item" universal scope - procedure enumeration item
+--"remark_schema.remark_procedure.remark_type.remark_enumeration_item" universal scope - procedure enumeration item
+--"remark_schema.remark_procedure.remark_enumeration_item" universal scope - procedure enumeration item, on the same level as the type
 --"remark_schema.remark_procedure.remark_constant" universal scope - procedure constant
 --"remark_schema.remark_procedure.remark_variable" universal scope - procedure variable
 --"remark_schema.remark_rule" universal scope - rule
 --"remark_schema.remark_rule.remark_type" universal scope - rule type
---"remark_schema.remark_rule.remark_enumeration_item" universal scope - rule enumeration item
+--"remark_schema.remark_rule.remark_type.remark_enumeration_item" universal scope - rule enumeration item
+--"remark_schema.remark_rule.remark_enumeration_item" universal scope - rule enumeration item, on the same level as the type
 --"remark_schema.remark_rule.remark_constant" universal scope - rule constant
 --"remark_schema.remark_rule.remark_variable" universal scope - rule variable
---"remark_schema.remark_rule.remark_where" universal scope - rule where
+--"remark_schema.remark_rule.WR1" universal scope - rule where
+--"remark_schema.remark_rule.IP1" universal scope - rule informal proposition
+--"remark_schema.remark_rule.wr:WR1" universal scope - rule where, with prefix
+--"remark_schema.remark_rule.ip:IP1" universal scope - rule informal proposition, with prefix