expressir 0.2.11-x86-mingw32 → 0.2.16-x86-mingw32

data/lib/expressir/express_exp/schema_head_formatter.rb

@@ -0,0 +1,12 @@
+module Expressir
+  module ExpressExp
+    module SchemaHeadFormatter
+      def format_schema(node)
+        [
+          "SCHEMA #{node.id}#{node.version ? " #{format(node.version)}" : ""};",
+          *node.interfaces.map{|x| format(x)}
+        ].join("\n")
+      end
+    end
+  end
+end

data/lib/expressir/express_exp/visitor.rb

@@ -14,7 +14,7 @@ require "set"
 # > method of gaining this information is multi-pass parsing: the first pass collects the identifiers from their
 # > declarations, so that subsequent passes are then able to distinguish a veriable_ref from a function_ref,
 # > for example.
-#
+# - such multi-pass parsing is not implemented yet
 # - xxxRef - merged to SimpleReference
 # - entityConstructor, functionCall - merged to Call
 # 
@@ -44,11 +44,10 @@ module Expressir
       end
 
       def visit(ctx)
-        result = super(ctx)
-        attach_source(ctx, result)
-        attach_parent(result)
-        attach_remarks(ctx, result)
-        result
+        node = super(ctx)
+        attach_source(ctx, node)
+        attach_remarks(ctx, node)
+        node
       end
 
       def visit_if(ctx, default = nil)
@@ -84,7 +83,7 @@ module Expressir
       end
 
       def get_tokens(ctx)
-        start_index, stop_index = if ctx.instance_of? ::ExpressParser::SyntaxContext
+        start_index, stop_index = if ctx.is_a? ::ExpressParser::SyntaxContext
           [0, @tokens.size - 1]
         else
           [ctx.start.token_index, ctx.stop.token_index]
@@ -93,56 +92,37 @@ module Expressir
         @tokens[start_index..stop_index]
       end
 
-      def get_head_tokens(ctx)
-        start_index, stop_index = if ctx.instance_of? ::ExpressParser::SchemaDeclContext
-          start_index = ctx.start.token_index
-          stop_index = if ctx.schema_body.interface_specification.length > 0
-            ctx.schema_body.interface_specification.last.stop.token_index
-          elsif ctx.schema_version_id
-            ctx.schema_version_id.stop.token_index + 1
-          else
-            ctx.schema_id.stop.token_index + 1
-          end
-
-          [start_index, stop_index]
-        end
-
-        if start_index and stop_index
-          @tokens[start_index..stop_index]
-        end
-      end
-
       def attach_source(ctx, node)
         if node.class.method_defined? :source
           tokens = get_tokens(ctx)
           node.source = get_tokens_source(tokens)
         end
-
-        if node.class.method_defined? :head_source
-          tokens = get_head_tokens(ctx)
-          node.head_source = get_tokens_source(tokens)
-        end
-      end
-
-      def attach_parent(node)
-        if node.class.method_defined? :attach_parent_to_children
-          node.attach_parent_to_children
-        end
       end
 
       def find_remark_target(node, path)
-        current_node = node
-        target_node = nil
+        target_node = node.find(path)
+        return target_node if target_node
 
-        if current_node.class.method_defined? :find_or_create
-          target_node = current_node.find_or_create(path)
-        end
-        while !target_node and current_node.class.method_defined? :parent and current_node.parent.class.method_defined? :find_or_create
-          current_node = current_node.parent
-          target_node = current_node.find_or_create(path)
-        end
+        # check if path should create implicit informal proposal
+        # see https://github.com/lutaml/expressir/issues/50
+        rest, _, current_path = path.rpartition(".") # get last path part
+        _, _, current_path = current_path.rpartition(":") # ignore prefix
+
+        # match informal proposition id
+        informal_proposition_id = current_path.match(/^IP\d+$/).to_a[0]
+        return unless informal_proposition_id
 
-        target_node
+        # find informal proposition target
+        target_node = node.find(rest)
+        return unless target_node and target_node.class.method_defined? :informal_propositions
+
+        # create implicit informal proposition
+        informal_proposition = Model::InformalProposition.new({
+          id: informal_proposition_id
+        })
+        target_node.informal_propositions << informal_proposition
+        informal_proposition.parent = target_node
+        informal_proposition
       end
 
       def attach_remarks(ctx, node)
@@ -687,9 +667,9 @@ module Expressir
         expression = visit_if(ctx__expression)
 
         Model::Attribute.new({
-          id: attribute.id,
+          id: attribute.id, # reuse
           kind: Model::Attribute::DERIVED,
-          supertype_attribute: attribute.supertype_attribute,
+          supertype_attribute: attribute.supertype_attribute, # reuse
           type: type,
           expression: expression
         })
