diff options
| author | Son Ho | 2024-04-11 19:40:08 +0200 |
|---|---|---|
| committer | Son Ho | 2024-04-11 19:40:08 +0200 |
| commit | 86c3680b1f3f50b4c4e6198eebc145cadfff3876 (patch) | |
| tree | c79ea2c4a35198d9011287db4767599b0c5c1c42 /compiler/ExtractBase.ml | |
| parent | 9c1773530a7056c161e69471b36eaa3603f6ed26 (diff) | |
| parent | 4fb9c9f655a9ffc3b4a1a717988311c057c9c599 (diff) | |
Merge remote-tracking branch 'origin/main' into son/clean
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 8b17591e..656d2f27 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) : |