Merge pull request #10 from carocad/more-unicodes

More unicodes
carocad · Oct 9, 2019 · c149e1c · c149e1c
2 parents 6072623 + 606e94c
commit c149e1c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject carocad/parcera "0.1.2"
+(defproject carocad/parcera "0.1.3"
   :description "Grammar-based Clojure(script) parser"
   :url "https://github.com/carocad/parcera"
   :license {:name "LGPLv3"

diff --git a/src/parcera/core.clj b/src/parcera/core.clj
@@ -114,9 +114,9 @@
     ;; EDN reader says otherwise https://github.com/edn-format/edn#symbols
     ;; nil, true, false are actually symbols with special meaning ... not grammar rules
     ;; on their own
-    VALID-CHARACTERS>: #'[\\w.*+\\-!?$%&=<>\\':#]+'
+    VALID-CHARACTERS>: #'[^\\s\\(\\)\\[\\]{}\"@~]+'
     *)
-    <name>: #'([\\p{L}\\w.*+\\-!?$%&=<>\\':#]+\\/)?(\\/|([\\p{L}\\w.*+\\-!?$%&=<>\\':#]+))(?!\\/)'
+    <name>: #'([^\\s\\(\\)\\[\\]{}\"@~,\\\\]+\\/)?(\\/|([^\\s\\(\\)\\[\\]{}\"@~,\\\\]+))(?!\\/)'
 
     (* HIDDEN PARSERS ------------------------------------------------------ *)
 

diff --git a/test/parcera/test/core.clj b/test/parcera/test/core.clj
@@ -49,6 +49,17 @@
                "high accuracy\n"
                (with-out-str (pprint/pprint result)))))))
 
+(deftest unit-tests
+  (testing "names"
+    (as-> "foo" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "foo-bar" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "foo->bar" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "->" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "->as" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "föl" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "Öl" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "ϕ" input (is (= input (parcera/code (parcera/clojure input)))))
+    (as-> "❤️" input (is (= input (parcera/code (parcera/clojure input)))))))
 
 (deftest macros
   (testing "metadata"