@@ -767,7 +747,7 @@ module Expressir
         id = visit_if(ctx__entity_head__entity_id)
         abstract = (ctx__entity_head__subsuper__supertype_constraint__abstract_entity_declaration || ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration) && true
         supertype_expression = visit_if(ctx__entity_head__subsuper__supertype_constraint__abstract_supertype_declaration || ctx__entity_head__subsuper__supertype_constraint__supertype_rule)
-        subtype_of = visit_if(ctx__entity_head__subsuper__subtype_declaration)
+        subtype_of = visit_if(ctx__entity_head__subsuper__subtype_declaration, [])
         attributes = [
           *visit_if_map_flatten(ctx__entity_body__explicit_attr),
           *visit_if(ctx__entity_body__derive_clause),
@@ -875,9 +855,9 @@ module Expressir
 
         attributes.map do |attribute|
           Model::Attribute.new({
-            id: attribute.id,
+            id: attribute.id, # reuse
             kind: Model::Attribute::EXPLICIT,
-            supertype_attribute: attribute.supertype_attribute,
+            supertype_attribute: attribute.supertype_attribute, # reuse
             optional: optional,
             type: type
           })
@@ -967,11 +947,11 @@ module Expressir
         parameters = visit_if_map_flatten(ctx__function_head__formal_parameter)
         return_type = visit_if(ctx__function_head__parameter_type)
         declarations = visit_if_map(ctx__algorithm_head__declaration)
-        types = declarations.select{|x| x.instance_of? Model::Type}
-        entities = declarations.select{|x| x.instance_of? Model::Entity}
-        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
-        functions = declarations.select{|x| x.instance_of? Model::Function}
-        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
+        types = declarations.select{|x| x.is_a? Model::Type}
+        entities = declarations.select{|x| x.is_a? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.is_a? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.is_a? Model::Function}
+        procedures = declarations.select{|x| x.is_a? Model::Procedure}
         constants = visit_if(ctx__algorithm_head__constant_decl, [])
         variables = visit_if(ctx__algorithm_head__local_decl, [])
         statements = visit_if_map(ctx__stmt)
@@ -1302,9 +1282,9 @@ module Expressir
         end
 
         Model::Attribute.new({
-          id: attribute.id,
+          id: attribute.id, # reuse
           kind: Model::Attribute::INVERSE,
-          supertype_attribute: attribute.supertype_attribute,
+          supertype_attribute: attribute.supertype_attribute, # reuse
           type: type,
           expression: expression
         })
@@ -1486,14 +1466,10 @@ module Expressir
         ref = visit_if(ctx__named_types)
         id = visit_if(ctx__entity_id || ctx__type_id)
 
-        if id
-          Model::RenamedRef.new({
-            ref: ref,
-            id: id
-          })
-        else
-          ref
-        end
+        Model::InterfaceItem.new({
+          ref: ref,
+          id: id
+        })
       end
 
       def visit_null_stmt(ctx)
@@ -1595,11 +1571,11 @@ module Expressir
         id = visit_if(ctx__procedure_head__procedure_id)
         parameters = visit_if_map_flatten(ctx__procedure_head__procedure_head_parameter)
         declarations = visit_if_map(ctx__algorithm_head__declaration)
-        types = declarations.select{|x| x.instance_of? Model::Type}
-        entities = declarations.select{|x| x.instance_of? Model::Entity}
-        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
-        functions = declarations.select{|x| x.instance_of? Model::Function}
-        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
+        types = declarations.select{|x| x.is_a? Model::Type}
+        entities = declarations.select{|x| x.is_a? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.is_a? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.is_a? Model::Function}
+        procedures = declarations.select{|x| x.is_a? Model::Procedure}
         constants = visit_if(ctx__algorithm_head__constant_decl, [])
         variables = visit_if(ctx__algorithm_head__local_decl, [])
         statements = visit_if_map(ctx__stmt)
@@ -1670,9 +1646,9 @@ module Expressir
             ref: Model::Expressions::SimpleReference.new({
               id: id
             }),
-            entity: group_reference.entity
+            entity: group_reference.entity # reuse
           }),
-          attribute: attribute_reference.attribute
+          attribute: attribute_reference.attribute # reuse
         })
       end
 
@@ -1837,21 +1813,13 @@ module Expressir
         ctx__resource_ref = ctx.resource_ref
         ctx__rename_id = ctx.rename_id
 
-        if ctx__resource_ref
-          if ctx__rename_id
-            ref = visit(ctx__resource_ref)
-            id = visit(ctx__rename_id)
+        ref = visit_if(ctx__resource_ref)
+        id = visit_if(ctx__rename_id)
 
-            Model::RenamedRef.new({
-              ref: ref,
-              id: id
-            })
-          else
-            visit(ctx__resource_ref)
-          end
-        else
-          raise 'Invalid state'
-        end
+        Model::InterfaceItem.new({
+          ref: ref,
+          id: id
+        })
       end
 
       def visit_resource_ref(ctx)
