Merge pull request #230 from LPCIC/bug-229

clarify doc of findall
LPCIC · May 20, 2024 · cbcd669 · cbcd669
2 parents ef05e82 + 17f1914
commit cbcd669
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 58 deletions.
diff --git a/src/builtin.elpi b/src/builtin.elpi
@@ -478,10 +478,9 @@ primitive? X S :- is_cdata X (ctype S).
 external pred new_int o:int.
 
 % [findall_solution P L] finds all the solved instances of P and puts them
-% in L
-% in the order in which they are found. Instances can contain
-% eigenvariables
-% and unification variables.
+% in L in the order in which they are found. Instances can contain
+% eigenvariables and unification variables. P may or may not be
+% instantiated. Instances should be found in L.
 
 external pred findall_solutions i:prop, o:list prop.
 

diff --git a/src/builtin.ml b/src/builtin.ml
@@ -1037,9 +1037,7 @@ X == Y :- same_term X Y.
       !: !fresh_int)),
   DocAbove);
 
-  LPDoc  {|[findall_solution P L] finds all the solved instances of P and puts them in L
-in the order in which they are found. Instances can contain eigenvariables
-and unification variables.|};
+  LPDoc  {|[findall_solution P L] finds all the solved instances of P and puts them in L in the order in which they are found. Instances can contain eigenvariables and unification variables. P may or may not be instantiated. Instances should be found in L.|};
   LPCode "external pred findall_solutions i:prop, o:list prop.";
 
   MLData safe;

diff --git a/tests/sources/trace_w.elab.json b/tests/sources/trace_w.elab.json
@@ -2429,9 +2429,9 @@
                                   "File",
                                   {
                                     "filename": "builtin.elpi",
-                                    "line": 505,
+                                    "line": 504,
                                     "column": 0,
-                                    "character": 12438
+                                    "character": 12502
                                   }
                                 ]
                               }
@@ -2466,9 +2466,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -2629,9 +2629,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -2761,9 +2761,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -2873,9 +2873,9 @@
                                   "File",
                                   {
                                     "filename": "builtin.elpi",
-                                    "line": 506,
+                                    "line": 505,
                                     "column": 0,
-                                    "character": 12459
+                                    "character": 12523
                                   }
                                 ]
                               }
@@ -2906,9 +2906,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 506,
+                                  "line": 505,
                                   "column": 0,
-                                  "character": 12459
+                                  "character": 12523
                                 }
                               ]
                             }
@@ -3035,9 +3035,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 506,
+                                  "line": 505,
                                   "column": 0,
-                                  "character": 12459
+                                  "character": 12523
                                 }
                               ]
                             }
@@ -3273,9 +3273,9 @@
                                   "File",
                                   {
                                     "filename": "builtin.elpi",
-                                    "line": 505,
+                                    "line": 504,
                                     "column": 0,
-                                    "character": 12438
+                                    "character": 12502
                                   }
                                 ]
                               }
@@ -3315,9 +3315,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -3478,9 +3478,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -3655,9 +3655,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -3796,9 +3796,9 @@
                               "File",
                               {
                                 "filename": "builtin.elpi",
-                                "line": 506,
+                                "line": 505,
                                 "column": 0,
-                                "character": 12459
+                                "character": 12523
                               }
                             ]
                           }
@@ -3846,9 +3846,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -4789,9 +4789,9 @@
                                   "File",
                                   {
                                     "filename": "builtin.elpi",
-                                    "line": 505,
+                                    "line": 504,
                                     "column": 0,
-                                    "character": 12438
+                                    "character": 12502
                                   }
                                 ]
                               }
@@ -4826,9 +4826,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -4951,9 +4951,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -5045,9 +5045,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 505,
+                                  "line": 504,
                                   "column": 0,
-                                  "character": 12438
+                                  "character": 12502
                                 }
                               ]
                             }
@@ -5119,9 +5119,9 @@
                                   "File",
                                   {
                                     "filename": "builtin.elpi",
-                                    "line": 506,
+                                    "line": 505,
                                     "column": 0,
-                                    "character": 12459
+                                    "character": 12523
                                   }
                                 ]
                               }
@@ -5145,9 +5145,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 506,
+                                  "line": 505,
                                   "column": 0,
-                                  "character": 12459
+                                  "character": 12523
                                 }
                               ]
                             }
@@ -5234,9 +5234,9 @@
                                 "File",
                                 {
                                   "filename": "builtin.elpi",
-                                  "line": 506,
+                                  "line": 505,
                                   "column": 0,
-                                  "character": 12459
+                                  "character": 12523
                                 }
                               ]
                             }