eyeprolog 1.6.2 → 1.6.4

package/examples/proof/iso-control-and-errors.pl

@@ -1,108 +1,86 @@
-report(first_destination, ghent).
-why(
-  report(first_destination, ghent),
-  step(
-    report(first_destination, ghent),
-    rule("iso-control-and-errors.pl", clause(8)),
-    ['To' = ghent],
-    [
-      step(
-        first_destination(antwerp, ghent),
-        rule("iso-control-and-errors.pl", clause(3)),
-        ['From' = antwerp, 'To' = ghent],
-        [
-          step(
-            once(route(antwerp, ghent)),
-            builtin(once, 1),
-            [],
-            [
-              step(route(antwerp, ghent), fact("iso-control-and-errors.pl", clause(1)), [], [])
-            ]
-          )
-        ]
-      )
-    ]
-  )
-).
+% Prolog result format 4
+query(1, report(_0, _1), ['X0' = _0, 'X1' = _1]).
+result(1, complete, 5).
+answer(1, ['X0' = first_destination, 'X1' = ghent]).
+why(1, ['X0' = first_destination, 'X1' = ghent], [report(first_destination, ghent)]).
+answer(1, ['X0' = cut_destination, 'X1' = ghent]).
+why(1, ['X0' = cut_destination, 'X1' = ghent], [report(cut_destination, ghent)]).
+answer(1, ['X0' = existing_route, 'X1' = connected]).
+why(1, ['X0' = existing_route, 'X1' = connected], [report(existing_route, connected)]).
+answer(1, ['X0' = missing_route, 'X1' = disconnected]).
+why(1, ['X0' = missing_route, 'X1' = disconnected], [report(missing_route, disconnected)]).
+answer(1, ['X0' = recovered_exception, 'X1' = rejected]).
+why(1, ['X0' = recovered_exception, 'X1' = rejected], [report(recovered_exception, rejected)]).
 
-report(cut_destination, ghent).
-why(
-  report(cut_destination, ghent),
-  step(
-    report(cut_destination, ghent),
-    rule("iso-control-and-errors.pl", clause(9)),
-    ['To' = ghent],
-    [
-      step(
-        preferred_destination(antwerp, ghent),
-        rule("iso-control-and-errors.pl", clause(4)),
-        ['From' = antwerp, 'To' = ghent],
-        [
-          step(route(antwerp, ghent), fact("iso-control-and-errors.pl", clause(1)), [], []),
-          step(!, builtin(goal, 0), [], [])
-        ]
-      )
-    ]
-  )
-).
-
-report(existing_route, connected).
-why(
-  report(existing_route, connected),
-  step(
-    report(existing_route, connected),
-    rule("iso-control-and-errors.pl", clause(10)),
-    ['Status' = connected],
-    [
-      step(
-        travel_status(antwerp, ghent, connected),
-        rule("iso-control-and-errors.pl", clause(5)),
-        ['From' = antwerp, 'To' = ghent, 'Status' = connected],
-        [
-          step(';'(->(call(route(antwerp, ghent)), =(connected, connected)), =(connected, disconnected)), builtin(';', 2), [], [])
-        ]
-      )
-    ]
-  )
-).
-
-report(missing_route, disconnected).
-why(
-  report(missing_route, disconnected),
-  step(
-    report(missing_route, disconnected),
-    rule("iso-control-and-errors.pl", clause(11)),
-    ['Status' = disconnected],
-    [
-      step(
-        travel_status(antwerp, paris, disconnected),
-        rule("iso-control-and-errors.pl", clause(5)),
-        ['From' = antwerp, 'To' = paris, 'Status' = disconnected],
-        [
-          step(';'(->(call(route(antwerp, paris)), =(disconnected, connected)), =(disconnected, disconnected)), builtin(';', 2), [], [])
-        ]
-      )
-    ]
-  )
-).
-
-report(recovered_exception, rejected).
-why(
-  report(recovered_exception, rejected),
-  step(
-    report(recovered_exception, rejected),
-    rule("iso-control-and-errors.pl", clause(12)),
-    ['Result' = rejected],
-    [
-      step(
-        checked_route(antwerp, paris, rejected),
-        rule("iso-control-and-errors.pl", clause(7)),
-        ['From' = antwerp, 'To' = paris, 'Result' = rejected],
-        [
-          step(catch((require_route(antwerp, paris), =(rejected, accepted)), no_route(antwerp, paris), =(rejected, rejected)), builtin(catch, 3), [], [])
-        ]
-      )
-    ]
-  )
-).
+clause(1, route(antwerp, ghent), true).
+clause(3, first_destination(var('From'), var('To')), once(route(var('From'), var('To')))).
+clause(4, preferred_destination(var('From'), var('To')), (route(var('From'), var('To')), !)).
+clause(5,
+       travel_status(var('From'), var('To'), var('Status')),
+       (call(route(var('From'), var('To'))) -> var('Status') = connected ; var('Status') = disconnected)).
+clause(7,
+       checked_route(var('From'), var('To'), var('Result')),
+       catch((require_route(var('From'), var('To')), var('Result') = accepted), no_route(var('From'), var('To')), var('Result') = rejected)).
+clause(8, report(first_destination, var('To')), first_destination(antwerp, var('To'))).
+clause(9, report(cut_destination, var('To')), preferred_destination(antwerp, var('To'))).
+clause(10, report(existing_route, var('Status')), travel_status(antwerp, ghent, var('Status'))).
+clause(11, report(missing_route, var('Status')), travel_status(antwerp, paris, var('Status'))).
+clause(12,
+       report(recovered_exception, var('Result')),
+       checked_route(antwerp, paris, var('Result'))).
 
