Skip to content
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

Jump to bottom

Fix for yojson 2.0.2 #167

Merged
merged 2 commits into from
Nov 25, 2022
Merged

Fix for yojson 2.0.2 #167

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
998dc65
Fix for yojson 2.0.2
Oct 24, 2022
03c518e
Tighten the dependency on atd in elpi.opam
Oct 25, 2022
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
4 changes: 2 additions & 2 deletions elpi.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ depends: [
"cmdliner" {with-test}
"dune" {>= "2.8.0"}
"conf-time" {with-test}
"atdgen" {>= "2.9.1" & < "2.10.0"}
"atdts" {>= "2.9.1" & < "2.10.0"}
"atdgen" {>= "2.10.0"}
"atdts" {>= "2.10.0"}
"odoc" {with-doc}
]
depopts: [
Expand Down
6 changes: 3 additions & 3 deletions src/elpi_trace_elaborator.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,6 @@ let main =

let cards = Trace.cards steps ~stack_frames ~aggregated_goal_success ~goal_text ~goal_attempts in

let ob = Bi_outbuf.create_channel_writer stdout in
write_trace ob cards;
Bi_outbuf.flush_channel_writer ob
let buf = Buffer.create 1000 in
write_trace buf cards;
Buffer.output_buffer stdout buf
35,691 changes: 11,897 additions & 23,794 deletions tests/sources/broken_trace1.elab.json
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions tests/sources/trace.elab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,7 @@
}
],
"events": [
[ "Assign", "A0 := 1" ],
[ "Assign", "A1 := 2 + 3" ]
[ "Assign", "A0 := 1" ], [ "Assign", "A1 := 2 + 3" ]
]
},
"siblings": [ { "goal_text": "calc (2 + 3) 1", "goal_id": 8 } ],
Expand Down
27 changes: 9 additions & 18 deletions tests/sources/trace2.elab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -52,8 +51,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -104,8 +102,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -161,8 +158,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -220,8 +216,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -282,8 +277,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -352,8 +346,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -452,8 +445,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down Expand Up @@ -530,8 +522,7 @@
"rule": [
"UserRule",
{
"rule_text":
"main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_text": "main :- (print 1), (pi (c0 \\ (sigma (c1 \\ (fail => (true , fail)))))).",
"rule_loc": [
"File",
{
Expand Down
Loading