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

Update charon #59

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Update charon #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CHARON_HOME ?= $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../charon
KRML_HOME ?= $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../karamel
EURYDICE ?= ./eurydice $(EURYDICE_FLAGS)
CHARON ?= $(CHARON_HOME)/bin/charon --extract-opaque-bodies
CHARON ?= $(CHARON_HOME)/bin/charon

BROKEN_TESTS = step_by where_clauses chunks mutable_slice_range closure
TEST_DIRS = $(filter-out $(BROKEN_TESTS),$(subst test/,,$(shell find test -maxdepth 1 -mindepth 1 -type d)))
Expand Down
14 changes: 7 additions & 7 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 1 addition & 16 deletions lib/AstOfLlbc.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,22 +750,7 @@ let rec build_trait_clause_mapping env (trait_clauses : C.trait_clause list) =
in
( (C.Clause clause_id, item_name),
(decl_generics, ts, trait_decl.C.item_meta.name, decl.C.signature) ))
trait_decl.C.required_methods
@ List.map
(fun (item_name, decl_id) ->
match decl_id with
| Some decl_id ->
let decl = env.get_nth_function decl_id in
let ts =
{
K.n = List.length trait_decl.generics.types;
n_cgs = List.length trait_decl.generics.const_generics;
}
in
( (C.Clause clause_id, item_name),
(decl_generics, ts, trait_decl.C.item_meta.name, decl.C.signature) )
| None -> failwith ("TODO: handle provided trait methods, like " ^ item_name))
trait_decl.C.provided_methods
(trait_decl.C.required_methods @ trait_decl.C.provided_methods)
@ List.flatten
(List.mapi
(fun i (parent_clause : C.trait_clause) ->
Expand Down
Loading