Fix escaping

src/axel_f/lexer.cljc

@@ -31,9 +31,6 @@
 (defn- escape-char? [{::keys [type]}]
   (= type ::escaped))
 
-(defn- escape-str [args]
-  (string/replace (apply str args) #"\\(.)" "$1"))
-
 (defmulti read-next* (fn [[e & _]]
                        (cond
                          (whitespace? e) ::whitespace
@@ -113,7 +110,7 @@
       (if (and (= v literal-t)
                (not (escape-char? (last acc))))
         [{::type ::string
-          ::value (->> acc (map ::v) escape-str)
+          ::value (apply str (map ::v acc))
           ::begin {::line line
                    ::col col}
           ::end {::line l
@@ -226,7 +223,7 @@
                  (not (escape-char? (last acc))))
           (let [{l' ::l c' ::c} (last acc)]
             [{::type ::symbol
-              ::value (->> acc (map ::v) escape-str)
+              ::value (apply str (map ::v acc))
               ::begin {::line l
                        ::col c}
               ::end {::line l'

test/axel_f/functions_test.cljc

@@ -336,7 +336,7 @@
 (t/deftest regexextract-function-test
   (t/testing "REGEXEXTRACT function"
     (t/is (= "826.25"
-             ((af/compile "REGEXEXTRACT('The price today is $826.25', '[0-9]*\\\\.[0-9]+[0-9]+')"))))
+             ((af/compile "REGEXEXTRACT('The price today is $826.25', '[0-9]*\\.[0-9]+[0-9]+')"))))
 
     (t/is (= "Content"
              ((af/compile "REGEXEXTRACT('(Content) between brackets', '\\(([A-Za-z]+)\\)')"))))
@@ -358,10 +358,10 @@
 (t/deftest regexreplace-function-test
   (t/testing "REGEXREPLACE function"
     (t/is (= "The price today is $0.00"
-             ((af/compile "REGEXREPLACE('The price today is $826.25', '[0-9]*\\\\.[0-9]+[0-9]+', '0.00')"))))
+             ((af/compile "REGEXREPLACE('The price today is $826.25', '[0-9]*\\.[0-9]+[0-9]+', '0.00')"))))
 
     (t/is (= "Word between brackets"
-             ((af/compile "REGEXREPLACE('(Content) between brackets', '\\\\(([A-Za-z]+)\\\\)', 'Word')"))))
+             ((af/compile "REGEXREPLACE('(Content) between brackets', '\\(([A-Za-z]+)\\)', 'Word')"))))
 
     (t/is (= "FOO"
              ((af/compile "REGEXREPLACE('FOO', '[a-z]+', 'OOF')"))))))

test/axel_f/issue_35_test.cljc

@@ -1,29 +1,28 @@
 (ns axel-f.issue-35-test
   (:require #?(:clj [clojure.test :as t]
                :cljs [cljs.test :as t :include-macros true])
-            [axel-f.excel :as af]
-            [clojure.string :as string]))
+            [axel-f.excel :as af]))
 
 (t/deftest object-references-could-be-anything
 
   (t/testing "fields with unicode symbols inside"
 
-    (t/are [x] (= 1 ((af/compile x) {(keyword (string/replace x #"\\" "")) 1}))
+    (t/are [x] (= 1 ((af/compile (str ".'" x "'")) {(keyword x) 1}))
       "ꙮ"
       "fooꙮbar"
-      "foo\\-bar"))
+      "foo-bar"))
 
   (t/testing "quoted fields with operators inside"
 
-    (t/are [x] (= 1 ((af/compile x) {(keyword (string/replace x #"\\" "")) 1}))
-      "foo\\/bar"
-      "foo\\+"
-      "foo\\*bar"
-      "foo\\>bar"
-      "foo\\ \\>\\ bar"
-      "foo\\^bar"
-      "foo\\%bar"
-      "foo\\&bar"))
+    (t/are [x] (= 1 ((af/compile (str ".'" x "'")) {(keyword x) 1}))
+      "foo/bar"
+      "foo+"
+      "foo*bar"
+      "foo>bar"
+      "foo > bar"
+      "foo^bar"
+      "foo%bar"
+      "foo&bar"))
 
   #_(t/testing "fields with special symbols throw an error without quoting"