+step(report(first_destination, ghent),
+     rule(8),
+     ['To' = ghent],
+     [first_destination(antwerp, ghent)]).
+step(first_destination(antwerp, ghent),
+     rule(3),
+     ['From' = antwerp, 'To' = ghent],
+     [once(route(antwerp, ghent))]).
+step(once(route(antwerp, ghent)), builtin, [], [route(antwerp, ghent)]).
+step(route(antwerp, ghent), fact(1), [], []).
+step(report(cut_destination, ghent),
+     rule(9),
+     ['To' = ghent],
+     [preferred_destination(antwerp, ghent)]).
+step(preferred_destination(antwerp, ghent),
+     rule(4),
+     ['From' = antwerp, 'To' = ghent],
+     [route(antwerp, ghent), !]).
+step(!, builtin, [], []).
+step(report(existing_route, connected),
+     rule(10),
+     ['Status' = connected],
+     [travel_status(antwerp, ghent, connected)]).
+step(travel_status(antwerp, ghent, connected),
+     rule(5),
+     ['From' = antwerp, 'To' = ghent, 'Status' = connected],
+     [(call(route(antwerp, ghent)) -> connected = connected ; connected = disconnected)]).
+step((call(route(antwerp, ghent)) -> connected = connected ; connected = disconnected),
+     builtin,
+     [],
+     []).
+step(report(missing_route, disconnected),
+     rule(11),
+     ['Status' = disconnected],
+     [travel_status(antwerp, paris, disconnected)]).
+step(travel_status(antwerp, paris, disconnected),
+     rule(5),
+     ['From' = antwerp, 'To' = paris, 'Status' = disconnected],
+     [(call(route(antwerp, paris)) -> disconnected = connected ; disconnected = disconnected)]).
+step((call(route(antwerp, paris)) -> disconnected = connected ; disconnected = disconnected),
+     builtin,
+     [],
+     []).
+step(report(recovered_exception, rejected),
+     rule(12),
+     ['Result' = rejected],
+     [checked_route(antwerp, paris, rejected)]).
+step(checked_route(antwerp, paris, rejected),
+     rule(7),
+     ['From' = antwerp, 'To' = paris, 'Result' = rejected],
+     [catch((require_route(antwerp, paris), rejected = accepted), no_route(antwerp, paris), rejected = rejected)]).
+step(catch((require_route(antwerp, paris), rejected = accepted), no_route(antwerp, paris), rejected = rejected),
+     builtin,
+     [],
+     []).

package/examples/proof/iso-dynamic-database.pl

