diff options
| author | Son HO | 2024-04-04 16:09:48 +0200 |
|---|---|---|
| committer | GitHub | 2024-04-04 16:09:48 +0200 |
| commit | 061d7f72bec27de46245afc82149271ca8c75627 (patch) | |
| tree | addd12dec0c1f5a564f9204fda77301771ff5e46 /compiler/ExtractBase.ml | |
| parent | 3909a38f3f8c58c9f97d36777c52e02617ef70b4 (diff) | |
| parent | 77208249c717579d1014f27592566069b8cd0eb2 (diff) | |
Merge pull request #106 from AeneasVerif/escherichia/error_catching
Added Error and EError to expressions and propagated related changes
Diffstat (limited to '')
| -rw-r--r-- | compiler/ExtractBase.ml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/ExtractBase.ml b/compiler/ExtractBase.ml index ce8c38ba..47b613c2 100644 --- a/compiler/ExtractBase.ml +++ b/compiler/ExtractBase.ml @@ -259,7 +259,7 @@ let report_name_collision (id_to_string : id -> string) let meta_to_string (meta : Meta.meta option) = match meta with | None -> "" - | Some meta -> "\n " ^ Errors.meta_to_string meta.span + | Some meta -> "\n " ^ Errors.meta_to_string meta in let id1 = "\n- " ^ id_to_string id1 ^ meta_to_string meta1 in let id2 = "\n- " ^ id_to_string id2 ^ meta_to_string meta2 in @@ -1719,7 +1719,8 @@ let ctx_compute_var_basename (meta : Meta.meta) (ctx : extraction_ctx) | TLiteral lty -> ( match lty with TBool -> "b" | TChar -> "c" | TInteger _ -> "i") | TArrow _ -> "f" - | TTraitType (_, name) -> name_from_type_ident name) + | TTraitType (_, name) -> name_from_type_ident name + | Error -> "x") (** Generates a type variable basename. *) let ctx_compute_type_var_basename (_ctx : extraction_ctx) (basename : string) : |