From ae6a97708ef7b62f09cdb790cb529558d173e187 Mon Sep 17 00:00:00 2001 From: Alain Mebsout Date: Tue, 22 May 2018 19:45:17 +0200 Subject: [PATCH] Michelson: disable typechecking of field names through annotations This is not compatible with the inferring mechanism for annotations in types. --- src/proto_alpha/lib_protocol/src/script_ir_translator.ml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/proto_alpha/lib_protocol/src/script_ir_translator.ml b/src/proto_alpha/lib_protocol/src/script_ir_translator.ml index 27806b95f..0b8c83ab3 100644 --- a/src/proto_alpha/lib_protocol/src/script_ir_translator.ml +++ b/src/proto_alpha/lib_protocol/src/script_ir_translator.ml @@ -758,7 +758,9 @@ let merge_field_annot | Some `Field_annot a1, Some `Field_annot a2 -> if String.equal a1 a2 then ok annot1 - else error (Inconsistent_annotations ("%" ^ a1, "%" ^ a2)) + else ok None + (* TODO check this, do we want typechecking here ? *) + (* error (Inconsistent_annotations ("%" ^ a1, "%" ^ a2)) *) let merge_var_annot : var_annot option -> var_annot option -> var_annot option