more regex fixes

cormullion · Jun 11, 2022 · 626ce01 · 626ce01
1 parent 09c7022
commit 626ce01
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [v0.5.0] - 2022-06-11 10:05:43
+
+### Added
+
+### Changed
+
+- fixed regex search again, perhaps
+
+### Removed
+
+### Deprecated
+
+# ────────────────────────────────────────────────────────────────────────────────────
 ## [v0.5.0] - 2022-06-10 18:51
 
 ### Added

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Glyphy"
 uuid = "e3b492bb-b251-48f2-9293-5b5772365208"
 authors = ["cormullion <[email protected]>"]
-version = "0.5.0"
+version = "0.6.0"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"

diff --git a/src/Glyphy.jl b/src/Glyphy.jl
@@ -123,12 +123,13 @@ function glyphy(s::String;
         showall = false )
     # filter looks at values
     # if it doesn't look like a regex
-    if all(c -> isletter(c) || isdigit(c) || isspace(c) || isequal(c, "-"), map(Char, s)) == true
+    if all(c -> isletter(c) || isdigit(c) || isspace(c) || isequal(c, '-') || isequal(c, '<'), map(Char, s)) == true
         # don't do a regex
         hitvalues = filterview(v -> occursin(s, v), unicodedict)
     else
         # do a regex
-        hitvalues = filterview(v -> occursin(Regex(s, "i"), v), unicodedict)
+        rgx = Regex(s, "i")
+        hitvalues = filterview(v -> occursin(rgx, v), unicodedict)
     end
     # result is another Dictionary{Int64, String}
     if isempty(hitvalues)