diff options
| author | Son Ho | 2022-02-28 19:16:22 +0100 |
|---|---|---|
| committer | Son Ho | 2022-02-28 19:16:22 +0100 |
| commit | a92a3a7f9088560f318adb569bf9c8a87a7e5d3a (patch) | |
| tree | 21639a21c5a15f461f5e951364086f760dfe6b1a | |
| parent | 9f8deb8283fc5affdfc36218c22e316f0efb866f (diff) | |
Fix minor issues due to updates in Charon
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | src/CfimOfJson.ml | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -47,10 +47,11 @@ translate-nll-betree_nll: SUBDIR:=misc # directories in Charon .PHONY: gen-cfim-% +# TODO: remove those "gen-..." rules, and just do `make` in the charon repo gen-cfim-%: CHARON_OPTIONS = --dest ../tests/cfim --no-code-duplication gen-cfim-%: CHARON_TESTS_SRC = ../tests/src -gen-cfim-nll-%: CHARON_OPTIONS = --dest ../tests/cfim --no-code-duplication --nll +gen-cfim-nll-%: CHARON_OPTIONS = --dest ../tests-nll/cfim --no-code-duplication --nll gen-cfim-nll-%: CHARON_TESTS_SRC = ../tests-nll/src gen-cfim-%: build diff --git a/src/CfimOfJson.ml b/src/CfimOfJson.ml index 8278668a..4c7fc58b 100644 --- a/src/CfimOfJson.ml +++ b/src/CfimOfJson.ml @@ -203,8 +203,8 @@ let type_def_of_json (js : json) : (T.type_def, string) result = ("name", name); ("region_params", region_params); ("type_params", type_params); - ("kind", kind); ("regions_hierarchy", regions_hierarchy); + ("kind", kind); ] -> let* def_id = T.TypeDefId.id_of_json def_id in let* name = name_of_json name in |