yeptris 0.6.26.2-arm-linux-eabihf → 0.6.28.1-arm-linux-eabihf

data/vendor/libyeptris/src/yeptris/dom/ytape.h

@@ -30,6 +30,7 @@ extern "C" {
 #endif
 
 typedef struct yep_pool yep_pool;
+struct yep_resolver;
 
 typedef struct yep_ytape {
     uint64_t* w;
@@ -42,7 +43,10 @@ typedef struct yep_ytape {
     int flow_strict; /* mirrors dom->flow_strict (0 everywhere today) */
     int docs;        /* DOCUMENT_START count (the empty-stream check) */
     int oom;
-    uint32_t flow_mark; /* record mark for the staged flow build */
+    uint32_t flow_mark;    /* record mark for the staged flow build */
+    struct yep_pool* pool; /* fused block-scalar content (owned by the doc
+                            * after a successful run; NULL on the engine route) */
+    void* flow_scratch;    /* the flow classifier's reused json-tape scratch */
 } yep_ytape;
 
 /* Record kinds — byte 7 of a word. */
@@ -62,6 +66,21 @@ enum {
 /* Recorder lifecycle. Returns 0, or -1 when the word carve fails
  * (caller answers YEPTRIS_ERROR_MEMORY — bounded-parse law). */
 int ytap_init(yep_ytape* t, const char* input, size_t len, int max_depth);
+
+/* The fused block runner (TODO.restructure/79): ONE sweep per line
+ * emitting the same records the engine's sink would. Returns 0 when
+ * the document was fully owned; 1 on any bail (the caller resets the
+ * tape and runs the engine route). */
+int ytap_fused_run(yep_ytape* t, const struct yep_resolver* resolver);
+
+/* The flow-rooted fast path: a document that is exactly one flow
+ * collection plus whitespace takes the classification directly —
+ * the block runner and the engine never run. Returns 0 when owned;
+ * 1 on any fallback. */
+int ytap_flow_rooted(yep_ytape* t);
+
+/* Rewind a bailed tape for the engine re-run. */
+void ytap_reset(yep_ytape* t);
 void ytap_sink(yep_ytape* t, yep_sink* sink);
 void ytap_free(yep_ytape* t);
 

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

@@ -156,7 +156,7 @@ YEPTRIS_API YeptrisDocument yeptris_parse_json(const char* buf, size_t len, Yept
                 st = YEPTRIS_ERROR_MEMORY;
                 goto jfail;
             }
-            if (yep_tape_walk_lenient_fused(buf, len, off, t, 1, 1) == YEPTRIS_OK) {
+            if (yep_tape_walk_lenient_fused(buf, len, off, t, 1, 1, 0) == YEPTRIS_OK) {
                 /* strict_nums=1: the arms validated the numbers at
                  * record time — the settle pass is gone (the profile's
                  * 10% lane; the spans were cache-warm in the walk) */
@@ -402,7 +402,27 @@ engine_enter:
                           .on_block_open = dom_on_block_open,
                           .on_block_item = dom_on_block_item};
     }
-    int rc = yep_engine_run(eng, data, data_len, &sink);
+    int rc = 0;
+    if (have_tape && ytap_flow_rooted(&yt) == 0) {
+        /* a pure flow-rooted document: the classification ran once and
+         * the scaffolding landed — neither runner nor engine runs */
+        yep_engine_destroy(eng);
+        eng = NULL;
+    } else if (have_tape &&
+               ytap_fused_run(&yt, (opts != NULL && opts->schema == YEPTRIS_SCHEMA_11_COMPAT)
+                                       ? yep_resolver_compat11()
+                                       : yep_resolver_core12()) == 0) {
+        /* the fused block runner owned the whole document — the engine
+         * never runs (TODO.restructure/79). Its only cost was the parse
+         * front-end above; on a bail it unwound and the engine runs. */
+        yep_engine_destroy(eng);
+        eng = NULL;
+    } else {
+        if (have_tape) {
+            ytap_reset(&yt);
+        }
+        rc = yep_engine_run(eng, data, data_len, &sink);
+    }
     if (rc != 0) {
         const yep_error* ee = yep_engine_error(eng);
         yep_err_code code = ee ? ee->code : YEP_ERR_UNEXPECTED;
@@ -479,6 +499,10 @@ engine_enter:
             goto fail;
         }
         *heap_tape = yt;
+        if (yt.pool != NULL && doc->finish_pool == NULL) {
+            doc->finish_pool = yt.pool; /* fused block-scalar content: the
+                                         * document owns it until replay copies */
+        }
         doc->dom = NULL;
         doc->lazy_tape = heap_tape;
         doc->lazy_kind = 1;

data/vendor/libyeptris/src/yeptris/scan/json.c

@@ -277,8 +277,8 @@ int yep_json_number_scan(const char* p, size_t len, size_t* i, int* is_float, in
                 /* no more digits and not a float/exponent — settle */
                 if (end < len) {
                     char c = p[end];
-                    if (c != ' ' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' &&
-                        c != ':') {
+                    if (c != ' ' && c != '\t' && c != '\n' && c != '\r' && c != ',' && c != ']' &&
+                        c != '}' && c != ':') {
                         return 0; /* "1x" is YAML, not JSON */
                     }
                 }
@@ -299,8 +299,8 @@ int yep_json_number_scan(const char* p, size_t len, size_t* i, int* is_float, in
                                (p[end] < '0' || p[end] > '9'))) {
                 if (end < len) {
                     char c = p[end];
-                    if (c != ' ' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' &&
-                        c != ':') {
+                    if (c != ' ' && c != '\t' && c != '\n' && c != '\r' && c != ',' && c != ']' &&
+                        c != '}' && c != ':') {
                         return 0;
                     }
                 }
@@ -387,7 +387,8 @@ int yep_json_number_scan(const char* p, size_t len, size_t* i, int* is_float, in
     }
     if (k < len) {
         char c = p[k];
-        if (c != ' ' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' && c != ':') {
+        if (c != ' ' && c != '\t' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' &&
+            c != ':') {
             return 0; /* "1x" is YAML, not JSON */
         }
     }
@@ -477,7 +478,8 @@ int yep_json_number_shape(const char* p, size_t len, size_t* i, int* is_float) {
     }
     if (k < len) {
         char c = p[k];
-        if (c != ' ' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' && c != ':') {
+        if (c != ' ' && c != '\t' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' &&
+            c != ':') {
             return 0; /* "1x" is YAML, not JSON */
         }
     }
@@ -497,7 +499,8 @@ int yep_json_literal(const char* p, size_t len, size_t* i, const char* word) {
     *i += w;
     if (*i < len) {
         char c = p[*i];
-        if (c != ' ' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' && c != ':') {
+        if (c != ' ' && c != '\t' && c != '\n' && c != '\r' && c != ',' && c != ']' && c != '}' &&
+            c != ':') {
             return 0; /* "truex" is a YAML plain, not JSON */
         }
     }