yeptris 0.6.18.2-arm-linux-eabihf → 0.6.19.1-arm-linux-eabihf

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d861d71fda8e06d38693a273a8c3eea7cbe96325af1eb0e4d2fdcc4bf7f08e46
-  data.tar.gz: 1120adc922c754da05873a318e2406206606ca966d22b79a686e08192b4a0e4d
+  metadata.gz: 64530aa53c5671af0f95cb5f727a69cd1765fa86af7fbb51accaeb43fcb7357a
+  data.tar.gz: 3214755f5922f24510501628009e5dce2aab3c4c232037bc543d36435c628385
 SHA512:
-  metadata.gz: a68230754f4f90049a59ea30d8d8abb903c8fdef3f5e26abf5b110fd966d4da973c811d8e4c55750034aaa2207289f9fed60ed50f5065125b7b6854b44c5bce4
-  data.tar.gz: eb0d85052b73579c0809a9b1aef3f6be57ee5aff43406b9569f7f77189d23af3471d4bd29b5d9f4815a50bd661e20007a7c93fc6b3a2bac8d842a1a7001da921
+  metadata.gz: d14f52f172a20abe10f11604284ec9e1d7e18139da58e510a7576b205575caae0ef1adb7aed293dd9da679b066664bb89ddda5bd0c5f2121f0125b9ed95de0ab
+  data.tar.gz: e6d35406f4d30785f220a909e1f51e031d6c7b911b9d2fec6eda1c6c07f3b2469f0d991ee0ab6e0426862af89f7b5239a071a228065cae123d284826d88fdf7e

data/lib/yeptris/materializer.rb

@@ -12,9 +12,10 @@ module Yeptris
   # materializer (Node#to_ruby) stays for node-based use; this is the
   # Yeptris::YAML fast path.
   class Materializer
-    RECORD_SIZE = 36 # YeptrisEventRecord layout (events.h, ABI-pinned)
-    FIELDS = 12      # unpacked values per record
-    RECORD_UNPACK = "C4V8" # type/style/flags/tag_id, line..tag_len
+    RECORD_SIZE = 44 # YeptrisEventRecord layout (events.h, ABI-pinned;
+                     # #179 added end_line/end_col in the 0.6.19 window)
+    FIELDS = 14      # unpacked values per record
+    RECORD_UNPACK = "C4V10" # type/style/flags/tag_id, line..tag_len
 
     STREAM_START = 1
     STREAM_END = 2
@@ -256,10 +257,10 @@ module Yeptris
           # not the text
           tag_id = flat[i + 3]
           v = Materializer.scan_by_tag(
-            arena[flat[i + 6], flat[i + 7]], tag_id, (flat[i + 2] & EF_IMPLICIT) != 0
+            arena[flat[i + 8], flat[i + 9]], tag_id, (flat[i + 2] & EF_IMPLICIT) != 0
           )
-          l = flat[i + 9]
-          anchors[arena[flat[i + 8], l]] = v if l != 0
+          l = flat[i + 11]
+          anchors[arena[flat[i + 10], l]] = v if l != 0
           # place(): the scalar fast path inlined — the overwhelming
           # majority of events land here
           if stack.empty?
@@ -284,22 +285,22 @@ module Yeptris
           end
         when MAPPING_START
           h = {}
-          l = flat[i + 9]
-          anchors[arena[flat[i + 8], l]] = h if l != 0
+          l = flat[i + 11]
+          anchors[arena[flat[i + 10], l]] = h if l != 0
           merge_target.push(place(docs, stack, pending_key, pending_key_merge, h))
           stack.push(h)
           pending_key.push(nil)
           pending_key_merge.push(nil)
         when SEQUENCE_START
           a = []
-          l = flat[i + 9]
-          anchors[arena[flat[i + 8], l]] = a if l != 0
+          l = flat[i + 11]
+          anchors[arena[flat[i + 10], l]] = a if l != 0
           merge_target.push(place(docs, stack, pending_key, pending_key_merge, a))
           stack.push(a)
           pending_key.push(nil)
           pending_key_merge.push(nil)
         when ALIAS