@@ -1888,11 +1856,11 @@ module Expressir
         id = visit_if(ctx__rule_head__rule_id)
         applies_to = visit_if_map(ctx__rule_head__entity_ref)
         declarations = visit_if_map(ctx__algorithm_head__declaration)
-        types = declarations.select{|x| x.instance_of? Model::Type}
-        entities = declarations.select{|x| x.instance_of? Model::Entity}
-        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
-        functions = declarations.select{|x| x.instance_of? Model::Function}
-        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
+        types = declarations.select{|x| x.is_a? Model::Type}
+        entities = declarations.select{|x| x.is_a? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.is_a? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.is_a? Model::Function}
+        procedures = declarations.select{|x| x.is_a? Model::Procedure}
         constants = visit_if(ctx__algorithm_head__constant_decl, [])
         variables = visit_if(ctx__algorithm_head__local_decl, [])
         statements = visit_if_map(ctx__stmt)
@@ -1953,12 +1921,12 @@ module Expressir
         interfaces = visit_if_map(ctx__schema_body__interface_specification)
         constants = visit_if(ctx__schema_body__constant_decl, [])
         declarations = visit_if_map(ctx__schema_body__schema_body_declaration)
-        types = declarations.select{|x| x.instance_of? Model::Type}
-        entities = declarations.select{|x| x.instance_of? Model::Entity}
-        subtype_constraints = declarations.select{|x| x.instance_of? Model::SubtypeConstraint}
-        functions = declarations.select{|x| x.instance_of? Model::Function}
-        procedures = declarations.select{|x| x.instance_of? Model::Procedure}
-        rules = declarations.select{|x| x.instance_of? Model::Rule}
+        types = declarations.select{|x| x.is_a? Model::Type}
+        entities = declarations.select{|x| x.is_a? Model::Entity}
+        subtype_constraints = declarations.select{|x| x.is_a? Model::SubtypeConstraint}
+        functions = declarations.select{|x| x.is_a? Model::Function}
+        procedures = declarations.select{|x| x.is_a? Model::Procedure}
+        rules = declarations.select{|x| x.is_a? Model::Rule}
 
         Model::Schema.new({
           id: id,

data/lib/expressir/model.rb

@@ -1,6 +1,5 @@
 require 'expressir/model/model_element'
 
-require 'expressir/model/scope'
 require 'expressir/model/identifier'
 
 require 'expressir/model/attribute'
@@ -10,9 +9,10 @@ require 'expressir/model/enumeration_item'
 require 'expressir/model/function'
 require 'expressir/model/informal_proposition'
 require 'expressir/model/interface'
+require 'expressir/model/interface_item'
+require 'expressir/model/interfaced_item'
 require 'expressir/model/parameter'
 require 'expressir/model/procedure'
-require 'expressir/model/renamed_ref'
 require 'expressir/model/repository'
 require 'expressir/model/rule'
 require 'expressir/model/schema'

data/lib/expressir/model/attribute.rb

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

data/lib/expressir/model/constant.rb

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

data/lib/expressir/model/entity.rb

@@ -1,7 +1,6 @@
 module Expressir
   module Model
     class Entity < ModelElement
-      include Scope
       include Identifier
 
       attr_accessor :abstract
@@ -19,11 +18,13 @@ module Expressir
 
         @abstract = options[:abstract]
         @supertype_expression = options[:supertype_expression]
-        @subtype_of = options[:subtype_of]
+        @subtype_of = options.fetch(:subtype_of, [])
         @attributes = options.fetch(:attributes, [])
         @unique = options.fetch(:unique, [])
         @where = options.fetch(:where, [])
         @informal_propositions = options.fetch(:informal_propositions, [])
+
+        super
       end
 
       def children

data/lib/expressir/model/enumeration_item.rb

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

data/lib/expressir/model/expressions/aggregate_initializer.rb

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

data/lib/expressir/model/expressions/aggregate_item.rb

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

data/lib/expressir/model/expressions/attribute_reference.rb

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

data/lib/expressir/model/expressions/binary_expression.rb

@@ -33,6 +33,8 @@ module Expressir
           @operator = options[:operator]
           @operand1 = options[:operand1]
           @operand2 = options[:operand2]
+
+          super
         end
       end
     end

data/lib/expressir/model/expressions/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/expressions/entity_constructor.rb

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

data/lib/expressir/model/expressions/group_reference.rb

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

data/lib/expressir/model/expressions/index_reference.rb

@@ -10,6 +10,8 @@ module Expressir
           @ref = options[:ref]
           @index1 = options[:index1]
           @index2 = options[:index2]
+
+          super
         end
       end
     end