expressir 0.2.11-x64-mingw32 → 0.2.12-x64-mingw32

data/lib/expressir/model/rule.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
     class Rule < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :applies_to
@@ -21,7 +20,7 @@ module Expressir
         @remarks = options.fetch(:remarks, [])
         @source = options[:source]
 
-        @applies_to = options[:applies_to]
+        @applies_to = options.fetch(:applies_to, [])
         @types = options.fetch(:types, [])
         @entities = options.fetch(:entities, [])
         @subtype_constraints = options.fetch(:subtype_constraints, [])
@@ -32,18 +31,14 @@ module Expressir
         @statements = options.fetch(:statements, [])
         @where = options.fetch(:where, [])
         @informal_propositions = options.fetch(:informal_propositions, [])
+
+        super
       end
 
       def children
         items = []
         items.push(*@types)
-        items.push(*@types.flat_map do |x|
-          if x.type.instance_of? Expressir::Model::Types::Enumeration
-            x.type.items
-          else
-            []
-          end
-        end)
+        items.push(*@types.flat_map{|x| x.type.is_a?(Expressir::Model::Types::Enumeration) ? x.type.items : []})
         items.push(*@entities)
         items.push(*@subtype_constraints)
         items.push(*@functions)

data/lib/expressir/model/schema.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
     class Schema < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :head_source
@@ -31,19 +30,17 @@ module Expressir
         @functions = options.fetch(:functions, [])
         @procedures = options.fetch(:procedures, [])
         @rules = options.fetch(:rules, [])
+
+        super
       end
 
       def children
         items = []
+        # TODO: select interface items
+        items.push(*@interfaces.flat_map{|x| parent.schemas.find{|y| x.schema.id == y.id}&.children || []})
         items.push(*@constants)
         items.push(*@types)
-        items.push(*@types.flat_map do |x|
-          if x.type.instance_of? Expressir::Model::Types::Enumeration
-            x.type.items
-          else
-            []
-          end
-        end)
+        items.push(*@types.flat_map{|x| x.type.is_a?(Expressir::Model::Types::Enumeration) ? x.type.items : []})
         items.push(*@entities)
         items.push(*@subtype_constraints)
         items.push(*@functions)

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

@@ -2,7 +2,6 @@ module Expressir
   module Model
     module Statements
       class Alias < ModelElement
-        include Scope
         include Identifier
 
         attr_accessor :expression
@@ -15,6 +14,8 @@ module Expressir
 
           @expression = options[:expression]
           @statements = options.fetch(:statements, [])
+
+          super
         end
 
         def children

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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @ref = options[:ref]
           @expression = options[:expression]
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @ref = options[:ref]
           @parameters = options.fetch(:parameters, [])
+
+          super
         end
       end
     end

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

@@ -10,6 +10,8 @@ module Expressir
           @expression = options[:expression]
           @actions = options.fetch(:actions, [])
           @otherwise_statement = options[:otherwise_statement]
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @labels = options.fetch(:labels, [])
           @statement = options[:statement]
+
+          super
         end
       end
     end

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

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @statements = options.fetch(:statements, [])
+
+          super
         end
       end
     end

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

@@ -10,6 +10,8 @@ module Expressir
           @expression = options[:expression]
           @statements = options.fetch(:statements, [])
           @else_statements = options.fetch(:else_statements, [])
+
+          super
         end
       end
     end

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

@@ -2,7 +2,6 @@ module Expressir
   module Model
     module Statements
       class Repeat < ModelElement
-        include Scope
         include Identifier
 
         attr_accessor :bound1
@@ -23,6 +22,8 @@ module Expressir
           @while_expression = options[:while_expression]
           @until_expression = options[:until_expression]
           @statements = options.fetch(:statements, [])
+
+          super
         end
 
         def children

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

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @expression = options[:expression]
+
+          super
         end
       end
     end

data/lib/expressir/model/subtype_constraint.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
     class SubtypeConstraint < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :applies_to
@@ -18,6 +17,8 @@ module Expressir
         @abstract = options[:abstract]
         @total_over = options[:total_over]
         @supertype_expression = options[:supertype_expression]
+
+        super
       end
 
       def children

data/lib/expressir/model/type.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
     class Type < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :type
@@ -16,15 +15,13 @@ module Expressir
         @type = options[:type]
         @where = options.fetch(:where, [])
         @informal_propositions = options.fetch(:informal_propositions, [])
+
+        super
       end
 
       def children
         items = []
-        items.push(*[
-          *if @type.instance_of? Expressir::Model::Types::Enumeration
-            @type.items
-          end
-        ])
+        items.push(*@type.is_a?(Expressir::Model::Types::Enumeration) ? @type.items : [])
         items.push(*@where)
         items.push(*@informal_propositions)
         items

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

@@ -12,6 +12,8 @@ module Expressir
           @source = options[:source]
 
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

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

@@ -14,6 +14,8 @@ module Expressir
           @optional = options[:optional]
           @unique = options[:unique]
           @base_type = options[:base_type]