@@ -1,59 +1,42 @@
-report(next_task, check_power).
-why(
-  report(next_task, check_power),
-  step(
-    report(next_task, check_power),
-    rule("iso-dynamic-database.pl", clause(5)),
-    ['Task' = check_power, '__anon0' = urgent],
-    [
-      step(
-        once(task(check_power, urgent)),
-        builtin(once, 1),
-        [],
-        [
-          step(task(check_power, urgent), fact("<input>", clause(8)), [], [])
-        ]
-      )
-    ]
-  )
-).
+% Prolog result format 4
+query(1, report(_0, _1), ['X0' = _0, 'X1' = _1]).
+result(1, complete, 4).
+answer(1, ['X0' = next_task, 'X1' = check_power]).
+why(1, ['X0' = next_task, 'X1' = check_power], [report(next_task, check_power)]).
+answer(1,
+       ['X0' = all_tasks,
+        'X1' = [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]]).
+why(1,
+    ['X0' = all_tasks,
+     'X1' = [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]],
+    [report(all_tasks, [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)])]).
+answer(1, ['X0' = old_task_removed, 'X1' = yes]).
+why(1, ['X0' = old_task_removed, 'X1' = yes], [report(old_task_removed, yes)]).
+answer(1, ['X0' = dynamic_predicate, 'X1' = yes]).
+why(1, ['X0' = dynamic_predicate, 'X1' = yes], [report(dynamic_predicate, yes)]).
 
-report(all_tasks, [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]).
-why(
-  report(all_tasks, [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]),
-  step(
-    report(all_tasks, [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]),
-    rule("iso-dynamic-database.pl", clause(6)),
-    ['Tasks' = [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]],
-    [
-      step(findall(task(Task, Priority), task(Task, Priority), [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]), builtin(findall, 3), [], [])
-    ]
-  )
-).
-
-report(old_task_removed, yes).
-why(
-  report(old_task_removed, yes),
-  step(
-    report(old_task_removed, yes),
-    rule("iso-dynamic-database.pl", clause(7)),
-    [],
-    [
-      step('\\+'(task(old_probe, obsolete)), builtin('\\+', 1), [], [])
-    ]
-  )
-).
-
-report(dynamic_predicate, yes).
-why(
-  report(dynamic_predicate, yes),
-  step(
-    report(dynamic_predicate, yes),
-    rule("iso-dynamic-database.pl", clause(8)),
-    [],
-    [
-      step(current_predicate(/(task, 2)), builtin(current_predicate, 1), [], [])
-    ]
-  )
-).
+clause(5, report(next_task, var('Task')), once(task(var('Task'), anonymous(1)))).
+clause(6,
+       report(all_tasks, var('Tasks')),
+       findall(task(var('Task'), var('Priority')), task(var('Task'), var('Priority')), var('Tasks'))).
+clause(7, report(old_task_removed, yes), \+ task(old_probe, obsolete)).
+clause(8, report(dynamic_predicate, yes), current_predicate(task / 2)).
 
+step(report(next_task, check_power),
+     rule(5),
+     ['Task' = check_power],
+     [once(task(check_power, urgent))]).
+step(once(task(check_power, urgent)), builtin, [], [task(check_power, urgent)]).
+step(task(check_power, urgent), asserted, [], []).
+step(report(all_tasks, [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]),
+     rule(6),
+     ['Tasks' = [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]],
+     [findall(task(Task, Priority), task(Task, Priority), [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)])]).
+step(findall(task(Task, Priority), task(Task, Priority), [task(check_power, urgent), task(check_network, normal), task(archive_logs, low)]),
+     collected,
+     [],
+     []).
+step(report(old_task_removed, yes), rule(7), [], [\+ task(old_probe, obsolete)]).
+step(\+ task(old_probe, obsolete), absent, [], []).
+step(report(dynamic_predicate, yes), rule(8), [], [current_predicate(task / 2)]).
+step(current_predicate(task / 2), builtin, [], []).

package/examples/proof/iso-extension-pipeline-audit.pl

