yeptris 0.6.34.3-arm-linux-eabihf → 0.6.35.2-arm-linux-eabihf

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

@@ -268,14 +268,33 @@ static uint32_t finish_double_body(const char* p, uint32_t start, uint32_t end,
         }
         case '\n':
         case '\r': {
-            /* line continuation: swallow the break and next line's leading spaces */
+            /* Escaped line break: the break itself is removed, but every
+             * break after it (whitespace-only lines included) contributes
+             * one newline, and the next line's leading whitespace is
+             * stripped. Folding the remaining run with the plain N-1 rule
+             * loses one break (libyaml and libfyaml agree on this count). */
             size_t j = i;
             if (p[j] == '\r' && j + 1 < end && p[j + 1] == '\n') {
                 j++;
             }
             j++;
-            while (j < end && (p[j] == ' ' || p[j] == '\t')) {
-                j++;
+            uint32_t extra = 0;
+            for (;;) {
+                while (j < end && (p[j] == ' ' || p[j] == '\t')) {
+                    j++;
+                }
+                if (j < end && (p[j] == '\n' || p[j] == '\r')) {
+                    if (p[j] == '\r' && j + 1 < end && p[j + 1] == '\n') {
+                        j++;
+                    }
+                    j++;
+                    extra++;
+                    continue;
+                }
+                break;
+            }
+            for (uint32_t k = 0; k < extra; k++) {
+                yep_buf_putc(b, '\n');
             }
             i = j;
             break;

data/vendor/libyeptris/src/yeptris/resolve/compat11.c

@@ -290,9 +290,15 @@ static yep_tag_id compat11(void* ctx, const char* p, uint32_t n) {
             return 1; /* plain 0 */
         }
     }
-    /* decimal int / float with underscores and commas (psych legacy) */
+    /* decimal int / float with underscores and commas (psych legacy).
+     * The float law is psych's scanner (and libyaml's 1.1 resolver): a
+     * DOT is required, and an exponent only counts when SIGNED —
+     * "1e0" and "1.5e2" stay strings (psych tokenize; libyaml's 1.1
+     * float regex agrees), "1.5" / ".5" / "1.5e+2" are floats. The
+     * unqualified-exponent float leaked host strings into number
+     * typing (yeptris-ruby #293's CBOR dump). */
     {
-        int digits = 0, dot = 0, e = 0, ed = 0;
+        int digits = 0, dot = 0, e = 0, ed = 0, esigned = 0;
         for (uint32_t k = i; k < n; k++) {
             char c = p[k];
             if (c >= '0' && c <= '9') {
@@ -311,13 +317,14 @@ static yep_tag_id compat11(void* ctx, const char* p, uint32_t n) {
             } else if ((c == 'e' || c == 'E') && digits && !e) {
                 e = 1;
                 if (k + 1 < n && (p[k + 1] == '-' || p[k + 1] == '+')) {
+                    esigned = 1;
                     k++;
                 }
             } else {
                 return 0;
             }
         }
-        if (digits && (dot || e) && (!e || ed)) {
+        if (digits && dot && (!e || (ed && esigned))) {
             return 2;
         }
         if (digits && !dot && !e) {

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

@@ -214,6 +214,7 @@ static int shape_val_bail(unsigned char c, const char* p, size_t len, size_t at)
     case '[':
     case '{':
     case '*': /* an alias after an anchor is an error shape (SR86) */
+    case '&': /* a second anchor is the suite's 4JVG error (catch 156) */
         return 1;
     case '-':
     case '?':

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yeptris
 version: !ruby/object:Gem::Version
-  version: 0.6.34.3
+  version: 0.6.35.2
 platform: arm-linux-eabihf
 authors:
 - Ribose Inc.