-          name = arena[flat[i + 6], flat[i + 7]]
+          name = arena[flat[i + 8], flat[i + 9]]
           raise Yeptris::ParseError, "unknown anchor: #{name.inspect}" unless anchors.key?(name)
 
           place(docs, stack, pending_key, pending_key_merge, anchors[name])

data/lib/yeptris/psych/handler.rb

@@ -49,6 +49,11 @@ module Yeptris
 
       def alias(anchor); end
 
+      # #179: called before EVERY event with the event's 0-based marks
+      # (psych 5's contract — TreeBuilder stashes them for node
+      # locations). No-op by default; handlers that care override it.
+      def event_location(start_line, start_column, end_line, end_column); end
+
       # +style+ is one of the scalar constants above; +plain+ /
       # +quoted+ are the implicit-typing flags (plain: resolvable
       # without a tag).

data/lib/yeptris/psych/parser.rb

@@ -52,12 +52,17 @@ module Yeptris
         h = @handler
         i = 0
         while i < flat.length
+          # #179: psych's parser calls event_location before every
+          # event; TreeBuilder stashes the marks for node locations
+          # (0-based).
+          h.event_location(flat[i + 4] - 1, flat[i + 5] - 1,
+                           flat[i + 6] - 1, flat[i + 7] - 1)
           type = flat[i]
           style = flat[i + 1]
           flags = flat[i + 2]
-          value = field(flat, arena, i + 6)
-          anchor = field(flat, arena, i + 8)
-          tag = field(flat, arena, i + 10)
+          value = field(flat, arena, i + 8)
+          anchor = field(flat, arena, i + 10)
+          tag = field(flat, arena, i + 12)
           case type
           when STREAM_START then h.start_stream(UTF8)
           when STREAM_END then h.end_stream

data/lib/yeptris/psych/tree_builder.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+module Yeptris
+  module Psych
+    # The stdlib TreeBuilder port (#179): builds a Nodes tree carrying
+    # start/end line:column on every node. The parser calls
+    # event_location before each event (psych 5's exact contract);
+    # stdlib's class is the reference — this port follows it
+    # function-for-function over the binding's keyword-arg Nodes.
+    class TreeBuilder < Handler
+      attr_reader :root
+
+      def initialize
+        super
+        @stack = []
+        @last = nil
+        @root = nil
+        @start_line = nil
+        @start_column = nil
+        @end_line = nil
+        @end_column = nil
+      end
+
+      def event_location(start_line, start_column, end_line, end_column)
+        @start_line = start_line
+        @start_column = start_column
+        @end_line = end_line
+        @end_column = end_column
+      end
+
+      %w[Sequence Mapping].each do |node|
+        class_eval <<~RUBY, __FILE__, __LINE__ + 1
+          def start_#{node.downcase}(anchor, tag, implicit, style)
+            n = Nodes::#{node}.new(anchor: anchor, tag: tag, style: style)
+            set_start_location(n)
+            @last.children << n
+            push n
+          end
+
+          def end_#{node.downcase}
+            n = pop
+            set_end_location(n)
+            n
+          end
+        RUBY
+      end
+
+      def start_document(version, tag_directives, implicit)
+        n = Nodes::Document.new(version, tag_directives)
+        set_start_location(n)
+        @last.children << n
+        push n
+      end
+
+      def end_document(_implicit = false)
+        n = pop
+        set_end_location(n)
+        n
+      end
+
+      def start_stream(_encoding)
+        n = Nodes::Stream.new
+        set_start_location(n)
+        @root = n
+        push n
+      end
+
+      def end_stream
+        n = pop
+        set_end_location(n)
+        n
+      end
+
+      def scalar(value, anchor, tag, plain, quoted, style)
+        n = Nodes::Scalar.new(value, anchor: anchor, tag: tag,
+                              plain: plain, quoted: quoted, style: style)
+        set_location(n)
+        @last.children << n
+        n
+      end
+
+      def alias(anchor)
+        n = Nodes::Alias.new(anchor)
+        set_location(n)
+        @last.children << n
+        n
+      end
+
+      private
+
+      def push(value)
+        @stack.push(value)
+        @last = value
+      end
+
+      def pop
+        value = @stack.pop
+        @last = @stack.last
+        value
+      end
+
+      def set_location(n)
+        n.start_line = @start_line
+        n.start_column = @start_column
+        n.end_line = @end_line
+        n.end_column = @end_column
+      end
+
+      def set_start_location(n)
+        set_location(n)
+      end
+
+      def set_end_location(n)
+        n.end_line = @end_line
+        n.end_column = @end_column
+      end
+    end
+  end
+end