@@ -1,19 +1,58 @@
-pipeline_audit(report(stages(5), transitions(4), summaries([stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), trace([step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete]), invariant(true), schema_variant(true))).
-why(
-  pipeline_audit(report(stages(5), transitions(4), summaries([stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), trace([step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete]), invariant(true), schema_variant(true))),
-  step(
-    pipeline_audit(report(stages(5), transitions(4), summaries([stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), trace([step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete]), invariant(true), schema_variant(true))),
-    rule("iso-extension-pipeline-audit.pl", clause(9)),
-    ['StageCount' = 5, 'TransitionCount' = 4, 'StageSummaries' = [stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))], 'Trace' = [step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete], 'Schema' = pipeline(step(_Input, Shared), step(Shared, _Output))],
-    [
-      step(countall(stage(__anon0, __anon1), 5), library(countall, 2), [], []),
-      step(countall(transition(__anon2, __anon3, __anon4), 4), library(countall, 2), [], []),
-      step(findall(stage(Index, Name, outgoing(Outgoing)), (cfor(0, 4, Index), stage(Index, Name), countall(transition(Index, __anon5, __anon6), Outgoing)), [stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), builtin(findall, 3), [], []),
-      step(findall(step(Index, From, To), transition(Index, From, To), [step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete], [complete]), library(findall, 4), [], []),
-      step(forall(transition(Index, From, To), transition_is_well_formed(Index, From, To)), library(forall, 2), [], []),
-      step(linked_pipeline_schema(pipeline(step(_Input, Shared), step(Shared, _Output))), fact("iso-extension-pipeline-audit.pl", clause(8)), [], []),
-      step(variant(pipeline(step(_Input, Shared), step(Shared, _Output)), pipeline(step(_Source, Middle), step(Middle, _Result))), library(variant, 2), [], [])
-    ]
-  )
-).
+% Prolog result format 4
+query(1, pipeline_audit(_0), ['X0' = _0]).
+result(1, complete, 1).
+answer(1,
+       ['X0' = report(stages(5), transitions(4), summaries([stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), trace([step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete]), invariant(true), schema_variant(true))]).
+why(1,
+    ['X0' = report(stages(5), transitions(4), summaries([stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), trace([step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete]), invariant(true), schema_variant(true))],
+    [pipeline_audit(report(stages(5), transitions(4), summaries([stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), trace([step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete]), invariant(true), schema_variant(true)))]).
 
+clause(8,
+       linked_pipeline_schema(pipeline(step(anonymous(1), var('Shared')), step(var('Shared'), anonymous(2)))),
+       true).
+clause(9,
+       pipeline_audit(report(stages(var('StageCount')), transitions(var('TransitionCount')), summaries(var('StageSummaries')), trace(var('Trace')), invariant(true), schema_variant(true))),
+       (countall(stage(anonymous(1), anonymous(2)), var('StageCount')),
+        countall(transition(anonymous(3), anonymous(4), anonymous(5)), var('TransitionCount')),
+        findall(stage(var('Index'), var('Name'), outgoing(var('Outgoing'))), (cfor(0, 4, var('Index')), stage(var('Index'), var('Name')), countall(transition(var('Index'), anonymous(6), anonymous(7)), var('Outgoing'))), var('StageSummaries')),
+        findall(step(var('Index'), var('From'), var('To')), transition(var('Index'), var('From'), var('To')), var('Trace'), [complete]),
+        forall(transition(var('Index'), var('From'), var('To')), transition_is_well_formed(var('Index'), var('From'), var('To'))),
+        linked_pipeline_schema(var('Schema')),
+        variant(var('Schema'), pipeline(step(anonymous(8), var('Middle')), step(var('Middle'), anonymous(9)))))).
+
+step(pipeline_audit(report(stages(5), transitions(4), summaries([stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]), trace([step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete]), invariant(true), schema_variant(true))),
+     rule(9),
+     ['StageCount' = 5,
+      'TransitionCount' = 4,
+      'StageSummaries' = [stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))],
+      'Trace' = [step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete],
+      'Schema' = pipeline(step(_Input, Shared), step(Shared, _Output))],
+     [countall(stage(__anon0, __anon1), 5),
+      countall(transition(__anon2, __anon3, __anon4), 4),
+      findall(stage(Index, Name, outgoing(Outgoing)), (cfor(0, 4, Index), stage(Index, Name), countall(transition(Index, __anon5, __anon6), Outgoing)), [stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]),
+      findall(step(Index, From, To), transition(Index, From, To), [step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete], [complete]),
+      forall(transition(Index, From, To), transition_is_well_formed(Index, From, To)),
+      linked_pipeline_schema(pipeline(step(_Input, Shared), step(Shared, _Output))),
+      variant(pipeline(step(_Input, Shared), step(Shared, _Output)), pipeline(step(_Source, Middle), step(Middle, _Result)))]).
+step(countall(stage(__anon0, __anon1), 5), builtin, [], []).
+step(countall(transition(__anon2, __anon3, __anon4), 4), builtin, [], []).
+step(findall(stage(Index, Name, outgoing(Outgoing)), (cfor(0, 4, Index), stage(Index, Name), countall(transition(Index, __anon5, __anon6), Outgoing)), [stage(0, receive, outgoing(1)), stage(1, parse, outgoing(1)), stage(2, validate, outgoing(1)), stage(3, reason, outgoing(1)), stage(4, publish, outgoing(0))]),
+     collected,
+     [],
+     []).
+step(findall(step(Index, From, To), transition(Index, From, To), [step(0, receive, parse), step(1, parse, validate), step(2, validate, reason), step(3, reason, publish), complete], [complete]),
+     builtin,
+     [],
+     []).
+step(forall(transition(Index, From, To), transition_is_well_formed(Index, From, To)),
+     builtin,
+     [],
+     []).
+step(linked_pipeline_schema(pipeline(step(_Input, Shared), step(Shared, _Output))),
+     fact(8),
+     [],
+     []).
+step(variant(pipeline(step(_Input, Shared), step(Shared, _Output)), pipeline(step(_Source, Middle), step(Middle, _Result))),
+     builtin,
+     [],
+     []).

package/examples/proof/iso-extensions.pl

@@ -1,78 +1,72 @@
-extension_example(all_colors_are_atoms, true).
-why(
-  extension_example(all_colors_are_atoms, true),
-  step(
-    extension_example(all_colors_are_atoms, true),
-    rule("iso-extensions.pl", clause(4)),
-    [],
-    [
-      step(forall(color(Color), atom(Color)), library(forall, 2), [], [])
-    ]
-  )
-).
+% Prolog result format 4
+query(1, extension_example(_0, _1), ['X0' = _0, 'X1' = _1]).
+result(1, complete, 6).
+answer(1, ['X0' = all_colors_are_atoms, 'X1' = true]).
+why(1,
+    ['X0' = all_colors_are_atoms, 'X1' = true],
+    [extension_example(all_colors_are_atoms, true)]).
+answer(1, ['X0' = successors, 'X1' = [1 - 2, 2 - 3, 3 - 4]]).
+why(1,
+    ['X0' = successors, 'X1' = [1 - 2, 2 - 3, 3 - 4]],
+    [extension_example(successors, [1 - 2, 2 - 3, 3 - 4])]).
+answer(1, ['X0' = collection_with_tail, 'X1' = [red, green, blue, done]]).
+why(1,
+    ['X0' = collection_with_tail, 'X1' = [red, green, blue, done]],
+    [extension_example(collection_with_tail, [red, green, blue, done])]).
+answer(1, ['X0' = repeated_variable_variant, 'X1' = true]).
+why(1,
+    ['X0' = repeated_variable_variant, 'X1' = true],
+    [extension_example(repeated_variable_variant, true)]).
+answer(1, ['X0' = different_variable_shape, 'X1' = true]).
+why(1,
+    ['X0' = different_variable_shape, 'X1' = true],
+    [extension_example(different_variable_shape, true)]).
+answer(1, ['X0' = color_count, 'X1' = 3]).
+why(1, ['X0' = color_count, 'X1' = 3], [extension_example(color_count, 3)]).
 
-extension_example(successors, [1 - 2, 2 - 3, 3 - 4]).
-why(
-  extension_example(successors, ['-'(1, 2), '-'(2, 3), '-'(3, 4)]),
-  step(
-    extension_example(successors, ['-'(1, 2), '-'(2, 3), '-'(3, 4)]),
-    rule("iso-extensions.pl", clause(5)),
-    ['Pairs' = ['-'(1, 2), '-'(2, 3), '-'(3, 4)]],
-    [
-      step(findall('-'(N, S), (cfor(1, 3, N), succ(N, S)), ['-'(1, 2), '-'(2, 3), '-'(3, 4)]), builtin(findall, 3), [], [])
-    ]
-  )
-).
-
-extension_example(collection_with_tail, [red, green, blue, done]).
-why(
-  extension_example(collection_with_tail, [red, green, blue, done]),
-  step(
-    extension_example(collection_with_tail, [red, green, blue, done]),
-    rule("iso-extensions.pl", clause(6)),
-    ['Colors' = [red, green, blue, done]],
-    [
-      step(findall(Template, color(Template), [red, green, blue, done], [done]), library(findall, 4), [], [])
-    ]
-  )
-).
-
-extension_example(repeated_variable_variant, true).
-why(
-  extension_example(repeated_variable_variant, true),
-  step(
-    extension_example(repeated_variable_variant, true),
-    rule("iso-extensions.pl", clause(7)),
-    [],
-    [
-      step(variant(tree(X, X), tree(Y, Y)), library(variant, 2), [], [])
-    ]
-  )
-).
-
-extension_example(different_variable_shape, true).
-why(
-  extension_example(different_variable_shape, true),
-  step(
-    extension_example(different_variable_shape, true),
-    rule("iso-extensions.pl", clause(8)),
-    [],
-    [
-      step('\\+'(variant(tree(X, X), tree(__anon0, _Y))), builtin('\\+', 1), [], [])
-    ]
-  )
-).
-
-extension_example(color_count, 3).
-why(
-  extension_example(color_count, 3),
-  step(
-    extension_example(color_count, 3),
-    rule("iso-extensions.pl", clause(9)),
-    ['Count' = 3],
-    [
-      step(countall(color(__anon1), 3), library(countall, 2), [], [])
-    ]
-  )
-).
+clause(4,
+       extension_example(all_colors_are_atoms, true),
+       forall(color(var('Color')), atom(var('Color')))).
+clause(5,
+       extension_example(successors, var('Pairs')),
+       findall(var('N') - var('S'), (cfor(1, 3, var('N')), succ(var('N'), var('S'))), var('Pairs'))).
+clause(6,
+       extension_example(collection_with_tail, var('Colors')),
+       findall(var('Color'), color(var('Color')), var('Colors'), [done])).
+clause(7,
+       extension_example(repeated_variable_variant, true),
+       variant(tree(var('X'), var('X')), tree(var('Y'), var('Y')))).
+clause(8,
+       extension_example(different_variable_shape, true),
+       \+ variant(tree(var('X'), var('X')), tree(anonymous(1), anonymous(2)))).
+clause(9,
+       extension_example(color_count, var('Count')),
+       countall(color(anonymous(1)), var('Count'))).
 
+step(extension_example(all_colors_are_atoms, true),
+     rule(4),
+     [],
+     [forall(color(Color), atom(Color))]).
+step(forall(color(Color), atom(Color)), builtin, [], []).
+step(extension_example(successors, [1 - 2, 2 - 3, 3 - 4]),
+     rule(5),
+     ['Pairs' = [1 - 2, 2 - 3, 3 - 4]],
+     [findall(N - S, (cfor(1, 3, N), succ(N, S)), [1 - 2, 2 - 3, 3 - 4])]).
+step(findall(N - S, (cfor(1, 3, N), succ(N, S)), [1 - 2, 2 - 3, 3 - 4]), collected, [], []).
+step(extension_example(collection_with_tail, [red, green, blue, done]),
+     rule(6),
+     ['Colors' = [red, green, blue, done]],
+     [findall(Template, color(Template), [red, green, blue, done], [done])]).
+step(findall(Template, color(Template), [red, green, blue, done], [done]), builtin, [], []).
+step(extension_example(repeated_variable_variant, true),
+     rule(7),
+     [],
+     [variant(tree(X, X), tree(Y, Y))]).
+step(variant(tree(X, X), tree(Y, Y)), builtin, [], []).
+step(extension_example(different_variable_shape, true),
+     rule(8),
+     [],
+     [\+ variant(tree(X, X), tree(__anon0, _Y))]).
+step(\+ variant(tree(X, X), tree(__anon0, _Y)), absent, [], []).
+step(extension_example(color_count, 3), rule(9), ['Count' = 3], [countall(color(__anon1), 3)]).
+step(countall(color(__anon1), 3), builtin, [], []).