expressir 2.4.60-x86_64-linux → 2.4.62-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1842449a26993ce58d415dbc1f525ef65a2f04baabf723be60fba33fa5e4b0c
-  data.tar.gz: d452b99ecb213b20a364f1317e97af8ed3061ebbace7a324cd19db95746e5c88
+  metadata.gz: 830afa636974a52efbae5fc4466c5f5352d922b6fcfe23abf652a9b47a2634a2
+  data.tar.gz: 89b3284e73f98d92a565b25f9530d047587f1cad4ac25f58cf60047d31b62199
 SHA512:
-  metadata.gz: 2ac5a8573061ba2e6c9383ed7ff5a1a1711fce4488da5ac5c4fdaf7d6f5bf9e005fd16c44328a86a7ead4981faaca241552bcfa8f8b295932785f5c8e6a03f18
-  data.tar.gz: 8ec14a01674464bacff9e7cc9cc3241d89044ac7842ba50e5843ba0756167e28b562eb0f09715b0b7ab2cdc0deb473543edf598c666edafc0868749c95c2e41f
+  metadata.gz: 17368dc0a11d176a80b4bc03a7ee4f43f44d42e42494786f591ec3752134e275a62eebcad6f274e632f4d0e2051a2fd59ef062ba37068ce133a2dc386c4b09d6
+  data.tar.gz: 632612a1d0abcae9d0f255a08903e44446991dbdc25c603c46af3f7ec97fcec7857742bc562860048362c51c1a0a7409b56f436cd6281c4ec15fa4c8af9801b6

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: x86_64-linux
 authors:
 - Ribose Inc.