+
+          super
         end
       end
     end

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

@@ -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/binary.rb

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @width = options[:width]
           @fixed = options[:fixed]
+
+          super
         end
       end
     end

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

@@ -12,6 +12,8 @@ module Expressir
           @items = options.fetch(:items, [])
           @extension_type = options[:extension_type]
           @extension_items = options.fetch(:extension_items, [])
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
           @source = options[:source]
+
+          super
         end
       end
     end

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

@@ -8,6 +8,8 @@ module Expressir
           @id = options[:id]
           @remarks = options.fetch(:remarks, [])
           @source = options[:source]
+
+          super
         end
       end
     end

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

@@ -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/real.rb

@@ -6,6 +6,8 @@ module Expressir
 
         def initialize(options = {})
           @precision = options[:precision]
+
+          super
         end
       end
     end

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

@@ -14,6 +14,8 @@ module Expressir
           @items = options.fetch(:items, [])
           @extension_type = options[:extension_type]
           @extension_items = options.fetch(:extension_items, [])
+
+          super
         end
       end
     end

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

@@ -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

@@ -8,6 +8,8 @@ module Expressir
         def initialize(options = {})
           @width = options[:width]
           @fixed = options[:fixed]
+
+          super
         end
       end
     end

data/lib/expressir/model/unique.rb

@@ -11,6 +11,8 @@ module Expressir
         @source = options[:source]
 
         @attributes = options.fetch(:attributes, [])
+
+        super
       end
     end
   end

data/lib/expressir/model/variable.rb

@@ -13,6 +13,8 @@ module Expressir
 
         @type = options[:type]
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/model/where.rb

@@ -11,6 +11,8 @@ module Expressir
         @source = options[:source]
 
         @expression = options[:expression]
+
+        super
       end
     end
   end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.11".freeze
+  VERSION = "0.2.12".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/syntax.exp

@@ -31,23 +31,23 @@ ENTITY attribute_entity; test : BOOLEAN; END_ENTITY;
 ENTITY attribute_optional_entity; test : OPTIONAL BOOLEAN; END_ENTITY;
 ENTITY attribute_multiple_entity; test : BOOLEAN; test2 : BOOLEAN; END_ENTITY;
 ENTITY attribute_multiple_shorthand_entity; test, test2 : BOOLEAN; END_ENTITY;
-ENTITY attribute_redeclared_entity; SELF\attribute_entity.test : BOOLEAN; END_ENTITY;
-ENTITY attribute_redeclared_renamed_entity; SELF\attribute_entity.test RENAMED test2 : BOOLEAN; END_ENTITY;
+ENTITY attribute_redeclared_entity SUBTYPE OF (attribute_entity); SELF\attribute_entity.test : BOOLEAN; END_ENTITY;
+ENTITY attribute_redeclared_renamed_entity SUBTYPE OF (attribute_entity); SELF\attribute_entity.test RENAMED test2 : BOOLEAN; END_ENTITY;
 ENTITY derived_attribute_entity; DERIVE test : BOOLEAN := TRUE; END_ENTITY;
-ENTITY derived_attribute_redeclared_entity; DERIVE SELF\attribute_entity.test : BOOLEAN := TRUE; END_ENTITY;
-ENTITY derived_attribute_redeclared_renamed_entity; DERIVE SELF\attribute_entity.test RENAMED test2 : BOOLEAN := TRUE; END_ENTITY;
+ENTITY derived_attribute_redeclared_entity SUBTYPE OF (attribute_entity); DERIVE SELF\attribute_entity.test : BOOLEAN := TRUE; END_ENTITY;
+ENTITY derived_attribute_redeclared_renamed_entity SUBTYPE OF (attribute_entity); DERIVE SELF\attribute_entity.test RENAMED test2 : BOOLEAN := TRUE; END_ENTITY;
 ENTITY inverse_attribute_entity; INVERSE test : attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_entity_entity; INVERSE test : attribute_entity FOR attribute_entity.test; END_ENTITY;
 ENTITY inverse_attribute_set_entity; INVERSE test : SET OF attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_set_bound_entity; INVERSE test : SET [1:9] OF attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_bag_entity; INVERSE test : BAG OF attribute_entity FOR test; END_ENTITY;
 ENTITY inverse_attribute_bag_bound_entity; INVERSE test : BAG [1:9] OF attribute_entity FOR test; END_ENTITY;
-ENTITY inverse_attribute_redeclared_entity; INVERSE SELF\attribute_entity.test : attribute_entity FOR test; END_ENTITY;
-ENTITY inverse_attribute_redeclared_renamed_entity; INVERSE SELF\attribute_entity.test RENAMED test2 : attribute_entity FOR test; END_ENTITY;
+ENTITY inverse_attribute_redeclared_entity SUBTYPE OF (attribute_entity); INVERSE SELF\attribute_entity.test : attribute_entity FOR test; END_ENTITY;
+ENTITY inverse_attribute_redeclared_renamed_entity SUBTYPE OF (attribute_entity); INVERSE SELF\attribute_entity.test RENAMED test2 : attribute_entity FOR test; END_ENTITY;
 ENTITY unique_entity; test : BOOLEAN; UNIQUE test; END_ENTITY;
 ENTITY unique_label_entity; test : BOOLEAN; UNIQUE UR1 : test; END_ENTITY;