data/lib/yeptris/psych.rb

@@ -86,6 +86,8 @@ module Yeptris
     # own entry so referencing Psych::Handlers triggers the load
     autoload :Handlers, "yeptris/psych/handler"
     autoload :Parser, "yeptris/psych/parser"
+    # #179: the located tree builder (stdlib's class, ported)
+    autoload :TreeBuilder, "yeptris/psych/tree_builder"
     autoload :CoderShim, "yeptris/psych/coder_shim"
     autoload :Visitors, "yeptris/psych/visitors"
     # The typed opt-in marker for arbitrary-object dump/load
@@ -425,6 +427,8 @@ module Yeptris
         include Enumerable
 
         attr_reader :children
+        # #179: the event marks (0-based), applied by TreeBuilder
+        attr_accessor :start_line, :start_column, :end_line, :end_column
         attr_reader :handle # @api private — the Yeptris::Node
         # @api private — the tree builder attaches handles; a writer,
         # never instance_variable_set from outside

data/lib/yeptris.rb

@@ -3,7 +3,7 @@
 module Yeptris
   # The gem's version lives in the parent namespace's file — the last
   # internal require (yeptris/version) retired with it.
-  VERSION = "0.6.18.2".freeze
+  VERSION = "0.6.19.1".freeze
   # The error hierarchy lives in THIS file (the parent namespace's
   # own file): nested constants do not trigger a parent-constant
   # autoload, and the law forbids internal requires — defining the

data/vendor/libyeptris/CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(yeptris
-    VERSION 0.6.18
+    VERSION 0.6.19
     DESCRIPTION "Ultra-fast YAML 1.2 parser, emitter and streamer in C"
     LANGUAGES C CXX
 )

data/vendor/libyeptris/src/include/yeptris/events.h

@@ -66,6 +66,9 @@ typedef struct {
     size_t tag_len;
     uint32_t line; /* 1-based node start */
     uint32_t col;
+    uint32_t end_line; /* #179: libyaml end_mark semantics — 1-based line,
+                        * col one past the node's end token */
+    uint32_t end_col;
 } YeptrisEvent;
 
 /* ---- push ------------------------------------------------------------- */
@@ -106,13 +109,17 @@ typedef struct {
                      * struct's pad byte: sizeof stays 36 (ABI-pinned) */
     uint32_t line;
     uint32_t col;
+    uint32_t end_line; /* #179: libyaml end_mark semantics (see the
+                        * internal event) — 1-based, col past the end */
+    uint32_t end_col;
     uint32_t value_off;
     uint32_t value_len;
     uint32_t anchor_off;
     uint32_t anchor_len;
     uint32_t tag_off;
     uint32_t tag_len;
-} YeptrisEventRecord;
+} YeptrisEventRecord; /* 44B — the bindings mirror this layout in the
+                         same lockstep window (the 0.6.9 law) */
 
 YEPTRIS_API YeptrisRecorder yeptris_recorder_new(void);
 

data/vendor/libyeptris/src/yeptris/events/capture.c

@@ -7,7 +7,7 @@
 #include "../../include/yeptris/events.h"
 
 /* The record IS the public ABI shape (events.h pins it). */
