expressir 2.4.60-aarch64-linux → 2.4.62-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bd534146e38bce1cb359cb26a194a6d2610bb7e24afb8cd5cac4fb7f266a71f
-  data.tar.gz: 0cc618e037f25541dd953a41bc362e676516b906cc30361f2b698980ffb4a61d
+  metadata.gz: 324e4deb12881b3d886c9d9ca434195fb2528da4cfe3b8f9d3f1026fbb655dc1
+  data.tar.gz: 12c72a4b83092d211a6c3b801e6cf6c7d060f5d372d97de1796b38de0bf231ff
 SHA512:
-  metadata.gz: c9c02402171ba4a5ee42858c3f349614f18e869284371a92a6f113cdb7613d138ab64c371e3f4b923e71ec11add272f763be9d9e4102fbb0bf38fc9c2a56b2e2
-  data.tar.gz: c375bba8a55f80a81b58bc8266efa4855009be7cd06b738ac968b13760e34bd65f65fdeb43157c7cc405e4d4000a82a437682906c728c2d81781ea839264926e
+  metadata.gz: efdaa3dd0530e121d4eef30e643db63de5a5450e22e84ab8eff2a1c4237c41fdf89844248fc8351e4d7e71b540ee904f002d696b0c00b299d159171f275fb340
+  data.tar.gz: bd907900898f2e9ed50c128e3c4eb6478d29cf810cba30d75242fd3724d2032c3a666dfd576c607ee49406403f8685fb697c5ab32a5c9fd466323e17ba3c64da

data/lib/expressir/express/formatters/declarations_formatter.rb

@@ -619,7 +619,10 @@ module Expressir
                  "",
                ]
              end,
-            *format_remark_items(node),
+            # A blank line before each remark-item child, mirroring the
+            # core-lane schema emitter — the two lanes must render
+            # remark.exp byte-identically for the formatter golden.
+            *format_remark_items(node).flat_map { |x| ["", x] },
             [
               "END_SCHEMA",
               ";",

data/lib/expressir/express/formatters/remark_item_formatter.rb

@@ -29,15 +29,22 @@ module Expressir
             tag = tag.delete_prefix(prefix) if prefix && tag.start_with?(prefix)
           end
 
-          # One line per remark. Single-line remarks take the tail form
-          # (the dominant inline convention); multi-line text takes the
-          # block form, which a tail line cannot express.
+          # Remark items are WG12 annotation blocks: the embedded form,
+          # a block per remark, matching the source convention of the
+          # annotated corpora (the conservation pairs are embedded, so
+          # tail-form emission reads as phantom gains). Rule-context
+          # owners keep the historic bare-tag tail form.
+          if rule_context
+            return node.remarks
+                .map { |remark| "--\"#{tag}\" #{remark}" }
+                .join("\n")
+          end
           node.remarks.map do |remark|
             remark = remark.to_s
             if remark.include?("\n")
               "(*\"#{tag}\"\n#{remark}\n*)"
             else
-              "--\"#{tag}\" #{remark}"
+              "(*\"#{tag}\" #{remark} *)"
             end
           end.join("\n")
         end

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}",

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.60".freeze
+    VERSION = "2.4.62".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 2.4.60
+  version: 2.4.62
 platform: aarch64-linux
 authors:
 - Ribose Inc.