-ENTITY unique_qualified_entity; UNIQUE SELF\attribute_entity.test; END_ENTITY;
-ENTITY unique_label_qualified_entity; UNIQUE UR1 : SELF\attribute_entity.test; END_ENTITY;
+ENTITY unique_redeclared_entity SUBTYPE OF (attribute_entity); UNIQUE SELF\attribute_entity.test; END_ENTITY;
+ENTITY unique_label_redeclared_entity SUBTYPE OF (attribute_entity); UNIQUE UR1 : SELF\attribute_entity.test; END_ENTITY;
 ENTITY where_entity; WHERE TRUE; END_ENTITY;
 ENTITY where_label_entity; WHERE WR1 : TRUE; END_ENTITY;
 
@@ -122,15 +122,15 @@ RULE where_label_rule FOR (empty_entity); WHERE WR1 : TRUE; END_RULE;
 PROCEDURE statements;
   -- statements
   PROCEDURE alias_simple_reference_statement; ALIAS test FOR test; ; END_ALIAS; END_PROCEDURE;
-  PROCEDURE alias_attribute_reference_statement; ALIAS test FOR test.test; ; END_ALIAS; END_PROCEDURE;
-  PROCEDURE alias_group_reference_statement; ALIAS test FOR test\test; ; END_ALIAS; END_PROCEDURE;
+  PROCEDURE alias_group_reference_statement; ALIAS test FOR test\test2; ; END_ALIAS; END_PROCEDURE;
   PROCEDURE alias_index_reference_statement; ALIAS test FOR test[1]; ; END_ALIAS; END_PROCEDURE;
   PROCEDURE alias_index2_reference_statement; ALIAS test FOR test[1:9]; ; END_ALIAS; END_PROCEDURE;
+  PROCEDURE alias_attribute_reference_statement; ALIAS test FOR test.test2; ; END_ALIAS; END_PROCEDURE;
   PROCEDURE assignment_simple_reference_statement; test := TRUE; END_PROCEDURE;
-  PROCEDURE assignment_attribute_reference_statement; test.test := TRUE; END_PROCEDURE;
-  PROCEDURE assignment_group_reference_statement; test\test := TRUE; END_PROCEDURE;
+  PROCEDURE assignment_group_reference_statement; test\test2 := TRUE; END_PROCEDURE;
   PROCEDURE assignment_index_reference_statement; test[1] := TRUE; END_PROCEDURE;
   PROCEDURE assignment_index2_reference_statement; test[1:9] := TRUE; END_PROCEDURE;
+  PROCEDURE assignment_attribute_reference_statement; test.test2 := TRUE; END_PROCEDURE;
   PROCEDURE case_statement; CASE test OF TRUE : ; END_CASE; END_PROCEDURE;
   PROCEDURE case_multiple_statement; CASE test OF TRUE : ; TRUE : ; END_CASE; END_PROCEDURE;
   PROCEDURE case_multiple_shorthand_statement; CASE test OF TRUE, TRUE : ; END_CASE; END_PROCEDURE;
@@ -290,7 +290,7 @@ PROCEDURE expressions;
     and_or_expression : BOOLEAN := TRUE AND FALSE OR TRUE;
     parenthesis_or_and_expression : BOOLEAN := (TRUE OR FALSE) AND TRUE;
     and_parenthesis_or_expression : BOOLEAN := TRUE AND (FALSE OR TRUE);
-    combine_expression : BOOLEAN := test || test;
+    combine_expression : BOOLEAN := test || test2;
     in_expression : BOOLEAN := TRUE IN [TRUE];
     like_expression : BOOLEAN := 'xxx' LIKE 'xxx';
 
@@ -304,11 +304,11 @@ PROCEDURE expressions;
     call_expression : BOOLEAN := parameter_function(TRUE);
 
     -- reference expressions
-    simple_reference_expression : BOOLEAN := simple_string_expression;
-    attribute_reference_expression : BOOLEAN := simple_string_expression.test;
-    group_reference_expression : BOOLEAN := simple_string_expression\test;
-    index_reference_expression : BOOLEAN := simple_string_expression[1];
-    index2_reference_expression : BOOLEAN := simple_string_expression[1:9];
+    simple_reference_expression : BOOLEAN := test;
+    group_reference_expression : BOOLEAN := test\test2;
+    index_reference_expression : BOOLEAN := test[1];
+    index2_reference_expression : BOOLEAN := test[1:9];
+    attribute_reference_expression : BOOLEAN := test.test2;
 
     -- interval expressions
     lt_lt_interval_expression : BOOLEAN := {1 < 5 < 9};