core: Fix for string escapes

yaml · Sep 5, 2024 · 4d385e8 · 4d385e8
1 parent ae1e8f2
commit 4d385e8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/core/src/yamlscript/builder.clj b/core/src/yamlscript/builder.clj
@@ -220,7 +220,11 @@
   (-> string
     (str/replace #"\\\$" "$")
     (str/replace #"\\ " " ")
+    (str/replace #"\\b" "\b")
+    (str/replace #"\\f" "\f")
     (str/replace #"\\n" "\n")
+    (str/replace #"\\r" "\r")
+    (str/replace #"\\t" "\t")
     Str))
 
 (defn build-vstr [node]

diff --git a/core/src/yamlscript/printer.clj b/core/src/yamlscript/printer.clj
@@ -14,7 +14,11 @@
 (def string-escape
   {\\ "\\\\"
    \" "\\\""
-   \newline "\\n"})
+   \backspace "\\b"
+   \formfeed "\\f"
+   \newline "\\n"
+   \return "\\r"
+   \tab "\\t"})
 
 (defn pr-string [s]
   (str/escape s string-escape))

diff --git a/core/src/yamlscript/ysreader.clj b/core/src/yamlscript/ysreader.clj
@@ -280,16 +280,6 @@
       (let [[form tokens] (read-form tokens)]
         (recur tokens (if form (conj list form) list))))))
 
-#_(def unescapes
-  {"\\\\" "\\"
-   "\\n" "\n"
-   "\\t" "\t"
-   "\\\"" "\""})
-
-#_(defn str-unescape [s]
-  (str/replace s #"(?:\\\\|\\n|\\t|\\\")"
-    (fn [m] (get unescapes m))))
-
 ;; TODO do in one call
 (defn str-unescape [s]
   (-> s