expressir 2.4.61-arm-linux → 2.4.63-arm-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eed4408f7187afa171995f1e6efea55425822a5b3acb33ae7ed7b659532bf5c0
-  data.tar.gz: a62e05ed6102e8374d51b1d6c0b387983daefe5f4aa606e0f7f8c853f68caade
+  metadata.gz: d6a7ac697ab324b957b79b990d5ffa290407be24404eb6327fee3c98af4d06fa
+  data.tar.gz: a90d722dd4adae788cd3a82c3c79bab75ef38f92e73704d9b3076649a4e37955
 SHA512:
-  metadata.gz: c9d3045425d53fd50a3388c8832d06b83f6268e96f0ce07bf97a7e04fbcb21f11c1e5a68e13166b69a2a1cfa511db0542f2ca2662e5c58c5357d1337ce99c547
-  data.tar.gz: 6aabee62b6b20af41a8a99e5576e0a24f0778f5bcde82b3d3027dc67d7e8a199f57c32d5e89eb060b3c3a844df069b233bbf1162a1aff49531e67a6b1703ba09
+  metadata.gz: 9ad070295b64fe439f1a138feb5603b19904e55f92b9fb6209b32451ddfb0b34990644cdeeec3b18401b264fbfac4cefe7b907c4f523fc78f91a60e763839a8b
+  data.tar.gz: 6ab8b7f53ca49b7b764f7f068a3f073cc4ea6774c356ca132a706521dca88e68216004b28f29b5cca95917f6a3e05b6d4716bf9d23868c45fdc9efdffdc876bc

data/lib/expressir/express/node_position_index.rb

@@ -69,12 +69,6 @@ module Expressir
         entries.sort_by { |n| node_order(n) }
       end
 
-      # First node (in node order) that is_a?(type), memoized per type.
-      def first_node_of_type(type)
-        @first_of_type ||= {}
-        @first_of_type[type] ||= @nodes.find { |n| n[:node].is_a?(type) }&.dig(:node)
-      end
-
       def semantic_entries
         @semantic_entries ||=
           @nodes.select { |n| n[:line] && semantic?(n[:node]) }
@@ -200,7 +194,19 @@ module Expressir
         end
 
         candidates.min_by { |n| node_order(n) }&.dig(:node) ||
-          first_node_of_type(node_type)
+          containing_node_of_type(node_type, remark_line)
+      end
+
+      # A comment on an END_XXX line whose scope's recorded end sits past
+      # the line — remark items live between declarations, and their spans
+      # push the owner's end_line beyond END_XXX — resolves by span
+      # containment. Falls back to nil, not the first node of the type:
+      # handing an unresolvable END_FUNCTION comment to the first function
+      # piled every stray tail onto one owner (#609).
+      def containing_node_of_type(type, line)
+        semantic_entries
+          .select { |n| n[:node].is_a?(type) && n[:end_line] && line.between?(n[:line], n[:end_line]) }
+          .min_by { |n| node_order(n) }&.dig(:node)
       end
 
       private

data/lib/expressir/express/remark_attacher.rb

@@ -163,7 +163,13 @@ module Expressir
 
             # Strategy 3: Create implicit item for qualified paths only
             if target.nil? && tag.include?(".")
-              if containing_scope && function_rule_procedure?(containing_scope)
+              # A tag whose first segment is a schema id is already
+              # absolute: prepending the containing scope's path would
+              # double-count it, and the implicit walk would then name
+              # the item after the schema (#609 — `(*"s.f.lv"` inside f
+              # must create `lv`, not `s`).
+              absolute_tag = get_schema_ids(@model).include?(tag.split(".").first)
+              if containing_scope && function_rule_procedure?(containing_scope) && !absolute_tag
                 scope_path = build_scope_path(containing_scope)
                 if scope_path
                   target = create_implicit_remark_item(@model, "#{scope_path}.#{tag}",
@@ -205,7 +211,8 @@ module Expressir
 
           line_content = line_content_for(remark.line)
           if end_scope_line?(line_content)
-            matched_node = @node_index.node_for_end_scope_at(remark.line, line_content)
+            matched_node = @node_index.node_for_end_scope_at(remark.line, line_content) ||
+              scope_owner_for_end_line(remark.line, line_content)
             if matched_node
               add_remark(matched_node, remark.text, format: remark.format, tag: nil,
                                                     source_offset: remark.position)
@@ -235,6 +242,34 @@ module Expressir
         line_content =~ /END_(SCHEMA|ENTITY|TYPE|FUNCTION|PROCEDURE|RULE)/i
       end
 
+      # A comment on an END_XXX line belongs to the scope that XXX closes.
+      # Spans can miss on the grammar lane — source strings there are
+      # reconstructions whose lengths undershoot the node's real extent,
+      # so neither the end-window nor containment reaches the END line
+      # (expressir#609 drift) — so this falls back to the scope walk: the
+      # construct open at the START of the END line is the scope being
+      # closed, by construction of the map.
+      def scope_owner_for_end_line(line, line_content)
+        type = case line_content
+               when /END_SCHEMA/i then Model::Declarations::Schema
+               when /END_ENTITY/i then Model::Declarations::Entity
+               when /END_TYPE/i then Model::Declarations::Type
+               when /END_FUNCTION/i then Model::Declarations::Function
+               when /END_PROCEDURE/i then Model::Declarations::Procedure
+               when /END_RULE/i then Model::Declarations::Rule
+               end
+        active = active_scope_map[line]
+        return nil unless type.is_a?(Class) && active.is_a?(Array)
+
+        klass, opener_line = active
+        # ENTITY/TYPE openers are tracked as :other — the walk is
+        # line-accurate, so trust it for those ends.
+        return nil unless klass == type || (klass == :other && [Model::Declarations::Entity, Model::Declarations::Type].include?(type))
+
+        @node_index.starting_at(opener_line)
+          .find { |n| n[:node].is_a?(type) }&.dig(:node)
+      end
+
       # Own-line body comments belong to the next statement in the same
       # statement region (Function body, THEN branch, ELSE branch, loop body):
       # attached there with LEADING placement. A comment with no following
@@ -553,6 +588,19 @@ module Expressir
         # from its closing keyword by an empty line still closes that body.
         while probe <= source_line_count
           content = line_content_for(probe).to_s.strip
+          # Embedded remark blocks (`(*"tag" ... *)`) that the renderer
+          # emits between a trailing comment and the closing keyword:
+          # skip the whole block, the keyword lies beyond it (#609).
+          if content.start_with?("(*")
+            # A single-line block carries its own "*)": only hunt for a
+            # closer when the start line does not have one.
+            unless content.include?("*)")
+              probe += 1
+              probe += 1 while probe <= source_line_count && !line_content_for(probe).to_s.include?("*)")
+            end
+            probe += 1
+            next
+          end
           break unless content.empty? || content.start_with?("--")
 
           probe += 1

data/lib/expressir/version.rb

@@ -3,6 +3,6 @@ module Expressir
   # autoload it (Ruby autoload only works for module/class constants, not
   # for string constants like `Expressir::VERSION`).
   module Version
-    VERSION = "2.4.61".freeze
+    VERSION = "2.4.63".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.61
+  version: 2.4.63
 platform: arm-linux
 authors:
 - Ribose Inc.