-YEPTRIS_CT_ASSERT(sizeof(YeptrisEventRecord) == 36);
+YEPTRIS_CT_ASSERT(sizeof(YeptrisEventRecord) == 44);
 
 void yep_rec_init(yep_rec_store* s) {
     s->recs = NULL;
@@ -114,6 +114,8 @@ int yep_rec_on_event(void* ctx, const yep_event* ev) {
     }
     r->line = ev->line;
     r->col = ev->col;
+    r->end_line = ev->end_line;
+    r->end_col = ev->end_col;
     r->value_off = arena_put(s, (const char*)ev->value.p, (uint32_t)ev->value.len);
     r->value_len = (uint32_t)ev->value.len;
     r->anchor_off = arena_put(s, (const char*)ev->anchor.p, (uint32_t)ev->anchor.len);
@@ -135,6 +137,8 @@ void yep_rec_materialize(const yep_rec_store* s, size_t i, void* out) {
     e->implicit = (r->flags & YEPTRIS_EF_IMPLICIT) != 0;
     e->line = r->line;
     e->col = r->col;
+    e->end_line = r->end_line;
+    e->end_col = r->end_col;
     if (r->value_len > 0) {
         e->value = s->arena + r->value_off;
         e->value_len = r->value_len;

data/vendor/libyeptris/src/yeptris/parse/engine.c

@@ -104,8 +104,11 @@ struct yep_engine {
         yep_view handle, prefix;
     } tagmap[8];
     int tagmap_n;
-    int saw_yaml; /* %YAML seen for the pending document */
-    void* step;   /* yep_stepstate: resumable stepping (07) */
+    int saw_yaml;     /* %YAML seen for the pending document */
+    size_t doc_begin; /* #179: first directive line of the pending doc
+                       * (SIZE_MAX = none) — libyaml's DOCUMENT_START
+                       * start_mark includes directives */
+    void* step;       /* yep_stepstate: resumable stepping (07) */
 
     /* Flow single-pair deferral: a sequence entry's events are buffered
      * until we know whether ':' follows ("[a: b]" needs MAP_START before
@@ -134,6 +137,34 @@ static uint32_t e_col(const yep_engine* e, size_t at) {
     return at >= e->line_start ? (uint32_t)(at - e->line_start) : 0;
 }
 
+/* #179: the (1-based line, 1-based col) of a byte offset. Unlike
+ * e_col this handles offsets on PRIOR lines — event ends whose scan
+ * already advanced past them (block scalars, collection closes).
+ * The backward walk covers only the span's own lines, so the total
+ * across a document stays linear in its size. */
+static void e_pos_mark(const yep_engine* e, size_t at, uint32_t* line, uint32_t* col) {
+    if (at >= e->line_start) {
+        *line = e->line;
+        *col = (uint32_t)(at - e->line_start) + 1;
+        return;
+    }
+    uint32_t l = e->line;
+    size_t ls = e->line_start;
+    while (at < ls && ls > 0) {
+        /* p[ls-1] is the newline ENDED the previous line: start the
+         * walk below it, or ls never decreases (the infinite-loop bug
+         * the Stepping.Directive hang found) */
+        size_t q = ls - 1;
+        while (q > 0 && e->p[q - 1] != '\n') {
+            q--;
+        }
+        ls = q; /* line_start(l-1) */
+        l--;
+    }
+    *line = l;
+    *col = (uint32_t)(at - ls) + 1;
+}
+
 static int e_fail(yep_engine* e, yep_err_code code, size_t at) {
     yep_error_set(&e->err, code, e->line, e_col(e, at) + 1, at, NULL);
     return -1;
@@ -374,6 +405,18 @@ static int e_open_seq(yep_engine* e, uint16_t col, uint32_t line, uint32_t coln,
     ev.tag = tag;
     ev.line = line;
     ev.col = coln;
+    ev.end_line = line; /* block opens are zero-span (libyaml) — except
+                         * the sequence at its parent mapping's column
+                         * ("k:\n- a"), which ends after the dash */
+    ev.end_col = coln;
+    for (int i = e->depth - 1; i >= 0; i--) {
+        if (e->frames[i].kind == YEP_FRAME_MAP) {
+            if (col == e->frames[i].col) {
+                ev.end_col = coln + 1;
+            }
+            break;
+        }
+    }
     return emit_now(e, &ev) == 0 ? 0 : -2;
 }
 
@@ -403,6 +446,8 @@ static int e_open_map(yep_engine* e, uint16_t col, uint32_t line, uint32_t coln,
     ev.tag = tag;
     ev.line = line;
     ev.col = coln;
+    ev.end_line = line; /* block opens are zero-span (libyaml) */
+    ev.end_col = coln;
     return emit_now(e, &ev) == 0 ? 0 : -2;
 }
 
@@ -436,6 +481,16 @@ static int e_close_to(yep_engine* e, int to_depth) {
         yep_event ev;
         e_event_init(&ev,
                      e->frames[e->depth].kind == YEP_FRAME_SEQ ? YEP_EV_SEQ_END : YEP_EV_MAP_END);
+        { /* libyaml: a block END's mark is the next token's position
+           * (zero-span) — the first non-space at the cursor, or EOF */
+            size_t at = e->pos;
+            while (at < e->len && e->p[at] == ' ') {
+                at++;
+            }
+            e_pos_mark(e, at, &ev.line, &ev.col);
+            ev.end_line = ev.line;
+            ev.end_col = ev.col;
+        }
         if (emit_now(e, &ev) != 0) {
             return -2;
         }
@@ -631,6 +686,7 @@ static int e_quoted_floor(yep_engine* e, yep_event* ev, uint16_t min_indent, int
         e->line_start = ls;
     }
     e->pos = after;
+    e_pos_mark(e, after, &ev->end_line, &ev->end_col);
     e_skip_inline_space(e);
     return 0;
 }
@@ -810,6 +866,7 @@ static int e_block_scalar(yep_engine* e, yep_event* ev, int parent_col) {
     ev->value.p = out; /* may be NULL for an empty block; len 0 */
     ev->borrowed = 0;
     ev->style = folded ? YEP_STYLE_FOLDED : YEP_STYLE_LITERAL;
+    e_pos_mark(e, e->pos, &ev->end_line, &ev->end_col);
     return 0;
 }
 
@@ -887,6 +944,11 @@ static int e_plain_multiline(yep_engine* e, yep_span s0, uint32_t block_floor, y
             break; /* the comment ends the scalar; later lines are new */
         }
     }
+    { /* #179: the source end = the last piece's content end */
+        const yep_view* last = &e->fold[e->fold_n - 1].content;
+        size_t lend = (size_t)(last->p - e->p) + last->len;
+        e_pos_mark(e, lend, &ev->end_line, &ev->end_col);
+    }
     if (e->fold_n == 1) {
         return 0; /* single line: the borrowed view stands */
     }
@@ -1082,6 +1144,7 @@ static int e_alias(yep_engine* e, yep_event* ev) {
                          the DOM borrows it like any plain scalar — no
                          arena copy per alias */
     ev->anchor_id = target;
+    e_pos_mark(e, e->pos, &ev->end_line, &ev->end_col);
     e_skip_inline_space(e);
     return 0;
 }
@@ -1224,6 +1287,7 @@ static int e_flow_node(yep_engine* e, yep_event* ev, int keyish) {
     if ((c == ',' || c == ']' || c == '}' || c == ':') &&
         (!yep_view_is_empty(anchor) || !yep_view_is_empty(tag))) {
         ev->implicit = 1; /* properties with no node: a tagged null */
+        e_pos_mark(e, e->pos, &ev->end_line, &ev->end_col);
         return 1;
     }
     if (c == '"' || c == '\'') {
@@ -1313,6 +1377,10 @@ static int e_flow_node(yep_engine* e, yep_event* ev, int keyish) {
     ev->style = YEP_STYLE_PLAIN;
     ev->implicit = 1;
     ev->multiline = (e->fold_n > 1) || crossed_break;
+    { /* #179: the source end = the last fold piece's content end */
+        const yep_view* lastp = &e->fold[e->fold_n - 1].content;
+        e_pos_mark(e, (size_t)(lastp->p - e->p) + lastp->len, &ev->end_line, &ev->end_col);
+    }
     return 1;
 }
 
@@ -1464,6 +1532,8 @@ static int e_flow_json(yep_engine* e, yep_view anchor, yep_view tag, uint32_t an
         ev.tag = tag;
         ev.line = cur_line;
         ev.col = (uint32_t)(open_pos + 1 - cur_ls) + 1;
+        ev.end_line = cur_line; /* flow opens end after the indicator */
+        ev.end_col = (uint32_t)(open_pos + 2 - cur_ls) + 1;
         if (emit_now(e, &ev) != 0) {
             return -2;
         }
@@ -1488,6 +1558,8 @@ static int e_flow_json(yep_engine* e, yep_view anchor, yep_view tag, uint32_t an
                 jx_advance_line(e, &cur_scan, i, &cur_line, &cur_ls);
             ev.line = cur_line;
             ev.col = (uint32_t)(i - cur_ls) + 1;
+            ev.end_line = cur_line;
+            ev.end_col = (uint32_t)(i + 1 - cur_ls) + 1;
             if (emit_now(e, &ev) != 0) {
                 return -2;
             }
@@ -1509,6 +1581,8 @@ static int e_flow_json(yep_engine* e, yep_view anchor, yep_view tag, uint32_t an
                 jx_advance_line(e, &cur_scan, i, &cur_line, &cur_ls);
             ev.line = cur_line;
             ev.col = (uint32_t)(i + 1 - cur_ls) + 1;
+            ev.end_line = cur_line; /* flow opens end after the indicator */
+            ev.end_col = (uint32_t)(i + 2 - cur_ls) + 1;
             if (emit_now(e, &ev) != 0) {
                 return -2;
             }
@@ -1582,6 +1656,11 @@ static int e_flow_json(yep_engine* e, yep_view anchor, yep_view tag, uint32_t an
                 return e_fail(e, YEP_ERR_KEY_TOO_LONG, vstart);
             }
         }
+        if (raw_end == vstart) {
+            raw_end = i; /* numbers/literals advance i, not raw_end */
+        }
+        ev.end_line = cur_line;
+        ev.end_col = (uint32_t)(raw_end - cur_ls) + 1;
         if (emit_now(e, &ev) != 0) {
             return -2;
         }
@@ -1652,6 +1731,8 @@ static int e_flow(yep_engine* e, yep_view anchor, yep_view tag, uint32_t anchor_
     ev.tag = tag;
     ev.line = e->line;
     ev.col = e_col(e, e->pos);
+    ev.end_line = e->line; /* flow opens end after the indicator */
+    ev.end_col = e_col(e, e->pos) + 1;
     if (emit_now(e, &ev) != 0) {
         return -2;
     }
@@ -1755,6 +1836,8 @@ static int e_flow(yep_engine* e, yep_view anchor, yep_view tag, uint32_t anchor_
             ev.tag = pt;
             ev.line = e->line;
             ev.col = e_col(e, e->pos);
+            ev.end_line = e->line; /* flow opens end after the indicator */
+            ev.end_col = e_col(e, e->pos) + 1;
             if (emit_now(e, &ev) != 0) {
                 return -2;
             }
@@ -1861,6 +1944,9 @@ static int e_flow(yep_engine* e, yep_view anchor, yep_view tag, uint32_t anchor_
                         mk.flow = 1;
                         mk.line = ev.line;
                         mk.col = ev.col;
+                        mk.end_line = ev.line; /* virtual opener: zero-span
+                                                * at the implied position */
+                        mk.end_col = ev.col;
                         if (emit_now(e, &mk) != 0) {
                             return -2;
                         }
@@ -2045,6 +2131,11 @@ static int e_flow(yep_engine* e, yep_view anchor, yep_view tag, uint32_t anchor_
             }
             e->pos++;
             e_event_init(&ev, st[n - 1].kind ? YEP_EV_MAP_END : YEP_EV_SEQ_END);
+            /* the close indicator's span: e->pos sits just past it */
+            ev.line = e->line;
+            ev.col = e_col(e, e->pos - 1) + 1;
+            ev.end_line = e->line;
+            ev.end_col = e_col(e, e->pos) + 1;
             if (emit_now(e, &ev) != 0) {
                 return -2;
             }
@@ -2135,6 +2226,9 @@ static int e_flow(yep_engine* e, yep_view anchor, yep_view tag, uint32_t anchor_
                 yep_event mk;
                 e_event_init(&mk, YEP_EV_MAP_START);
                 mk.flow = 1;
+                e_pos_mark(e, e->pos, &mk.line, &mk.col);
+                mk.end_line = mk.line; /* virtual opener: zero-span */
+                mk.end_col = mk.col;
                 if (emit_now(e, &mk) != 0) {
                     return -2;
                 }
@@ -2282,6 +2376,9 @@ static void e_key_event(const yep_engine* e, const yep_line_shape* sh, uint16_t
     kv->borrowed = 1;
     kv->line = line;
     kv->col = key_col + 1;
+    /* keys are single-line by the simple-key law; the cursor may have
+     * advanced past the line, so the mark comes from e_pos_mark */
+    e_pos_mark(e, sh->key_end, &kv->end_line, &kv->end_col);
 }
 
 static int e_classified(yep_engine* e, uint16_t floor_col) {
@@ -2786,6 +2883,7 @@ static int e_node(yep_engine* e, yep_ctx ctx, uint16_t floor_col) {
         kv.borrowed = 1;
         kv.line = e->line;
         kv.col = key_col + 1;
+        e_pos_mark(e, s.end, &kv.end_line, &kv.end_col);
         if (emit_now(e, &kv) != 0) {
             return -2;
         }
@@ -2958,6 +3056,20 @@ empty_value: {
     e->pend_anchor_id = 0;
     e->pend_tag.p = NULL;
     e->pend_tag.len = 0;
+    { /* libyaml: the implicit null sits just past the key's colon
+       * ("k:   " -> col 2, not the line end), zero-span */
+        size_t at = e->pos;
+        while (at > 0 && (e->p[at - 1] == ' ' || e->p[at - 1] == '\t' || e->p[at - 1] == '\n' ||
+                          e->p[at - 1] == '\r')) {
+            at--; /* the cursor may sit lines past the deferred key */
+        }
+        if (at == 0 || e->p[at - 1] != ':') {
+            at = e->pos; /* not a plain "key:" defer: the cursor stands */
+        }
+        e_pos_mark(e, at, &ev.line, &ev.col);
+        ev.end_line = ev.line;
+        ev.end_col = ev.col;
+    }
     return emit_now(e, &ev) == 0 ? 0 : -2;
 }
 }
@@ -3300,6 +3412,7 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
     yep_nametab_clear(&e->anchors);
     e->tagmap_n = 0;
     e->saw_yaml = 0;
+    e->doc_begin = (size_t)-1;
     e->doc_content = 0;
     e->q_key_pending = 0;
     e->q_value_pending = 0;
@@ -3312,6 +3425,10 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
     yep_event ev;
     if (emit_start) {
         e_event_init(&ev, YEP_EV_STREAM_START);
+        ev.line = 1;
+        ev.col = 1;
+        ev.end_line = 1;
+        ev.end_col = 1;
         if (emit_now(e, &ev) != 0) {
             return -2;
         }
@@ -3406,6 +3523,11 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
                     e->tagmap_n++;
                 }
             }
+            if (e->doc_begin == (size_t)-1) {
+                e->doc_begin = li.offset; /* libyaml: DOCUMENT_START's
+                                           * start_mark includes the
+                                           * leading directive lines */
+            }
             e_line_done(e, li.end);
             continue;
         }
@@ -3428,6 +3550,10 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
                 }
                 e->doc_content = 0;
                 e_event_init(&ev, YEP_EV_DOCUMENT_END);
+                e_pos_mark(e, li.offset + li.indent, &ev.line, &ev.col);
+                ev.end_line = ev.line; /* zero-span at the new marker —
+                                        * libyaml's implicit close mark */
+                ev.end_col = ev.col;
                 if (emit_now(e, &ev) != 0) {
                     return -2;
                 }
@@ -3437,6 +3563,10 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
             }
             e_event_init(&ev, YEP_EV_DOCUMENT_START);
             ev.style = 1; /* explicit marker */
+            e_pos_mark(e, e->doc_begin != (size_t)-1 ? e->doc_begin : li.offset + li.indent,
+                       &ev.line, &ev.col);
+            e_pos_mark(e, li.offset + li.indent + 3, &ev.end_line, &ev.end_col);
+            e->doc_begin = (size_t)-1;
             if (emit_now(e, &ev) != 0) {
                 return -2;
             }
@@ -3485,7 +3615,9 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
                     }
                 }
                 e_event_init(&ev, YEP_EV_DOCUMENT_END);
-                ev.style = 1;    /* explicit "..." marker */
+                ev.style = 1; /* explicit "..." marker */
+                e_pos_mark(e, li.offset + li.indent, &ev.line, &ev.col);
+                e_pos_mark(e, li.offset + li.indent + 3, &ev.end_line, &ev.end_col);
                 e->tagmap_n = 0; /* directives are per-document */
                 yep_nametab_clear(&e->anchors);
                 if (emit_now(e, &ev) != 0) {
@@ -3494,6 +3626,7 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
                 doc_open = 0;
                 e->doc_content = 0;
                 e->saw_yaml = 0;
+                e->doc_begin = (size_t)-1;
             }
             e_line_done(e, li.end);
             continue;
@@ -3501,6 +3634,14 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
 
         if (!doc_open) {
             e_event_init(&ev, YEP_EV_DOCUMENT_START);
+            if (e->doc_begin != (size_t)-1) {
+                e_pos_mark(e, e->doc_begin, &ev.line, &ev.col);
+            } else {
+                e_pos_mark(e, li.offset + li.indent, &ev.line, &ev.col);
+            }
+            ev.end_line = ev.line;
+            ev.end_col = ev.col;
+            e->doc_begin = (size_t)-1;
             if (emit_now(e, &ev) != 0) {
                 return -2;
             }
@@ -3670,6 +3811,9 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
             }
         }
         e_event_init(&ev, YEP_EV_DOCUMENT_END);
+        e_pos_mark(e, e->len, &ev.line, &ev.col);
+        ev.end_line = ev.line;
+        ev.end_col = ev.col;
         if (emit_now(e, &ev) != 0) {
             return -2;
         }
@@ -3678,6 +3822,9 @@ static int engine_run_impl(yep_engine* e, const char* buf, size_t len, const yep
     }
     if (emit_end) {
         e_event_init(&ev, YEP_EV_STREAM_END);
+        e_pos_mark(e, e->len, &ev.line, &ev.col);
+        ev.end_line = ev.line;
+        ev.end_col = ev.col;
         if (emit_now(e, &ev) != 0) {
             return -2;
         }

data/vendor/libyeptris/src/yeptris/parse/events.h

@@ -55,6 +55,12 @@ typedef struct yep_event {
                          * that key on it skip the name hash entirely. */
     uint32_t line;      /* 1-based position of the node start */
     uint32_t col;
+    uint32_t end_line; /* #179: 1-based position of the node's end —
+                        * libyaml's end_mark semantics: a START event
+                        * ends after its opening token, a scalar/alias
+                        * spans anchor/tag through content, an END
+                        * event spans its closing indicator */
+    uint32_t end_col;
 } yep_event;
 
 struct yep_block_value; /* value facts for on_block_pair (below) */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeptris
 version: !ruby/object:Gem::Version
-  version: 0.6.18.2
+  version: 0.6.19.1
 platform: arm-linux-eabihf
 authors:
 - Ribose Inc.
@@ -56,6 +56,7 @@ files:
 - lib/yeptris/psych/handler.rb
 - lib/yeptris/psych/parser.rb
 - lib/yeptris/psych/scalar_scanner.rb
+- lib/yeptris/psych/tree_builder.rb
 - lib/yeptris/psych/visitors.rb
 - lib/yeptris/schema.rb
 - lib/yeptris/valueml.rb