fail on non-list solutions in setof/3 (#1553)

diff --git a/src/lib/builtins.pl b/src/lib/builtins.pl
index dd7fb5470f3057eacb31a41d6f4ea95ea8d5daa0..536f0d67d37635610ae95f99d90618307bba2269 100644 (file)
--- a/src/lib/builtins.pl
+++ b/src/lib/builtins.pl
@@ -818,7 +818,8 @@ bagof(Template, Goal, Solution) :-
 :- non_counted_backtracking iterate_variants_and_sort/3.
 
 iterate_variants_and_sort([V-Solution0|GroupSolutions], V, Solution) :-
-    sort(Solution0, Solution),
+    sort(Solution0, Solution1),
+    Solution1 = Solution,
     (  GroupSolutions == [] -> !
     ;  true
     ).

diff --git a/tests/scryer/issues.rs b/tests/scryer/issues.rs
index 9f22bfc8a1fa8765b7d14fab0af1231987310c74..af22252abcbe0a7906190c6b8cc916fca9442f93 100644 (file)
--- a/tests/scryer/issues.rs
+++ b/tests/scryer/issues.rs
@@ -155,7 +155,7 @@ fn ignored_constraint() {
     run_top_level_test_no_args(
         "use_module(library(freeze)), freeze(X,false), X \\=a.\n\
          halt.",
-        "   freeze:freeze(X,user:false).\n",
+        "   freeze:freeze(X,false).\n",
     );
 }