fixing issue with graffiti in n3p input

eyereasoner · Sep 19, 2023 · 9430c9b · 9430c9b
1 parent 709dded
commit 9430c9b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 13 deletions.
diff --git a/RELEASE b/RELEASE
@@ -1,5 +1,6 @@
                                   EYE release
 
+v4.16.5 (2023-09-19) fixing issue with graffiti in n3p input
 v4.16.4 (2023-09-18) using ( and | to delimit graffiti
 v4.16.3 (2023-09-18) reverting graffiti to be list terms
 v4.16.2 (2023-09-15) adding extra func:add-duration-to-dateTime built-in (obs from Wout Slabbinck)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.16.4
+4.16.5
diff --git a/eye.pl b/eye.pl
@@ -21,7 +21,7 @@
 :- use_module(library(pcre)).
 :- catch(use_module(library(http/http_open)), _, true).
 
-version_info('EYE v4.16.4 (2023-09-18)').
+version_info('EYE v4.16.5 (2023-09-19)').
 
 license_info('MIT License
 
@@ -1456,23 +1456,29 @@
             ->  true
             ;   (   Rt \= pred('<http://eulersharp.sourceforge.net/2003/03swap/log-rules#relabel>'),
                     \+ (Rt = scope(_), Mode = query)
-                ->  djiti_assertz(Rt),
+                ->  (   Rt =.. [Pa, Sa, Oa],
+                        regex('^<.*#on.*Surface>$', Pa, _),
+                        is_list(Sa)
+                    ->  Ra =.. [Pa, graffiti(Sa), Oa]
+                    ;   Ra = Rt
+                    ),
+                    djiti_assertz(Ra),
                     (   flag(intermediate, Out),
-                        Rt \= scount(_)
-                    ->  format(Out, '~q.~n', [Rt])
+                        Ra \= scount(_)
+                    ->  format(Out, '~q.~n', [Ra])
                     ;   true
                     ),
-                    (   Rt \= flag(_, _),
-                        Rt \= scope(_),
-                        Rt \= pfx(_, _),
-                        Rt \= pred(_),
-                        Rt \= cpred(_),
-                        Rt \= scount(_)
+                    (   Ra \= flag(_, _),
+                        Ra \= scope(_),
+                        Ra \= pfx(_, _),
+                        Ra \= pred(_),
+                        Ra \= cpred(_),
+                        Ra \= scount(_)
                     ->  (   flag(nope)
                         ->  true
                         ;   term_index(true, Pnd),
                             nb_getval(current_scope, Src),
-                            assertz(prfstep(Rt, true, Pnd, Rt, _, forward, Src))
+                            assertz(prfstep(Ra, true, Pnd, Ra, _, forward, Src))
                         )
                     ;   true
                     )

diff --git a/eye.zip b/eye.zip
diff --git a/logic/version.n3s.out b/logic/version.n3s.out
@@ -1,3 +1,3 @@
 @prefix log: <http://www.w3.org/2000/10/swap/log#>.
 
-() log:version "EYE v4.16.4 (2023-09-18)".
+() log:version "EYE v4.16.5 (2023-09-19)".