fixing blank node parsing and reverting quickvar parsing

RELEASE

@@ -1,5 +1,6 @@
                                   EYE release
 
+v6.0.4 (2023-10-21) fixing blank node parsing and reverting quickvar parsing
 v6.0.3 (2023-10-21) simplifying blank node and quickvar parsing
 v6.0.2 (2023-10-21) fixing _:_ blank nodes
 v6.0.1 (2023-10-21) adding graph depth to _:_ blank node label

VERSION

@@ -1 +1 @@
-6.0.3
+6.0.4

eye.pl

@@ -21,7 +21,7 @@
 :- use_module(library(pcre)).
 :- catch(use_module(library(http/http_open)), _, true).
 
-version_info('EYE v6.0.3 (2023-10-21)').
+version_info('EYE v6.0.4 (2023-10-21)').
 
 license_info('MIT License
 
@@ -2341,14 +2341,17 @@
             )
         )
     }.
-pathitem(UVar, []) -->
+pathitem(VarID, []) -->
     [uvar(Var)],
     !,
-    {   atom_concat('_', Var, VarID),
+    {   atom_codes(Var, VarCodes),
+        subst([[[0'-], [0'_, 0'M, 0'I, 0'N, 0'U, 0'S, 0'_]], [[0'.], [0'_, 0'D, 0'O, 0'T, 0'_]]], VarCodes, VarTidy),
+        atom_codes(VarAtom, [0'_|VarTidy]),
         (   flag('pass-all-ground')
         ->  nb_getval(var_ns, Sns),
-            atomic_list_concat(['\'<', Sns, Var, '>\''], UVar)
-        ;   UVar = VarID
+            atom_codes(VarFrag, VarTidy),
+            atomic_list_concat(['\'<', Sns, VarFrag, '>\''], VarID)
+        ;   VarID = VarAtom
         )
     }.
 pathitem(Number, []) -->
@@ -2717,8 +2720,11 @@
         )
     }.
 symbol(Name) -->
-    [bnode(Label)],
-    {   (   \+sub_atom(Label, 0, 1, _, '_')
+    [bnode(Lbl)],
+    {   atom_codes(Lbl, LblCodes),
+        subst([[[0'-], [0'_, 0'M, 0'I, 0'N, 0'U, 0'S, 0'_]], [[0'.], [0'_, 0'D, 0'O, 0'T, 0'_]]], LblCodes, LblTidy),
+        atom_codes(Label, LblTidy),
+        (   \+sub_atom(Label, 0, 1, _, '_')
         ->  (   evar(Label, S, 0)
             ->  true
             ;   atom_concat(Label, '_', M),

reasoning/blogic/version.n3.out

@@ -1,3 +1,3 @@
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
 
-() log:version "EYE v6.0.3 (2023-10-21)".
+() log:version "EYE v6.0.4 (2023-10-21)".