fixing log:notIncludes for (context recursion) scope (obs from Patric…

…k Hochstenbach)

RELEASE

@@ -1,5 +1,6 @@
                                   EYE release
 
+[v3.1.2] fixing log:notIncludes for (context recursion) scope (obs from Patrick Hochstenbach)
 [v3.1.1] fixing log:n3String interference with writing prefixes (obs from Jesse Wright)
 [v3.1.0] adding blogic deiteration at nested level
 [v3.0.1] fixing blogic graffiti when using rdf:first, rdf:rest and rdf:nil (obs from Patrick Hochstenbach)

VERSION

@@ -1 +1 @@
-3.1.1
+3.1.2

eye.pl

@@ -20,7 +20,7 @@
 :- use_module(library(semweb/turtle)).
 :- catch(use_module(library(http/http_open)), _, true).
 
-version_info('EYE v3.1.1 josd').
+version_info('EYE v3.1.2 josd').
 
 license_info('MIT License
 
@@ -6779,7 +6779,8 @@
         (   nonvar(X),
             nonvar(Y)
         ),
-        (   conj_list(X, A),
+        (   X \= [_, _],
+            conj_list(X, A),
             conj_list(Y, B),
             includes(A, B)
         )
@@ -6885,8 +6886,25 @@
     ).
 
 '<http://www.w3.org/2000/10/swap/log#notIncludes>'(X, Y) :-
-    ignore(within_scope(X)),
-    \+'<http://www.w3.org/2000/10/swap/log#includes>'(X, Y).
+    within_scope(X),
+    !,
+    when(
+        (   nonvar(Y)
+        ),
+        (   \+call(Y)
+        )
+    ).
+'<http://www.w3.org/2000/10/swap/log#notIncludes>'(X, Y) :-
+    when(
+        (   nonvar(X),
+            nonvar(Y)
+        ),
+        (   X \= [_, _],
+            conj_list(X, A),
+            conj_list(Y, B),
+            \+includes(A, B)
+        )
+    ).
 
 '<http://www.w3.org/2000/10/swap/log#parsedAsN3>'(literal(A, _), B) :-
     atom_codes(A, C),