Skip to content

Add newly quantified terms to the stack trace #426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gares merged 2 commits into from
Jul 24, 2026
Merged

Add newly quantified terms to the stack trace #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f3d85f
Add quantified variables to pi/sigma traces
VojtechStep Jul 23, 2026
e13e2b3
Propagate newly quantified terms in the elaborator
VojtechStep Jul 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/elpi_trace_elaborator.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,14 @@ try
assert(List.length events = 1);
let _, events = List.hd events in
Builtin { name; outcome; events = List.map decode_infer_event events }
else if name = "pi" || name = "sigma" then
let new_term = match has "user:new-quant" items with
| Some ({ payload = var }, _) -> var
| _ -> [] in
let name = { kind = `Logic; name; payload = [] } in
let () =
push_stack (step,rid) goal_id (`BuiltinRule ({ name with payload = new_term })) siblings in
Builtin { name; outcome; events = [] }
else if name = "implication" then
let new_hyps = match has "user:new-hyps" items with
| Some ({ payload = hyps },_) -> hyps
Expand Down
2 changes: 2 additions & 0 deletions src/runtime/runtime.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4116,13 +4116,15 @@ let make_runtime : ?max_steps: int -> ?delay_outside_fragment: bool -> executabl
| Builtin(Pi, [arg]) -> [%spy "user:rule" ~rid ~gid pp_string "pi"];
let f = get_lambda_body ~depth arg in
let gid[@trace] = make_subgoal_id gid ((depth+1,f)[@trace]) in
[%spy "user:new-quant" ~rid ~gid pp_constant depth];
[%spy "user:rule:pi" ~rid ~gid pp_string "success"];
[%tcall run (depth+1) p f (gid[@trace]) gs next alts cutto_alts]
| Builtin(Sigma, [arg]) -> [%spy "user:rule" ~rid ~gid pp_string "sigma"];
let f = get_lambda_body ~depth arg in
let v = UVar(oref ~depth C.dummy, 0) in
let fv = subst depth [v] f in
let gid[@trace] = make_subgoal_id gid ((depth,fv)[@trace]) in
[%spy "user:new-quant" ~rid ~gid (uppterm depth [] ~argsdepth:0 empty_env) v];
[%spy "user:rule:sigma" ~rid ~gid pp_string "success"];
[%tcall run depth p fv (gid[@trace]) gs next alts cutto_alts]
| Builtin(Delay,args) -> [%spy "user:rule" ~rid ~gid pp_string "builtin"]; [%spy "user:rule:builtin:name" ~rid ~gid pp_string (show_builtin_predicate C.show Delay)];
Expand Down
28 changes: 17 additions & 11 deletions tests/sources/trace2.elab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@
"stack": [
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 3,
"runtime_id": 0
Expand Down Expand Up @@ -219,14 +220,15 @@
{
"rule": [
"BuiltinRule",
{ "name": "sigma", "kind": "Logic", "payload": [] }
{ "name": "sigma", "kind": "Logic", "payload": [ "X0^1" ] }
],
"step_id": 4,
"runtime_id": 0
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 3,
"runtime_id": 0
Expand Down Expand Up @@ -295,14 +297,15 @@
{
"rule": [
"BuiltinRule",
{ "name": "sigma", "kind": "Logic", "payload": [] }
{ "name": "sigma", "kind": "Logic", "payload": [ "X0^1" ] }
],
"step_id": 4,
"runtime_id": 0
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 3,
"runtime_id": 0
Expand Down Expand Up @@ -382,14 +385,15 @@
{
"rule": [
"BuiltinRule",
{ "name": "sigma", "kind": "Logic", "payload": [] }
{ "name": "sigma", "kind": "Logic", "payload": [ "X0^1" ] }
],
"step_id": 4,
"runtime_id": 0
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 3,
"runtime_id": 0
Expand Down Expand Up @@ -496,14 +500,15 @@
{
"rule": [
"BuiltinRule",
{ "name": "sigma", "kind": "Logic", "payload": [] }
{ "name": "sigma", "kind": "Logic", "payload": [ "X0^1" ] }
],
"step_id": 4,
"runtime_id": 0
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 3,
"runtime_id": 0
Expand Down Expand Up @@ -588,14 +593,15 @@
{
"rule": [
"BuiltinRule",
{ "name": "sigma", "kind": "Logic", "payload": [] }
{ "name": "sigma", "kind": "Logic", "payload": [ "X0^1" ] }
],
"step_id": 4,
"runtime_id": 0
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 3,
"runtime_id": 0
Expand Down
2 changes: 2 additions & 0 deletions tests/sources/trace2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
{"step" : 3,"kind" : ["Info"],"goal_id" : 6,"runtime_id" : 0,"name" : "user:rule","payload" : ["pi"]}
{"step" : 3,"kind" : ["Info"],"goal_id" : 6,"runtime_id" : 0,"name" : "user:subgoal","payload" : ["7"]}
{"step" : 3,"kind" : ["Info"],"goal_id" : 7,"runtime_id" : 0,"name" : "user:newgoal","payload" : ["sigma c1 \\ fail => (true , fail)"]}
{"step" : 3,"kind" : ["Info"],"goal_id" : 7,"runtime_id" : 0,"name" : "user:new-quant","payload" : ["c0"]}
{"step" : 3,"kind" : ["Info"],"goal_id" : 7,"runtime_id" : 0,"name" : "user:rule:pi","payload" : ["success"]}
{"step" : 4,"kind" : ["Info"],"goal_id" : 7,"runtime_id" : 0,"name" : "user:curgoal","payload" : ["sigma","sigma c1 \\ fail => (true , fail)"]}
{"step" : 4,"kind" : ["Info"],"goal_id" : 7,"runtime_id" : 0,"name" : "user:rule","payload" : ["sigma"]}
{"step" : 4,"kind" : ["Info"],"goal_id" : 7,"runtime_id" : 0,"name" : "user:subgoal","payload" : ["8"]}
{"step" : 4,"kind" : ["Info"],"goal_id" : 8,"runtime_id" : 0,"name" : "user:newgoal","payload" : ["fail => (true , fail)"]}
{"step" : 4,"kind" : ["Info"],"goal_id" : 8,"runtime_id" : 0,"name" : "user:new-quant","payload" : ["X0^1"]}
{"step" : 4,"kind" : ["Info"],"goal_id" : 8,"runtime_id" : 0,"name" : "user:rule:sigma","payload" : ["success"]}
{"step" : 5,"kind" : ["Info"],"goal_id" : 8,"runtime_id" : 0,"name" : "user:curgoal","payload" : ["=>","fail => (true , fail)"]}
{"step" : 5,"kind" : ["Info"],"goal_id" : 8,"runtime_id" : 0,"name" : "user:rule","payload" : ["implication"]}
Expand Down
78 changes: 58 additions & 20 deletions tests/sources/trace_w.elab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1149,7 +1149,8 @@
"stack": [
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 11,
"runtime_id": 0
Expand Down Expand Up @@ -1293,7 +1294,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 11,
"runtime_id": 0
Expand Down Expand Up @@ -1451,7 +1453,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 11,
"runtime_id": 0
Expand Down Expand Up @@ -5392,7 +5395,11 @@
{
"rule": [
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [] }
{
"name": "pi",
"kind": "Logic",
"payload": [ "c0" ]
}
],
"step_id": 31,
"runtime_id": 1
Expand Down Expand Up @@ -5491,7 +5498,11 @@
{
"rule": [
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [] }
{
"name": "pi",
"kind": "Logic",
"payload": [ "c0" ]
}
],
"step_id": 31,
"runtime_id": 1
Expand Down Expand Up @@ -5623,7 +5634,11 @@
{
"rule": [
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [] }
{
"name": "pi",
"kind": "Logic",
"payload": [ "c0" ]
}
],
"step_id": 31,
"runtime_id": 1
Expand Down Expand Up @@ -5775,7 +5790,11 @@
{
"rule": [
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [] }
{
"name": "pi",
"kind": "Logic",
"payload": [ "c0" ]
}
],
"step_id": 31,
"runtime_id": 1
Expand Down Expand Up @@ -5917,7 +5936,11 @@
{
"rule": [
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [] }
{
"name": "pi",
"kind": "Logic",
"payload": [ "c0" ]
}
],
"step_id": 31,
"runtime_id": 1
Expand Down Expand Up @@ -6059,7 +6082,11 @@
{
"rule": [
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [] }
{
"name": "pi",
"kind": "Logic",
"payload": [ "c0" ]
}
],
"step_id": 31,
"runtime_id": 1
Expand Down Expand Up @@ -6270,7 +6297,8 @@
"stack": [
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -6402,7 +6430,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -6566,7 +6595,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -6758,7 +6788,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -6932,7 +6963,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -7127,7 +7159,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -7337,7 +7370,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -7689,7 +7723,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -7960,7 +7995,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -8163,7 +8199,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down Expand Up @@ -8382,7 +8419,8 @@
},
{
"rule": [
"BuiltinRule", { "name": "pi", "kind": "Logic", "payload": [] }
"BuiltinRule",
{ "name": "pi", "kind": "Logic", "payload": [ "c0" ] }
],
"step_id": 20,
"runtime_id": 0
Expand Down
3 changes: 3 additions & 0 deletions tests/sources/trace_w.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
{"step" : 11,"kind" : ["Info"],"goal_id" : 20,"runtime_id" : 0,"name" : "user:rule","payload" : ["pi"]}
{"step" : 11,"kind" : ["Info"],"goal_id" : 20,"runtime_id" : 0,"name" : "user:subgoal","payload" : ["21"]}
{"step" : 11,"kind" : ["Info"],"goal_id" : 21,"runtime_id" : 0,"name" : "user:newgoal","payload" : ["of c0 (mono X5) => of c0 (mono X6)"]}
{"step" : 11,"kind" : ["Info"],"goal_id" : 21,"runtime_id" : 0,"name" : "user:new-quant","payload" : ["c0"]}
{"step" : 11,"kind" : ["Info"],"goal_id" : 21,"runtime_id" : 0,"name" : "user:rule:pi","payload" : ["success"]}
{"step" : 12,"kind" : ["Info"],"goal_id" : 21,"runtime_id" : 0,"name" : "user:curgoal","payload" : ["=>","of c0 (mono X5) => of c0 (mono X6)"]}
{"step" : 12,"kind" : ["Info"],"goal_id" : 21,"runtime_id" : 0,"name" : "user:rule","payload" : ["implication"]}
Expand Down Expand Up @@ -400,6 +401,7 @@
{"step" : 31,"kind" : ["Info"],"goal_id" : 54,"runtime_id" : 1,"name" : "user:rule","payload" : ["pi"]}
{"step" : 31,"kind" : ["Info"],"goal_id" : 54,"runtime_id" : 1,"name" : "user:subgoal","payload" : ["60"]}
{"step" : 31,"kind" : ["Info"],"goal_id" : 60,"runtime_id" : 1,"name" : "user:newgoal","payload" : ["copy (uvar frozen--452 []) c0 =>\n bind [] [] (uvar frozen--452 [] ===> uvar frozen--452 []) (X13 c0)"]}
{"step" : 31,"kind" : ["Info"],"goal_id" : 60,"runtime_id" : 1,"name" : "user:new-quant","payload" : ["c0"]}
{"step" : 31,"kind" : ["Info"],"goal_id" : 60,"runtime_id" : 1,"name" : "user:rule:pi","payload" : ["success"]}
{"step" : 32,"kind" : ["Info"],"goal_id" : 60,"runtime_id" : 1,"name" : "user:curgoal","payload" : ["=>","copy (uvar frozen--452 []) c0 =>\n bind [] [] (uvar frozen--452 [] ===> uvar frozen--452 []) (X13 c0)"]}
{"step" : 32,"kind" : ["Info"],"goal_id" : 60,"runtime_id" : 1,"name" : "user:rule","payload" : ["implication"]}
Expand Down Expand Up @@ -464,6 +466,7 @@
{"step" : 20,"kind" : ["Info"],"goal_id" : 19,"runtime_id" : 0,"name" : "user:rule","payload" : ["pi"]}
{"step" : 20,"kind" : ["Info"],"goal_id" : 19,"runtime_id" : 0,"name" : "user:subgoal","payload" : ["67"]}
{"step" : 20,"kind" : ["Info"],"goal_id" : 67,"runtime_id" : 0,"name" : "user:newgoal","payload" : ["of c0 (all any c1 \\ mono (c1 ===> c1)) => of (app c0 (global [])) (mono X3)"]}
{"step" : 20,"kind" : ["Info"],"goal_id" : 67,"runtime_id" : 0,"name" : "user:new-quant","payload" : ["c0"]}
{"step" : 20,"kind" : ["Info"],"goal_id" : 67,"runtime_id" : 0,"name" : "user:rule:pi","payload" : ["success"]}
{"step" : 21,"kind" : ["Info"],"goal_id" : 67,"runtime_id" : 0,"name" : "user:curgoal","payload" : ["=>","of c0 (all any c1 \\ mono (c1 ===> c1)) => of (app c0 (global [])) (mono X3)"]}
{"step" : 21,"kind" : ["Info"],"goal_id" : 67,"runtime_id" : 0,"name" : "user:rule","payload" : ["implication"]}
Expand Down
Loading