Merge pull request #383 from EvgSkv/ti2023

Automatically include stop as satellite.

compiler/universe.py

@@ -642,8 +642,15 @@ def InscribeOrbits(self, rules, depth_map):
     # satellites. You are responsible for those whom you tamed.
     master = {}
     for p, args in depth_map.items():
+      satellite_names = []
       for s in args.get('satellites', []):
         master[s['predicate_name']] = p
+        satellite_names.append(s['predicate_name'])
+      if stop_predicate := args.get('stop', None):
+        if stop_predicate['predicate_name'] not in satellite_names:
+          if 'satellites' not in args:
+            args['satellites'] = []
+          args['satellites'] += [stop_predicate]
     for r in rules:
       p = r['head']['predicate_name']
       if p in depth_map:

integration_tests/duckdb_stop_test.l

@@ -15,10 +15,10 @@
 
 @Engine("duckdb");
 
-@Recursive(N, 100, stop: S);
-N() = 0 :- ~S() || true;
+@Recursive(N, -1, stop: S);
+N() = 0 :- ~N();
 N() = N() + 1;
 
 S("yes") :- N() > 10;
 
-Test(!~ (N() > 10), !~ (N() < 20));
+Test(!~ (N() > 10), !~ (N() < 20), Array{n -> n :- n = N()});

integration_tests/duckdb_stop_test.txt

@@ -1,5 +1,5 @@
-+------+------+
-| col0 | col1 |
-+------+------+
-| True | True |
-+------+------+
++------+------+------+
+| col0 | col1 | col2 |
++------+------+------+
+| True | True | [14] |
++------+------+------+