From 6e2fc7fa47fcb8b88d9048eab0bb99028739de4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20Mart=C3=ADnez?= Date: Mon, 5 Feb 2024 16:34:46 -0800 Subject: [PATCH] snap --- .../fstar-lib/generated/FStar_CheckedFiles.ml | 4 +- ocaml/fstar-lib/generated/FStar_Class_Deq.ml | 15 +- ocaml/fstar-lib/generated/FStar_Class_Ord.ml | 15 +- ocaml/fstar-lib/generated/FStar_Class_PP.ml | 15 +- .../generated/FStar_Class_Printable.ml | 15 +- ocaml/fstar-lib/generated/FStar_Class_Show.ml | 12 +- ocaml/fstar-lib/generated/FStar_Errors.ml | 30 +- .../fstar-lib/generated/FStar_Errors_Codes.ml | 2 +- .../generated/FStar_Extraction_Krml.ml | 163 +++++---- .../generated/FStar_Extraction_ML_Code.ml | 17 +- .../generated/FStar_Extraction_ML_Modul.ml | 27 +- .../generated/FStar_Extraction_ML_RegEmb.ml | 10 +- ...ar_Extraction_ML_RemoveUnusedParameters.ml | 25 +- .../generated/FStar_Extraction_ML_Syntax.ml | 58 +-- .../generated/FStar_Extraction_ML_Term.ml | 56 +-- .../generated/FStar_Extraction_ML_UEnv.ml | 20 +- .../FStar_InteractiveHelpers_Base.ml | 47 +-- .../FStar_InteractiveHelpers_Effectful.ml | 25 +- .../FStar_InteractiveHelpers_ExploreTerm.ml | 4 +- .../FStar_InteractiveHelpers_PostProcess.ml | 4 +- .../FStar_Interactive_CompletionTable.ml | 10 +- .../generated/FStar_Interactive_Ide_Types.ml | 31 +- .../FStar_Interactive_Incremental.ml | 15 +- .../generated/FStar_Interactive_JsonHelper.ml | 3 +- .../generated/FStar_Interactive_Legacy.ml | 42 ++- .../generated/FStar_Interactive_PushHelper.ml | 23 +- .../FStar_Interactive_QueryHelper.ml | 2 +- .../fstar-lib/generated/FStar_Math_Euclid.ml | 8 +- ocaml/fstar-lib/generated/FStar_Options.ml | 24 +- ocaml/fstar-lib/generated/FStar_Parser_AST.ml | 342 ++++++++++-------- .../generated/FStar_Parser_AST_Util.ml | 30 +- .../fstar-lib/generated/FStar_Parser_Const.ml | 83 ++++- ocaml/fstar-lib/generated/FStar_Parser_Dep.ml | 168 ++++----- .../generated/FStar_Parser_ToDocument.ml | 39 +- ocaml/fstar-lib/generated/FStar_Pervasives.ml | 51 --- .../generated/FStar_Reflection_Typing.ml | 4 +- .../generated/FStar_Reflection_V1_Data.ml | 93 ++--- .../FStar_Reflection_V1_Embeddings.ml | 10 +- .../FStar_Reflection_V1_NBEEmbeddings.ml | 10 +- .../generated/FStar_Reflection_V2_Data.ml | 78 ++-- .../FStar_Reflection_V2_Embeddings.ml | 19 +- .../FStar_Reflection_V2_NBEEmbeddings.ml | 10 +- .../FStar_ReflexiveTransitiveClosure.ml | 14 +- .../generated/FStar_SMTEncoding_Encode.ml | 21 +- .../generated/FStar_SMTEncoding_EncodeTerm.ml | 23 +- .../generated/FStar_SMTEncoding_Env.ml | 27 +- .../FStar_SMTEncoding_ErrorReporting.ml | 9 +- .../generated/FStar_SMTEncoding_Solver.ml | 4 +- .../generated/FStar_SMTEncoding_Term.ml | 84 +++-- .../generated/FStar_SMTEncoding_Util.ml | 9 +- .../generated/FStar_SMTEncoding_Z3.ml | 4 +- .../fstar-lib/generated/FStar_Syntax_DsEnv.ml | 20 +- .../generated/FStar_Syntax_Embeddings.ml | 3 +- .../generated/FStar_Syntax_Formula.ml | 12 +- .../fstar-lib/generated/FStar_Syntax_Free.ml | 9 +- .../fstar-lib/generated/FStar_Syntax_Hash.ml | 80 ++-- .../generated/FStar_Syntax_InstFV.ml | 9 +- .../fstar-lib/generated/FStar_Syntax_Print.ml | 5 +- .../generated/FStar_Syntax_Resugar.ml | 27 +- .../fstar-lib/generated/FStar_Syntax_Subst.ml | 11 +- .../generated/FStar_Syntax_Syntax.ml | 125 ++++--- .../generated/FStar_Syntax_Unionfind.ml | 5 +- .../fstar-lib/generated/FStar_Syntax_Util.ml | 85 +++-- .../generated/FStar_Syntax_VisitM.ml | 18 +- .../FStar_Tactics_CanonCommMonoid.ml | 4 +- .../FStar_Tactics_CanonCommMonoidSimple.ml | 6 +- ...tar_Tactics_CanonCommMonoidSimple_Equiv.ml | 12 +- .../FStar_Tactics_CanonCommSemiring.ml | 8 +- .../generated/FStar_Tactics_Hooks.ml | 17 +- .../generated/FStar_Tactics_NamedView.ml | 4 +- .../FStar_Tactics_PatternMatching.ml | 7 +- .../generated/FStar_Tactics_V1_Basic.ml | 31 +- .../generated/FStar_Tactics_V2_Basic.ml | 43 ++- .../generated/FStar_ToSyntax_ToSyntax.ml | 261 ++++++------- .../generated/FStar_TypeChecker_Common.ml | 3 +- .../generated/FStar_TypeChecker_Core.ml | 47 ++- .../generated/FStar_TypeChecker_DMFF.ml | 49 ++- .../FStar_TypeChecker_DeferredImplicits.ml | 8 +- .../generated/FStar_TypeChecker_Env.ml | 150 ++++---- .../generated/FStar_TypeChecker_Err.ml | 6 +- .../generated/FStar_TypeChecker_Generalize.ml | 34 +- .../generated/FStar_TypeChecker_NBE.ml | 9 +- .../generated/FStar_TypeChecker_NBETerm.ml | 108 +++--- .../generated/FStar_TypeChecker_Normalize.ml | 172 +++++---- .../FStar_TypeChecker_PatternUtils.ml | 5 +- .../generated/FStar_TypeChecker_Positivity.ml | 9 +- .../generated/FStar_TypeChecker_Primops.ml | 12 +- .../FStar_TypeChecker_Primops_Base.ml | 4 +- .../generated/FStar_TypeChecker_Rel.ml | 135 +++---- .../generated/FStar_TypeChecker_Tc.ml | 28 +- .../generated/FStar_TypeChecker_TcEffect.ml | 29 +- .../FStar_TypeChecker_TcInductive.ml | 33 +- .../generated/FStar_TypeChecker_TcTerm.ml | 175 ++++----- .../generated/FStar_TypeChecker_Util.ml | 66 ++-- ocaml/fstar-lib/generated/FStar_Universal.ml | 24 +- .../fstar-lib/generated/LowStar_BufferView.ml | 6 +- .../generated/LowStar_BufferView_Down.ml | 6 +- .../generated/LowStar_Monotonic_Buffer.ml | 4 +- .../fstar-tests/generated/FStar_Tests_Norm.ml | 11 +- 99 files changed, 2062 insertions(+), 1727 deletions(-) diff --git a/ocaml/fstar-lib/generated/FStar_CheckedFiles.ml b/ocaml/fstar-lib/generated/FStar_CheckedFiles.ml index 3670109831f..03e1bb1964e 100644 --- a/ocaml/fstar-lib/generated/FStar_CheckedFiles.ml +++ b/ocaml/fstar-lib/generated/FStar_CheckedFiles.ml @@ -585,8 +585,8 @@ let (store_module_to_cache : else () let (unsafe_raw_load_checked_file : Prims.string -> - (FStar_Parser_Dep.parsing_data * Prims.string Prims.list * tc_result) - FStar_Pervasives_Native.option) + (FStar_Parser_Dep.parsing_data, Prims.string Prims.list, tc_result) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun checked_fn -> let entry = FStar_Compiler_Util.load_2values_from_file checked_fn in diff --git a/ocaml/fstar-lib/generated/FStar_Class_Deq.ml b/ocaml/fstar-lib/generated/FStar_Class_Deq.ml index dc8123b2a79..84ade2d599e 100644 --- a/ocaml/fstar-lib/generated/FStar_Class_Deq.ml +++ b/ocaml/fstar-lib/generated/FStar_Class_Deq.ml @@ -73,7 +73,9 @@ let deq_tuple2 : 'a 'b . 'a deq -> 'b deq -> ('a * 'b) deq = (op_Equals_Question d1 x1 y1) && (op_Equals_Question d2 x2 y2)) } -let deq_tuple3 : 'a 'b 'c . 'a deq -> 'b deq -> 'c deq -> ('a * 'b * 'c) deq +let deq_tuple3 : + 'a 'b 'c . + 'a deq -> 'b deq -> 'c deq -> ('a, 'b, 'c) FStar_Tuple3.tuple3 deq = fun d1 -> fun d2 -> @@ -90,7 +92,8 @@ let deq_tuple3 : 'a 'b 'c . 'a deq -> 'b deq -> 'c deq -> ('a * 'b * 'c) deq } let deq_tuple4 : 'a 'b 'c 'd . - 'a deq -> 'b deq -> 'c deq -> 'd deq -> ('a * 'b * 'c * 'd) deq + 'a deq -> + 'b deq -> 'c deq -> 'd deq -> ('a, 'b, 'c, 'd) FStar_Tuple4.tuple4 deq = fun d1 -> fun d2 -> @@ -110,7 +113,9 @@ let deq_tuple4 : let deq_tuple5 : 'a 'b 'c 'd 'e . 'a deq -> - 'b deq -> 'c deq -> 'd deq -> 'e deq -> ('a * 'b * 'c * 'd * 'e) deq + 'b deq -> + 'c deq -> + 'd deq -> 'e deq -> ('a, 'b, 'c, 'd, 'e) FStar_Tuple5.tuple5 deq = fun d1 -> fun d2 -> @@ -134,7 +139,9 @@ let deq_tuple6 : 'a deq -> 'b deq -> 'c deq -> - 'd deq -> 'e deq -> 'f deq -> ('a * 'b * 'c * 'd * 'e * 'f) deq + 'd deq -> + 'e deq -> + 'f deq -> ('a, 'b, 'c, 'd, 'e, 'f) FStar_Tuple6.tuple6 deq = fun d1 -> fun d2 -> diff --git a/ocaml/fstar-lib/generated/FStar_Class_Ord.ml b/ocaml/fstar-lib/generated/FStar_Class_Ord.ml index 2a0c546051d..55e3bba5377 100644 --- a/ocaml/fstar-lib/generated/FStar_Class_Ord.ml +++ b/ocaml/fstar-lib/generated/FStar_Class_Ord.ml @@ -139,7 +139,9 @@ let ord_tuple2 : 'a 'b . 'a ord -> 'b ord -> ('a * 'b) ord = FStar_Compiler_Order.lex uu___2 (fun uu___3 -> cmp d2 x2 y2)) } -let ord_tuple3 : 'a 'b 'c . 'a ord -> 'b ord -> 'c ord -> ('a * 'b * 'c) ord +let ord_tuple3 : + 'a 'b 'c . + 'a ord -> 'b ord -> 'c ord -> ('a, 'b, 'c) FStar_Tuple3.tuple3 ord = fun d1 -> fun d2 -> @@ -161,7 +163,8 @@ let ord_tuple3 : 'a 'b 'c . 'a ord -> 'b ord -> 'c ord -> ('a * 'b * 'c) ord } let ord_tuple4 : 'a 'b 'c 'd . - 'a ord -> 'b ord -> 'c ord -> 'd ord -> ('a * 'b * 'c * 'd) ord + 'a ord -> + 'b ord -> 'c ord -> 'd ord -> ('a, 'b, 'c, 'd) FStar_Tuple4.tuple4 ord = fun d1 -> fun d2 -> @@ -189,7 +192,9 @@ let ord_tuple4 : let ord_tuple5 : 'a 'b 'c 'd 'e . 'a ord -> - 'b ord -> 'c ord -> 'd ord -> 'e ord -> ('a * 'b * 'c * 'd * 'e) ord + 'b ord -> + 'c ord -> + 'd ord -> 'e ord -> ('a, 'b, 'c, 'd, 'e) FStar_Tuple5.tuple5 ord = fun d1 -> fun d2 -> @@ -223,7 +228,9 @@ let ord_tuple6 : 'a ord -> 'b ord -> 'c ord -> - 'd ord -> 'e ord -> 'f ord -> ('a * 'b * 'c * 'd * 'e * 'f) ord + 'd ord -> + 'e ord -> + 'f ord -> ('a, 'b, 'c, 'd, 'e, 'f) FStar_Tuple6.tuple6 ord = fun d1 -> fun d2 -> diff --git a/ocaml/fstar-lib/generated/FStar_Class_PP.ml b/ocaml/fstar-lib/generated/FStar_Class_PP.ml index cbace49bb0b..76a85e3834c 100644 --- a/ocaml/fstar-lib/generated/FStar_Class_PP.ml +++ b/ocaml/fstar-lib/generated/FStar_Class_PP.ml @@ -67,7 +67,10 @@ let pp_tuple2 : 'a 'b . 'a pretty -> 'b pretty -> ('a * 'b) pretty = FStar_Pprint.parens uu___3) } let pp_tuple3 : - 'a 'b 'c . 'a pretty -> 'b pretty -> 'c pretty -> ('a * 'b * 'c) pretty = + 'a 'b 'c . + 'a pretty -> + 'b pretty -> 'c pretty -> ('a, 'b, 'c) FStar_Tuple3.tuple3 pretty + = fun uu___ -> fun uu___1 -> fun uu___2 -> @@ -90,7 +93,8 @@ let pp_tuple3 : let pp_tuple4 : 'a 'b 'c 'd . 'a pretty -> - 'b pretty -> 'c pretty -> 'd pretty -> ('a * 'b * 'c * 'd) pretty + 'b pretty -> + 'c pretty -> 'd pretty -> ('a, 'b, 'c, 'd) FStar_Tuple4.tuple4 pretty = fun uu___ -> fun uu___1 -> @@ -121,7 +125,8 @@ let pp_tuple5 : 'a pretty -> 'b pretty -> 'c pretty -> - 'd pretty -> 'e pretty -> ('a * 'b * 'c * 'd * 'e) pretty + 'd pretty -> + 'e pretty -> ('a, 'b, 'c, 'd, 'e) FStar_Tuple5.tuple5 pretty = fun uu___ -> fun uu___1 -> @@ -157,7 +162,9 @@ let pp_tuple6 : 'b pretty -> 'c pretty -> 'd pretty -> - 'e pretty -> 'f pretty -> ('a * 'b * 'c * 'd * 'e * 'f) pretty + 'e pretty -> + 'f pretty -> + ('a, 'b, 'c, 'd, 'e, 'f) FStar_Tuple6.tuple6 pretty = fun uu___ -> fun uu___1 -> diff --git a/ocaml/fstar-lib/generated/FStar_Class_Printable.ml b/ocaml/fstar-lib/generated/FStar_Class_Printable.ml index a6c581cf4d4..974dedc1c60 100644 --- a/ocaml/fstar-lib/generated/FStar_Class_Printable.ml +++ b/ocaml/fstar-lib/generated/FStar_Class_Printable.ml @@ -92,7 +92,8 @@ let printable_tuple2 : let printable_tuple3 : 't0 't1 't2 . 't0 printable -> - 't1 printable -> 't2 printable -> ('t0 * 't1 * 't2) printable + 't1 printable -> + 't2 printable -> ('t0, 't1, 't2) FStar_Tuple3.tuple3 printable = fun uu___ -> fun uu___1 -> @@ -113,7 +114,8 @@ let printable_tuple4 : 't0 't1 't2 't3 . 't0 printable -> 't1 printable -> - 't2 printable -> 't3 printable -> ('t0 * 't1 * 't2 * 't3) printable + 't2 printable -> + 't3 printable -> ('t0, 't1, 't2, 't3) FStar_Tuple4.tuple4 printable = fun uu___ -> fun uu___1 -> @@ -140,7 +142,8 @@ let printable_tuple5 : 't1 printable -> 't2 printable -> 't3 printable -> - 't4 printable -> ('t0 * 't1 * 't2 * 't3 * 't4) printable + 't4 printable -> + ('t0, 't1, 't2, 't3, 't4) FStar_Tuple5.tuple5 printable = fun uu___ -> fun uu___1 -> @@ -172,7 +175,8 @@ let printable_tuple6 : 't2 printable -> 't3 printable -> 't4 printable -> - 't5 printable -> ('t0 * 't1 * 't2 * 't3 * 't4 * 't5) printable + 't5 printable -> + ('t0, 't1, 't2, 't3, 't4, 't5) FStar_Tuple6.tuple6 printable = fun uu___ -> fun uu___1 -> @@ -211,7 +215,8 @@ let printable_tuple7 : 't4 printable -> 't5 printable -> 't6 printable -> - ('t0 * 't1 * 't2 * 't3 * 't4 * 't5 * 't6) printable + ('t0, 't1, 't2, 't3, 't4, 't5, 't6) FStar_Tuple7.tuple7 + printable = fun uu___ -> fun uu___1 -> diff --git a/ocaml/fstar-lib/generated/FStar_Class_Show.ml b/ocaml/fstar-lib/generated/FStar_Class_Show.ml index d79429eca09..eccb8e2ca8f 100644 --- a/ocaml/fstar-lib/generated/FStar_Class_Show.ml +++ b/ocaml/fstar-lib/generated/FStar_Class_Show.ml @@ -46,7 +46,8 @@ let show_tuple2 : 'a 'b . 'a showable -> 'b showable -> ('a * 'b) showable = } let show_tuple3 : 'a 'b 'c . - 'a showable -> 'b showable -> 'c showable -> ('a * 'b * 'c) showable + 'a showable -> + 'b showable -> 'c showable -> ('a, 'b, 'c) FStar_Tuple3.tuple3 showable = fun uu___ -> fun uu___1 -> @@ -75,7 +76,8 @@ let show_tuple4 : 'a 'b 'c 'd . 'a showable -> 'b showable -> - 'c showable -> 'd showable -> ('a * 'b * 'c * 'd) showable + 'c showable -> + 'd showable -> ('a, 'b, 'c, 'd) FStar_Tuple4.tuple4 showable = fun uu___ -> fun uu___1 -> @@ -111,7 +113,8 @@ let show_tuple5 : 'a showable -> 'b showable -> 'c showable -> - 'd showable -> 'e showable -> ('a * 'b * 'c * 'd * 'e) showable + 'd showable -> + 'e showable -> ('a, 'b, 'c, 'd, 'e) FStar_Tuple5.tuple5 showable = fun uu___ -> fun uu___1 -> @@ -155,7 +158,8 @@ let show_tuple6 : 'c showable -> 'd showable -> 'e showable -> - 'f showable -> ('a * 'b * 'c * 'd * 'e * 'f) showable + 'f showable -> + ('a, 'b, 'c, 'd, 'e, 'f) FStar_Tuple6.tuple6 showable = fun uu___ -> fun uu___1 -> diff --git a/ocaml/fstar-lib/generated/FStar_Errors.ml b/ocaml/fstar-lib/generated/FStar_Errors.ml index 492957d9c2a..8cc3e7ed0e0 100644 --- a/ocaml/fstar-lib/generated/FStar_Errors.ml +++ b/ocaml/fstar-lib/generated/FStar_Errors.ml @@ -15,8 +15,8 @@ let (__proj__Invalid_warn_error_setting__item__uu___ : match projectee with | Invalid_warn_error_setting uu___ -> uu___ let lookup_error : 'uuuuu 'uuuuu1 'uuuuu2 . - ('uuuuu * 'uuuuu1 * 'uuuuu2) Prims.list -> - 'uuuuu -> ('uuuuu * 'uuuuu1 * 'uuuuu2) + ('uuuuu, 'uuuuu1, 'uuuuu2) FStar_Tuple3.tuple3 Prims.list -> + 'uuuuu -> ('uuuuu, 'uuuuu1, 'uuuuu2) FStar_Tuple3.tuple3 = fun settings -> fun e -> @@ -30,8 +30,9 @@ let lookup_error : FStar_Compiler_Effect.failwith "Impossible: unrecognized error" let lookup_error_range : 'uuuuu 'uuuuu1 . - ('uuuuu * 'uuuuu1 * Prims.int) Prims.list -> - (Prims.int * Prims.int) -> ('uuuuu * 'uuuuu1 * Prims.int) Prims.list + ('uuuuu, 'uuuuu1, Prims.int) FStar_Tuple3.tuple3 Prims.list -> + (Prims.int * Prims.int) -> + ('uuuuu, 'uuuuu1, Prims.int) FStar_Tuple3.tuple3 Prims.list = fun settings -> fun uu___ -> @@ -147,8 +148,9 @@ let (update_flags : FStar_Compiler_List.collect set_flag_for_range error_range_settings in FStar_Compiler_List.op_At uu___ FStar_Errors_Codes.default_settings type error = - (FStar_Errors_Codes.raw_error * FStar_Errors_Msg.error_message * - FStar_Compiler_Range_Type.range * Prims.string Prims.list) + (FStar_Errors_Codes.raw_error, FStar_Errors_Msg.error_message, + FStar_Compiler_Range_Type.range, Prims.string Prims.list) + FStar_Tuple4.tuple4 type issue_level = | ENotImplemented | EInfo @@ -231,14 +233,15 @@ let (uu___is_Error : Prims.exn -> Prims.bool) = match projectee with | Error uu___ -> true | uu___ -> false let (__proj__Error__item__uu___ : Prims.exn -> error) = fun projectee -> match projectee with | Error uu___ -> uu___ -exception Err of (FStar_Errors_Codes.raw_error * - FStar_Errors_Msg.error_message * Prims.string Prims.list) +exception Err of (FStar_Errors_Codes.raw_error, + FStar_Errors_Msg.error_message, Prims.string Prims.list) + FStar_Tuple3.tuple3 let (uu___is_Err : Prims.exn -> Prims.bool) = fun projectee -> match projectee with | Err uu___ -> true | uu___ -> false let (__proj__Err__item__uu___ : Prims.exn -> - (FStar_Errors_Codes.raw_error * FStar_Errors_Msg.error_message * - Prims.string Prims.list)) + (FStar_Errors_Codes.raw_error, FStar_Errors_Msg.error_message, + Prims.string Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Err uu___ -> uu___ exception Warning of error let (uu___is_Warning : Prims.exn -> Prims.bool) = @@ -1039,8 +1042,8 @@ let with_ctx_if : 'a . Prims.bool -> Prims.string -> (unit -> 'a) -> 'a = let catch_errors_aux : 'a . (unit -> 'a) -> - (issue Prims.list * issue Prims.list * 'a - FStar_Pervasives_Native.option) + (issue Prims.list, issue Prims.list, 'a FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 = fun f -> let newh = mk_default_handler false in @@ -1093,7 +1096,8 @@ let catch_errors_and_ignore_rest : let (find_multiset_discrepancy : Prims.int Prims.list -> Prims.int Prims.list -> - (Prims.int * Prims.int * Prims.int) FStar_Pervasives_Native.option) + (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun l1 -> fun l2 -> diff --git a/ocaml/fstar-lib/generated/FStar_Errors_Codes.ml b/ocaml/fstar-lib/generated/FStar_Errors_Codes.ml index 4a0df373997..d202356cc4a 100644 --- a/ocaml/fstar-lib/generated/FStar_Errors_Codes.ml +++ b/ocaml/fstar-lib/generated/FStar_Errors_Codes.ml @@ -1923,7 +1923,7 @@ let (uu___is_Warning_SolverVersionMismatch : raw_error -> Prims.bool) = let (uu___is_Warning_ProofRecovery : raw_error -> Prims.bool) = fun projectee -> match projectee with | Warning_ProofRecovery -> true | uu___ -> false -type error_setting = (raw_error * error_flag * Prims.int) +type error_setting = (raw_error, error_flag, Prims.int) FStar_Tuple3.tuple3 let (default_settings : error_setting Prims.list) = [(Error_DependencyAnalysisFailed, CAlwaysError, Prims.int_zero); (Error_IDETooManyPops, CAlwaysError, Prims.int_one); diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_Krml.ml b/ocaml/fstar-lib/generated/FStar_Extraction_Krml.ml index 9617bbe9608..42b33816408 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_Krml.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_Krml.ml @@ -1,24 +1,29 @@ open Prims type decl = - | DGlobal of (flag Prims.list * (Prims.string Prims.list * Prims.string) * - Prims.int * typ * expr) - | DFunction of (cc FStar_Pervasives_Native.option * flag Prims.list * - Prims.int * typ * (Prims.string Prims.list * Prims.string) * binder - Prims.list * expr) - | DTypeAlias of ((Prims.string Prims.list * Prims.string) * flag Prims.list - * Prims.int * typ) - | DTypeFlat of ((Prims.string Prims.list * Prims.string) * flag Prims.list - * Prims.int * (Prims.string * (typ * Prims.bool)) Prims.list) - | DUnusedRetainedForBackwardsCompat of (cc FStar_Pervasives_Native.option * - flag Prims.list * (Prims.string Prims.list * Prims.string) * typ) - | DTypeVariant of ((Prims.string Prims.list * Prims.string) * flag - Prims.list * Prims.int * (Prims.string * (Prims.string * (typ * - Prims.bool)) Prims.list) Prims.list) + | DGlobal of (flag Prims.list, (Prims.string Prims.list * Prims.string), + Prims.int, typ, expr) FStar_Tuple5.tuple5 + | DFunction of (cc FStar_Pervasives_Native.option, flag Prims.list, + Prims.int, typ, (Prims.string Prims.list * Prims.string), + binder Prims.list, expr) FStar_Tuple7.tuple7 + | DTypeAlias of ((Prims.string Prims.list * Prims.string), flag Prims.list, + Prims.int, typ) FStar_Tuple4.tuple4 + | DTypeFlat of ((Prims.string Prims.list * Prims.string), flag Prims.list, + Prims.int, (Prims.string * (typ * Prims.bool)) Prims.list) + FStar_Tuple4.tuple4 + | DUnusedRetainedForBackwardsCompat of (cc FStar_Pervasives_Native.option, + flag Prims.list, (Prims.string Prims.list * Prims.string), typ) + FStar_Tuple4.tuple4 + | DTypeVariant of ((Prims.string Prims.list * Prims.string), + flag Prims.list, Prims.int, + (Prims.string * (Prims.string * (typ * Prims.bool)) Prims.list) Prims.list) + FStar_Tuple4.tuple4 | DTypeAbstractStruct of (Prims.string Prims.list * Prims.string) - | DExternal of (cc FStar_Pervasives_Native.option * flag Prims.list * - (Prims.string Prims.list * Prims.string) * typ * Prims.string Prims.list) - | DUntaggedUnion of ((Prims.string Prims.list * Prims.string) * flag - Prims.list * Prims.int * (Prims.string * typ) Prims.list) + | DExternal of (cc FStar_Pervasives_Native.option, flag Prims.list, + (Prims.string Prims.list * Prims.string), typ, Prims.string Prims.list) + FStar_Tuple5.tuple5 + | DUntaggedUnion of ((Prims.string Prims.list * Prims.string), + flag Prims.list, Prims.int, (Prims.string * typ) Prims.list) + FStar_Tuple4.tuple4 and cc = | StdCall | CDecl @@ -50,15 +55,15 @@ and expr = | EUnit | EApp of (expr * expr Prims.list) | ETypApp of (expr * typ Prims.list) - | ELet of (binder * expr * expr) - | EIfThenElse of (expr * expr * expr) + | ELet of (binder, expr, expr) FStar_Tuple3.tuple3 + | EIfThenElse of (expr, expr, expr) FStar_Tuple3.tuple3 | ESequence of expr Prims.list | EAssign of (expr * expr) - | EBufCreate of (lifetime * expr * expr) + | EBufCreate of (lifetime, expr, expr) FStar_Tuple3.tuple3 | EBufRead of (expr * expr) - | EBufWrite of (expr * expr * expr) + | EBufWrite of (expr, expr, expr) FStar_Tuple3.tuple3 | EBufSub of (expr * expr) - | EBufBlit of (expr * expr * expr * expr * expr) + | EBufBlit of (expr, expr, expr, expr, expr) FStar_Tuple5.tuple5 | EMatch of (expr * (pattern * expr) Prims.list) | EOp of (op * width) | ECast of (expr * typ) @@ -69,19 +74,19 @@ and expr = | EAbort | EReturn of expr | EFlat of (typ * (Prims.string * expr) Prims.list) - | EField of (typ * expr * Prims.string) + | EField of (typ, expr, Prims.string) FStar_Tuple3.tuple3 | EWhile of (expr * expr) | EBufCreateL of (lifetime * expr Prims.list) | ETuple of expr Prims.list - | ECons of (typ * Prims.string * expr Prims.list) - | EBufFill of (expr * expr * expr) + | ECons of (typ, Prims.string, expr Prims.list) FStar_Tuple3.tuple3 + | EBufFill of (expr, expr, expr) FStar_Tuple3.tuple3 | EString of Prims.string - | EFun of (binder Prims.list * expr * typ) + | EFun of (binder Prims.list, expr, typ) FStar_Tuple3.tuple3 | EAbortS of Prims.string | EBufFree of expr | EBufCreateNoInit of (lifetime * expr) | EAbortT of (Prims.string * typ) - | EComment of (Prims.string * expr * Prims.string) + | EComment of (Prims.string, expr, Prims.string) FStar_Tuple3.tuple3 | EStandaloneComment of Prims.string | EAddrOf of expr | EBufNull of typ @@ -154,32 +159,33 @@ let (uu___is_DGlobal : decl -> Prims.bool) = fun projectee -> match projectee with | DGlobal _0 -> true | uu___ -> false let (__proj__DGlobal__item___0 : decl -> - (flag Prims.list * (Prims.string Prims.list * Prims.string) * Prims.int * - typ * expr)) + (flag Prims.list, (Prims.string Prims.list * Prims.string), Prims.int, + typ, expr) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | DGlobal _0 -> _0 let (uu___is_DFunction : decl -> Prims.bool) = fun projectee -> match projectee with | DFunction _0 -> true | uu___ -> false let (__proj__DFunction__item___0 : decl -> - (cc FStar_Pervasives_Native.option * flag Prims.list * Prims.int * typ * - (Prims.string Prims.list * Prims.string) * binder Prims.list * expr)) + (cc FStar_Pervasives_Native.option, flag Prims.list, Prims.int, typ, + (Prims.string Prims.list * Prims.string), binder Prims.list, expr) + FStar_Tuple7.tuple7) = fun projectee -> match projectee with | DFunction _0 -> _0 let (uu___is_DTypeAlias : decl -> Prims.bool) = fun projectee -> match projectee with | DTypeAlias _0 -> true | uu___ -> false let (__proj__DTypeAlias__item___0 : decl -> - ((Prims.string Prims.list * Prims.string) * flag Prims.list * Prims.int * - typ)) + ((Prims.string Prims.list * Prims.string), flag Prims.list, Prims.int, + typ) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | DTypeAlias _0 -> _0 let (uu___is_DTypeFlat : decl -> Prims.bool) = fun projectee -> match projectee with | DTypeFlat _0 -> true | uu___ -> false let (__proj__DTypeFlat__item___0 : decl -> - ((Prims.string Prims.list * Prims.string) * flag Prims.list * Prims.int * - (Prims.string * (typ * Prims.bool)) Prims.list)) + ((Prims.string Prims.list * Prims.string), flag Prims.list, Prims.int, + (Prims.string * (typ * Prims.bool)) Prims.list) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | DTypeFlat _0 -> _0 let (uu___is_DUnusedRetainedForBackwardsCompat : decl -> Prims.bool) = fun projectee -> @@ -188,8 +194,8 @@ let (uu___is_DUnusedRetainedForBackwardsCompat : decl -> Prims.bool) = | uu___ -> false let (__proj__DUnusedRetainedForBackwardsCompat__item___0 : decl -> - (cc FStar_Pervasives_Native.option * flag Prims.list * (Prims.string - Prims.list * Prims.string) * typ)) + (cc FStar_Pervasives_Native.option, flag Prims.list, + (Prims.string Prims.list * Prims.string), typ) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | DUnusedRetainedForBackwardsCompat _0 -> _0 @@ -198,9 +204,10 @@ let (uu___is_DTypeVariant : decl -> Prims.bool) = match projectee with | DTypeVariant _0 -> true | uu___ -> false let (__proj__DTypeVariant__item___0 : decl -> - ((Prims.string Prims.list * Prims.string) * flag Prims.list * Prims.int * + ((Prims.string Prims.list * Prims.string), flag Prims.list, Prims.int, (Prims.string * (Prims.string * (typ * Prims.bool)) Prims.list) - Prims.list)) + Prims.list) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | DTypeVariant _0 -> _0 let (uu___is_DTypeAbstractStruct : decl -> Prims.bool) = fun projectee -> @@ -213,16 +220,17 @@ let (uu___is_DExternal : decl -> Prims.bool) = match projectee with | DExternal _0 -> true | uu___ -> false let (__proj__DExternal__item___0 : decl -> - (cc FStar_Pervasives_Native.option * flag Prims.list * (Prims.string - Prims.list * Prims.string) * typ * Prims.string Prims.list)) + (cc FStar_Pervasives_Native.option, flag Prims.list, + (Prims.string Prims.list * Prims.string), typ, Prims.string Prims.list) + FStar_Tuple5.tuple5) = fun projectee -> match projectee with | DExternal _0 -> _0 let (uu___is_DUntaggedUnion : decl -> Prims.bool) = fun projectee -> match projectee with | DUntaggedUnion _0 -> true | uu___ -> false let (__proj__DUntaggedUnion__item___0 : decl -> - ((Prims.string Prims.list * Prims.string) * flag Prims.list * Prims.int * - (Prims.string * typ) Prims.list)) + ((Prims.string Prims.list * Prims.string), flag Prims.list, Prims.int, + (Prims.string * typ) Prims.list) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | DUntaggedUnion _0 -> _0 let (uu___is_StdCall : cc -> Prims.bool) = fun projectee -> match projectee with | StdCall -> true | uu___ -> false @@ -308,12 +316,14 @@ let (__proj__ETypApp__item___0 : expr -> (expr * typ Prims.list)) = fun projectee -> match projectee with | ETypApp _0 -> _0 let (uu___is_ELet : expr -> Prims.bool) = fun projectee -> match projectee with | ELet _0 -> true | uu___ -> false -let (__proj__ELet__item___0 : expr -> (binder * expr * expr)) = +let (__proj__ELet__item___0 : + expr -> (binder, expr, expr) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | ELet _0 -> _0 let (uu___is_EIfThenElse : expr -> Prims.bool) = fun projectee -> match projectee with | EIfThenElse _0 -> true | uu___ -> false -let (__proj__EIfThenElse__item___0 : expr -> (expr * expr * expr)) = +let (__proj__EIfThenElse__item___0 : + expr -> (expr, expr, expr) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | EIfThenElse _0 -> _0 let (uu___is_ESequence : expr -> Prims.bool) = fun projectee -> @@ -327,7 +337,8 @@ let (__proj__EAssign__item___0 : expr -> (expr * expr)) = let (uu___is_EBufCreate : expr -> Prims.bool) = fun projectee -> match projectee with | EBufCreate _0 -> true | uu___ -> false -let (__proj__EBufCreate__item___0 : expr -> (lifetime * expr * expr)) = +let (__proj__EBufCreate__item___0 : + expr -> (lifetime, expr, expr) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | EBufCreate _0 -> _0 let (uu___is_EBufRead : expr -> Prims.bool) = fun projectee -> @@ -337,7 +348,8 @@ let (__proj__EBufRead__item___0 : expr -> (expr * expr)) = let (uu___is_EBufWrite : expr -> Prims.bool) = fun projectee -> match projectee with | EBufWrite _0 -> true | uu___ -> false -let (__proj__EBufWrite__item___0 : expr -> (expr * expr * expr)) = +let (__proj__EBufWrite__item___0 : + expr -> (expr, expr, expr) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | EBufWrite _0 -> _0 let (uu___is_EBufSub : expr -> Prims.bool) = fun projectee -> match projectee with | EBufSub _0 -> true | uu___ -> false @@ -346,8 +358,9 @@ let (__proj__EBufSub__item___0 : expr -> (expr * expr)) = let (uu___is_EBufBlit : expr -> Prims.bool) = fun projectee -> match projectee with | EBufBlit _0 -> true | uu___ -> false -let (__proj__EBufBlit__item___0 : expr -> (expr * expr * expr * expr * expr)) - = fun projectee -> match projectee with | EBufBlit _0 -> _0 +let (__proj__EBufBlit__item___0 : + expr -> (expr, expr, expr, expr, expr) FStar_Tuple5.tuple5) = + fun projectee -> match projectee with | EBufBlit _0 -> _0 let (uu___is_EMatch : expr -> Prims.bool) = fun projectee -> match projectee with | EMatch _0 -> true | uu___ -> false let (__proj__EMatch__item___0 : expr -> (expr * (pattern * expr) Prims.list)) @@ -383,7 +396,8 @@ let (__proj__EFlat__item___0 : fun projectee -> match projectee with | EFlat _0 -> _0 let (uu___is_EField : expr -> Prims.bool) = fun projectee -> match projectee with | EField _0 -> true | uu___ -> false -let (__proj__EField__item___0 : expr -> (typ * expr * Prims.string)) = +let (__proj__EField__item___0 : + expr -> (typ, expr, Prims.string) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | EField _0 -> _0 let (uu___is_EWhile : expr -> Prims.bool) = fun projectee -> match projectee with | EWhile _0 -> true | uu___ -> false @@ -401,12 +415,13 @@ let (__proj__ETuple__item___0 : expr -> expr Prims.list) = let (uu___is_ECons : expr -> Prims.bool) = fun projectee -> match projectee with | ECons _0 -> true | uu___ -> false let (__proj__ECons__item___0 : - expr -> (typ * Prims.string * expr Prims.list)) = + expr -> (typ, Prims.string, expr Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | ECons _0 -> _0 let (uu___is_EBufFill : expr -> Prims.bool) = fun projectee -> match projectee with | EBufFill _0 -> true | uu___ -> false -let (__proj__EBufFill__item___0 : expr -> (expr * expr * expr)) = +let (__proj__EBufFill__item___0 : + expr -> (expr, expr, expr) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | EBufFill _0 -> _0 let (uu___is_EString : expr -> Prims.bool) = fun projectee -> match projectee with | EString _0 -> true | uu___ -> false @@ -414,7 +429,8 @@ let (__proj__EString__item___0 : expr -> Prims.string) = fun projectee -> match projectee with | EString _0 -> _0 let (uu___is_EFun : expr -> Prims.bool) = fun projectee -> match projectee with | EFun _0 -> true | uu___ -> false -let (__proj__EFun__item___0 : expr -> (binder Prims.list * expr * typ)) = +let (__proj__EFun__item___0 : + expr -> (binder Prims.list, expr, typ) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | EFun _0 -> _0 let (uu___is_EAbortS : expr -> Prims.bool) = fun projectee -> match projectee with | EAbortS _0 -> true | uu___ -> false @@ -438,7 +454,7 @@ let (uu___is_EComment : expr -> Prims.bool) = fun projectee -> match projectee with | EComment _0 -> true | uu___ -> false let (__proj__EComment__item___0 : - expr -> (Prims.string * expr * Prims.string)) = + expr -> (Prims.string, expr, Prims.string) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | EComment _0 -> _0 let (uu___is_EStandaloneComment : expr -> Prims.bool) = fun projectee -> @@ -629,12 +645,18 @@ type file = (Prims.string * program) type version = Prims.int type binary_format = (version * file Prims.list) let (current_version : version) = (Prims.of_int (28)) -let fst3 : 'uuuuu 'uuuuu1 'uuuuu2 . ('uuuuu * 'uuuuu1 * 'uuuuu2) -> 'uuuuu = - fun uu___ -> match uu___ with | (x, uu___1, uu___2) -> x -let snd3 : 'uuuuu 'uuuuu1 'uuuuu2 . ('uuuuu * 'uuuuu1 * 'uuuuu2) -> 'uuuuu1 = - fun uu___ -> match uu___ with | (uu___1, x, uu___2) -> x -let thd3 : 'uuuuu 'uuuuu1 'uuuuu2 . ('uuuuu * 'uuuuu1 * 'uuuuu2) -> 'uuuuu2 = - fun uu___ -> match uu___ with | (uu___1, uu___2, x) -> x +let fst3 : + 'uuuuu 'uuuuu1 'uuuuu2 . + ('uuuuu, 'uuuuu1, 'uuuuu2) FStar_Tuple3.tuple3 -> 'uuuuu + = fun uu___ -> match uu___ with | (x, uu___1, uu___2) -> x +let snd3 : + 'uuuuu 'uuuuu1 'uuuuu2 . + ('uuuuu, 'uuuuu1, 'uuuuu2) FStar_Tuple3.tuple3 -> 'uuuuu1 + = fun uu___ -> match uu___ with | (uu___1, x, uu___2) -> x +let thd3 : + 'uuuuu 'uuuuu1 'uuuuu2 . + ('uuuuu, 'uuuuu1, 'uuuuu2) FStar_Tuple3.tuple3 -> 'uuuuu2 + = fun uu___ -> match uu___ with | (uu___1, uu___2, x) -> x let (mk_width : Prims.string -> width FStar_Pervasives_Native.option) = fun uu___ -> match uu___ with @@ -2550,17 +2572,19 @@ and (assert_lid : env -> FStar_Extraction_ML_Syntax.mlty -> typ) = FStar_Compiler_Effect.failwith uu___1 and (translate_branches : env -> - (FStar_Extraction_ML_Syntax.mlpattern * FStar_Extraction_ML_Syntax.mlexpr - FStar_Pervasives_Native.option * FStar_Extraction_ML_Syntax.mlexpr) - Prims.list -> (pattern * expr) Prims.list) + (FStar_Extraction_ML_Syntax.mlpattern, + FStar_Extraction_ML_Syntax.mlexpr FStar_Pervasives_Native.option, + FStar_Extraction_ML_Syntax.mlexpr) FStar_Tuple3.tuple3 Prims.list -> + (pattern * expr) Prims.list) = fun env1 -> fun branches1 -> FStar_Compiler_List.map (translate_branch env1) branches1 and (translate_branch : env -> - (FStar_Extraction_ML_Syntax.mlpattern * FStar_Extraction_ML_Syntax.mlexpr - FStar_Pervasives_Native.option * FStar_Extraction_ML_Syntax.mlexpr) -> + (FStar_Extraction_ML_Syntax.mlpattern, + FStar_Extraction_ML_Syntax.mlexpr FStar_Pervasives_Native.option, + FStar_Extraction_ML_Syntax.mlexpr) FStar_Tuple3.tuple3 -> (pattern * expr)) = fun env1 -> @@ -3073,9 +3097,10 @@ let (translate_decl : m; []) let (translate_module : - (FStar_Extraction_ML_Syntax.mlpath * (FStar_Extraction_ML_Syntax.mlsig * - FStar_Extraction_ML_Syntax.mlmodule) FStar_Pervasives_Native.option * - FStar_Extraction_ML_Syntax.mllib) -> file) + (FStar_Extraction_ML_Syntax.mlpath, + (FStar_Extraction_ML_Syntax.mlsig * FStar_Extraction_ML_Syntax.mlmodule) + FStar_Pervasives_Native.option, + FStar_Extraction_ML_Syntax.mllib) FStar_Tuple3.tuple3 -> file) = fun m -> let uu___ = m in diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Code.ml b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Code.ml index aa235a87342..8429172eef0 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Code.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Code.ml @@ -78,8 +78,8 @@ let (enclose : doc -> doc -> doc -> doc) = fun uu___ -> fun uu___1 -> fun uu___2 -> - match (uu___, uu___1, uu___2) with - | (Doc l, Doc r, Doc x) -> Doc (Prims.strcat l (Prims.strcat x r)) + match ((uu___, uu___1), uu___2) with + | ((Doc l, Doc r), Doc x) -> Doc (Prims.strcat l (Prims.strcat x r)) let (cbrackets : doc -> doc) = fun uu___ -> match uu___ with | Doc d -> enclose (text "{") (text "}") (Doc d) @@ -210,7 +210,9 @@ let (ptctor : if uu___1 then Prims.strcat "U__" s else s in FStar_Compiler_String.concat "." (FStar_Compiler_List.op_At p [s1]) let (infix_prim_ops : - (Prims.string * (Prims.int * fixity) * Prims.string) Prims.list) = + (Prims.string, (Prims.int * fixity), Prims.string) FStar_Tuple3.tuple3 + Prims.list) + = [("op_Addition", e_bin_prio_op1, "+"); ("op_Subtraction", e_bin_prio_op1, "-"); ("op_Multiply", e_bin_prio_op1, "*"); @@ -241,8 +243,8 @@ let (is_prims_ns : fun ns -> ns = ["Prims"] let (as_bin_op : FStar_Extraction_ML_Syntax.mlpath -> - (FStar_Extraction_ML_Syntax.mlsymbol * (Prims.int * fixity) * - Prims.string) FStar_Pervasives_Native.option) + (FStar_Extraction_ML_Syntax.mlsymbol, (Prims.int * fixity), Prims.string) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun uu___ -> match uu___ with @@ -1011,8 +1013,9 @@ and (doc_of_branch : combine hardline uu___1 and (doc_of_lets : FStar_Extraction_ML_Syntax.mlsymbol -> - (FStar_Extraction_ML_Syntax.mlletflavor * Prims.bool * - FStar_Extraction_ML_Syntax.mllb Prims.list) -> doc) + (FStar_Extraction_ML_Syntax.mlletflavor, Prims.bool, + FStar_Extraction_ML_Syntax.mllb Prims.list) FStar_Tuple3.tuple3 -> + doc) = fun currentModule -> fun uu___ -> diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Modul.ml b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Modul.ml index 9214b07b477..ecd9ae52b6f 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Modul.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Modul.ml @@ -1,7 +1,7 @@ open Prims type tydef_declaration = - (FStar_Extraction_ML_Syntax.mlsymbol * FStar_Extraction_ML_Syntax.metadata - * Prims.int) + (FStar_Extraction_ML_Syntax.mlsymbol, FStar_Extraction_ML_Syntax.metadata, + Prims.int) FStar_Tuple3.tuple3 type iface = { iface_module_name: FStar_Extraction_ML_Syntax.mlpath ; @@ -664,7 +664,8 @@ let (print_binding : let print_tydef : 'uuuuu 'uuuuu1 . FStar_Extraction_ML_Syntax.mlpath -> - (FStar_Extraction_ML_UEnv.tydef, (Prims.string * 'uuuuu * 'uuuuu1)) + (FStar_Extraction_ML_UEnv.tydef, + (Prims.string, 'uuuuu, 'uuuuu1) FStar_Tuple3.tuple3) FStar_Pervasives.either -> Prims.string = fun cm -> @@ -721,7 +722,8 @@ let (extract_typ_abbrev : FStar_Syntax_Syntax.qualifier Prims.list -> FStar_Syntax_Syntax.term Prims.list -> FStar_Syntax_Syntax.letbinding -> - (env_t * iface * FStar_Extraction_ML_Syntax.mlmodule1 Prims.list)) + (env_t, iface, FStar_Extraction_ML_Syntax.mlmodule1 Prims.list) + FStar_Tuple3.tuple3) = fun env -> fun quals -> @@ -862,7 +864,8 @@ let (extract_let_rec_type : FStar_Syntax_Syntax.qualifier Prims.list -> FStar_Syntax_Syntax.term Prims.list -> FStar_Syntax_Syntax.letbinding -> - (env_t * iface * FStar_Extraction_ML_Syntax.mlmodule1 Prims.list)) + (env_t, iface, FStar_Extraction_ML_Syntax.mlmodule1 Prims.list) + FStar_Tuple3.tuple3) = fun env -> fun quals -> @@ -1038,8 +1041,9 @@ let (extract_type_declaration : FStar_Syntax_Syntax.term Prims.list -> FStar_Syntax_Syntax.univ_name Prims.list -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> - (env_t * iface * FStar_Extraction_ML_Syntax.mlmodule1 - Prims.list)) + (env_t, iface, + FStar_Extraction_ML_Syntax.mlmodule1 Prims.list) + FStar_Tuple3.tuple3) = fun g -> fun is_interface_val -> @@ -1114,8 +1118,8 @@ let (extract_type_declaration : let (extract_reifiable_effect : FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.eff_decl -> - (FStar_Extraction_ML_UEnv.uenv * iface * - FStar_Extraction_ML_Syntax.mlmodule1 Prims.list)) + (FStar_Extraction_ML_UEnv.uenv, iface, + FStar_Extraction_ML_Syntax.mlmodule1 Prims.list) FStar_Tuple3.tuple3) = fun g -> fun ed -> @@ -1454,8 +1458,9 @@ let (extract_let_rec_types : FStar_Syntax_Syntax.sigelt -> FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.letbinding Prims.list -> - (FStar_Extraction_ML_UEnv.uenv * iface * - FStar_Extraction_ML_Syntax.mlmodule1 Prims.list)) + (FStar_Extraction_ML_UEnv.uenv, iface, + FStar_Extraction_ML_Syntax.mlmodule1 Prims.list) + FStar_Tuple3.tuple3) = fun se -> fun env -> diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_ML_RegEmb.ml b/ocaml/fstar-lib/generated/FStar_Extraction_ML_RegEmb.ml index 6c1d0ecd219..94f88b7b9fc 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_ML_RegEmb.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_ML_RegEmb.ml @@ -1255,17 +1255,17 @@ let rec (embedding_for : NoEmbedding uu___2 in FStar_Compiler_Effect.raise uu___1 type wrapped_term = - (FStar_Extraction_ML_Syntax.mlexpr * FStar_Extraction_ML_Syntax.mlexpr * - Prims.int * Prims.bool) + (FStar_Extraction_ML_Syntax.mlexpr, FStar_Extraction_ML_Syntax.mlexpr, + Prims.int, Prims.bool) FStar_Tuple4.tuple4 let (interpret_plugin_as_term_fun : FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.fv -> FStar_Syntax_Syntax.typ -> Prims.int FStar_Pervasives_Native.option -> FStar_Extraction_ML_Syntax.mlexpr' -> - (FStar_Extraction_ML_Syntax.mlexpr * - FStar_Extraction_ML_Syntax.mlexpr * Prims.int * Prims.bool) - FStar_Pervasives_Native.option) + (FStar_Extraction_ML_Syntax.mlexpr, + FStar_Extraction_ML_Syntax.mlexpr, Prims.int, Prims.bool) + FStar_Tuple4.tuple4 FStar_Pervasives_Native.option) = fun env -> fun fv -> diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_ML_RemoveUnusedParameters.ml b/ocaml/fstar-lib/generated/FStar_Extraction_ML_RemoveUnusedParameters.ml index d176a94d1c3..c399b330636 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_ML_RemoveUnusedParameters.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_ML_RemoveUnusedParameters.ml @@ -23,9 +23,10 @@ let (initial_env : env_t) = let uu___ = FStar_Compiler_Util.psmap_empty () in { current_module = []; tydef_map = uu___ } type tydef = - (FStar_Extraction_ML_Syntax.mlsymbol * FStar_Extraction_ML_Syntax.metadata - * (FStar_Extraction_ML_Syntax.mltyscheme, Prims.int) - FStar_Pervasives.either) + (FStar_Extraction_ML_Syntax.mlsymbol, FStar_Extraction_ML_Syntax.metadata, + (FStar_Extraction_ML_Syntax.mltyscheme, Prims.int) + FStar_Pervasives.either) + FStar_Tuple3.tuple3 let (extend_env : env_t -> FStar_Extraction_ML_Syntax.mlsymbol -> entry -> env_t) = fun env -> @@ -231,11 +232,12 @@ and (elim_letbinding : (flavor, uu___1) and (elim_branch : env_t -> - (FStar_Extraction_ML_Syntax.mlpattern * FStar_Extraction_ML_Syntax.mlexpr - FStar_Pervasives_Native.option * FStar_Extraction_ML_Syntax.mlexpr) -> - (FStar_Extraction_ML_Syntax.mlpattern * - FStar_Extraction_ML_Syntax.mlexpr FStar_Pervasives_Native.option * - FStar_Extraction_ML_Syntax.mlexpr)) + (FStar_Extraction_ML_Syntax.mlpattern, + FStar_Extraction_ML_Syntax.mlexpr FStar_Pervasives_Native.option, + FStar_Extraction_ML_Syntax.mlexpr) FStar_Tuple3.tuple3 -> + (FStar_Extraction_ML_Syntax.mlpattern, + FStar_Extraction_ML_Syntax.mlexpr FStar_Pervasives_Native.option, + FStar_Extraction_ML_Syntax.mlexpr) FStar_Tuple3.tuple3) = fun env -> fun uu___ -> @@ -265,9 +267,10 @@ let (elim_tydef : FStar_Extraction_ML_Syntax.meta Prims.list -> Prims.string Prims.list -> FStar_Extraction_ML_Syntax.mlty -> - (env_t * (Prims.string * FStar_Extraction_ML_Syntax.meta - Prims.list * Prims.string Prims.list * - FStar_Extraction_ML_Syntax.mlty))) + (env_t * (Prims.string, + FStar_Extraction_ML_Syntax.meta Prims.list, + Prims.string Prims.list, FStar_Extraction_ML_Syntax.mlty) + FStar_Tuple4.tuple4)) = fun env -> fun name -> diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Syntax.ml b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Syntax.ml index 359062050a0..802fb40496b 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Syntax.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Syntax.ml @@ -185,7 +185,7 @@ type mlloc = (Prims.int * Prims.string) let (dummy_loc : mlloc) = (Prims.int_zero, "") type mlty = | MLTY_Var of mlident - | MLTY_Fun of (mlty * e_tag * mlty) + | MLTY_Fun of (mlty, e_tag, mlty) FStar_Tuple3.tuple3 | MLTY_Named of (mlty Prims.list * mlpath) | MLTY_Tuple of mlty Prims.list | MLTY_Top @@ -198,7 +198,8 @@ let (__proj__MLTY_Var__item___0 : mlty -> mlident) = let (uu___is_MLTY_Fun : mlty -> Prims.bool) = fun projectee -> match projectee with | MLTY_Fun _0 -> true | uu___ -> false -let (__proj__MLTY_Fun__item___0 : mlty -> (mlty * e_tag * mlty)) = +let (__proj__MLTY_Fun__item___0 : + mlty -> (mlty, e_tag, mlty) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | MLTY_Fun _0 -> _0 let (uu___is_MLTY_Named : mlty -> Prims.bool) = fun projectee -> @@ -423,19 +424,20 @@ type mlexpr' = | MLE_App of (mlexpr * mlexpr Prims.list) | MLE_TApp of (mlexpr * mlty Prims.list) | MLE_Fun of ((mlident * mlty) Prims.list * mlexpr) - | MLE_Match of (mlexpr * (mlpattern * mlexpr FStar_Pervasives_Native.option - * mlexpr) Prims.list) - | MLE_Coerce of (mlexpr * mlty * mlty) + | MLE_Match of (mlexpr * (mlpattern, mlexpr FStar_Pervasives_Native.option, + mlexpr) FStar_Tuple3.tuple3 Prims.list) + | MLE_Coerce of (mlexpr, mlty, mlty) FStar_Tuple3.tuple3 | MLE_CTor of (mlpath * mlexpr Prims.list) | MLE_Seq of mlexpr Prims.list | MLE_Tuple of mlexpr Prims.list - | MLE_Record of (mlsymbol Prims.list * mlsymbol * (mlsymbol * mlexpr) - Prims.list) + | MLE_Record of (mlsymbol Prims.list, mlsymbol, + (mlsymbol * mlexpr) Prims.list) FStar_Tuple3.tuple3 | MLE_Proj of (mlexpr * mlpath) - | MLE_If of (mlexpr * mlexpr * mlexpr FStar_Pervasives_Native.option) + | MLE_If of (mlexpr, mlexpr, mlexpr FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 | MLE_Raise of (mlpath * mlexpr Prims.list) - | MLE_Try of (mlexpr * (mlpattern * mlexpr FStar_Pervasives_Native.option * - mlexpr) Prims.list) + | MLE_Try of (mlexpr * (mlpattern, mlexpr FStar_Pervasives_Native.option, + mlexpr) FStar_Tuple3.tuple3 Prims.list) and mlexpr = { expr: mlexpr' ; mlty: mlty ; @@ -486,13 +488,14 @@ let (uu___is_MLE_Match : mlexpr' -> Prims.bool) = match projectee with | MLE_Match _0 -> true | uu___ -> false let (__proj__MLE_Match__item___0 : mlexpr' -> - (mlexpr * (mlpattern * mlexpr FStar_Pervasives_Native.option * mlexpr) - Prims.list)) + (mlexpr * (mlpattern, mlexpr FStar_Pervasives_Native.option, mlexpr) + FStar_Tuple3.tuple3 Prims.list)) = fun projectee -> match projectee with | MLE_Match _0 -> _0 let (uu___is_MLE_Coerce : mlexpr' -> Prims.bool) = fun projectee -> match projectee with | MLE_Coerce _0 -> true | uu___ -> false -let (__proj__MLE_Coerce__item___0 : mlexpr' -> (mlexpr * mlty * mlty)) = +let (__proj__MLE_Coerce__item___0 : + mlexpr' -> (mlexpr, mlty, mlty) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | MLE_Coerce _0 -> _0 let (uu___is_MLE_CTor : mlexpr' -> Prims.bool) = fun projectee -> @@ -513,7 +516,8 @@ let (uu___is_MLE_Record : mlexpr' -> Prims.bool) = match projectee with | MLE_Record _0 -> true | uu___ -> false let (__proj__MLE_Record__item___0 : mlexpr' -> - (mlsymbol Prims.list * mlsymbol * (mlsymbol * mlexpr) Prims.list)) + (mlsymbol Prims.list, mlsymbol, (mlsymbol * mlexpr) Prims.list) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | MLE_Record _0 -> _0 let (uu___is_MLE_Proj : mlexpr' -> Prims.bool) = fun projectee -> @@ -523,8 +527,10 @@ let (__proj__MLE_Proj__item___0 : mlexpr' -> (mlexpr * mlpath)) = let (uu___is_MLE_If : mlexpr' -> Prims.bool) = fun projectee -> match projectee with | MLE_If _0 -> true | uu___ -> false let (__proj__MLE_If__item___0 : - mlexpr' -> (mlexpr * mlexpr * mlexpr FStar_Pervasives_Native.option)) = - fun projectee -> match projectee with | MLE_If _0 -> _0 + mlexpr' -> + (mlexpr, mlexpr, mlexpr FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | MLE_If _0 -> _0 let (uu___is_MLE_Raise : mlexpr' -> Prims.bool) = fun projectee -> match projectee with | MLE_Raise _0 -> true | uu___ -> false @@ -534,8 +540,8 @@ let (uu___is_MLE_Try : mlexpr' -> Prims.bool) = fun projectee -> match projectee with | MLE_Try _0 -> true | uu___ -> false let (__proj__MLE_Try__item___0 : mlexpr' -> - (mlexpr * (mlpattern * mlexpr FStar_Pervasives_Native.option * mlexpr) - Prims.list)) + (mlexpr * (mlpattern, mlexpr FStar_Pervasives_Native.option, mlexpr) + FStar_Tuple3.tuple3 Prims.list)) = fun projectee -> match projectee with | MLE_Try _0 -> _0 let (__proj__Mkmlexpr__item__expr : mlexpr -> mlexpr') = fun projectee -> @@ -576,7 +582,9 @@ let (__proj__Mkmllb__item__print_typ : mllb -> Prims.bool) = match projectee with | { mllb_name; mllb_tysc; mllb_add_unit; mllb_def; mllb_meta; print_typ;_} -> print_typ -type mlbranch = (mlpattern * mlexpr FStar_Pervasives_Native.option * mlexpr) +type mlbranch = + (mlpattern, mlexpr FStar_Pervasives_Native.option, mlexpr) + FStar_Tuple3.tuple3 type mlletbinding = (mlletflavor * mllb Prims.list) type mltybody = | MLTD_Abbrev of mlty @@ -697,13 +705,13 @@ let (with_ty_loc : mlty -> mlexpr' -> mlloc -> mlexpr) = let (with_ty : mlty -> mlexpr' -> mlexpr) = fun t -> fun e -> with_ty_loc t e dummy_loc type mllib = - | MLLib of (mlpath * (mlsig * mlmodule) FStar_Pervasives_Native.option * - mllib) Prims.list + | MLLib of (mlpath, (mlsig * mlmodule) FStar_Pervasives_Native.option, + mllib) FStar_Tuple3.tuple3 Prims.list let (uu___is_MLLib : mllib -> Prims.bool) = fun projectee -> true let (__proj__MLLib__item___0 : mllib -> - (mlpath * (mlsig * mlmodule) FStar_Pervasives_Native.option * mllib) - Prims.list) + (mlpath, (mlsig * mlmodule) FStar_Pervasives_Native.option, mllib) + FStar_Tuple3.tuple3 Prims.list) = fun projectee -> match projectee with | MLLib _0 -> _0 let (ml_unit_ty : mlty) = MLTY_Erased let (ml_bool_ty : mlty) = MLTY_Named ([], (["Prims"], "bool")) @@ -880,8 +888,8 @@ let rec (mlexpr_to_string : mlexpr -> Prims.string) = FStar_Compiler_String.concat "; " uu___2 in FStar_Compiler_Util.format2 "(MLE_Try (%s, [%s]))" uu___ uu___1 and (mlbranch_to_string : - (mlpattern * mlexpr FStar_Pervasives_Native.option * mlexpr) -> - Prims.string) + (mlpattern, mlexpr FStar_Pervasives_Native.option, mlexpr) + FStar_Tuple3.tuple3 -> Prims.string) = fun uu___ -> match uu___ with diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Term.ml b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Term.ml index 7fcfd765d0f..9976f77560a 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_ML_Term.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_ML_Term.ml @@ -626,10 +626,12 @@ let (unit_binder : unit -> FStar_Syntax_Syntax.binder) = FStar_Syntax_Syntax.t_unit in FStar_Syntax_Syntax.mk_binder uu___1 let (check_pats_for_ite : - (FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.term - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term) Prims.list -> - (Prims.bool * FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option)) + (FStar_Syntax_Syntax.pat, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3 Prims.list -> + (Prims.bool, FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun l -> let def = @@ -691,9 +693,9 @@ let (instantiate_maybe_partial : FStar_Extraction_ML_Syntax.mlexpr -> FStar_Extraction_ML_Syntax.mltyscheme -> FStar_Extraction_ML_Syntax.mlty Prims.list -> - (FStar_Extraction_ML_Syntax.mlexpr * - FStar_Extraction_ML_Syntax.e_tag * - FStar_Extraction_ML_Syntax.mlty)) + (FStar_Extraction_ML_Syntax.mlexpr, + FStar_Extraction_ML_Syntax.e_tag, + FStar_Extraction_ML_Syntax.mlty) FStar_Tuple3.tuple3) = fun g -> fun e -> @@ -1521,14 +1523,15 @@ let rec (extract_one_pat : FStar_Extraction_ML_Syntax.mlty -> (FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.term -> - (FStar_Extraction_ML_Syntax.mlexpr * - FStar_Extraction_ML_Syntax.e_tag * - FStar_Extraction_ML_Syntax.mlty)) + (FStar_Extraction_ML_Syntax.mlexpr, + FStar_Extraction_ML_Syntax.e_tag, + FStar_Extraction_ML_Syntax.mlty) FStar_Tuple3.tuple3) -> - (FStar_Extraction_ML_UEnv.uenv * + (FStar_Extraction_ML_UEnv.uenv, (FStar_Extraction_ML_Syntax.mlpattern * - FStar_Extraction_ML_Syntax.mlexpr Prims.list) - FStar_Pervasives_Native.option * Prims.bool)) + FStar_Extraction_ML_Syntax.mlexpr Prims.list) + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) = fun imp -> fun g -> @@ -1818,14 +1821,15 @@ let (extract_pat : FStar_Extraction_ML_Syntax.mlty -> (FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.term -> - (FStar_Extraction_ML_Syntax.mlexpr * - FStar_Extraction_ML_Syntax.e_tag * - FStar_Extraction_ML_Syntax.mlty)) + (FStar_Extraction_ML_Syntax.mlexpr, + FStar_Extraction_ML_Syntax.e_tag, + FStar_Extraction_ML_Syntax.mlty) FStar_Tuple3.tuple3) -> - (FStar_Extraction_ML_UEnv.uenv * + (FStar_Extraction_ML_UEnv.uenv, (FStar_Extraction_ML_Syntax.mlpattern * - FStar_Extraction_ML_Syntax.mlexpr FStar_Pervasives_Native.option) - Prims.list * Prims.bool)) + FStar_Extraction_ML_Syntax.mlexpr + FStar_Pervasives_Native.option) Prims.list, + Prims.bool) FStar_Tuple3.tuple3) = fun g -> fun p -> @@ -2126,10 +2130,10 @@ let (maybe_promote_effect : let (extract_lb_sig : FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.letbindings -> - (FStar_Syntax_Syntax.lbname * FStar_Extraction_ML_Syntax.e_tag * + (FStar_Syntax_Syntax.lbname, FStar_Extraction_ML_Syntax.e_tag, (FStar_Syntax_Syntax.typ * (FStar_Syntax_Syntax.binders * - FStar_Extraction_ML_Syntax.mltyscheme)) * Prims.bool * - FStar_Syntax_Syntax.term) Prims.list) + FStar_Extraction_ML_Syntax.mltyscheme)), + Prims.bool, FStar_Syntax_Syntax.term) FStar_Tuple5.tuple5 Prims.list) = fun g -> fun lbs -> @@ -2612,8 +2616,8 @@ let rec (check_term_as_mlexpr : and (term_as_mlexpr : FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.term -> - (FStar_Extraction_ML_Syntax.mlexpr * FStar_Extraction_ML_Syntax.e_tag * - FStar_Extraction_ML_Syntax.mlty)) + (FStar_Extraction_ML_Syntax.mlexpr, FStar_Extraction_ML_Syntax.e_tag, + FStar_Extraction_ML_Syntax.mlty) FStar_Tuple3.tuple3) = fun g -> fun e -> @@ -2625,8 +2629,8 @@ and (term_as_mlexpr : and (term_as_mlexpr' : FStar_Extraction_ML_UEnv.uenv -> FStar_Syntax_Syntax.term -> - (FStar_Extraction_ML_Syntax.mlexpr * FStar_Extraction_ML_Syntax.e_tag * - FStar_Extraction_ML_Syntax.mlty)) + (FStar_Extraction_ML_Syntax.mlexpr, FStar_Extraction_ML_Syntax.e_tag, + FStar_Extraction_ML_Syntax.mlty) FStar_Tuple3.tuple3) = fun g -> fun top -> diff --git a/ocaml/fstar-lib/generated/FStar_Extraction_ML_UEnv.ml b/ocaml/fstar-lib/generated/FStar_Extraction_ML_UEnv.ml index 7848a2aa53e..05e3fdc79d5 100644 --- a/ocaml/fstar-lib/generated/FStar_Extraction_ML_UEnv.ml +++ b/ocaml/fstar-lib/generated/FStar_Extraction_ML_UEnv.ml @@ -703,7 +703,8 @@ let (extend_bv : FStar_Extraction_ML_Syntax.mltyscheme -> Prims.bool -> Prims.bool -> - (uenv * FStar_Extraction_ML_Syntax.mlident * exp_binding)) + (uenv, FStar_Extraction_ML_Syntax.mlident, exp_binding) + FStar_Tuple3.tuple3) = fun g -> fun x -> @@ -792,7 +793,8 @@ let (extend_fv : FStar_Syntax_Syntax.fv -> FStar_Extraction_ML_Syntax.mltyscheme -> Prims.bool -> - (uenv * FStar_Extraction_ML_Syntax.mlident * exp_binding)) + (uenv, FStar_Extraction_ML_Syntax.mlident, exp_binding) + FStar_Tuple3.tuple3) = fun g -> fun x -> @@ -899,7 +901,8 @@ let (extend_lb : FStar_Syntax_Syntax.typ -> FStar_Extraction_ML_Syntax.mltyscheme -> Prims.bool -> - (uenv * FStar_Extraction_ML_Syntax.mlident * exp_binding)) + (uenv, FStar_Extraction_ML_Syntax.mlident, exp_binding) + FStar_Tuple3.tuple3) = fun g -> fun l -> @@ -914,7 +917,8 @@ let (extend_tydef : FStar_Syntax_Syntax.fv -> FStar_Extraction_ML_Syntax.mltyscheme -> FStar_Extraction_ML_Syntax.metadata -> - (tydef * FStar_Extraction_ML_Syntax.mlpath * uenv)) + (tydef, FStar_Extraction_ML_Syntax.mlpath, uenv) + FStar_Tuple3.tuple3) = fun g -> fun fv -> @@ -996,8 +1000,8 @@ let (extend_with_monad_op_name : FStar_Syntax_Syntax.eff_decl -> Prims.string -> FStar_Extraction_ML_Syntax.mltyscheme -> - (FStar_Extraction_ML_Syntax.mlpath * FStar_Ident.lident * - exp_binding * uenv)) + (FStar_Extraction_ML_Syntax.mlpath, FStar_Ident.lident, + exp_binding, uenv) FStar_Tuple4.tuple4) = fun g -> fun ed -> @@ -1020,8 +1024,8 @@ let (extend_with_action_name : FStar_Syntax_Syntax.eff_decl -> FStar_Syntax_Syntax.action -> FStar_Extraction_ML_Syntax.mltyscheme -> - (FStar_Extraction_ML_Syntax.mlpath * FStar_Ident.lident * - exp_binding * uenv)) + (FStar_Extraction_ML_Syntax.mlpath, FStar_Ident.lident, + exp_binding, uenv) FStar_Tuple4.tuple4) = fun g -> fun ed -> diff --git a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Base.ml b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Base.ml index c62e5667a89..2a23d50bb6b 100644 --- a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Base.ml +++ b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Base.ml @@ -1562,16 +1562,16 @@ type genv = { env: FStar_Reflection_Types.env ; bmap: - (FStar_Reflection_Types.typ * Prims.bool * FStar_Reflection_Types.term) - bind_map + (FStar_Reflection_Types.typ, Prims.bool, FStar_Reflection_Types.term) + FStar_Tuple3.tuple3 bind_map ; svars: (FStar_Reflection_Types.bv * FStar_Reflection_Types.typ) Prims.list } let (__proj__Mkgenv__item__env : genv -> FStar_Reflection_Types.env) = fun projectee -> match projectee with | { env; bmap; svars;_} -> env let (__proj__Mkgenv__item__bmap : genv -> - (FStar_Reflection_Types.typ * Prims.bool * FStar_Reflection_Types.term) - bind_map) + (FStar_Reflection_Types.typ, Prims.bool, FStar_Reflection_Types.term) + FStar_Tuple3.tuple3 bind_map) = fun projectee -> match projectee with | { env; bmap; svars;_} -> bmap let (__proj__Mkgenv__item__svars : genv -> (FStar_Reflection_Types.bv * FStar_Reflection_Types.typ) Prims.list) @@ -1579,13 +1579,13 @@ let (__proj__Mkgenv__item__svars : let (get_env : genv -> FStar_Reflection_Types.env) = fun e -> e.env let (get_bind_map : genv -> - (FStar_Reflection_Types.typ * Prims.bool * FStar_Reflection_Types.term) - bind_map) + (FStar_Reflection_Types.typ, Prims.bool, FStar_Reflection_Types.term) + FStar_Tuple3.tuple3 bind_map) = fun e -> e.bmap let (mk_genv : FStar_Reflection_Types.env -> - (FStar_Reflection_Types.typ * Prims.bool * FStar_Reflection_Types.term) - bind_map -> + (FStar_Reflection_Types.typ, Prims.bool, FStar_Reflection_Types.term) + FStar_Tuple3.tuple3 bind_map -> (FStar_Reflection_Types.bv * FStar_Reflection_Types.typ) Prims.list -> genv) = fun env -> fun bmap -> fun svars -> { env; bmap; svars } @@ -1982,8 +1982,8 @@ let (genv_to_string : let (genv_get : genv -> FStar_Reflection_Types.bv -> - (FStar_Reflection_Types.typ * Prims.bool * FStar_Reflection_Types.term) - FStar_Pervasives_Native.option) + (FStar_Reflection_Types.typ, Prims.bool, FStar_Reflection_Types.term) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun ge -> fun b -> bind_map_get ge.bmap b let (genv_get_from_name : genv -> @@ -2459,8 +2459,8 @@ let (push_fresh_var : FStar_Reflection_Types.env -> Prims.string -> FStar_Reflection_Types.typ -> - ((FStar_Reflection_Types.term * FStar_Reflection_Types.binder * - FStar_Reflection_Types.env), + ((FStar_Reflection_Types.term, FStar_Reflection_Types.binder, + FStar_Reflection_Types.env) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun e0 -> @@ -2508,7 +2508,8 @@ let (genv_push_fresh_var : genv -> Prims.string -> FStar_Reflection_Types.typ -> - ((FStar_Reflection_Types.term * FStar_Reflection_Types.binder * genv), + ((FStar_Reflection_Types.term, FStar_Reflection_Types.binder, + genv) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun ge0 -> @@ -2556,9 +2557,9 @@ let (push_two_fresh_vars : FStar_Reflection_Types.env -> Prims.string -> FStar_Reflection_Types.typ -> - ((FStar_Reflection_Types.term * FStar_Reflection_Types.binder * - FStar_Reflection_Types.term * FStar_Reflection_Types.binder * - FStar_Reflection_Types.env), + ((FStar_Reflection_Types.term, FStar_Reflection_Types.binder, + FStar_Reflection_Types.term, FStar_Reflection_Types.binder, + FStar_Reflection_Types.env) FStar_Tuple5.tuple5, unit) FStar_Tactics_Effect.tac_repr) = fun e0 -> @@ -2657,9 +2658,9 @@ let (genv_push_two_fresh_vars : genv -> Prims.string -> FStar_Reflection_Types.typ -> - ((FStar_Reflection_Types.term * FStar_Reflection_Types.binder * - FStar_Reflection_Types.term * FStar_Reflection_Types.binder * - genv), + ((FStar_Reflection_Types.term, FStar_Reflection_Types.binder, + FStar_Reflection_Types.term, FStar_Reflection_Types.binder, + genv) FStar_Tuple5.tuple5, unit) FStar_Tactics_Effect.tac_repr) = fun ge0 -> @@ -4837,8 +4838,8 @@ let rec (_generate_shadowed_subst : genv -> FStar_Reflection_Types.term -> (FStar_Reflection_Types.bv * FStar_Reflection_Types.typ) Prims.list -> - ((genv * (FStar_Reflection_Types.bv * FStar_Reflection_Types.typ * - FStar_Reflection_Types.bv) Prims.list), + ((genv * (FStar_Reflection_Types.bv, FStar_Reflection_Types.typ, + FStar_Reflection_Types.bv) FStar_Tuple3.tuple3 Prims.list), unit) FStar_Tactics_Effect.tac_repr) = fun uu___2 -> @@ -5157,8 +5158,8 @@ let rec (_generate_shadowed_subst : uu___)))) uu___2 uu___1 uu___ let (generate_shadowed_subst : genv -> - ((genv * (FStar_Reflection_Types.bv * FStar_Reflection_Types.typ * - FStar_Reflection_Types.bv) Prims.list), + ((genv * (FStar_Reflection_Types.bv, FStar_Reflection_Types.typ, + FStar_Reflection_Types.bv) FStar_Tuple3.tuple3 Prims.list), unit) FStar_Tactics_Effect.tac_repr) = fun ge -> diff --git a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Effectful.ml b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Effectful.ml index a7e9adea523..c672239e2cf 100644 --- a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Effectful.ml +++ b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_Effectful.ml @@ -4203,9 +4203,9 @@ let (check_opt_pre_post_type : let rec (_introduce_variables_for_abs : FStar_InteractiveHelpers_Base.genv -> FStar_Reflection_Types.typ -> - ((FStar_Reflection_Types.term Prims.list * - FStar_Reflection_Types.binder Prims.list * - FStar_InteractiveHelpers_Base.genv), + ((FStar_Reflection_Types.term Prims.list, + FStar_Reflection_Types.binder Prims.list, + FStar_InteractiveHelpers_Base.genv) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun ge -> @@ -4403,9 +4403,9 @@ let rec (_introduce_variables_for_abs : let (introduce_variables_for_abs : FStar_InteractiveHelpers_Base.genv -> FStar_Reflection_Types.term -> - ((FStar_Reflection_Types.term Prims.list * - FStar_Reflection_Types.binder Prims.list * - FStar_InteractiveHelpers_Base.genv), + ((FStar_Reflection_Types.term Prims.list, + FStar_Reflection_Types.binder Prims.list, + FStar_InteractiveHelpers_Base.genv) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun ge -> @@ -4437,9 +4437,9 @@ let (introduce_variables_for_abs : let (introduce_variables_for_opt_abs : FStar_InteractiveHelpers_Base.genv -> FStar_Reflection_Types.term FStar_Pervasives_Native.option -> - ((FStar_Reflection_Types.term Prims.list * - FStar_Reflection_Types.binder Prims.list * - FStar_InteractiveHelpers_Base.genv), + ((FStar_Reflection_Types.term Prims.list, + FStar_Reflection_Types.binder Prims.list, + FStar_InteractiveHelpers_Base.genv) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun uu___1 -> @@ -5498,11 +5498,12 @@ let (pre_post_to_propositions : FStar_Reflection_Types.term FStar_Pervasives_Native.option -> FStar_Reflection_V1_Data.term_view Prims.list -> FStar_Reflection_V1_Data.term_view Prims.list -> - ((FStar_InteractiveHelpers_Base.genv * + ((FStar_InteractiveHelpers_Base.genv, FStar_InteractiveHelpers_Propositions.proposition - FStar_Pervasives_Native.option * + FStar_Pervasives_Native.option, FStar_InteractiveHelpers_Propositions.proposition - FStar_Pervasives_Native.option), + FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun dbg -> diff --git a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_ExploreTerm.ml b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_ExploreTerm.ml index 12cd4de7bf0..9d0fa0998cc 100644 --- a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_ExploreTerm.ml +++ b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_ExploreTerm.ml @@ -4541,8 +4541,8 @@ and (explore_pattern : Obj.t -> FStar_InteractiveHelpers_Base.genv -> FStar_Reflection_V1_Data.pattern -> - ((FStar_InteractiveHelpers_Base.genv * Obj.t * - FStar_Tactics_Types.ctrl_flag), + ((FStar_InteractiveHelpers_Base.genv, Obj.t, + FStar_Tactics_Types.ctrl_flag) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun dbg -> diff --git a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_PostProcess.ml b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_PostProcess.ml index 0d7cf4f6a35..a3e0a2388db 100644 --- a/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_PostProcess.ml +++ b/ocaml/fstar-lib/generated/FStar_InteractiveHelpers_PostProcess.ml @@ -3279,8 +3279,8 @@ let (__proj__Eq_Hetero__item___1 : eq_kind -> FStar_Reflection_Types.typ) = let (is_eq : Prims.bool -> FStar_Reflection_Types.term -> - ((eq_kind * FStar_Reflection_Types.term * FStar_Reflection_Types.term) - FStar_Pervasives_Native.option, + ((eq_kind, FStar_Reflection_Types.term, FStar_Reflection_Types.term) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option, unit) FStar_Tactics_Effect.tac_repr) = fun dbg -> diff --git a/ocaml/fstar-lib/generated/FStar_Interactive_CompletionTable.ml b/ocaml/fstar-lib/generated/FStar_Interactive_CompletionTable.ml index 09d972c83f0..e2039efa9b7 100644 --- a/ocaml/fstar-lib/generated/FStar_Interactive_CompletionTable.ml +++ b/ocaml/fstar-lib/generated/FStar_Interactive_CompletionTable.ml @@ -130,15 +130,15 @@ let merge_increasing_lists_rev : let uu___1 = heap_from_list cmp lists2 in aux uu___1 [] type 'a btree = | StrEmpty - | StrBranch of (Prims.string * 'a * 'a btree * 'a btree) + | StrBranch of (Prims.string, 'a, 'a btree, 'a btree) FStar_Tuple4.tuple4 let uu___is_StrEmpty : 'a . 'a btree -> Prims.bool = fun projectee -> match projectee with | StrEmpty -> true | uu___ -> false let uu___is_StrBranch : 'a . 'a btree -> Prims.bool = fun projectee -> match projectee with | StrBranch _0 -> true | uu___ -> false let __proj__StrBranch__item___0 : - 'a . 'a btree -> (Prims.string * 'a * 'a btree * 'a btree) = - fun projectee -> match projectee with | StrBranch _0 -> _0 + 'a . 'a btree -> (Prims.string, 'a, 'a btree, 'a btree) FStar_Tuple4.tuple4 + = fun projectee -> match projectee with | StrBranch _0 -> _0 let rec btree_to_list_rev : 'a . 'a btree -> @@ -215,7 +215,9 @@ let rec btree_find_exact : else FStar_Pervasives_Native.Some v let rec btree_extract_min : 'a . - 'a btree -> (Prims.string * 'a * 'a btree) FStar_Pervasives_Native.option + 'a btree -> + (Prims.string, 'a, 'a btree) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option = fun bt -> match bt with diff --git a/ocaml/fstar-lib/generated/FStar_Interactive_Ide_Types.ml b/ocaml/fstar-lib/generated/FStar_Interactive_Ide_Types.ml index 25840971d4d..bedc87a5113 100644 --- a/ocaml/fstar-lib/generated/FStar_Interactive_Ide_Types.ml +++ b/ocaml/fstar-lib/generated/FStar_Interactive_Ide_Types.ml @@ -34,7 +34,7 @@ let (uu___is_LKOption : lookup_context -> Prims.bool) = fun projectee -> match projectee with | LKOption -> true | uu___ -> false let (uu___is_LKCode : lookup_context -> Prims.bool) = fun projectee -> match projectee with | LKCode -> true | uu___ -> false -type position = (Prims.string * Prims.int * Prims.int) +type position = (Prims.string, Prims.int, Prims.int) FStar_Tuple3.tuple3 type push_kind = | SyntaxCheck | LaxCheck @@ -116,8 +116,10 @@ type repl_task = | LDInterleaved of (timed_fname * timed_fname) | LDSingle of timed_fname | LDInterfaceOfCurrentFile of timed_fname - | PushFragment of ((FStar_Parser_ParseIt.input_frag, FStar_Parser_AST.decl) - FStar_Pervasives.either * push_kind * FStar_Json.json Prims.list) + | PushFragment of + ((FStar_Parser_ParseIt.input_frag, FStar_Parser_AST.decl) + FStar_Pervasives.either, + push_kind, FStar_Json.json Prims.list) FStar_Tuple3.tuple3 | Noop let (uu___is_LDInterleaved : repl_task -> Prims.bool) = fun projectee -> @@ -143,7 +145,8 @@ let (uu___is_PushFragment : repl_task -> Prims.bool) = let (__proj__PushFragment__item___0 : repl_task -> ((FStar_Parser_ParseIt.input_frag, FStar_Parser_AST.decl) - FStar_Pervasives.either * push_kind * FStar_Json.json Prims.list)) + FStar_Pervasives.either, + push_kind, FStar_Json.json Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | PushFragment _0 -> _0 let (uu___is_Noop : repl_task -> Prims.bool) = fun projectee -> match projectee with | Noop -> true | uu___ -> false @@ -183,15 +186,16 @@ type query' = | PushPartialCheckedFile of Prims.string | VfsAdd of (Prims.string FStar_Pervasives_Native.option * Prims.string) | AutoComplete of (Prims.string * completion_context) - | Lookup of (Prims.string * lookup_context * position - FStar_Pervasives_Native.option * Prims.string Prims.list * - lookup_symbol_range FStar_Pervasives_Native.option) + | Lookup of (Prims.string, lookup_context, + position FStar_Pervasives_Native.option, Prims.string Prims.list, + lookup_symbol_range FStar_Pervasives_Native.option) FStar_Tuple5.tuple5 | Compute of (Prims.string * FStar_TypeChecker_Env.step Prims.list FStar_Pervasives_Native.option) | Search of Prims.string | GenericError of Prims.string | ProtocolViolation of Prims.string - | FullBuffer of (Prims.string * full_buffer_request_kind * Prims.bool) + | FullBuffer of (Prims.string, full_buffer_request_kind, Prims.bool) + FStar_Tuple3.tuple3 | Callback of (repl_state -> ((query_status * FStar_Json.json Prims.list) * (repl_state, Prims.int) @@ -252,9 +256,9 @@ let (uu___is_Lookup : query' -> Prims.bool) = fun projectee -> match projectee with | Lookup _0 -> true | uu___ -> false let (__proj__Lookup__item___0 : query' -> - (Prims.string * lookup_context * position FStar_Pervasives_Native.option - * Prims.string Prims.list * lookup_symbol_range - FStar_Pervasives_Native.option)) + (Prims.string, lookup_context, position FStar_Pervasives_Native.option, + Prims.string Prims.list, + lookup_symbol_range FStar_Pervasives_Native.option) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | Lookup _0 -> _0 let (uu___is_Compute : query' -> Prims.bool) = fun projectee -> match projectee with | Compute _0 -> true | uu___ -> false @@ -281,8 +285,9 @@ let (uu___is_FullBuffer : query' -> Prims.bool) = fun projectee -> match projectee with | FullBuffer _0 -> true | uu___ -> false let (__proj__FullBuffer__item___0 : - query' -> (Prims.string * full_buffer_request_kind * Prims.bool)) = - fun projectee -> match projectee with | FullBuffer _0 -> _0 + query' -> + (Prims.string, full_buffer_request_kind, Prims.bool) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | FullBuffer _0 -> _0 let (uu___is_Callback : query' -> Prims.bool) = fun projectee -> match projectee with | Callback _0 -> true | uu___ -> false diff --git a/ocaml/fstar-lib/generated/FStar_Interactive_Incremental.ml b/ocaml/fstar-lib/generated/FStar_Interactive_Incremental.ml index 6c6473678e9..88efaa5b5da 100644 --- a/ocaml/fstar-lib/generated/FStar_Interactive_Incremental.ml +++ b/ocaml/fstar-lib/generated/FStar_Interactive_Incremental.ml @@ -2,9 +2,9 @@ open Prims type fragment_progress = | FullBufferStarted | FragmentStarted of FStar_Parser_AST.decl - | FragmentSuccess of (FStar_Parser_AST.decl * - FStar_Parser_ParseIt.code_fragment * FStar_Interactive_Ide_Types.push_kind) - + | FragmentSuccess of (FStar_Parser_AST.decl, + FStar_Parser_ParseIt.code_fragment, FStar_Interactive_Ide_Types.push_kind) + FStar_Tuple3.tuple3 | FragmentFailed of FStar_Parser_AST.decl | FragmentError of FStar_Errors.issue Prims.list | FullBufferFinished @@ -22,8 +22,8 @@ let (uu___is_FragmentSuccess : fragment_progress -> Prims.bool) = match projectee with | FragmentSuccess _0 -> true | uu___ -> false let (__proj__FragmentSuccess__item___0 : fragment_progress -> - (FStar_Parser_AST.decl * FStar_Parser_ParseIt.code_fragment * - FStar_Interactive_Ide_Types.push_kind)) + (FStar_Parser_AST.decl, FStar_Parser_ParseIt.code_fragment, + FStar_Interactive_Ide_Types.push_kind) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | FragmentSuccess _0 -> _0 let (uu___is_FragmentFailed : fragment_progress -> Prims.bool) = fun projectee -> @@ -362,8 +362,9 @@ let (parse_code : Prims.string -> FStar_Parser_ParseIt.parse_result) = FStar_Parser_ParseIt.Incremental uu___1 in FStar_Parser_ParseIt.parse uu___ let (syntax_issue : - (FStar_Errors_Codes.raw_error * FStar_Errors_Msg.error_message * - FStar_Compiler_Range_Type.range) -> FStar_Errors.issue) + (FStar_Errors_Codes.raw_error, FStar_Errors_Msg.error_message, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 -> + FStar_Errors.issue) = fun uu___ -> match uu___ with diff --git a/ocaml/fstar-lib/generated/FStar_Interactive_JsonHelper.ml b/ocaml/fstar-lib/generated/FStar_Interactive_JsonHelper.ml index 48dfb98cfb7..4dc22a664b5 100644 --- a/ocaml/fstar-lib/generated/FStar_Interactive_JsonHelper.ml +++ b/ocaml/fstar-lib/generated/FStar_Interactive_JsonHelper.ml @@ -694,7 +694,8 @@ let (js_loclink : FStar_Compiler_Range_Type.range -> FStar_Json.json) = FStar_Json.JsonAssoc uu___2 in [uu___1] in FStar_Json.JsonList uu___ -let (pos_munge : txdoc_pos -> (Prims.string * Prims.int * Prims.int)) = +let (pos_munge : + txdoc_pos -> (Prims.string, Prims.int, Prims.int) FStar_Tuple3.tuple3) = fun pos -> ((pos.path), (pos.line + Prims.int_one), (pos.col)) let (js_diag : Prims.string -> diff --git a/ocaml/fstar-lib/generated/FStar_Interactive_Legacy.ml b/ocaml/fstar-lib/generated/FStar_Interactive_Legacy.ml index e0d22a8cae1..01998133949 100644 --- a/ocaml/fstar-lib/generated/FStar_Interactive_Legacy.ml +++ b/ocaml/fstar-lib/generated/FStar_Interactive_Legacy.ml @@ -2,8 +2,9 @@ open Prims let (tc_one_file : Prims.string Prims.list -> FStar_TypeChecker_Env.env -> - ((Prims.string FStar_Pervasives_Native.option * Prims.string) * - FStar_TypeChecker_Env.env_t * Prims.string Prims.list)) + ((Prims.string FStar_Pervasives_Native.option * Prims.string), + FStar_TypeChecker_Env.env_t, Prims.string Prims.list) + FStar_Tuple3.tuple3) = fun remaining -> fun env -> @@ -159,8 +160,8 @@ let (check_frag : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.modul FStar_Pervasives_Native.option -> FStar_Parser_ParseIt.input_frag -> - (FStar_Syntax_Syntax.modul FStar_Pervasives_Native.option * - FStar_TypeChecker_Env.env * Prims.int) + (FStar_Syntax_Syntax.modul FStar_Pervasives_Native.option, + FStar_TypeChecker_Env.env, Prims.int) FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun env -> @@ -199,16 +200,18 @@ let (report_fail : unit -> unit) = fun uu___ -> (let uu___2 = FStar_Errors.report_all () in ()); FStar_Errors.clear () type input_chunks = - | Push of (Prims.bool * Prims.int * Prims.int) + | Push of (Prims.bool, Prims.int, Prims.int) FStar_Tuple3.tuple3 | Pop of Prims.string | Code of (Prims.string * (Prims.string * Prims.string)) - | Info of (Prims.string * Prims.bool * (Prims.string * Prims.int * - Prims.int) FStar_Pervasives_Native.option) + | Info of (Prims.string, Prims.bool, + (Prims.string, Prims.int, Prims.int) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 | Completions of Prims.string let (uu___is_Push : input_chunks -> Prims.bool) = fun projectee -> match projectee with | Push _0 -> true | uu___ -> false let (__proj__Push__item___0 : - input_chunks -> (Prims.bool * Prims.int * Prims.int)) = + input_chunks -> (Prims.bool, Prims.int, Prims.int) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Push _0 -> _0 let (uu___is_Pop : input_chunks -> Prims.bool) = fun projectee -> match projectee with | Pop _0 -> true | uu___ -> false @@ -223,8 +226,10 @@ let (uu___is_Info : input_chunks -> Prims.bool) = fun projectee -> match projectee with | Info _0 -> true | uu___ -> false let (__proj__Info__item___0 : input_chunks -> - (Prims.string * Prims.bool * (Prims.string * Prims.int * Prims.int) - FStar_Pervasives_Native.option)) + (Prims.string, Prims.bool, + (Prims.string, Prims.int, Prims.int) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Info _0 -> _0 let (uu___is_Completions : input_chunks -> Prims.bool) = fun projectee -> @@ -412,8 +417,8 @@ let (fill_buffer : unit -> unit) = FStar_Compiler_Effect.op_Colon_Equals s.buffer uu___1 let (deps_of_our_file : Prims.string -> - (Prims.string Prims.list * Prims.string FStar_Pervasives_Native.option * - FStar_Parser_Dep.deps)) + (Prims.string Prims.list, Prims.string FStar_Pervasives_Native.option, + FStar_Parser_Dep.deps) FStar_Tuple3.tuple3) = fun filename -> let uu___ = @@ -464,16 +469,17 @@ let (deps_of_our_file : FStar_Pervasives_Native.None) in (deps1, maybe_intf, dep_graph)) type m_timestamps = - (Prims.string FStar_Pervasives_Native.option * Prims.string * - FStar_Compiler_Util.time FStar_Pervasives_Native.option * - FStar_Compiler_Util.time) Prims.list + (Prims.string FStar_Pervasives_Native.option, Prims.string, + FStar_Compiler_Util.time FStar_Pervasives_Native.option, + FStar_Compiler_Util.time) FStar_Tuple4.tuple4 Prims.list let rec (tc_deps : modul_t -> stack_t -> FStar_TypeChecker_Env.env -> Prims.string Prims.list -> m_timestamps -> - (stack_t * FStar_TypeChecker_Env.env * m_timestamps)) + (stack_t, FStar_TypeChecker_Env.env, m_timestamps) + FStar_Tuple3.tuple3) = fun m -> fun stack -> @@ -511,7 +517,9 @@ let rec (tc_deps : let (update_deps : Prims.string -> modul_t -> - stack_t -> env_t -> m_timestamps -> (stack_t * env_t * m_timestamps)) + stack_t -> + env_t -> + m_timestamps -> (stack_t, env_t, m_timestamps) FStar_Tuple3.tuple3) = fun filename -> fun m -> diff --git a/ocaml/fstar-lib/generated/FStar_Interactive_PushHelper.ml b/ocaml/fstar-lib/generated/FStar_Interactive_PushHelper.ml index 07f1b48d8cd..ed61814b806 100644 --- a/ocaml/fstar-lib/generated/FStar_Interactive_PushHelper.ml +++ b/ocaml/fstar-lib/generated/FStar_Interactive_PushHelper.ml @@ -1,12 +1,14 @@ open Prims type ctx_depth_t = - (Prims.int * Prims.int * FStar_TypeChecker_Env.solver_depth_t * Prims.int) + (Prims.int, Prims.int, FStar_TypeChecker_Env.solver_depth_t, Prims.int) + FStar_Tuple4.tuple4 type deps_t = FStar_Parser_Dep.deps type either_replst = (FStar_Interactive_Ide_Types.repl_state, FStar_Interactive_Ide_Types.repl_state) FStar_Pervasives.either type name_tracking_event = - | NTAlias of (FStar_Ident.lid * FStar_Ident.ident * FStar_Ident.lid) + | NTAlias of (FStar_Ident.lid, FStar_Ident.ident, FStar_Ident.lid) + FStar_Tuple3.tuple3 | NTOpen of (FStar_Ident.lid * FStar_Syntax_Syntax.open_module_or_namespace) | NTInclude of (FStar_Ident.lid * FStar_Ident.lid) @@ -16,7 +18,7 @@ let (uu___is_NTAlias : name_tracking_event -> Prims.bool) = fun projectee -> match projectee with | NTAlias _0 -> true | uu___ -> false let (__proj__NTAlias__item___0 : name_tracking_event -> - (FStar_Ident.lid * FStar_Ident.ident * FStar_Ident.lid)) + (FStar_Ident.lid, FStar_Ident.ident, FStar_Ident.lid) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | NTAlias _0 -> _0 let (uu___is_NTOpen : name_tracking_event -> Prims.bool) = fun projectee -> match projectee with | NTOpen _0 -> true | uu___ -> false @@ -170,8 +172,9 @@ let (repl_ld_tasks_of_deps : aux deps final_tasks let (deps_and_repl_ld_tasks_of_our_file : Prims.string -> - (Prims.string Prims.list * FStar_Interactive_Ide_Types.repl_task - Prims.list * deps_t)) + (Prims.string Prims.list, + FStar_Interactive_Ide_Types.repl_task Prims.list, deps_t) + FStar_Tuple3.tuple3) = fun filename -> let get_mod_name fname = FStar_Parser_Dep.lowercase_module_name fname in @@ -311,8 +314,9 @@ let (add_issues_to_push_fragment : FStar_Json.json Prims.list -> unit) = let (rollback_env : FStar_TypeChecker_Env.solver_t -> Prims.string -> - ((Prims.int * Prims.int * FStar_TypeChecker_Env.solver_depth_t * - Prims.int) * Prims.int) -> FStar_TypeChecker_Env.env) + ((Prims.int, Prims.int, FStar_TypeChecker_Env.solver_depth_t, + Prims.int) FStar_Tuple4.tuple4 * Prims.int) -> + FStar_TypeChecker_Env.env) = fun solver -> fun msg -> @@ -506,8 +510,9 @@ let (commit_name_tracking : } let (fresh_name_tracking_hooks : unit -> - (name_tracking_event Prims.list FStar_Compiler_Effect.ref * - FStar_Syntax_DsEnv.dsenv_hooks * FStar_TypeChecker_Env.tcenv_hooks)) + (name_tracking_event Prims.list FStar_Compiler_Effect.ref, + FStar_Syntax_DsEnv.dsenv_hooks, FStar_TypeChecker_Env.tcenv_hooks) + FStar_Tuple3.tuple3) = fun uu___ -> let events = FStar_Compiler_Util.mk_ref [] in diff --git a/ocaml/fstar-lib/generated/FStar_Interactive_QueryHelper.ml b/ocaml/fstar-lib/generated/FStar_Interactive_QueryHelper.ml index c36b397fb74..c14e8822c99 100644 --- a/ocaml/fstar-lib/generated/FStar_Interactive_QueryHelper.ml +++ b/ocaml/fstar-lib/generated/FStar_Interactive_QueryHelper.ml @@ -1,5 +1,5 @@ open Prims -type position = (Prims.string * Prims.int * Prims.int) +type position = (Prims.string, Prims.int, Prims.int) FStar_Tuple3.tuple3 type sl_reponse = { slr_name: Prims.string ; diff --git a/ocaml/fstar-lib/generated/FStar_Math_Euclid.ml b/ocaml/fstar-lib/generated/FStar_Math_Euclid.ml index 937a4fc95fa..1ec8d7b27a7 100644 --- a/ocaml/fstar-lib/generated/FStar_Math_Euclid.ml +++ b/ocaml/fstar-lib/generated/FStar_Math_Euclid.ml @@ -8,7 +8,9 @@ let rec (egcd : Prims.int -> Prims.int -> Prims.int -> - Prims.int -> Prims.int -> (Prims.int * Prims.int * Prims.int)) + Prims.int -> + Prims.int -> + (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3) = fun a -> fun b -> @@ -36,7 +38,9 @@ let rec (egcd : let r = egcd a b u11 u21 u31 v11 v21 v31 in r))) let (euclid_gcd : - Prims.int -> Prims.int -> (Prims.int * Prims.int * Prims.int)) = + Prims.int -> + Prims.int -> (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3) + = fun a -> fun b -> if b >= Prims.int_zero diff --git a/ocaml/fstar-lib/generated/FStar_Options.ml b/ocaml/fstar-lib/generated/FStar_Options.ml index 2b56c00ddb2..e410822c728 100644 --- a/ocaml/fstar-lib/generated/FStar_Options.ml +++ b/ocaml/fstar-lib/generated/FStar_Options.ml @@ -770,8 +770,8 @@ let (display_version : unit -> unit) = FStar_Compiler_Util.print_string uu___1 let display_usage_aux : 'uuuuu 'uuuuu1 . - (('uuuuu * Prims.string * 'uuuuu1 FStar_Getopt.opt_variant) * - FStar_Pprint.document) Prims.list -> unit + (('uuuuu, Prims.string, 'uuuuu1 FStar_Getopt.opt_variant) + FStar_Tuple3.tuple3 * FStar_Pprint.document) Prims.list -> unit = fun specs -> let text s = @@ -844,8 +844,8 @@ let display_usage_aux : (Prims.of_int (80)) d in FStar_Compiler_Util.print_string uu___ let (mk_spec : - (FStar_BaseTypes.char * Prims.string * option_val FStar_Getopt.opt_variant) - -> FStar_Getopt.opt) + (FStar_BaseTypes.char, Prims.string, option_val FStar_Getopt.opt_variant) + FStar_Tuple3.tuple3 -> FStar_Getopt.opt) = fun o -> let uu___ = o in @@ -996,8 +996,8 @@ let (pp_lowercase : option_val -> option_val) = String uu___ let (abort_counter : Prims.int FStar_Compiler_Effect.ref) = FStar_Compiler_Util.mk_ref Prims.int_zero -let (interp_quake_arg : Prims.string -> (Prims.int * Prims.int * Prims.bool)) - = +let (interp_quake_arg : + Prims.string -> (Prims.int, Prims.int, Prims.bool) FStar_Tuple3.tuple3) = fun s -> let ios = FStar_Compiler_Util.int_of_string in match FStar_Compiler_Util.split s "/" with @@ -1039,8 +1039,8 @@ let (set_option_warning_callback : (Prims.string -> unit) -> unit) = fun f -> set_option_warning_callback_aux f let rec (specs_with_types : Prims.bool -> - (FStar_BaseTypes.char * Prims.string * opt_type * FStar_Pprint.document) - Prims.list) + (FStar_BaseTypes.char, Prims.string, opt_type, FStar_Pprint.document) + FStar_Tuple4.tuple4 Prims.list) = fun warn_unsafe -> let text s = @@ -3566,12 +3566,12 @@ let (all_specs : (FStar_Getopt.opt * FStar_Pprint.document) Prims.list) = let (all_specs_getopt : FStar_Getopt.opt Prims.list) = FStar_Compiler_List.map FStar_Pervasives_Native.fst all_specs let (all_specs_with_types : - (FStar_BaseTypes.char * Prims.string * opt_type * FStar_Pprint.document) - Prims.list) + (FStar_BaseTypes.char, Prims.string, opt_type, FStar_Pprint.document) + FStar_Tuple4.tuple4 Prims.list) = specs_with_types true let (settable_specs : - ((FStar_BaseTypes.char * Prims.string * unit FStar_Getopt.opt_variant) * - FStar_Pprint.document) Prims.list) + ((FStar_BaseTypes.char, Prims.string, unit FStar_Getopt.opt_variant) + FStar_Tuple3.tuple3 * FStar_Pprint.document) Prims.list) = FStar_Compiler_List.filter (fun uu___ -> diff --git a/ocaml/fstar-lib/generated/FStar_Parser_AST.ml b/ocaml/fstar-lib/generated/FStar_Parser_AST.ml index e9f0e558134..fa46c48cfc0 100644 --- a/ocaml/fstar-lib/generated/FStar_Parser_AST.ml +++ b/ocaml/fstar-lib/generated/FStar_Parser_AST.ml @@ -41,36 +41,45 @@ type term' = | Projector of (FStar_Ident.lid * FStar_Ident.ident) | Construct of (FStar_Ident.lid * (term * imp) Prims.list) | Abs of (pattern Prims.list * term) - | App of (term * term * imp) - | Let of (let_qualifier * (term Prims.list FStar_Pervasives_Native.option * - (pattern * term)) Prims.list * term) - | LetOperator of ((FStar_Ident.ident * pattern * term) Prims.list * term) + | App of (term, term, imp) FStar_Tuple3.tuple3 + | Let of (let_qualifier, + (term Prims.list FStar_Pervasives_Native.option * (pattern * term)) + Prims.list, + term) FStar_Tuple3.tuple3 + | LetOperator of ((FStar_Ident.ident, pattern, term) FStar_Tuple3.tuple3 + Prims.list * term) | LetOpen of (FStar_Ident.lid * term) - | LetOpenRecord of (term * term * term) + | LetOpenRecord of (term, term, term) FStar_Tuple3.tuple3 | Seq of (term * term) - | Bind of (FStar_Ident.ident * term * term) - | If of (term * FStar_Ident.ident FStar_Pervasives_Native.option * - (FStar_Ident.ident FStar_Pervasives_Native.option * term * Prims.bool) - FStar_Pervasives_Native.option * term * term) - | Match of (term * FStar_Ident.ident FStar_Pervasives_Native.option * - (FStar_Ident.ident FStar_Pervasives_Native.option * term * Prims.bool) - FStar_Pervasives_Native.option * (pattern * term - FStar_Pervasives_Native.option * term) Prims.list) - | TryWith of (term * (pattern * term FStar_Pervasives_Native.option * term) - Prims.list) - | Ascribed of (term * term * term FStar_Pervasives_Native.option * - Prims.bool) + | Bind of (FStar_Ident.ident, term, term) FStar_Tuple3.tuple3 + | If of (term, FStar_Ident.ident FStar_Pervasives_Native.option, + (FStar_Ident.ident FStar_Pervasives_Native.option, term, Prims.bool) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option, + term, term) FStar_Tuple5.tuple5 + | Match of (term, FStar_Ident.ident FStar_Pervasives_Native.option, + (FStar_Ident.ident FStar_Pervasives_Native.option, term, Prims.bool) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option, + (pattern, term FStar_Pervasives_Native.option, term) FStar_Tuple3.tuple3 + Prims.list) + FStar_Tuple4.tuple4 + | TryWith of (term * (pattern, term FStar_Pervasives_Native.option, + term) FStar_Tuple3.tuple3 Prims.list) + | Ascribed of (term, term, term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4 | Record of (term FStar_Pervasives_Native.option * (FStar_Ident.lid * term) Prims.list) | Project of (term * FStar_Ident.lid) | Product of (binder Prims.list * term) | Sum of ((binder, term) FStar_Pervasives.either Prims.list * term) - | QForall of (binder Prims.list * (FStar_Ident.ident Prims.list * term - Prims.list Prims.list) * term) - | QExists of (binder Prims.list * (FStar_Ident.ident Prims.list * term - Prims.list Prims.list) * term) - | QuantOp of (FStar_Ident.ident * binder Prims.list * (FStar_Ident.ident - Prims.list * term Prims.list Prims.list) * term) + | QForall of (binder Prims.list, + (FStar_Ident.ident Prims.list * term Prims.list Prims.list), term) + FStar_Tuple3.tuple3 + | QExists of (binder Prims.list, + (FStar_Ident.ident Prims.list * term Prims.list Prims.list), term) + FStar_Tuple3.tuple3 + | QuantOp of (FStar_Ident.ident, binder Prims.list, + (FStar_Ident.ident Prims.list * term Prims.list Prims.list), term) + FStar_Tuple4.tuple4 | Refine of (binder * term) | NamedTyp of (FStar_Ident.ident * term) | Paren of term @@ -79,29 +88,33 @@ type term' = | LexList of term Prims.list | WFOrder of (term * term) | Decreases of (term * Prims.string FStar_Pervasives_Native.option) - | Labeled of (term * Prims.string * Prims.bool) + | Labeled of (term, Prims.string, Prims.bool) FStar_Tuple3.tuple3 | Discrim of FStar_Ident.lid | Attributes of term Prims.list | Antiquote of term | Quote of (term * quote_kind) | VQuote of term - | CalcProof of (term * term * calc_step Prims.list) - | IntroForall of (binder Prims.list * term * term) - | IntroExists of (binder Prims.list * term * term Prims.list * term) - | IntroImplies of (term * term * binder * term) - | IntroOr of (Prims.bool * term * term * term) - | IntroAnd of (term * term * term * term) - | ElimForall of (binder Prims.list * term * term Prims.list) - | ElimExists of (binder Prims.list * term * term * binder * term) - | ElimImplies of (term * term * term) - | ElimOr of (term * term * term * binder * term * binder * term) - | ElimAnd of (term * term * term * binder * binder * term) + | CalcProof of (term, term, calc_step Prims.list) FStar_Tuple3.tuple3 + | IntroForall of (binder Prims.list, term, term) FStar_Tuple3.tuple3 + | IntroExists of (binder Prims.list, term, term Prims.list, term) + FStar_Tuple4.tuple4 + | IntroImplies of (term, term, binder, term) FStar_Tuple4.tuple4 + | IntroOr of (Prims.bool, term, term, term) FStar_Tuple4.tuple4 + | IntroAnd of (term, term, term, term) FStar_Tuple4.tuple4 + | ElimForall of (binder Prims.list, term, term Prims.list) + FStar_Tuple3.tuple3 + | ElimExists of (binder Prims.list, term, term, binder, term) + FStar_Tuple5.tuple5 + | ElimImplies of (term, term, term) FStar_Tuple3.tuple3 + | ElimOr of (term, term, term, binder, term, binder, term) + FStar_Tuple7.tuple7 + | ElimAnd of (term, term, term, binder, binder, term) FStar_Tuple6.tuple6 and term = { tm: term' ; range: FStar_Compiler_Range_Type.range ; level: level } and calc_step = - | CalcStep of (term * term * term) + | CalcStep of (term, term, term) FStar_Tuple3.tuple3 and binder' = | Variable of FStar_Ident.ident | TVariable of FStar_Ident.ident @@ -120,11 +133,13 @@ and pattern' = Prims.list) | PatConst of FStar_Const.sconst | PatApp of (pattern * pattern Prims.list) - | PatVar of (FStar_Ident.ident * arg_qualifier - FStar_Pervasives_Native.option * term Prims.list) + | PatVar of (FStar_Ident.ident, + arg_qualifier FStar_Pervasives_Native.option, term Prims.list) + FStar_Tuple3.tuple3 | PatName of FStar_Ident.lid - | PatTvar of (FStar_Ident.ident * arg_qualifier - FStar_Pervasives_Native.option * term Prims.list) + | PatTvar of (FStar_Ident.ident, + arg_qualifier FStar_Pervasives_Native.option, term Prims.list) + FStar_Tuple3.tuple3 | PatList of pattern Prims.list | PatTuple of (pattern Prims.list * Prims.bool) | PatRecord of (FStar_Ident.lid * pattern) Prims.list @@ -191,21 +206,25 @@ let (__proj__Abs__item___0 : term' -> (pattern Prims.list * term)) = fun projectee -> match projectee with | Abs _0 -> _0 let (uu___is_App : term' -> Prims.bool) = fun projectee -> match projectee with | App _0 -> true | uu___ -> false -let (__proj__App__item___0 : term' -> (term * term * imp)) = - fun projectee -> match projectee with | App _0 -> _0 +let (__proj__App__item___0 : term' -> (term, term, imp) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | App _0 -> _0 let (uu___is_Let : term' -> Prims.bool) = fun projectee -> match projectee with | Let _0 -> true | uu___ -> false let (__proj__Let__item___0 : term' -> - (let_qualifier * (term Prims.list FStar_Pervasives_Native.option * - (pattern * term)) Prims.list * term)) + (let_qualifier, + (term Prims.list FStar_Pervasives_Native.option * (pattern * term)) + Prims.list, + term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Let _0 -> _0 let (uu___is_LetOperator : term' -> Prims.bool) = fun projectee -> match projectee with | LetOperator _0 -> true | uu___ -> false let (__proj__LetOperator__item___0 : - term' -> ((FStar_Ident.ident * pattern * term) Prims.list * term)) = - fun projectee -> match projectee with | LetOperator _0 -> _0 + term' -> + ((FStar_Ident.ident, pattern, term) FStar_Tuple3.tuple3 Prims.list * + term)) + = fun projectee -> match projectee with | LetOperator _0 -> _0 let (uu___is_LetOpen : term' -> Prims.bool) = fun projectee -> match projectee with | LetOpen _0 -> true | uu___ -> false let (__proj__LetOpen__item___0 : term' -> (FStar_Ident.lid * term)) = @@ -213,7 +232,8 @@ let (__proj__LetOpen__item___0 : term' -> (FStar_Ident.lid * term)) = let (uu___is_LetOpenRecord : term' -> Prims.bool) = fun projectee -> match projectee with | LetOpenRecord _0 -> true | uu___ -> false -let (__proj__LetOpenRecord__item___0 : term' -> (term * term * term)) = +let (__proj__LetOpenRecord__item___0 : + term' -> (term, term, term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | LetOpenRecord _0 -> _0 let (uu___is_Seq : term' -> Prims.bool) = fun projectee -> match projectee with | Seq _0 -> true | uu___ -> false @@ -221,37 +241,43 @@ let (__proj__Seq__item___0 : term' -> (term * term)) = fun projectee -> match projectee with | Seq _0 -> _0 let (uu___is_Bind : term' -> Prims.bool) = fun projectee -> match projectee with | Bind _0 -> true | uu___ -> false -let (__proj__Bind__item___0 : term' -> (FStar_Ident.ident * term * term)) = +let (__proj__Bind__item___0 : + term' -> (FStar_Ident.ident, term, term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Bind _0 -> _0 let (uu___is_If : term' -> Prims.bool) = fun projectee -> match projectee with | If _0 -> true | uu___ -> false let (__proj__If__item___0 : term' -> - (term * FStar_Ident.ident FStar_Pervasives_Native.option * - (FStar_Ident.ident FStar_Pervasives_Native.option * term * Prims.bool) - FStar_Pervasives_Native.option * term * term)) + (term, FStar_Ident.ident FStar_Pervasives_Native.option, + (FStar_Ident.ident FStar_Pervasives_Native.option, term, Prims.bool) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option, + term, term) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | If _0 -> _0 let (uu___is_Match : term' -> Prims.bool) = fun projectee -> match projectee with | Match _0 -> true | uu___ -> false let (__proj__Match__item___0 : term' -> - (term * FStar_Ident.ident FStar_Pervasives_Native.option * - (FStar_Ident.ident FStar_Pervasives_Native.option * term * Prims.bool) - FStar_Pervasives_Native.option * (pattern * term - FStar_Pervasives_Native.option * term) Prims.list)) + (term, FStar_Ident.ident FStar_Pervasives_Native.option, + (FStar_Ident.ident FStar_Pervasives_Native.option, term, Prims.bool) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option, + (pattern, term FStar_Pervasives_Native.option, term) + FStar_Tuple3.tuple3 Prims.list) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Match _0 -> _0 let (uu___is_TryWith : term' -> Prims.bool) = fun projectee -> match projectee with | TryWith _0 -> true | uu___ -> false let (__proj__TryWith__item___0 : term' -> - (term * (pattern * term FStar_Pervasives_Native.option * term) - Prims.list)) + (term * (pattern, term FStar_Pervasives_Native.option, term) + FStar_Tuple3.tuple3 Prims.list)) = fun projectee -> match projectee with | TryWith _0 -> _0 let (uu___is_Ascribed : term' -> Prims.bool) = fun projectee -> match projectee with | Ascribed _0 -> true | uu___ -> false let (__proj__Ascribed__item___0 : - term' -> (term * term * term FStar_Pervasives_Native.option * Prims.bool)) + term' -> + (term, term, term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Ascribed _0 -> _0 let (uu___is_Record : term' -> Prims.bool) = fun projectee -> match projectee with | Record _0 -> true | uu___ -> false @@ -277,22 +303,25 @@ let (uu___is_QForall : term' -> Prims.bool) = fun projectee -> match projectee with | QForall _0 -> true | uu___ -> false let (__proj__QForall__item___0 : term' -> - (binder Prims.list * (FStar_Ident.ident Prims.list * term Prims.list - Prims.list) * term)) + (binder Prims.list, + (FStar_Ident.ident Prims.list * term Prims.list Prims.list), term) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | QForall _0 -> _0 let (uu___is_QExists : term' -> Prims.bool) = fun projectee -> match projectee with | QExists _0 -> true | uu___ -> false let (__proj__QExists__item___0 : term' -> - (binder Prims.list * (FStar_Ident.ident Prims.list * term Prims.list - Prims.list) * term)) + (binder Prims.list, + (FStar_Ident.ident Prims.list * term Prims.list Prims.list), term) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | QExists _0 -> _0 let (uu___is_QuantOp : term' -> Prims.bool) = fun projectee -> match projectee with | QuantOp _0 -> true | uu___ -> false let (__proj__QuantOp__item___0 : term' -> - (FStar_Ident.ident * binder Prims.list * (FStar_Ident.ident Prims.list * - term Prims.list Prims.list) * term)) + (FStar_Ident.ident, binder Prims.list, + (FStar_Ident.ident Prims.list * term Prims.list Prims.list), term) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | QuantOp _0 -> _0 let (uu___is_Refine : term' -> Prims.bool) = fun projectee -> match projectee with | Refine _0 -> true | uu___ -> false @@ -334,8 +363,9 @@ let (__proj__Decreases__item___0 : fun projectee -> match projectee with | Decreases _0 -> _0 let (uu___is_Labeled : term' -> Prims.bool) = fun projectee -> match projectee with | Labeled _0 -> true | uu___ -> false -let (__proj__Labeled__item___0 : term' -> (term * Prims.string * Prims.bool)) - = fun projectee -> match projectee with | Labeled _0 -> _0 +let (__proj__Labeled__item___0 : + term' -> (term, Prims.string, Prims.bool) FStar_Tuple3.tuple3) = + fun projectee -> match projectee with | Labeled _0 -> _0 let (uu___is_Discrim : term' -> Prims.bool) = fun projectee -> match projectee with | Discrim _0 -> true | uu___ -> false let (__proj__Discrim__item___0 : term' -> FStar_Ident.lid) = @@ -362,60 +392,65 @@ let (uu___is_CalcProof : term' -> Prims.bool) = fun projectee -> match projectee with | CalcProof _0 -> true | uu___ -> false let (__proj__CalcProof__item___0 : - term' -> (term * term * calc_step Prims.list)) = + term' -> (term, term, calc_step Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | CalcProof _0 -> _0 let (uu___is_IntroForall : term' -> Prims.bool) = fun projectee -> match projectee with | IntroForall _0 -> true | uu___ -> false let (__proj__IntroForall__item___0 : - term' -> (binder Prims.list * term * term)) = + term' -> (binder Prims.list, term, term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | IntroForall _0 -> _0 let (uu___is_IntroExists : term' -> Prims.bool) = fun projectee -> match projectee with | IntroExists _0 -> true | uu___ -> false let (__proj__IntroExists__item___0 : - term' -> (binder Prims.list * term * term Prims.list * term)) = - fun projectee -> match projectee with | IntroExists _0 -> _0 + term' -> + (binder Prims.list, term, term Prims.list, term) FStar_Tuple4.tuple4) + = fun projectee -> match projectee with | IntroExists _0 -> _0 let (uu___is_IntroImplies : term' -> Prims.bool) = fun projectee -> match projectee with | IntroImplies _0 -> true | uu___ -> false -let (__proj__IntroImplies__item___0 : term' -> (term * term * binder * term)) - = fun projectee -> match projectee with | IntroImplies _0 -> _0 +let (__proj__IntroImplies__item___0 : + term' -> (term, term, binder, term) FStar_Tuple4.tuple4) = + fun projectee -> match projectee with | IntroImplies _0 -> _0 let (uu___is_IntroOr : term' -> Prims.bool) = fun projectee -> match projectee with | IntroOr _0 -> true | uu___ -> false -let (__proj__IntroOr__item___0 : term' -> (Prims.bool * term * term * term)) - = fun projectee -> match projectee with | IntroOr _0 -> _0 +let (__proj__IntroOr__item___0 : + term' -> (Prims.bool, term, term, term) FStar_Tuple4.tuple4) = + fun projectee -> match projectee with | IntroOr _0 -> _0 let (uu___is_IntroAnd : term' -> Prims.bool) = fun projectee -> match projectee with | IntroAnd _0 -> true | uu___ -> false -let (__proj__IntroAnd__item___0 : term' -> (term * term * term * term)) = +let (__proj__IntroAnd__item___0 : + term' -> (term, term, term, term) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | IntroAnd _0 -> _0 let (uu___is_ElimForall : term' -> Prims.bool) = fun projectee -> match projectee with | ElimForall _0 -> true | uu___ -> false let (__proj__ElimForall__item___0 : - term' -> (binder Prims.list * term * term Prims.list)) = + term' -> (binder Prims.list, term, term Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | ElimForall _0 -> _0 let (uu___is_ElimExists : term' -> Prims.bool) = fun projectee -> match projectee with | ElimExists _0 -> true | uu___ -> false let (__proj__ElimExists__item___0 : - term' -> (binder Prims.list * term * term * binder * term)) = - fun projectee -> match projectee with | ElimExists _0 -> _0 + term' -> (binder Prims.list, term, term, binder, term) FStar_Tuple5.tuple5) + = fun projectee -> match projectee with | ElimExists _0 -> _0 let (uu___is_ElimImplies : term' -> Prims.bool) = fun projectee -> match projectee with | ElimImplies _0 -> true | uu___ -> false -let (__proj__ElimImplies__item___0 : term' -> (term * term * term)) = +let (__proj__ElimImplies__item___0 : + term' -> (term, term, term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | ElimImplies _0 -> _0 let (uu___is_ElimOr : term' -> Prims.bool) = fun projectee -> match projectee with | ElimOr _0 -> true | uu___ -> false let (__proj__ElimOr__item___0 : - term' -> (term * term * term * binder * term * binder * term)) = - fun projectee -> match projectee with | ElimOr _0 -> _0 + term' -> (term, term, term, binder, term, binder, term) FStar_Tuple7.tuple7) + = fun projectee -> match projectee with | ElimOr _0 -> _0 let (uu___is_ElimAnd : term' -> Prims.bool) = fun projectee -> match projectee with | ElimAnd _0 -> true | uu___ -> false let (__proj__ElimAnd__item___0 : - term' -> (term * term * term * binder * binder * term)) = + term' -> (term, term, term, binder, binder, term) FStar_Tuple6.tuple6) = fun projectee -> match projectee with | ElimAnd _0 -> _0 let (__proj__Mkterm__item__tm : term -> term') = fun projectee -> @@ -427,7 +462,8 @@ let (__proj__Mkterm__item__level : term -> level) = fun projectee -> match projectee with | { tm; range; level = level1;_} -> level1 let (uu___is_CalcStep : calc_step -> Prims.bool) = fun projectee -> true -let (__proj__CalcStep__item___0 : calc_step -> (term * term * term)) = +let (__proj__CalcStep__item___0 : + calc_step -> (term, term, term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | CalcStep _0 -> _0 let (uu___is_Variable : binder' -> Prims.bool) = fun projectee -> @@ -493,8 +529,8 @@ let (uu___is_PatVar : pattern' -> Prims.bool) = fun projectee -> match projectee with | PatVar _0 -> true | uu___ -> false let (__proj__PatVar__item___0 : pattern' -> - (FStar_Ident.ident * arg_qualifier FStar_Pervasives_Native.option * term - Prims.list)) + (FStar_Ident.ident, arg_qualifier FStar_Pervasives_Native.option, + term Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | PatVar _0 -> _0 let (uu___is_PatName : pattern' -> Prims.bool) = fun projectee -> match projectee with | PatName _0 -> true | uu___ -> false @@ -504,8 +540,8 @@ let (uu___is_PatTvar : pattern' -> Prims.bool) = fun projectee -> match projectee with | PatTvar _0 -> true | uu___ -> false let (__proj__PatTvar__item___0 : pattern' -> - (FStar_Ident.ident * arg_qualifier FStar_Pervasives_Native.option * term - Prims.list)) + (FStar_Ident.ident, arg_qualifier FStar_Pervasives_Native.option, + term Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | PatTvar _0 -> _0 let (uu___is_PatList : pattern' -> Prims.bool) = fun projectee -> match projectee with | PatList _0 -> true | uu___ -> false @@ -574,16 +610,19 @@ let (uu___is_Infix : imp -> Prims.bool) = let (uu___is_Nothing : imp -> Prims.bool) = fun projectee -> match projectee with | Nothing -> true | uu___ -> false type match_returns_annotation = - (FStar_Ident.ident FStar_Pervasives_Native.option * term * Prims.bool) + (FStar_Ident.ident FStar_Pervasives_Native.option, term, Prims.bool) + FStar_Tuple3.tuple3 type patterns = (FStar_Ident.ident Prims.list * term Prims.list Prims.list) type attributes_ = term Prims.list -type branch = (pattern * term FStar_Pervasives_Native.option * term) +type branch = + (pattern, term FStar_Pervasives_Native.option, term) FStar_Tuple3.tuple3 type aqual = arg_qualifier FStar_Pervasives_Native.option type knd = term type typ = term type expr = term type tycon_record = - (FStar_Ident.ident * aqual * attributes_ * term) Prims.list + (FStar_Ident.ident, aqual, attributes_, term) FStar_Tuple4.tuple4 + Prims.list type constructor_payload = | VpOfNotation of typ | VpArbitrary of typ @@ -605,48 +644,53 @@ let (__proj__VpRecord__item___0 : constructor_payload -> (tycon_record * typ FStar_Pervasives_Native.option)) = fun projectee -> match projectee with | VpRecord _0 -> _0 type tycon = - | TyconAbstract of (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option) - | TyconAbbrev of (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option * term) - | TyconRecord of (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option * attributes_ * tycon_record) - | TyconVariant of (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option * (FStar_Ident.ident * constructor_payload - FStar_Pervasives_Native.option * attributes_) Prims.list) + | TyconAbstract of (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option) FStar_Tuple3.tuple3 + | TyconAbbrev of (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option, term) FStar_Tuple4.tuple4 + | TyconRecord of (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option, attributes_, tycon_record) + FStar_Tuple5.tuple5 + | TyconVariant of (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option, + (FStar_Ident.ident, constructor_payload FStar_Pervasives_Native.option, + attributes_) FStar_Tuple3.tuple3 Prims.list) + FStar_Tuple4.tuple4 let (uu___is_TyconAbstract : tycon -> Prims.bool) = fun projectee -> match projectee with | TyconAbstract _0 -> true | uu___ -> false let (__proj__TyconAbstract__item___0 : tycon -> - (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option)) + (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | TyconAbstract _0 -> _0 let (uu___is_TyconAbbrev : tycon -> Prims.bool) = fun projectee -> match projectee with | TyconAbbrev _0 -> true | uu___ -> false let (__proj__TyconAbbrev__item___0 : tycon -> - (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option * term)) + (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option, term) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | TyconAbbrev _0 -> _0 let (uu___is_TyconRecord : tycon -> Prims.bool) = fun projectee -> match projectee with | TyconRecord _0 -> true | uu___ -> false let (__proj__TyconRecord__item___0 : tycon -> - (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option * attributes_ * tycon_record)) + (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option, attributes_, tycon_record) + FStar_Tuple5.tuple5) = fun projectee -> match projectee with | TyconRecord _0 -> _0 let (uu___is_TyconVariant : tycon -> Prims.bool) = fun projectee -> match projectee with | TyconVariant _0 -> true | uu___ -> false let (__proj__TyconVariant__item___0 : tycon -> - (FStar_Ident.ident * binder Prims.list * knd - FStar_Pervasives_Native.option * (FStar_Ident.ident * - constructor_payload FStar_Pervasives_Native.option * attributes_) - Prims.list)) + (FStar_Ident.ident, binder Prims.list, + knd FStar_Pervasives_Native.option, + (FStar_Ident.ident, constructor_payload FStar_Pervasives_Native.option, + attributes_) FStar_Tuple3.tuple3 Prims.list) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | TyconVariant _0 -> _0 type qualifier = | Private @@ -806,20 +850,23 @@ type decl' = | Include of FStar_Ident.lid | ModuleAbbrev of (FStar_Ident.ident * FStar_Ident.lid) | TopLevelLet of (let_qualifier * (pattern * term) Prims.list) - | Tycon of (Prims.bool * Prims.bool * tycon Prims.list) + | Tycon of (Prims.bool, Prims.bool, tycon Prims.list) FStar_Tuple3.tuple3 | Val of (FStar_Ident.ident * term) | Exception of (FStar_Ident.ident * term FStar_Pervasives_Native.option) | NewEffect of effect_decl | LayeredEffect of effect_decl | SubEffect of lift - | Polymonadic_bind of (FStar_Ident.lid * FStar_Ident.lid * FStar_Ident.lid - * term) - | Polymonadic_subcomp of (FStar_Ident.lid * FStar_Ident.lid * term) + | Polymonadic_bind of (FStar_Ident.lid, FStar_Ident.lid, FStar_Ident.lid, + term) FStar_Tuple4.tuple4 + | Polymonadic_subcomp of (FStar_Ident.lid, FStar_Ident.lid, term) + FStar_Tuple3.tuple3 | Pragma of pragma | Assume of (FStar_Ident.ident * term) - | Splice of (Prims.bool * FStar_Ident.ident Prims.list * term) - | DeclSyntaxExtension of (Prims.string * Prims.string * - FStar_Compiler_Range_Type.range * FStar_Compiler_Range_Type.range) + | Splice of (Prims.bool, FStar_Ident.ident Prims.list, term) + FStar_Tuple3.tuple3 + | DeclSyntaxExtension of (Prims.string, Prims.string, + FStar_Compiler_Range_Type.range, FStar_Compiler_Range_Type.range) + FStar_Tuple4.tuple4 and decl = { d: decl' ; @@ -828,9 +875,10 @@ and decl = attrs: attributes_ ; interleaved: Prims.bool } and effect_decl = - | DefineEffect of (FStar_Ident.ident * binder Prims.list * term * decl - Prims.list) - | RedefineEffect of (FStar_Ident.ident * binder Prims.list * term) + | DefineEffect of (FStar_Ident.ident, binder Prims.list, term, + decl Prims.list) FStar_Tuple4.tuple4 + | RedefineEffect of (FStar_Ident.ident, binder Prims.list, term) + FStar_Tuple3.tuple3 let (uu___is_TopLevelModule : decl' -> Prims.bool) = fun projectee -> match projectee with | TopLevelModule _0 -> true | uu___ -> false @@ -863,7 +911,7 @@ let (__proj__TopLevelLet__item___0 : let (uu___is_Tycon : decl' -> Prims.bool) = fun projectee -> match projectee with | Tycon _0 -> true | uu___ -> false let (__proj__Tycon__item___0 : - decl' -> (Prims.bool * Prims.bool * tycon Prims.list)) = + decl' -> (Prims.bool, Prims.bool, tycon Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Tycon _0 -> _0 let (uu___is_Val : decl' -> Prims.bool) = fun projectee -> match projectee with | Val _0 -> true | uu___ -> false @@ -894,13 +942,15 @@ let (uu___is_Polymonadic_bind : decl' -> Prims.bool) = fun projectee -> match projectee with | Polymonadic_bind _0 -> true | uu___ -> false let (__proj__Polymonadic_bind__item___0 : - decl' -> (FStar_Ident.lid * FStar_Ident.lid * FStar_Ident.lid * term)) = - fun projectee -> match projectee with | Polymonadic_bind _0 -> _0 + decl' -> + (FStar_Ident.lid, FStar_Ident.lid, FStar_Ident.lid, term) + FStar_Tuple4.tuple4) + = fun projectee -> match projectee with | Polymonadic_bind _0 -> _0 let (uu___is_Polymonadic_subcomp : decl' -> Prims.bool) = fun projectee -> match projectee with | Polymonadic_subcomp _0 -> true | uu___ -> false let (__proj__Polymonadic_subcomp__item___0 : - decl' -> (FStar_Ident.lid * FStar_Ident.lid * term)) = + decl' -> (FStar_Ident.lid, FStar_Ident.lid, term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Polymonadic_subcomp _0 -> _0 let (uu___is_Pragma : decl' -> Prims.bool) = fun projectee -> match projectee with | Pragma _0 -> true | uu___ -> false @@ -913,15 +963,16 @@ let (__proj__Assume__item___0 : decl' -> (FStar_Ident.ident * term)) = let (uu___is_Splice : decl' -> Prims.bool) = fun projectee -> match projectee with | Splice _0 -> true | uu___ -> false let (__proj__Splice__item___0 : - decl' -> (Prims.bool * FStar_Ident.ident Prims.list * term)) = - fun projectee -> match projectee with | Splice _0 -> _0 + decl' -> + (Prims.bool, FStar_Ident.ident Prims.list, term) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | Splice _0 -> _0 let (uu___is_DeclSyntaxExtension : decl' -> Prims.bool) = fun projectee -> match projectee with | DeclSyntaxExtension _0 -> true | uu___ -> false let (__proj__DeclSyntaxExtension__item___0 : decl' -> - (Prims.string * Prims.string * FStar_Compiler_Range_Type.range * - FStar_Compiler_Range_Type.range)) + (Prims.string, Prims.string, FStar_Compiler_Range_Type.range, + FStar_Compiler_Range_Type.range) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | DeclSyntaxExtension _0 -> _0 let (__proj__Mkdecl__item__d : decl -> decl') = fun projectee -> @@ -946,17 +997,20 @@ let (uu___is_DefineEffect : effect_decl -> Prims.bool) = match projectee with | DefineEffect _0 -> true | uu___ -> false let (__proj__DefineEffect__item___0 : effect_decl -> - (FStar_Ident.ident * binder Prims.list * term * decl Prims.list)) + (FStar_Ident.ident, binder Prims.list, term, decl Prims.list) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | DefineEffect _0 -> _0 let (uu___is_RedefineEffect : effect_decl -> Prims.bool) = fun projectee -> match projectee with | RedefineEffect _0 -> true | uu___ -> false let (__proj__RedefineEffect__item___0 : - effect_decl -> (FStar_Ident.ident * binder Prims.list * term)) = - fun projectee -> match projectee with | RedefineEffect _0 -> _0 + effect_decl -> + (FStar_Ident.ident, binder Prims.list, term) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | RedefineEffect _0 -> _0 type modul = | Module of (FStar_Ident.lid * decl Prims.list) - | Interface of (FStar_Ident.lid * decl Prims.list * Prims.bool) + | Interface of (FStar_Ident.lid, decl Prims.list, Prims.bool) + FStar_Tuple3.tuple3 let (uu___is_Module : modul -> Prims.bool) = fun projectee -> match projectee with | Module _0 -> true | uu___ -> false let (__proj__Module__item___0 : modul -> (FStar_Ident.lid * decl Prims.list)) @@ -965,8 +1019,8 @@ let (uu___is_Interface : modul -> Prims.bool) = fun projectee -> match projectee with | Interface _0 -> true | uu___ -> false let (__proj__Interface__item___0 : - modul -> (FStar_Ident.lid * decl Prims.list * Prims.bool)) = - fun projectee -> match projectee with | Interface _0 -> _0 + modul -> (FStar_Ident.lid, decl Prims.list, Prims.bool) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | Interface _0 -> _0 type file = modul type inputFragment = (file, decl Prims.list) FStar_Pervasives.either let (lid_of_modul : modul -> FStar_Ident.lid) = @@ -1264,7 +1318,8 @@ let (mkAdmitMagic : FStar_Compiler_Range_Type.range -> term) = let mkWildAdmitMagic : 'uuuuu . FStar_Compiler_Range_Type.range -> - (pattern * 'uuuuu FStar_Pervasives_Native.option * term) + (pattern, 'uuuuu FStar_Pervasives_Native.option, term) + FStar_Tuple3.tuple3 = fun r -> let uu___ = mk_pattern (PatWild (FStar_Pervasives_Native.None, [])) r in @@ -1272,10 +1327,11 @@ let mkWildAdmitMagic : (uu___, FStar_Pervasives_Native.None, uu___1) let focusBranches : 'uuuuu . - (Prims.bool * (pattern * 'uuuuu FStar_Pervasives_Native.option * term)) - Prims.list -> + (Prims.bool * (pattern, 'uuuuu FStar_Pervasives_Native.option, term) + FStar_Tuple3.tuple3) Prims.list -> FStar_Compiler_Range_Type.range -> - (pattern * 'uuuuu FStar_Pervasives_Native.option * term) Prims.list + (pattern, 'uuuuu FStar_Pervasives_Native.option, term) + FStar_Tuple3.tuple3 Prims.list = fun branches -> fun r -> @@ -1499,8 +1555,8 @@ let (mkRefinedPattern : (PatAscribed (pat, (t1, FStar_Pervasives_Native.None))) range let rec (extract_named_refinement : term -> - (FStar_Ident.ident * term * term FStar_Pervasives_Native.option) - FStar_Pervasives_Native.option) + (FStar_Ident.ident, term, term FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun t1 -> match t1.tm with @@ -2182,10 +2238,12 @@ and (binders_to_string : Prims.string -> binder Prims.list -> Prims.string) = and (try_or_match_to_string : term -> term -> - (pattern * term FStar_Pervasives_Native.option * term) Prims.list -> + (pattern, term FStar_Pervasives_Native.option, term) + FStar_Tuple3.tuple3 Prims.list -> FStar_Ident.ident FStar_Pervasives_Native.option -> - (FStar_Ident.ident FStar_Pervasives_Native.option * term * - Prims.bool) FStar_Pervasives_Native.option -> Prims.string) + (FStar_Ident.ident FStar_Pervasives_Native.option, term, + Prims.bool) FStar_Tuple3.tuple3 FStar_Pervasives_Native.option -> + Prims.string) = fun x -> fun scrutinee -> diff --git a/ocaml/fstar-lib/generated/FStar_Parser_AST_Util.ml b/ocaml/fstar-lib/generated/FStar_Parser_AST_Util.ml index 40c7b0ad513..19168492aff 100644 --- a/ocaml/fstar-lib/generated/FStar_Parser_AST_Util.ml +++ b/ocaml/fstar-lib/generated/FStar_Parser_AST_Util.ml @@ -394,10 +394,10 @@ and (eq_binder' : eq_term t1 t2 | uu___ -> false and (eq_match_returns_annotation : - (FStar_Ident.ident FStar_Pervasives_Native.option * FStar_Parser_AST.term * - Prims.bool) -> - (FStar_Ident.ident FStar_Pervasives_Native.option * FStar_Parser_AST.term - * Prims.bool) -> Prims.bool) + (FStar_Ident.ident FStar_Pervasives_Native.option, FStar_Parser_AST.term, + Prims.bool) FStar_Tuple3.tuple3 -> + (FStar_Ident.ident FStar_Pervasives_Native.option, FStar_Parser_AST.term, + Prims.bool) FStar_Tuple3.tuple3 -> Prims.bool) = fun uu___ -> fun uu___1 -> @@ -405,10 +405,12 @@ and (eq_match_returns_annotation : | ((i1, t1, b1), (i2, t2, b2)) -> ((eq_option eq_ident i1 i2) && (eq_term t1 t2)) && (b1 = b2) and (eq_branch : - (FStar_Parser_AST.pattern * FStar_Parser_AST.term - FStar_Pervasives_Native.option * FStar_Parser_AST.term) -> - (FStar_Parser_AST.pattern * FStar_Parser_AST.term - FStar_Pervasives_Native.option * FStar_Parser_AST.term) -> Prims.bool) + (FStar_Parser_AST.pattern, + FStar_Parser_AST.term FStar_Pervasives_Native.option, + FStar_Parser_AST.term) FStar_Tuple3.tuple3 -> + (FStar_Parser_AST.pattern, + FStar_Parser_AST.term FStar_Pervasives_Native.option, + FStar_Parser_AST.term) FStar_Tuple3.tuple3 -> Prims.bool) = fun uu___ -> fun uu___1 -> @@ -859,8 +861,9 @@ and (lidents_of_term' : FStar_Compiler_List.op_At uu___2 uu___3 in FStar_Compiler_List.op_At uu___ uu___1 and (lidents_of_branch : - (FStar_Parser_AST.pattern * FStar_Parser_AST.term - FStar_Pervasives_Native.option * FStar_Parser_AST.term) -> + (FStar_Parser_AST.pattern, + FStar_Parser_AST.term FStar_Pervasives_Native.option, + FStar_Parser_AST.term) FStar_Tuple3.tuple3 -> FStar_Ident.lident Prims.list) = fun uu___ -> @@ -921,7 +924,7 @@ and (lidents_of_binder : | uu___ -> [] let lidents_of_tycon_record : 'uuuuu 'uuuuu1 'uuuuu2 . - ('uuuuu * 'uuuuu1 * 'uuuuu2 * FStar_Parser_AST.term) -> + ('uuuuu, 'uuuuu1, 'uuuuu2, FStar_Parser_AST.term) FStar_Tuple4.tuple4 -> FStar_Ident.lident Prims.list = fun uu___ -> @@ -939,8 +942,9 @@ let (lidents_of_constructor_payload : let uu___1 = lidents_of_term t1 in FStar_Compiler_List.op_At uu___ uu___1 let (lidents_of_tycon_variant : - (FStar_Ident.ident * FStar_Parser_AST.constructor_payload - FStar_Pervasives_Native.option * FStar_Parser_AST.attributes_) -> + (FStar_Ident.ident, + FStar_Parser_AST.constructor_payload FStar_Pervasives_Native.option, + FStar_Parser_AST.attributes_) FStar_Tuple3.tuple3 -> FStar_Ident.lident Prims.list) = fun tc -> diff --git a/ocaml/fstar-lib/generated/FStar_Parser_Const.ml b/ocaml/fstar-lib/generated/FStar_Parser_Const.ml index 86a9f8374df..073194d2b18 100644 --- a/ocaml/fstar-lib/generated/FStar_Parser_Const.ml +++ b/ocaml/fstar-lib/generated/FStar_Parser_Const.ml @@ -388,16 +388,36 @@ let (mk_tuple_lid : Prims.int -> FStar_Compiler_Range_Type.range -> FStar_Ident.lident) = fun n -> fun r -> - let t = - let uu___ = FStar_Compiler_Util.string_of_int n in - FStar_Compiler_Util.format1 "tuple%s" uu___ in - let uu___ = psnconst t in FStar_Ident.set_lid_range uu___ r + let l = + if n = (Prims.of_int (2)) + then FStar_Ident.lid_of_str "FStar.Pervasives.Native.tuple2" + else + (let s = + let uu___1 = FStar_Compiler_Util.string_of_int n in + let uu___2 = FStar_Compiler_Util.string_of_int n in + FStar_Compiler_Util.format2 "FStar.Tuple%s.tuple%s" uu___1 + uu___2 in + FStar_Ident.lid_of_str s) in + FStar_Ident.set_lid_range l r let (lid_tuple2 : FStar_Ident.lident) = mk_tuple_lid (Prims.of_int (2)) FStar_Compiler_Range_Type.dummyRange let (lid_tuple3 : FStar_Ident.lident) = mk_tuple_lid (Prims.of_int (3)) FStar_Compiler_Range_Type.dummyRange let (is_tuple_constructor_string : Prims.string -> Prims.bool) = - fun s -> FStar_Compiler_Util.starts_with s "FStar.Pervasives.Native.tuple" + fun s -> + ((((((((((((s = "FStar.Pervasives.Native.tuple2") || + (s = "FStar.Tuple3.tuple3")) + || (s = "FStar.Tuple4.tuple4")) + || (s = "FStar.Tuple5.tuple5")) + || (s = "FStar.Tuple6.tuple6")) + || (s = "FStar.Tuple7.tuple7")) + || (s = "FStar.Tuple8.tuple8")) + || (s = "FStar.Tuple9.tuple9")) + || (s = "FStar.Tuple10.tuple10")) + || (s = "FStar.Tuple11.tuple11")) + || (s = "FStar.Tuple12.tuple12")) + || (s = "FStar.Tuple13.tuple13")) + || (s = "FStar.Tuple14.tuple14") let (is_tuple_constructor_id : FStar_Ident.ident -> Prims.bool) = fun id -> let uu___ = FStar_Ident.string_of_id id in @@ -410,17 +430,36 @@ let (mk_tuple_data_lid : Prims.int -> FStar_Compiler_Range_Type.range -> FStar_Ident.lident) = fun n -> fun r -> - let t = - let uu___ = FStar_Compiler_Util.string_of_int n in - FStar_Compiler_Util.format1 "Mktuple%s" uu___ in - let uu___ = psnconst t in FStar_Ident.set_lid_range uu___ r + let l = + if n = (Prims.of_int (2)) + then FStar_Ident.lid_of_str "FStar.Pervasives.Native.Mktuple2" + else + (let s = + let uu___1 = FStar_Compiler_Util.string_of_int n in + let uu___2 = FStar_Compiler_Util.string_of_int n in + FStar_Compiler_Util.format2 "FStar.Tuple%s.Mktuple%s" uu___1 + uu___2 in + FStar_Ident.lid_of_str s) in + FStar_Ident.set_lid_range l r let (lid_Mktuple2 : FStar_Ident.lident) = mk_tuple_data_lid (Prims.of_int (2)) FStar_Compiler_Range_Type.dummyRange let (lid_Mktuple3 : FStar_Ident.lident) = mk_tuple_data_lid (Prims.of_int (3)) FStar_Compiler_Range_Type.dummyRange let (is_tuple_datacon_string : Prims.string -> Prims.bool) = fun s -> - FStar_Compiler_Util.starts_with s "FStar.Pervasives.Native.Mktuple" + ((((((((((((s = "FStar.Pervasives.Native.Mktuple2") || + (s = "FStar.Tuple3.Mktuple3")) + || (s = "FStar.Tuple4.Mktuple4")) + || (s = "FStar.Tuple5.Mktuple5")) + || (s = "FStar.Tuple6.Mktuple6")) + || (s = "FStar.Tuple7.Mktuple7")) + || (s = "FStar.Tuple8.Mktuple8")) + || (s = "FStar.Tuple9.Mktuple9")) + || (s = "FStar.Tuple10.Mktuple10")) + || (s = "FStar.Tuple11.Mktuple11")) + || (s = "FStar.Tuple12.Mktuple12")) + || (s = "FStar.Tuple13.Mktuple13")) + || (s = "FStar.Tuple14.Mktuple14") let (is_tuple_datacon_id : FStar_Ident.ident -> Prims.bool) = fun id -> let uu___ = FStar_Ident.string_of_id id in is_tuple_datacon_string uu___ @@ -437,7 +476,19 @@ let (is_tuple_data_lid' : FStar_Ident.lident -> Prims.bool) = fun f -> let uu___ = FStar_Ident.string_of_lid f in is_tuple_datacon_string uu___ let (mod_prefix_dtuple : Prims.int -> Prims.string -> FStar_Ident.lident) = - fun n -> if n = (Prims.of_int (2)) then pconst else psconst + fun n -> + fun s -> + if n = (Prims.of_int (2)) + then pconst s + else + (let uu___1 = + let uu___2 = + let uu___3 = + let uu___4 = FStar_Compiler_Util.string_of_int n in + Prims.strcat "DTuple" uu___4 in + [uu___3; s] in + "FStar" :: uu___2 in + FStar_Ident.lid_of_path uu___1 FStar_Compiler_Range_Type.dummyRange) let (mk_dtuple_lid : Prims.int -> FStar_Compiler_Range_Type.range -> FStar_Ident.lident) = fun n -> @@ -449,8 +500,9 @@ let (mk_dtuple_lid : FStar_Ident.set_lid_range uu___ r let (is_dtuple_constructor_string : Prims.string -> Prims.bool) = fun s -> - (s = "Prims.dtuple2") || - (FStar_Compiler_Util.starts_with s "FStar.Pervasives.dtuple") + (((s = "Prims.dtuple2") || (s = "FStar.DTuple3.dtuple3")) || + (s = "FStar.DTuple4.dtuple4")) + || (s = "FStar.DTuple5.dtuple5") let (is_dtuple_constructor_lid : FStar_Ident.lident -> Prims.bool) = fun lid -> let uu___ = FStar_Ident.string_of_lid lid in @@ -466,8 +518,9 @@ let (mk_dtuple_data_lid : FStar_Ident.set_lid_range uu___ r let (is_dtuple_datacon_string : Prims.string -> Prims.bool) = fun s -> - (s = "Prims.Mkdtuple2") || - (FStar_Compiler_Util.starts_with s "FStar.Pervasives.Mkdtuple") + (((s = "Prims.Mkdtuple2") || (s = "FStar.DTuple3.Mkdtuple3")) || + (s = "FStar.DTuple4.Mkdtuple4")) + || (s = "FStar.DTuple5.Mkdtuple5") let (is_dtuple_data_lid : FStar_Ident.lident -> Prims.int -> Prims.bool) = fun f -> fun n -> diff --git a/ocaml/fstar-lib/generated/FStar_Parser_Dep.ml b/ocaml/fstar-lib/generated/FStar_Parser_Dep.ml index b2b3d8281f1..89a93e71990 100644 --- a/ocaml/fstar-lib/generated/FStar_Parser_Dep.ml +++ b/ocaml/fstar-lib/generated/FStar_Parser_Dep.ml @@ -986,8 +986,8 @@ let (collect_one : files_for_module_name -> Prims.string -> (Prims.string -> parsing_data FStar_Pervasives_Native.option) -> - (parsing_data * dependence Prims.list * Prims.bool * dependence - Prims.list)) + (parsing_data, dependence Prims.list, Prims.bool, + dependence Prims.list) FStar_Tuple4.tuple4) = fun original_map -> fun filename -> @@ -1218,6 +1218,12 @@ let (collect_one : uu___3 in FStar_Compiler_Effect.op_Colon_Equals pd uu___2 else () in + let add_module m = + let uu___1 = + let uu___2 = + let uu___3 = FStar_Ident.lid_of_str m in (false, uu___3) in + P_dep uu___2 in + add_to_parsing_data uu___1 in let rec collect_module uu___1 = match uu___1 with | FStar_Parser_AST.Module (lid, decls) -> @@ -1342,8 +1348,7 @@ let (collect_one : FStar_Compiler_Util.iter_opt k collect_term; (let uu___5 = FStar_Compiler_List.filter_map - FStar_Pervasives_Native.__proj__Mktuple3__item___2 - identterms in + FStar_Tuple3.__proj__Mktuple3__item___2 identterms in FStar_Compiler_List.iter (fun uu___6 -> match uu___6 with @@ -1403,7 +1408,26 @@ let (collect_one : -> add_to_parsing_data (P_lid FStar_Parser_Const.tcresolve_lid) | uu___2 -> () - and collect_term t = collect_term' t.FStar_Parser_AST.tm + and collect_term t = + let rec tdepth t1 = + match t1.FStar_Parser_AST.tm with + | FStar_Parser_AST.Op (id, uu___1::r::[]) when + (let uu___2 = FStar_Ident.string_of_id id in uu___2 = "*") + || + (let uu___2 = FStar_Ident.string_of_id id in + uu___2 = "&") + -> let uu___2 = tdepth r in Prims.int_one + uu___2 + | uu___1 -> Prims.int_one in + let d = tdepth t in + (let uu___2 = let uu___3 = tdepth t in uu___3 > Prims.int_one in + if uu___2 + then + let uu___3 = + let uu___4 = FStar_Compiler_Util.string_of_int d in + Prims.strcat "FStar.Tuple" uu___4 in + add_module uu___3 + else ()); + collect_term' t.FStar_Parser_AST.tm and collect_constant uu___1 = match uu___1 with | FStar_Const.Const_int @@ -1464,7 +1488,7 @@ let (collect_one : match uu___1 with | FStar_Parser_AST.Wild -> () | FStar_Parser_AST.Const c -> collect_constant c - | FStar_Parser_AST.Op (uu___2, ts) -> + | FStar_Parser_AST.Op (op, ts) -> FStar_Compiler_List.iter collect_term ts | FStar_Parser_AST.Tvar uu___2 -> () | FStar_Parser_AST.Uvar uu___2 -> () @@ -1546,9 +1570,23 @@ let (collect_one : | FStar_Parser_AST.Product (binders, t) -> (collect_binders binders; collect_term t) | FStar_Parser_AST.Sum (binders, t) -> - (FStar_Compiler_List.iter - (fun uu___3 -> - match uu___3 with + let sn = + FStar_Compiler_Util.string_of_int + (Prims.int_one + (FStar_Compiler_List.length binders)) in + let is_dep = + let uu___2 = + FStar_Compiler_List.for_all + (fun uu___3 -> + match uu___3 with + | FStar_Pervasives.Inr uu___4 -> true + | uu___4 -> false) binders in + Prims.op_Negation uu___2 in + (if is_dep + then add_module (Prims.strcat "FStar.DTuple" sn) + else add_module (Prims.strcat "FStar.Tuple" sn); + FStar_Compiler_List.iter + (fun uu___4 -> + match uu___4 with | FStar_Pervasives.Inl b -> collect_binder b | FStar_Pervasives.Inr t1 -> collect_term t1) binders; collect_term t) @@ -1577,13 +1615,7 @@ let (collect_one : | FStar_Parser_AST.LexList l -> FStar_Compiler_List.iter collect_term l | FStar_Parser_AST.WFOrder (t1, t2) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.WellFounded" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.WellFounded"; collect_term t1; collect_term t2) | FStar_Parser_AST.Decreases (t, uu___2) -> collect_term t @@ -1593,12 +1625,7 @@ let (collect_one : | FStar_Parser_AST.Attributes cattributes -> FStar_Compiler_List.iter collect_term cattributes | FStar_Parser_AST.CalcProof (rel, init, steps) -> - ((let uu___3 = - let uu___4 = - let uu___5 = FStar_Ident.lid_of_str "FStar.Calc" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Calc"; collect_term rel; collect_term init; FStar_Compiler_List.iter @@ -1609,106 +1636,52 @@ let (collect_one : collect_term just; collect_term next)) steps) | FStar_Parser_AST.IntroForall (bs, p, e) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_binders bs; collect_term p; collect_term e) | FStar_Parser_AST.IntroExists (bs, t, vs, e) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_binders bs; collect_term t; FStar_Compiler_List.iter collect_term vs; collect_term e) | FStar_Parser_AST.IntroImplies (p, q, x, e) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_term p; collect_term q; collect_binder x; collect_term e) | FStar_Parser_AST.IntroOr (b, p, q, r) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_term p; collect_term q; collect_term r) | FStar_Parser_AST.IntroAnd (p, q, r, e) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_term p; collect_term q; collect_term r; collect_term e) | FStar_Parser_AST.ElimForall (bs, p, vs) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_binders bs; collect_term p; FStar_Compiler_List.iter collect_term vs) | FStar_Parser_AST.ElimExists (bs, p, q, b, e) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_binders bs; collect_term p; collect_term q; collect_binder b; collect_term e) | FStar_Parser_AST.ElimImplies (p, q, e) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_term p; collect_term q; collect_term e) | FStar_Parser_AST.ElimAnd (p, q, r, x, y, e) -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_term p; collect_term q; collect_term r; @@ -1716,13 +1689,7 @@ let (collect_one : collect_binder y; collect_term e) | FStar_Parser_AST.ElimOr (p, q, r, x, e, y, e') -> - ((let uu___3 = - let uu___4 = - let uu___5 = - FStar_Ident.lid_of_str "FStar.Classical.Sugar" in - (false, uu___5) in - P_dep uu___4 in - add_to_parsing_data uu___3); + (add_module "FStar.Classical.Sugar"; collect_term p; collect_term q; collect_term r; @@ -1752,7 +1719,14 @@ let (collect_one : | FStar_Parser_AST.PatName uu___2 -> () | FStar_Parser_AST.PatList ps -> collect_patterns ps | FStar_Parser_AST.PatOr ps -> collect_patterns ps - | FStar_Parser_AST.PatTuple (ps, uu___2) -> collect_patterns ps + | FStar_Parser_AST.PatTuple (ps, is_dep) -> + let sn = + FStar_Compiler_Util.string_of_int + (FStar_Compiler_List.length ps) in + (if is_dep + then add_module (Prims.strcat "FStar.DTuple" sn) + else add_module (Prims.strcat "FStar.Tuple" sn); + collect_patterns ps) | FStar_Parser_AST.PatRecord lidpats -> FStar_Compiler_List.iter (fun uu___2 -> @@ -1799,14 +1773,14 @@ let (collect_one : | (deps1, has_inline_for_extraction, mo_roots) -> (pd1, deps1, has_inline_for_extraction, mo_roots)))) let (collect_one_cache : - (dependence Prims.list * dependence Prims.list * Prims.bool) - FStar_Compiler_Util.smap FStar_Compiler_Effect.ref) + (dependence Prims.list, dependence Prims.list, Prims.bool) + FStar_Tuple3.tuple3 FStar_Compiler_Util.smap FStar_Compiler_Effect.ref) = let uu___ = FStar_Compiler_Util.smap_create Prims.int_zero in FStar_Compiler_Util.mk_ref uu___ let (set_collect_one_cache : - (dependence Prims.list * dependence Prims.list * Prims.bool) - FStar_Compiler_Util.smap -> unit) + (dependence Prims.list, dependence Prims.list, Prims.bool) + FStar_Tuple3.tuple3 FStar_Compiler_Util.smap -> unit) = fun cache -> FStar_Compiler_Effect.op_Colon_Equals collect_one_cache cache let (dep_graph_copy : dependence_graph -> dependence_graph) = diff --git a/ocaml/fstar-lib/generated/FStar_Parser_ToDocument.ml b/ocaml/fstar-lib/generated/FStar_Parser_ToDocument.ml index e28b5bd5ac1..50e93766de8 100644 --- a/ocaml/fstar-lib/generated/FStar_Parser_ToDocument.ml +++ b/ocaml/fstar-lib/generated/FStar_Parser_ToDocument.ml @@ -600,7 +600,9 @@ let (level_associativity_spec : associativity_level Prims.list) = amp; colon_colon] let (level_table : - ((Prims.int * Prims.int * Prims.int) * token Prims.list) Prims.list) = + ((Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3 * token Prims.list) + Prims.list) + = let levels_from_associativity l uu___ = match uu___ with | Left -> (l, l, (l - Prims.int_one)) @@ -614,7 +616,7 @@ let (level_table : level_associativity_spec let (assign_levels : associativity_level Prims.list -> - Prims.string -> (Prims.int * Prims.int * Prims.int)) + Prims.string -> (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3) = fun token_associativity_spec -> fun s -> @@ -648,7 +650,8 @@ let max_level : 'uuuuu . ('uuuuu * token Prims.list) Prims.list -> Prims.int uu___2 in FStar_Compiler_Effect.failwith uu___1 in FStar_Compiler_List.fold_left find_level_and_max Prims.int_zero l -let (levels : Prims.string -> (Prims.int * Prims.int * Prims.int)) = +let (levels : + Prims.string -> (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3) = fun op -> let uu___ = assign_levels level_associativity_spec op in match uu___ with @@ -734,13 +737,13 @@ let handleable_op : [".()<-"; ".[]<-"; ".(||)<-"; ".[||]<-"] | uu___ -> false type annotation_style = - | Binders of (Prims.int * Prims.int * Prims.bool) + | Binders of (Prims.int, Prims.int, Prims.bool) FStar_Tuple3.tuple3 | Arrows of (Prims.int * Prims.int) let (uu___is_Binders : annotation_style -> Prims.bool) = fun projectee -> match projectee with | Binders _0 -> true | uu___ -> false let (__proj__Binders__item___0 : - annotation_style -> (Prims.int * Prims.int * Prims.bool)) = - fun projectee -> match projectee with | Binders _0 -> _0 + annotation_style -> (Prims.int, Prims.int, Prims.bool) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | Binders _0 -> _0 let (uu___is_Arrows : annotation_style -> Prims.bool) = fun projectee -> match projectee with | Arrows _0 -> true | uu___ -> false let (__proj__Arrows__item___0 : annotation_style -> (Prims.int * Prims.int)) @@ -1461,8 +1464,8 @@ and (p_typeDeclWithKw : and (p_typeDecl : FStar_Pprint.document -> FStar_Parser_AST.tycon -> - (FStar_Pprint.document * FStar_Pprint.document * FStar_Pprint.document - * (FStar_Pprint.document -> FStar_Pprint.document))) + (FStar_Pprint.document, FStar_Pprint.document, FStar_Pprint.document, + FStar_Pprint.document -> FStar_Pprint.document) FStar_Tuple4.tuple4) = fun pre -> fun uu___ -> @@ -1578,9 +1581,8 @@ and (p_typeDeclPrefix : prefix2 uu___1 typ)) and (p_recordFieldDecl : Prims.bool -> - (FStar_Ident.ident * FStar_Parser_AST.aqual * - FStar_Parser_AST.attributes_ * FStar_Parser_AST.term) -> - FStar_Pprint.document) + (FStar_Ident.ident, FStar_Parser_AST.aqual, FStar_Parser_AST.attributes_, + FStar_Parser_AST.term) FStar_Tuple4.tuple4 -> FStar_Pprint.document) = fun ps -> fun uu___ -> @@ -1600,8 +1602,9 @@ and (p_recordFieldDecl : FStar_Pprint.op_Hat_Hat uu___2 uu___3 in FStar_Pprint.group uu___1 and (p_constructorBranch : - (FStar_Ident.ident * FStar_Parser_AST.constructor_payload - FStar_Pervasives_Native.option * FStar_Parser_AST.attributes_) -> + (FStar_Ident.ident, + FStar_Parser_AST.constructor_payload FStar_Pervasives_Native.option, + FStar_Parser_AST.attributes_) FStar_Tuple3.tuple3 -> FStar_Pprint.document) = fun uu___ -> @@ -3698,8 +3701,8 @@ and (sig_as_binders_if_possible : FStar_Pprint.op_Hat_Hat FStar_Pprint.colon uu___3 in FStar_Pprint.group uu___2) and (collapse_pats : - (FStar_Pprint.document * FStar_Pprint.document * Prims.bool * Prims.bool) - Prims.list -> FStar_Pprint.document Prims.list) + (FStar_Pprint.document, FStar_Pprint.document, Prims.bool, Prims.bool) + FStar_Tuple4.tuple4 Prims.list -> FStar_Pprint.document Prims.list) = fun pats -> let fold_fun bs x = @@ -3873,9 +3876,9 @@ and (p_maybeFocusArrow : Prims.bool -> FStar_Pprint.document) = fun b -> if b then str "~>" else FStar_Pprint.rarrow and (p_patternBranch : Prims.bool -> - (FStar_Parser_AST.pattern * FStar_Parser_AST.term - FStar_Pervasives_Native.option * FStar_Parser_AST.term) -> - FStar_Pprint.document) + (FStar_Parser_AST.pattern, + FStar_Parser_AST.term FStar_Pervasives_Native.option, + FStar_Parser_AST.term) FStar_Tuple3.tuple3 -> FStar_Pprint.document) = fun pb -> fun uu___ -> diff --git a/ocaml/fstar-lib/generated/FStar_Pervasives.ml b/ocaml/fstar-lib/generated/FStar_Pervasives.ml index eec9ac907b2..3eed83f7df1 100644 --- a/ocaml/fstar-lib/generated/FStar_Pervasives.ml +++ b/ocaml/fstar-lib/generated/FStar_Pervasives.ml @@ -180,57 +180,6 @@ let dfst : 'a 'b . ('a, 'b) Prims.dtuple2 -> 'a = fun t -> Prims.__proj__Mkdtuple2__item___1 t let dsnd : 'a 'b . ('a, 'b) Prims.dtuple2 -> 'b = fun t -> Prims.__proj__Mkdtuple2__item___2 t -type ('a, 'b, 'c) dtuple3 = - | Mkdtuple3 of 'a * 'b * 'c -let uu___is_Mkdtuple3 : 'a 'b 'c . ('a, 'b, 'c) dtuple3 -> Prims.bool = - fun projectee -> true -let __proj__Mkdtuple3__item___1 : 'a 'b 'c . ('a, 'b, 'c) dtuple3 -> 'a = - fun projectee -> match projectee with | Mkdtuple3 (_1, _2, _3) -> _1 -let __proj__Mkdtuple3__item___2 : 'a 'b 'c . ('a, 'b, 'c) dtuple3 -> 'b = - fun projectee -> match projectee with | Mkdtuple3 (_1, _2, _3) -> _2 -let __proj__Mkdtuple3__item___3 : 'a 'b 'c . ('a, 'b, 'c) dtuple3 -> 'c = - fun projectee -> match projectee with | Mkdtuple3 (_1, _2, _3) -> _3 -type ('a, 'b, 'c, 'd) dtuple4 = - | Mkdtuple4 of 'a * 'b * 'c * 'd -let uu___is_Mkdtuple4 : 'a 'b 'c 'd . ('a, 'b, 'c, 'd) dtuple4 -> Prims.bool - = fun projectee -> true -let __proj__Mkdtuple4__item___1 : - 'a 'b 'c 'd . ('a, 'b, 'c, 'd) dtuple4 -> 'a = - fun projectee -> match projectee with | Mkdtuple4 (_1, _2, _3, _4) -> _1 -let __proj__Mkdtuple4__item___2 : - 'a 'b 'c 'd . ('a, 'b, 'c, 'd) dtuple4 -> 'b = - fun projectee -> match projectee with | Mkdtuple4 (_1, _2, _3, _4) -> _2 -let __proj__Mkdtuple4__item___3 : - 'a 'b 'c 'd . ('a, 'b, 'c, 'd) dtuple4 -> 'c = - fun projectee -> match projectee with | Mkdtuple4 (_1, _2, _3, _4) -> _3 -let __proj__Mkdtuple4__item___4 : - 'a 'b 'c 'd . ('a, 'b, 'c, 'd) dtuple4 -> 'd = - fun projectee -> match projectee with | Mkdtuple4 (_1, _2, _3, _4) -> _4 -type ('a, 'b, 'c, 'd, 'e) dtuple5 = - | Mkdtuple5 of 'a * 'b * 'c * 'd * 'e -let uu___is_Mkdtuple5 : - 'a 'b 'c 'd 'e . ('a, 'b, 'c, 'd, 'e) dtuple5 -> Prims.bool = - fun projectee -> true -let __proj__Mkdtuple5__item___1 : - 'a 'b 'c 'd 'e . ('a, 'b, 'c, 'd, 'e) dtuple5 -> 'a = - fun projectee -> - match projectee with | Mkdtuple5 (_1, _2, _3, _4, _5) -> _1 -let __proj__Mkdtuple5__item___2 : - 'a 'b 'c 'd 'e . ('a, 'b, 'c, 'd, 'e) dtuple5 -> 'b = - fun projectee -> - match projectee with | Mkdtuple5 (_1, _2, _3, _4, _5) -> _2 -let __proj__Mkdtuple5__item___3 : - 'a 'b 'c 'd 'e . ('a, 'b, 'c, 'd, 'e) dtuple5 -> 'c = - fun projectee -> - match projectee with | Mkdtuple5 (_1, _2, _3, _4, _5) -> _3 -let __proj__Mkdtuple5__item___4 : - 'a 'b 'c 'd 'e . ('a, 'b, 'c, 'd, 'e) dtuple5 -> 'd = - fun projectee -> - match projectee with | Mkdtuple5 (_1, _2, _3, _4, _5) -> _4 -let __proj__Mkdtuple5__item___5 : - 'a 'b 'c 'd 'e . ('a, 'b, 'c, 'd, 'e) dtuple5 -> 'e = - fun projectee -> - match projectee with | Mkdtuple5 (_1, _2, _3, _4, _5) -> _5 let rec false_elim : 'uuuuu . unit -> 'uuuuu = fun uu___ -> false_elim () type __internal_ocaml_attributes = | PpxDerivingShow diff --git a/ocaml/fstar-lib/generated/FStar_Reflection_Typing.ml b/ocaml/fstar-lib/generated/FStar_Reflection_Typing.ml index fb845046af1..e7bc21590ed 100644 --- a/ocaml/fstar-lib/generated/FStar_Reflection_Typing.ml +++ b/ocaml/fstar-lib/generated/FStar_Reflection_Typing.ml @@ -1653,8 +1653,8 @@ let (__proj__ST_Let_Opaque__item__ty : match projectee with | ST_Let_Opaque (g, fv, ty, _3) -> ty type blob = (Prims.string * FStar_Reflection_Types.term) type 'g sigelt_for = - (Prims.bool * FStar_Reflection_Types.sigelt * blob - FStar_Pervasives_Native.option) + (Prims.bool, FStar_Reflection_Types.sigelt, + blob FStar_Pervasives_Native.option) FStar_Tuple3.tuple3 type 'g dsl_tac_result_t = unit sigelt_for Prims.list type dsl_tac_t = fstar_top_env -> diff --git a/ocaml/fstar-lib/generated/FStar_Reflection_V1_Data.ml b/ocaml/fstar-lib/generated/FStar_Reflection_V1_Data.ml index d40d3244131..f7ab9b7ff58 100644 --- a/ocaml/fstar-lib/generated/FStar_Reflection_V1_Data.ml +++ b/ocaml/fstar-lib/generated/FStar_Reflection_V1_Data.ml @@ -42,9 +42,9 @@ let (__proj__C_Reflect__item___0 : vconst -> name) = type universes = FStar_Syntax_Syntax.universe Prims.list type pattern = | Pat_Constant of vconst - | Pat_Cons of (FStar_Syntax_Syntax.fv * FStar_Syntax_Syntax.universe - Prims.list FStar_Pervasives_Native.option * (pattern * Prims.bool) - Prims.list) + | Pat_Cons of (FStar_Syntax_Syntax.fv, + FStar_Syntax_Syntax.universe Prims.list FStar_Pervasives_Native.option, + (pattern * Prims.bool) Prims.list) FStar_Tuple3.tuple3 | Pat_Var of (FStar_Syntax_Syntax.bv * typ) | Pat_Dot_Term of FStar_Syntax_Syntax.term FStar_Pervasives_Native.option let (uu___is_Pat_Constant : pattern -> Prims.bool) = @@ -57,8 +57,9 @@ let (uu___is_Pat_Cons : pattern -> Prims.bool) = match projectee with | Pat_Cons _0 -> true | uu___ -> false let (__proj__Pat_Cons__item___0 : pattern -> - (FStar_Syntax_Syntax.fv * FStar_Syntax_Syntax.universe Prims.list - FStar_Pervasives_Native.option * (pattern * Prims.bool) Prims.list)) + (FStar_Syntax_Syntax.fv, + FStar_Syntax_Syntax.universe Prims.list FStar_Pervasives_Native.option, + (pattern * Prims.bool) Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Pat_Cons _0 -> _0 let (uu___is_Pat_Var : pattern -> Prims.bool) = fun projectee -> match projectee with | Pat_Var _0 -> true | uu___ -> false @@ -162,19 +163,22 @@ type term_view = | Tv_Abs of (FStar_Syntax_Syntax.binder * FStar_Syntax_Syntax.term) | Tv_Arrow of (FStar_Syntax_Syntax.binder * FStar_Syntax_Syntax.comp) | Tv_Type of FStar_Syntax_Syntax.universe - | Tv_Refine of (FStar_Syntax_Syntax.bv * typ * FStar_Syntax_Syntax.term) + | Tv_Refine of (FStar_Syntax_Syntax.bv, typ, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3 | Tv_Const of vconst | Tv_Uvar of (FStar_BigInt.t * FStar_Syntax_Syntax.ctx_uvar_and_subst) - | Tv_Let of (Prims.bool * FStar_Syntax_Syntax.term Prims.list * - FStar_Syntax_Syntax.bv * typ * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term) - | Tv_Match of (FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.match_returns_ascription FStar_Pervasives_Native.option - * branch Prims.list) - | Tv_AscribedT of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool) - | Tv_AscribedC of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool) + | Tv_Let of (Prims.bool, FStar_Syntax_Syntax.term Prims.list, + FStar_Syntax_Syntax.bv, typ, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple6.tuple6 + | Tv_Match of (FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.match_returns_ascription FStar_Pervasives_Native.option, + branch Prims.list) FStar_Tuple3.tuple3 + | Tv_AscribedT of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4 + | Tv_AscribedC of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4 | Tv_Unknown | Tv_Unsupp let (uu___is_Tv_Var : term_view -> Prims.bool) = @@ -219,8 +223,10 @@ let (uu___is_Tv_Refine : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Refine _0 -> true | uu___ -> false let (__proj__Tv_Refine__item___0 : - term_view -> (FStar_Syntax_Syntax.bv * typ * FStar_Syntax_Syntax.term)) = - fun projectee -> match projectee with | Tv_Refine _0 -> _0 + term_view -> + (FStar_Syntax_Syntax.bv, typ, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | Tv_Refine _0 -> _0 let (uu___is_Tv_Const : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Const _0 -> true | uu___ -> false @@ -235,33 +241,37 @@ let (uu___is_Tv_Let : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Let _0 -> true | uu___ -> false let (__proj__Tv_Let__item___0 : term_view -> - (Prims.bool * FStar_Syntax_Syntax.term Prims.list * - FStar_Syntax_Syntax.bv * typ * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) + (Prims.bool, FStar_Syntax_Syntax.term Prims.list, FStar_Syntax_Syntax.bv, + typ, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple6.tuple6) = fun projectee -> match projectee with | Tv_Let _0 -> _0 let (uu___is_Tv_Match : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Match _0 -> true | uu___ -> false let (__proj__Tv_Match__item___0 : term_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.match_returns_ascription - FStar_Pervasives_Native.option * branch Prims.list)) + (FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.match_returns_ascription + FStar_Pervasives_Native.option, + branch Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Tv_Match _0 -> _0 let (uu___is_Tv_AscribedT : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_AscribedT _0 -> true | uu___ -> false let (__proj__Tv_AscribedT__item___0 : term_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Tv_AscribedT _0 -> _0 let (uu___is_Tv_AscribedC : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_AscribedC _0 -> true | uu___ -> false let (__proj__Tv_AscribedC__item___0 : term_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Tv_AscribedC _0 -> _0 let (uu___is_Tv_Unknown : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Unknown -> true | uu___ -> false @@ -274,10 +284,10 @@ let (notAscription : term_view -> Prims.bool) = type comp_view = | C_Total of typ | C_GTotal of typ - | C_Lemma of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term) - | C_Eff of (universes * name * FStar_Syntax_Syntax.term * argv Prims.list * - FStar_Syntax_Syntax.term Prims.list) + | C_Lemma of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3 + | C_Eff of (universes, name, FStar_Syntax_Syntax.term, argv Prims.list, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple5.tuple5 let (uu___is_C_Total : comp_view -> Prims.bool) = fun projectee -> match projectee with | C_Total _0 -> true | uu___ -> false let (__proj__C_Total__item___0 : comp_view -> typ) = @@ -291,15 +301,15 @@ let (uu___is_C_Lemma : comp_view -> Prims.bool) = fun projectee -> match projectee with | C_Lemma _0 -> true | uu___ -> false let (__proj__C_Lemma__item___0 : comp_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | C_Lemma _0 -> _0 let (uu___is_C_Eff : comp_view -> Prims.bool) = fun projectee -> match projectee with | C_Eff _0 -> true | uu___ -> false let (__proj__C_Eff__item___0 : comp_view -> - (universes * name * FStar_Syntax_Syntax.term * argv Prims.list * - FStar_Syntax_Syntax.term Prims.list)) + (universes, name, FStar_Syntax_Syntax.term, argv Prims.list, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | C_Eff _0 -> _0 type ctor = (name * typ) type lb_view = @@ -322,9 +332,10 @@ let (__proj__Mklb_view__item__lb_def : lb_view -> FStar_Syntax_Syntax.term) = match projectee with | { lb_fv; lb_us; lb_typ; lb_def;_} -> lb_def type sigelt_view = | Sg_Let of (Prims.bool * FStar_Syntax_Syntax.letbinding Prims.list) - | Sg_Inductive of (name * univ_name Prims.list * FStar_Syntax_Syntax.binder - Prims.list * typ * ctor Prims.list) - | Sg_Val of (name * univ_name Prims.list * typ) + | Sg_Inductive of (name, univ_name Prims.list, + FStar_Syntax_Syntax.binder Prims.list, typ, ctor Prims.list) + FStar_Tuple5.tuple5 + | Sg_Val of (name, univ_name Prims.list, typ) FStar_Tuple3.tuple3 | Unk let (uu___is_Sg_Let : sigelt_view -> Prims.bool) = fun projectee -> match projectee with | Sg_Let _0 -> true | uu___ -> false @@ -336,13 +347,13 @@ let (uu___is_Sg_Inductive : sigelt_view -> Prims.bool) = match projectee with | Sg_Inductive _0 -> true | uu___ -> false let (__proj__Sg_Inductive__item___0 : sigelt_view -> - (name * univ_name Prims.list * FStar_Syntax_Syntax.binder Prims.list * - typ * ctor Prims.list)) + (name, univ_name Prims.list, FStar_Syntax_Syntax.binder Prims.list, + typ, ctor Prims.list) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | Sg_Inductive _0 -> _0 let (uu___is_Sg_Val : sigelt_view -> Prims.bool) = fun projectee -> match projectee with | Sg_Val _0 -> true | uu___ -> false let (__proj__Sg_Val__item___0 : - sigelt_view -> (name * univ_name Prims.list * typ)) = + sigelt_view -> (name, univ_name Prims.list, typ) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Sg_Val _0 -> _0 let (uu___is_Unk : sigelt_view -> Prims.bool) = fun projectee -> match projectee with | Unk -> true | uu___ -> false diff --git a/ocaml/fstar-lib/generated/FStar_Reflection_V1_Embeddings.ml b/ocaml/fstar-lib/generated/FStar_Reflection_V1_Embeddings.ml index 8d0a7c7d145..9d8e0e93eb9 100644 --- a/ocaml/fstar-lib/generated/FStar_Reflection_V1_Embeddings.ml +++ b/ocaml/fstar-lib/generated/FStar_Reflection_V1_Embeddings.ml @@ -574,10 +574,12 @@ let (e_argv_aq : let uu___ = e_term_aq aq in FStar_Syntax_Embeddings.e_tuple2 uu___ e_aqualv let (e_match_returns_annotation : - (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term, - FStar_Syntax_Syntax.comp) FStar_Pervasives.either * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) - FStar_Pervasives_Native.option FStar_Syntax_Embeddings_Base.embedding) + (FStar_Syntax_Syntax.binder * + ((FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) FStar_Pervasives_Native.option + FStar_Syntax_Embeddings_Base.embedding) = FStar_Syntax_Embeddings.e_option (FStar_Syntax_Embeddings.e_tuple2 e_binder diff --git a/ocaml/fstar-lib/generated/FStar_Reflection_V1_NBEEmbeddings.ml b/ocaml/fstar-lib/generated/FStar_Reflection_V1_NBEEmbeddings.ml index 49bded700ba..a97dc27b643 100644 --- a/ocaml/fstar-lib/generated/FStar_Reflection_V1_NBEEmbeddings.ml +++ b/ocaml/fstar-lib/generated/FStar_Reflection_V1_NBEEmbeddings.ml @@ -649,10 +649,12 @@ let (e_argv_aq : FStar_TypeChecker_NBETerm.embedding) = fun aq -> FStar_TypeChecker_NBETerm.e_tuple2 (e_term_aq aq) e_aqualv let (e_match_returns_annotation : - (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term, - FStar_Syntax_Syntax.comp) FStar_Pervasives.either * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) - FStar_Pervasives_Native.option FStar_TypeChecker_NBETerm.embedding) + (FStar_Syntax_Syntax.binder * + ((FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) FStar_Pervasives_Native.option + FStar_TypeChecker_NBETerm.embedding) = FStar_TypeChecker_NBETerm.e_option (FStar_TypeChecker_NBETerm.e_tuple2 e_binder diff --git a/ocaml/fstar-lib/generated/FStar_Reflection_V2_Data.ml b/ocaml/fstar-lib/generated/FStar_Reflection_V2_Data.ml index 99896a830a3..7659d26030b 100644 --- a/ocaml/fstar-lib/generated/FStar_Reflection_V2_Data.ml +++ b/ocaml/fstar-lib/generated/FStar_Reflection_V2_Data.ml @@ -209,16 +209,18 @@ type term_view = | Tv_Refine of (FStar_Syntax_Syntax.binder * FStar_Syntax_Syntax.term) | Tv_Const of vconst | Tv_Uvar of (FStar_BigInt.t * FStar_Syntax_Syntax.ctx_uvar_and_subst) - | Tv_Let of (Prims.bool * FStar_Syntax_Syntax.term Prims.list * - FStar_Syntax_Syntax.binder * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term) - | Tv_Match of (FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.match_returns_ascription FStar_Pervasives_Native.option - * branch Prims.list) - | Tv_AscribedT of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool) - | Tv_AscribedC of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool) + | Tv_Let of (Prims.bool, FStar_Syntax_Syntax.term Prims.list, + FStar_Syntax_Syntax.binder, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple5.tuple5 + | Tv_Match of (FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.match_returns_ascription FStar_Pervasives_Native.option, + branch Prims.list) FStar_Tuple3.tuple3 + | Tv_AscribedT of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4 + | Tv_AscribedC of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4 | Tv_Unknown | Tv_Unsupp let (uu___is_Tv_Var : term_view -> Prims.bool) = @@ -279,33 +281,37 @@ let (uu___is_Tv_Let : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Let _0 -> true | uu___ -> false let (__proj__Tv_Let__item___0 : term_view -> - (Prims.bool * FStar_Syntax_Syntax.term Prims.list * - FStar_Syntax_Syntax.binder * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) + (Prims.bool, FStar_Syntax_Syntax.term Prims.list, + FStar_Syntax_Syntax.binder, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | Tv_Let _0 -> _0 let (uu___is_Tv_Match : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Match _0 -> true | uu___ -> false let (__proj__Tv_Match__item___0 : term_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.match_returns_ascription - FStar_Pervasives_Native.option * branch Prims.list)) + (FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.match_returns_ascription + FStar_Pervasives_Native.option, + branch Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Tv_Match _0 -> _0 let (uu___is_Tv_AscribedT : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_AscribedT _0 -> true | uu___ -> false let (__proj__Tv_AscribedT__item___0 : term_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Tv_AscribedT _0 -> _0 let (uu___is_Tv_AscribedC : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_AscribedC _0 -> true | uu___ -> false let (__proj__Tv_AscribedC__item___0 : term_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Tv_AscribedC _0 -> _0 let (uu___is_Tv_Unknown : term_view -> Prims.bool) = fun projectee -> match projectee with | Tv_Unknown -> true | uu___ -> false @@ -318,10 +324,10 @@ let (notAscription : term_view -> Prims.bool) = type comp_view = | C_Total of typ | C_GTotal of typ - | C_Lemma of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term) - | C_Eff of (universes * name * FStar_Syntax_Syntax.term * argv Prims.list * - FStar_Syntax_Syntax.term Prims.list) + | C_Lemma of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3 + | C_Eff of (universes, name, FStar_Syntax_Syntax.term, argv Prims.list, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple5.tuple5 let (uu___is_C_Total : comp_view -> Prims.bool) = fun projectee -> match projectee with | C_Total _0 -> true | uu___ -> false let (__proj__C_Total__item___0 : comp_view -> typ) = @@ -335,15 +341,15 @@ let (uu___is_C_Lemma : comp_view -> Prims.bool) = fun projectee -> match projectee with | C_Lemma _0 -> true | uu___ -> false let (__proj__C_Lemma__item___0 : comp_view -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | C_Lemma _0 -> _0 let (uu___is_C_Eff : comp_view -> Prims.bool) = fun projectee -> match projectee with | C_Eff _0 -> true | uu___ -> false let (__proj__C_Eff__item___0 : comp_view -> - (universes * name * FStar_Syntax_Syntax.term * argv Prims.list * - FStar_Syntax_Syntax.term Prims.list)) + (universes, name, FStar_Syntax_Syntax.term, argv Prims.list, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | C_Eff _0 -> _0 type ctor = (name * typ) type lb_view = @@ -367,9 +373,11 @@ let (__proj__Mklb_view__item__lb_def : lb_view -> FStar_Syntax_Syntax.term) = match projectee with | { lb_fv; lb_us; lb_typ; lb_def;_} -> lb_def type sigelt_view = | Sg_Let of (Prims.bool * FStar_Syntax_Syntax.letbinding Prims.list) - | Sg_Inductive of (name * FStar_Syntax_Syntax.univ_name Prims.list * - FStar_Syntax_Syntax.binder Prims.list * typ * ctor Prims.list) - | Sg_Val of (name * FStar_Syntax_Syntax.univ_name Prims.list * typ) + | Sg_Inductive of (name, FStar_Syntax_Syntax.univ_name Prims.list, + FStar_Syntax_Syntax.binder Prims.list, typ, ctor Prims.list) + FStar_Tuple5.tuple5 + | Sg_Val of (name, FStar_Syntax_Syntax.univ_name Prims.list, typ) + FStar_Tuple3.tuple3 | Unk let (uu___is_Sg_Let : sigelt_view -> Prims.bool) = fun projectee -> match projectee with | Sg_Let _0 -> true | uu___ -> false @@ -381,14 +389,16 @@ let (uu___is_Sg_Inductive : sigelt_view -> Prims.bool) = match projectee with | Sg_Inductive _0 -> true | uu___ -> false let (__proj__Sg_Inductive__item___0 : sigelt_view -> - (name * FStar_Syntax_Syntax.univ_name Prims.list * - FStar_Syntax_Syntax.binder Prims.list * typ * ctor Prims.list)) + (name, FStar_Syntax_Syntax.univ_name Prims.list, + FStar_Syntax_Syntax.binder Prims.list, typ, ctor Prims.list) + FStar_Tuple5.tuple5) = fun projectee -> match projectee with | Sg_Inductive _0 -> _0 let (uu___is_Sg_Val : sigelt_view -> Prims.bool) = fun projectee -> match projectee with | Sg_Val _0 -> true | uu___ -> false let (__proj__Sg_Val__item___0 : - sigelt_view -> (name * FStar_Syntax_Syntax.univ_name Prims.list * typ)) = - fun projectee -> match projectee with | Sg_Val _0 -> _0 + sigelt_view -> + (name, FStar_Syntax_Syntax.univ_name Prims.list, typ) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | Sg_Val _0 -> _0 let (uu___is_Unk : sigelt_view -> Prims.bool) = fun projectee -> match projectee with | Unk -> true | uu___ -> false type qualifier = diff --git a/ocaml/fstar-lib/generated/FStar_Reflection_V2_Embeddings.ml b/ocaml/fstar-lib/generated/FStar_Reflection_V2_Embeddings.ml index d633c73dd27..32716ff90ff 100644 --- a/ocaml/fstar-lib/generated/FStar_Reflection_V2_Embeddings.ml +++ b/ocaml/fstar-lib/generated/FStar_Reflection_V2_Embeddings.ml @@ -41,18 +41,19 @@ let curry : = fun f -> fun x -> fun y -> f (x, y) let curry3 : 'uuuuu 'uuuuu1 'uuuuu2 'uuuuu3 . - (('uuuuu * 'uuuuu1 * 'uuuuu2) -> 'uuuuu3) -> + (('uuuuu, 'uuuuu1, 'uuuuu2) FStar_Tuple3.tuple3 -> 'uuuuu3) -> 'uuuuu -> 'uuuuu1 -> 'uuuuu2 -> 'uuuuu3 = fun f -> fun x -> fun y -> fun z -> f (x, y, z) let curry4 : 'uuuuu 'uuuuu1 'uuuuu2 'uuuuu3 'uuuuu4 . - (('uuuuu * 'uuuuu1 * 'uuuuu2 * 'uuuuu3) -> 'uuuuu4) -> + (('uuuuu, 'uuuuu1, 'uuuuu2, 'uuuuu3) FStar_Tuple4.tuple4 -> 'uuuuu4) -> 'uuuuu -> 'uuuuu1 -> 'uuuuu2 -> 'uuuuu3 -> 'uuuuu4 = fun f -> fun x -> fun y -> fun z -> fun w -> f (x, y, z, w) let curry5 : 'uuuuu 'uuuuu1 'uuuuu2 'uuuuu3 'uuuuu4 'uuuuu5 . - (('uuuuu * 'uuuuu1 * 'uuuuu2 * 'uuuuu3 * 'uuuuu4) -> 'uuuuu5) -> - 'uuuuu -> 'uuuuu1 -> 'uuuuu2 -> 'uuuuu3 -> 'uuuuu4 -> 'uuuuu5 + (('uuuuu, 'uuuuu1, 'uuuuu2, 'uuuuu3, 'uuuuu4) FStar_Tuple5.tuple5 -> + 'uuuuu5) + -> 'uuuuu -> 'uuuuu1 -> 'uuuuu2 -> 'uuuuu3 -> 'uuuuu4 -> 'uuuuu5 = fun f -> fun x -> fun y -> fun z -> fun w -> fun v -> f (x, y, z, w, v) let (head_fv_and_args : FStar_Syntax_Syntax.term -> @@ -708,10 +709,12 @@ let (e_argv_aq : let uu___ = e_term_aq aq in FStar_Syntax_Embeddings.e_tuple2 uu___ e_aqualv let (e_match_returns_annotation : - (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term, - FStar_Syntax_Syntax.comp) FStar_Pervasives.either * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) - FStar_Pervasives_Native.option FStar_Syntax_Embeddings_Base.embedding) + (FStar_Syntax_Syntax.binder * + ((FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) FStar_Pervasives_Native.option + FStar_Syntax_Embeddings_Base.embedding) = FStar_Syntax_Embeddings.e_option (FStar_Syntax_Embeddings.e_tuple2 e_binder diff --git a/ocaml/fstar-lib/generated/FStar_Reflection_V2_NBEEmbeddings.ml b/ocaml/fstar-lib/generated/FStar_Reflection_V2_NBEEmbeddings.ml index ae971f2dbb7..9b8752aef30 100644 --- a/ocaml/fstar-lib/generated/FStar_Reflection_V2_NBEEmbeddings.ml +++ b/ocaml/fstar-lib/generated/FStar_Reflection_V2_NBEEmbeddings.ml @@ -684,10 +684,12 @@ let (e_argv_aq : FStar_TypeChecker_NBETerm.embedding) = fun aq -> FStar_TypeChecker_NBETerm.e_tuple2 (e_term_aq aq) e_aqualv let (e_match_returns_annotation : - (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term, - FStar_Syntax_Syntax.comp) FStar_Pervasives.either * - FStar_Syntax_Syntax.term FStar_Pervasives_Native.option * Prims.bool)) - FStar_Pervasives_Native.option FStar_TypeChecker_NBETerm.embedding) + (FStar_Syntax_Syntax.binder * + ((FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) FStar_Pervasives_Native.option + FStar_TypeChecker_NBETerm.embedding) = FStar_TypeChecker_NBETerm.e_option (FStar_TypeChecker_NBETerm.e_tuple2 e_binder diff --git a/ocaml/fstar-lib/generated/FStar_ReflexiveTransitiveClosure.ml b/ocaml/fstar-lib/generated/FStar_ReflexiveTransitiveClosure.ml index aad2f3b148b..5702147d31c 100644 --- a/ocaml/fstar-lib/generated/FStar_ReflexiveTransitiveClosure.ml +++ b/ocaml/fstar-lib/generated/FStar_ReflexiveTransitiveClosure.ml @@ -84,8 +84,7 @@ let rec closure_one_aux : 'a -> ('a, 'r, unit, unit) _closure -> (unit, - ('a, unit, ('a, 'r, unit, unit) _closure) - FStar_Pervasives.dtuple3) + ('a, unit, ('a, 'r, unit, unit) _closure) FStar_DTuple3.dtuple3) FStar_Pervasives.either = fun x -> @@ -94,22 +93,21 @@ let rec closure_one_aux : match xy with | Refl uu___ -> FStar_Pervasives.Inl () | Step (uu___, uu___1, pr) -> - FStar_Pervasives.Inr - (FStar_Pervasives.Mkdtuple3 (y, (), (Refl y))) + FStar_Pervasives.Inr (FStar_DTuple3.Mkdtuple3 (y, (), (Refl y))) | Closure (x1, i, y1, xi, iy) -> (match closure_one_aux i y1 iy with | FStar_Pervasives.Inl uu___ -> closure_one_aux x1 y1 xi - | FStar_Pervasives.Inr (FStar_Pervasives.Mkdtuple3 + | FStar_Pervasives.Inr (FStar_DTuple3.Mkdtuple3 (z, r_i_z, c_z_y)) -> let c_z_y1 = c_z_y in (match closure_one_aux x1 i xi with | FStar_Pervasives.Inl uu___ -> FStar_Pervasives.Inr - (FStar_Pervasives.Mkdtuple3 (z, (), c_z_y1)) - | FStar_Pervasives.Inr (FStar_Pervasives.Mkdtuple3 + (FStar_DTuple3.Mkdtuple3 (z, (), c_z_y1)) + | FStar_Pervasives.Inr (FStar_DTuple3.Mkdtuple3 (w, r_x_w, c_w_i)) -> let step = Step (i, z, ()) in let c_i_y = Closure (i, z, y1, step, c_z_y1) in let c_w_y = Closure (w, i, y1, c_w_i, c_i_y) in FStar_Pervasives.Inr - (FStar_Pervasives.Mkdtuple3 (w, (), c_w_y)))) \ No newline at end of file + (FStar_DTuple3.Mkdtuple3 (w, (), c_w_y)))) \ No newline at end of file diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Encode.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Encode.ml index 74187ca1445..30defd209a9 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Encode.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Encode.ml @@ -45,16 +45,16 @@ type prims_t = mk: FStar_Ident.lident -> Prims.string -> - (FStar_SMTEncoding_Term.term * Prims.int * - FStar_SMTEncoding_Term.decl Prims.list) + (FStar_SMTEncoding_Term.term, Prims.int, + FStar_SMTEncoding_Term.decl Prims.list) FStar_Tuple3.tuple3 ; is: FStar_Ident.lident -> Prims.bool } let (__proj__Mkprims_t__item__mk : prims_t -> FStar_Ident.lident -> Prims.string -> - (FStar_SMTEncoding_Term.term * Prims.int * - FStar_SMTEncoding_Term.decl Prims.list)) + (FStar_SMTEncoding_Term.term, Prims.int, + FStar_SMTEncoding_Term.decl Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | { mk; is;_} -> mk let (__proj__Mkprims_t__item__is : prims_t -> FStar_Ident.lident -> Prims.bool) = @@ -2124,8 +2124,9 @@ let (declare_top_level_let : FStar_Syntax_Syntax.fv -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> FStar_Syntax_Syntax.term -> - (FStar_SMTEncoding_Env.fvar_binding * - FStar_SMTEncoding_Term.decls_t * FStar_SMTEncoding_Env.env_t)) + (FStar_SMTEncoding_Env.fvar_binding, + FStar_SMTEncoding_Term.decls_t, FStar_SMTEncoding_Env.env_t) + FStar_Tuple3.tuple3) = fun env -> fun x -> @@ -7602,10 +7603,10 @@ let (encode_query : (unit -> Prims.string) FStar_Pervasives_Native.option -> FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_SMTEncoding_Term.decl Prims.list * - FStar_SMTEncoding_ErrorReporting.label Prims.list * - FStar_SMTEncoding_Term.decl * FStar_SMTEncoding_Term.decl - Prims.list)) + (FStar_SMTEncoding_Term.decl Prims.list, + FStar_SMTEncoding_ErrorReporting.label Prims.list, + FStar_SMTEncoding_Term.decl, + FStar_SMTEncoding_Term.decl Prims.list) FStar_Tuple4.tuple4) = fun use_env_msg -> fun tcenv -> diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_EncodeTerm.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_EncodeTerm.ml index ec50ccf9f2f..595b22eaab1 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_EncodeTerm.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_EncodeTerm.ml @@ -4,9 +4,9 @@ let mkForall_fuel' : Prims.string -> FStar_Compiler_Range_Type.range -> 'uuuuu -> - (FStar_SMTEncoding_Term.pat Prims.list Prims.list * - FStar_SMTEncoding_Term.fvs * FStar_SMTEncoding_Term.term) -> - FStar_SMTEncoding_Term.term + (FStar_SMTEncoding_Term.pat Prims.list Prims.list, + FStar_SMTEncoding_Term.fvs, FStar_SMTEncoding_Term.term) + FStar_Tuple3.tuple3 -> FStar_SMTEncoding_Term.term = fun mname -> fun r -> @@ -60,9 +60,9 @@ let mkForall_fuel' : let (mkForall_fuel : Prims.string -> FStar_Compiler_Range_Type.range -> - (FStar_SMTEncoding_Term.pat Prims.list Prims.list * - FStar_SMTEncoding_Term.fvs * FStar_SMTEncoding_Term.term) -> - FStar_SMTEncoding_Term.term) + (FStar_SMTEncoding_Term.pat Prims.list Prims.list, + FStar_SMTEncoding_Term.fvs, FStar_SMTEncoding_Term.term) + FStar_Tuple3.tuple3 -> FStar_SMTEncoding_Term.term) = fun mname -> fun r -> mkForall_fuel' mname r Prims.int_one let (head_normal : FStar_SMTEncoding_Env.env_t -> FStar_Syntax_Syntax.term -> Prims.bool) = @@ -426,8 +426,8 @@ let check_pattern_vars : (FStar_Errors_Codes.Warning_SMTPatternIllFormed, uu___5) in FStar_Errors.log_issue pos uu___4) type label = - (FStar_SMTEncoding_Term.fv * Prims.string * - FStar_Compiler_Range_Type.range) + (FStar_SMTEncoding_Term.fv, Prims.string, FStar_Compiler_Range_Type.range) + FStar_Tuple3.tuple3 type labels = label Prims.list type pattern = { @@ -711,9 +711,10 @@ and (encode_binders : FStar_SMTEncoding_Term.term FStar_Pervasives_Native.option -> FStar_Syntax_Syntax.binders -> FStar_SMTEncoding_Env.env_t -> - (FStar_SMTEncoding_Term.fv Prims.list * FStar_SMTEncoding_Term.term - Prims.list * FStar_SMTEncoding_Env.env_t * - FStar_SMTEncoding_Term.decls_t * FStar_Syntax_Syntax.bv Prims.list)) + (FStar_SMTEncoding_Term.fv Prims.list, + FStar_SMTEncoding_Term.term Prims.list, + FStar_SMTEncoding_Env.env_t, FStar_SMTEncoding_Term.decls_t, + FStar_Syntax_Syntax.bv Prims.list) FStar_Tuple5.tuple5) = fun fuel_opt -> fun bs -> diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Env.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Env.ml index 9ec8b772ce6..1399107af05 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Env.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Env.ml @@ -14,7 +14,8 @@ let add_fuel : 'uuuuu . 'uuuuu -> 'uuuuu Prims.list -> 'uuuuu Prims.list = if uu___ then tl else x :: tl let withenv : 'uuuuu 'uuuuu1 'uuuuu2 . - 'uuuuu -> ('uuuuu1 * 'uuuuu2) -> ('uuuuu1 * 'uuuuu2 * 'uuuuu) + 'uuuuu -> + ('uuuuu1 * 'uuuuu2) -> ('uuuuu1, 'uuuuu2, 'uuuuu) FStar_Tuple3.tuple3 = fun c -> fun uu___ -> match uu___ with | (a, b) -> (a, b, c) let vargs : 'uuuuu 'uuuuu1 'uuuuu2 . @@ -552,7 +553,7 @@ let (fresh_fvar : let (gen_term_var : env_t -> FStar_Syntax_Syntax.bv -> - (Prims.string * FStar_SMTEncoding_Term.term * env_t)) + (Prims.string, FStar_SMTEncoding_Term.term, env_t) FStar_Tuple3.tuple3) = fun env -> fun x -> @@ -582,7 +583,7 @@ let (gen_term_var : let (new_term_constant : env_t -> FStar_Syntax_Syntax.bv -> - (Prims.string * FStar_SMTEncoding_Term.term * env_t)) + (Prims.string, FStar_SMTEncoding_Term.term, env_t) FStar_Tuple3.tuple3) = fun env -> fun x -> @@ -610,7 +611,9 @@ let (new_term_constant : let (new_term_constant_from_string : env_t -> FStar_Syntax_Syntax.bv -> - Prims.string -> (Prims.string * FStar_SMTEncoding_Term.term * env_t)) + Prims.string -> + (Prims.string, FStar_SMTEncoding_Term.term, env_t) + FStar_Tuple3.tuple3) = fun env -> fun x -> @@ -699,8 +702,8 @@ let (new_term_constant_and_tok_from_lid_aux : FStar_Ident.lident -> Prims.int -> Prims.bool -> - (Prims.string * Prims.string FStar_Pervasives_Native.option * - env_t)) + (Prims.string, Prims.string FStar_Pervasives_Native.option, + env_t) FStar_Tuple3.tuple3) = fun env -> fun x -> @@ -739,7 +742,8 @@ let (new_term_constant_and_tok_from_lid_aux : (fname, ftok_name, uu___1) let (new_term_constant_and_tok_from_lid : env_t -> - FStar_Ident.lident -> Prims.int -> (Prims.string * Prims.string * env_t)) + FStar_Ident.lident -> + Prims.int -> (Prims.string, Prims.string, env_t) FStar_Tuple3.tuple3) = fun env -> fun x -> @@ -754,8 +758,8 @@ let (new_term_constant_and_tok_from_lid_maybe_thunked : FStar_Ident.lident -> Prims.int -> Prims.bool -> - (Prims.string * Prims.string FStar_Pervasives_Native.option * - env_t)) + (Prims.string, Prims.string FStar_Pervasives_Native.option, + env_t) FStar_Tuple3.tuple3) = fun env -> fun x -> @@ -984,8 +988,9 @@ let (lookup_free_var_sym : env_t -> FStar_Ident.lident FStar_Syntax_Syntax.withinfo_t -> ((FStar_SMTEncoding_Term.op, FStar_SMTEncoding_Term.term) - FStar_Pervasives.either * FStar_SMTEncoding_Term.term Prims.list * - Prims.int)) + FStar_Pervasives.either, + FStar_SMTEncoding_Term.term Prims.list, Prims.int) + FStar_Tuple3.tuple3) = fun env -> fun a -> diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_ErrorReporting.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_ErrorReporting.ml index 9d52f5c3985..7bf044a63ed 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_ErrorReporting.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_ErrorReporting.ml @@ -11,8 +11,9 @@ let (__proj__Not_a_wp_implication__item__uu___ : Prims.exn -> Prims.string) = fun projectee -> match projectee with | Not_a_wp_implication uu___ -> uu___ let (sort_labels : (FStar_SMTEncoding_Term.error_label * Prims.bool) Prims.list -> - ((FStar_SMTEncoding_Term.fv * Prims.string * - FStar_Compiler_Range_Type.range) * Prims.bool) Prims.list) + ((FStar_SMTEncoding_Term.fv, Prims.string, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 * Prims.bool) + Prims.list) = fun l -> FStar_Compiler_List.sortWith @@ -23,8 +24,8 @@ let (sort_labels : -> FStar_Compiler_Range_Ops.compare r1 r2) l let (remove_dups : labels -> - (FStar_SMTEncoding_Term.fv * Prims.string * - FStar_Compiler_Range_Type.range) Prims.list) + (FStar_SMTEncoding_Term.fv, Prims.string, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 Prims.list) = fun l -> FStar_Compiler_Util.remove_dups diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Solver.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Solver.ml index 3c94ee482b1..830364d5572 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Solver.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Solver.ml @@ -162,8 +162,8 @@ let rec (filter_assertions_with_stats : FStar_TypeChecker_Env.env -> FStar_SMTEncoding_Z3.unsat_core -> FStar_SMTEncoding_Term.decl Prims.list -> - (FStar_SMTEncoding_Term.decl Prims.list * Prims.bool * Prims.int * - Prims.int)) + (FStar_SMTEncoding_Term.decl Prims.list, Prims.bool, Prims.int, + Prims.int) FStar_Tuple4.tuple4) = fun e -> fun core -> diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Term.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Term.ml index 99e85a2c75b..31bce0ac4cc 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Term.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Term.ml @@ -163,10 +163,12 @@ type term' = | BoundV of Prims.int | FreeV of fv | App of (op * term Prims.list) - | Quant of (qop * term Prims.list Prims.list * Prims.int - FStar_Pervasives_Native.option * sort Prims.list * term) + | Quant of (qop, term Prims.list Prims.list, + Prims.int FStar_Pervasives_Native.option, sort Prims.list, term) + FStar_Tuple5.tuple5 | Let of (term Prims.list * term) - | Labeled of (term * Prims.string * FStar_Compiler_Range_Type.range) + | Labeled of (term, Prims.string, FStar_Compiler_Range_Type.range) + FStar_Tuple3.tuple3 | LblPos of (term * Prims.string) and term = { @@ -174,7 +176,7 @@ and term = freevars: fv Prims.list FStar_Syntax_Syntax.memo ; rng: FStar_Compiler_Range_Type.range } and fv = - | FV of (Prims.string * sort * Prims.bool) + | FV of (Prims.string, sort, Prims.bool) FStar_Tuple3.tuple3 let (uu___is_Integer : term' -> Prims.bool) = fun projectee -> match projectee with | Integer _0 -> true | uu___ -> false let (__proj__Integer__item___0 : term' -> Prims.string) = @@ -203,8 +205,9 @@ let (uu___is_Quant : term' -> Prims.bool) = fun projectee -> match projectee with | Quant _0 -> true | uu___ -> false let (__proj__Quant__item___0 : term' -> - (qop * term Prims.list Prims.list * Prims.int - FStar_Pervasives_Native.option * sort Prims.list * term)) + (qop, term Prims.list Prims.list, + Prims.int FStar_Pervasives_Native.option, sort Prims.list, term) + FStar_Tuple5.tuple5) = fun projectee -> match projectee with | Quant _0 -> _0 let (uu___is_Let : term' -> Prims.bool) = fun projectee -> match projectee with | Let _0 -> true | uu___ -> false @@ -213,8 +216,9 @@ let (__proj__Let__item___0 : term' -> (term Prims.list * term)) = let (uu___is_Labeled : term' -> Prims.bool) = fun projectee -> match projectee with | Labeled _0 -> true | uu___ -> false let (__proj__Labeled__item___0 : - term' -> (term * Prims.string * FStar_Compiler_Range_Type.range)) = - fun projectee -> match projectee with | Labeled _0 -> _0 + term' -> + (term, Prims.string, FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3) + = fun projectee -> match projectee with | Labeled _0 -> _0 let (uu___is_LblPos : term' -> Prims.bool) = fun projectee -> match projectee with | LblPos _0 -> true | uu___ -> false let (__proj__LblPos__item___0 : term' -> (term * Prims.string)) = @@ -227,7 +231,8 @@ let (__proj__Mkterm__item__freevars : let (__proj__Mkterm__item__rng : term -> FStar_Compiler_Range_Type.range) = fun projectee -> match projectee with | { tm; freevars; rng;_} -> rng let (uu___is_FV : fv -> Prims.bool) = fun projectee -> true -let (__proj__FV__item___0 : fv -> (Prims.string * sort * Prims.bool)) = +let (__proj__FV__item___0 : + fv -> (Prims.string, sort, Prims.bool) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | FV _0 -> _0 type pat = term type fvs = fv Prims.list @@ -328,8 +333,10 @@ let (__proj__Mkassumption__item__assumption_fact_ids : assumption_fact_ids;_} -> assumption_fact_ids type decl = | DefPrelude - | DeclFun of (Prims.string * sort Prims.list * sort * caption) - | DefineFun of (Prims.string * sort Prims.list * sort * term * caption) + | DeclFun of (Prims.string, sort Prims.list, sort, caption) + FStar_Tuple4.tuple4 + | DefineFun of (Prims.string, sort Prims.list, sort, term, caption) + FStar_Tuple5.tuple5 | Assume of assumption | Caption of Prims.string | Module of (Prims.string * decl Prims.list) @@ -348,14 +355,15 @@ let (uu___is_DefPrelude : decl -> Prims.bool) = let (uu___is_DeclFun : decl -> Prims.bool) = fun projectee -> match projectee with | DeclFun _0 -> true | uu___ -> false let (__proj__DeclFun__item___0 : - decl -> (Prims.string * sort Prims.list * sort * caption)) = - fun projectee -> match projectee with | DeclFun _0 -> _0 + decl -> (Prims.string, sort Prims.list, sort, caption) FStar_Tuple4.tuple4) + = fun projectee -> match projectee with | DeclFun _0 -> _0 let (uu___is_DefineFun : decl -> Prims.bool) = fun projectee -> match projectee with | DefineFun _0 -> true | uu___ -> false let (__proj__DefineFun__item___0 : - decl -> (Prims.string * sort Prims.list * sort * term * caption)) = - fun projectee -> match projectee with | DefineFun _0 -> _0 + decl -> + (Prims.string, sort Prims.list, sort, term, caption) FStar_Tuple5.tuple5) + = fun projectee -> match projectee with | DefineFun _0 -> _0 let (uu___is_Assume : decl -> Prims.bool) = fun projectee -> match projectee with | Assume _0 -> true | uu___ -> false let (__proj__Assume__item___0 : decl -> assumption) = @@ -523,7 +531,8 @@ let (fv_sort : fv -> sort) = let (fv_force : fv -> Prims.bool) = fun x -> let uu___ = x in match uu___ with | FV (uu___1, uu___2, force) -> force -type error_label = (fv * Prims.string * FStar_Compiler_Range_Type.range) +type error_label = + (fv, Prims.string, FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 type error_labels = error_label Prims.list let (fv_eq : fv -> fv -> Prims.bool) = fun x -> @@ -978,7 +987,9 @@ let (mkMod : (term * term) -> FStar_Compiler_Range_Type.range -> term) = mk_bin_op Mod let (mkRealOfInt : term -> FStar_Compiler_Range_Type.range -> term) = fun t -> fun r -> mkApp ("to_real", [t]) r -let (mkITE : (term * term * term) -> FStar_Compiler_Range_Type.range -> term) +let (mkITE : + (term, term, term) FStar_Tuple3.tuple3 -> + FStar_Compiler_Range_Type.range -> term) = fun uu___ -> fun r -> @@ -1116,8 +1127,9 @@ and (print_smt_term_list_list : term Prims.list Prims.list -> Prims.string) = let (mkQuant : FStar_Compiler_Range_Type.range -> Prims.bool -> - (qop * term Prims.list Prims.list * Prims.int - FStar_Pervasives_Native.option * sort Prims.list * term) -> term) + (qop, term Prims.list Prims.list, + Prims.int FStar_Pervasives_Native.option, sort Prims.list, term) + FStar_Tuple5.tuple5 -> term) = fun r -> fun check_pats -> @@ -1294,8 +1306,9 @@ let (subst : term -> fv -> term -> term) = fun t -> fun fv1 -> fun s -> let uu___ = abstr [fv1] t in inst [s] uu___ let (mkQuant' : FStar_Compiler_Range_Type.range -> - (qop * term Prims.list Prims.list * Prims.int - FStar_Pervasives_Native.option * fv Prims.list * term) -> term) + (qop, term Prims.list Prims.list, + Prims.int FStar_Pervasives_Native.option, fv Prims.list, term) + FStar_Tuple5.tuple5 -> term) = fun r -> fun uu___ -> @@ -1311,7 +1324,7 @@ let (mkQuant' : mkQuant r true uu___1 let (mkForall : FStar_Compiler_Range_Type.range -> - (pat Prims.list Prims.list * fvs * term) -> term) + (pat Prims.list Prims.list, fvs, term) FStar_Tuple3.tuple3 -> term) = fun r -> fun uu___ -> @@ -1320,8 +1333,8 @@ let (mkForall : mkQuant' r (Forall, pats, FStar_Pervasives_Native.None, vars, body) let (mkForall'' : FStar_Compiler_Range_Type.range -> - (pat Prims.list Prims.list * Prims.int FStar_Pervasives_Native.option * - sort Prims.list * term) -> term) + (pat Prims.list Prims.list, Prims.int FStar_Pervasives_Native.option, + sort Prims.list, term) FStar_Tuple4.tuple4 -> term) = fun r -> fun uu___ -> @@ -1330,8 +1343,8 @@ let (mkForall'' : mkQuant r true (Forall, pats, wopt, sorts, body) let (mkForall' : FStar_Compiler_Range_Type.range -> - (pat Prims.list Prims.list * Prims.int FStar_Pervasives_Native.option * - fvs * term) -> term) + (pat Prims.list Prims.list, Prims.int FStar_Pervasives_Native.option, + fvs, term) FStar_Tuple4.tuple4 -> term) = fun r -> fun uu___ -> @@ -1340,7 +1353,7 @@ let (mkForall' : mkQuant' r (Forall, pats, wopt, vars, body) let (mkExists : FStar_Compiler_Range_Type.range -> - (pat Prims.list Prims.list * fvs * term) -> term) + (pat Prims.list Prims.list, fvs, term) FStar_Tuple3.tuple3 -> term) = fun r -> fun uu___ -> @@ -1362,7 +1375,9 @@ let (mkLet' : let (norng : FStar_Compiler_Range_Type.range) = FStar_Compiler_Range_Type.dummyRange let (mkDefineFun : - (Prims.string * fv Prims.list * sort * term * caption) -> decl) = + (Prims.string, fv Prims.list, sort, term, caption) FStar_Tuple5.tuple5 -> + decl) + = fun uu___ -> match uu___ with | (nm, vars, s, tm, c) -> @@ -1404,7 +1419,8 @@ let (fresh_token : (Prims.string * sort) -> Prims.int -> decl) = Assume a let (fresh_constructor : FStar_Compiler_Range_Type.range -> - (Prims.string * sort Prims.list * sort * Prims.int) -> decl) + (Prims.string, sort Prims.list, sort, Prims.int) FStar_Tuple4.tuple4 -> + decl) = fun rng -> fun uu___ -> @@ -1450,7 +1466,8 @@ let (fresh_constructor : Assume a let (injective_constructor : FStar_Compiler_Range_Type.range -> - (Prims.string * constructor_field Prims.list * sort) -> decl Prims.list) + (Prims.string, constructor_field Prims.list, sort) FStar_Tuple3.tuple3 -> + decl Prims.list) = fun rng -> fun uu___ -> @@ -1625,7 +1642,8 @@ let (name_binders_inner : fv Prims.list -> Prims.int -> sort Prims.list -> - (fv Prims.list * Prims.string Prims.list * Prims.int)) + (fv Prims.list, Prims.string Prims.list, Prims.int) + FStar_Tuple3.tuple3) = fun prefix_opt -> fun outer_names -> @@ -1998,7 +2016,9 @@ let (declsToSmt : Prims.string -> decl Prims.list -> Prims.string) = let (declToSmt_no_caps : Prims.string -> decl -> Prims.string) = fun z3options -> fun decl1 -> declToSmt' false z3options decl1 let (mkBvConstructor : - Prims.int -> (decl Prims.list * Prims.string * Prims.string)) = + Prims.int -> + (decl Prims.list, Prims.string, Prims.string) FStar_Tuple3.tuple3) + = fun sz -> let constr = let uu___ = diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Util.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Util.ml index d60ab7ba0bc..b68740ec199 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Util.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Util.ml @@ -1,7 +1,7 @@ open Prims let (mkAssume : - (FStar_SMTEncoding_Term.term * FStar_SMTEncoding_Term.caption * - Prims.string) -> FStar_SMTEncoding_Term.decl) + (FStar_SMTEncoding_Term.term, FStar_SMTEncoding_Term.caption, Prims.string) + FStar_Tuple3.tuple3 -> FStar_SMTEncoding_Term.decl) = fun uu___ -> match uu___ with @@ -189,8 +189,9 @@ let (mkBvUext : let (mkBvToNat : FStar_SMTEncoding_Term.term -> FStar_SMTEncoding_Term.term) = norng FStar_SMTEncoding_Term.mkBvToNat let (mkITE : - (FStar_SMTEncoding_Term.term * FStar_SMTEncoding_Term.term * - FStar_SMTEncoding_Term.term) -> FStar_SMTEncoding_Term.term) + (FStar_SMTEncoding_Term.term, FStar_SMTEncoding_Term.term, + FStar_SMTEncoding_Term.term) FStar_Tuple3.tuple3 -> + FStar_SMTEncoding_Term.term) = norng FStar_SMTEncoding_Term.mkITE let (mkCases : FStar_SMTEncoding_Term.term Prims.list -> FStar_SMTEncoding_Term.term) = diff --git a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Z3.ml b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Z3.ml index 0c3f9809670..98582d9e6ad 100644 --- a/ocaml/fstar-lib/generated/FStar_SMTEncoding_Z3.ml +++ b/ocaml/fstar-lib/generated/FStar_SMTEncoding_Z3.ml @@ -1034,8 +1034,8 @@ let (context_profile : FStar_SMTEncoding_Term.decl Prims.list -> unit) = let (mk_input : Prims.bool -> FStar_SMTEncoding_Term.decl Prims.list -> - (Prims.string * Prims.string FStar_Pervasives_Native.option * - Prims.string FStar_Pervasives_Native.option)) + (Prims.string, Prims.string FStar_Pervasives_Native.option, + Prims.string FStar_Pervasives_Native.option) FStar_Tuple3.tuple3) = fun fresh -> fun theory -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_DsEnv.ml b/ocaml/fstar-lib/generated/FStar_Syntax_DsEnv.ml index 821d2993eee..59419235362 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_DsEnv.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_DsEnv.ml @@ -50,10 +50,11 @@ let (ugly_sigelt_to_string : FStar_Syntax_Syntax.sigelt -> Prims.string) = let uu___ = FStar_Compiler_Effect.op_Bang ugly_sigelt_to_string_hook in uu___ se type local_binding = - (FStar_Ident.ident * FStar_Syntax_Syntax.bv * used_marker) + (FStar_Ident.ident, FStar_Syntax_Syntax.bv, used_marker) + FStar_Tuple3.tuple3 type rec_binding = - (FStar_Ident.ident * FStar_Ident.lid * FStar_Syntax_Syntax.delta_depth * - used_marker) + (FStar_Ident.ident, FStar_Ident.lid, FStar_Syntax_Syntax.delta_depth, + used_marker) FStar_Tuple4.tuple4 type scope_mod = | Local_binding of local_binding | Rec_binding of rec_binding @@ -639,8 +640,9 @@ let (bv_to_name : fun r -> let uu___ = set_bv_range bv r in FStar_Syntax_Syntax.bv_to_name uu___ let (unmangleMap : - (Prims.string * Prims.string * FStar_Syntax_Syntax.delta_depth * - FStar_Syntax_Syntax.fv_qual FStar_Pervasives_Native.option) Prims.list) + (Prims.string, Prims.string, FStar_Syntax_Syntax.delta_depth, + FStar_Syntax_Syntax.fv_qual FStar_Pervasives_Native.option) + FStar_Tuple4.tuple4 Prims.list) = [("op_ColonColon", "Cons", FStar_Syntax_Syntax.delta_constant, (FStar_Pervasives_Native.Some FStar_Syntax_Syntax.Data_ctor)); @@ -889,7 +891,8 @@ let try_lookup_id'' : let found_local_binding : 'uuuuu 'uuuuu1 . FStar_Compiler_Range_Type.range -> - ('uuuuu * FStar_Syntax_Syntax.bv * 'uuuuu1) -> FStar_Syntax_Syntax.term + ('uuuuu, FStar_Syntax_Syntax.bv, 'uuuuu1) FStar_Tuple3.tuple3 -> + FStar_Syntax_Syntax.term = fun r -> fun uu___ -> match uu___ with | (id', x, uu___1) -> bv_to_name x r let find_in_module : @@ -2394,7 +2397,10 @@ let (push_scope_mod : env -> scope_mod -> env) = dep_graph = (env1.dep_graph) } let (push_bv' : - env -> FStar_Ident.ident -> (env * FStar_Syntax_Syntax.bv * used_marker)) = + env -> + FStar_Ident.ident -> + (env, FStar_Syntax_Syntax.bv, used_marker) FStar_Tuple3.tuple3) + = fun env1 -> fun x -> let r = FStar_Ident.range_of_id x in diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Embeddings.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Embeddings.ml index 8f266b83c1f..e28fabec454 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Embeddings.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Embeddings.ml @@ -603,7 +603,8 @@ let e_tuple3 : 'a FStar_Syntax_Embeddings_Base.embedding -> 'b FStar_Syntax_Embeddings_Base.embedding -> 'c FStar_Syntax_Embeddings_Base.embedding -> - ('a * 'b * 'c) FStar_Syntax_Embeddings_Base.embedding + ('a, 'b, 'c) FStar_Tuple3.tuple3 + FStar_Syntax_Embeddings_Base.embedding = fun ea -> fun eb -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Formula.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Formula.ml index 881be53ab93..456f02fc9c5 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Formula.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Formula.ml @@ -1,20 +1,24 @@ open Prims type qpats = FStar_Syntax_Syntax.args Prims.list type connective = - | QAll of (FStar_Syntax_Syntax.binders * qpats * FStar_Syntax_Syntax.typ) - | QEx of (FStar_Syntax_Syntax.binders * qpats * FStar_Syntax_Syntax.typ) + | QAll of (FStar_Syntax_Syntax.binders, qpats, FStar_Syntax_Syntax.typ) + FStar_Tuple3.tuple3 + | QEx of (FStar_Syntax_Syntax.binders, qpats, FStar_Syntax_Syntax.typ) + FStar_Tuple3.tuple3 | BaseConn of (FStar_Ident.lident * FStar_Syntax_Syntax.args) let (uu___is_QAll : connective -> Prims.bool) = fun projectee -> match projectee with | QAll _0 -> true | uu___ -> false let (__proj__QAll__item___0 : connective -> - (FStar_Syntax_Syntax.binders * qpats * FStar_Syntax_Syntax.typ)) + (FStar_Syntax_Syntax.binders, qpats, FStar_Syntax_Syntax.typ) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | QAll _0 -> _0 let (uu___is_QEx : connective -> Prims.bool) = fun projectee -> match projectee with | QEx _0 -> true | uu___ -> false let (__proj__QEx__item___0 : connective -> - (FStar_Syntax_Syntax.binders * qpats * FStar_Syntax_Syntax.typ)) + (FStar_Syntax_Syntax.binders, qpats, FStar_Syntax_Syntax.typ) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | QEx _0 -> _0 let (uu___is_BaseConn : connective -> Prims.bool) = fun projectee -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Free.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Free.ml index 29953fecb10..bfc70a787b1 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Free.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Free.ml @@ -404,10 +404,11 @@ and (free_names_and_uvars_binders : union n uu___) no_free_vars bs and (free_names_and_uvars_ascription : ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool) - -> use_cache_t -> free_vars_and_fvars) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> use_cache_t -> free_vars_and_fvars) = fun asc -> fun use_cache -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Hash.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Hash.ml index a096c4f7bc8..550a34a1ac8 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Hash.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Hash.ml @@ -294,10 +294,11 @@ and (hash_lb : FStar_Syntax_Syntax.letbinding -> FStar_Hash.hash_code mm) = and (hash_match_returns : (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool)) - -> FStar_Hash.hash_code mm) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) -> FStar_Hash.hash_code mm) = fun uu___ -> match uu___ with @@ -305,10 +306,11 @@ and (hash_match_returns : let uu___1 = hash_binder b in let uu___2 = hash_ascription asc in mix uu___1 uu___2 and (hash_branch : - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> FStar_Hash.hash_code mm) + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) FStar_Tuple3.tuple3 + -> FStar_Hash.hash_code mm) = fun b -> let uu___ = b in @@ -437,16 +439,18 @@ and (hash_uvar : of_int uu___2 and (hash_universe_uvar : (FStar_Syntax_Syntax.universe FStar_Pervasives_Native.option - FStar_Unionfind.p_uvar * FStar_Syntax_Syntax.version * - FStar_Compiler_Range_Type.range) -> FStar_Hash.hash_code mm) + FStar_Unionfind.p_uvar, + FStar_Syntax_Syntax.version, FStar_Compiler_Range_Type.range) + FStar_Tuple3.tuple3 -> FStar_Hash.hash_code mm) = fun u -> let uu___ = FStar_Syntax_Unionfind.univ_uvar_id u in of_int uu___ and (hash_ascription : ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool) - -> FStar_Hash.hash_code mm) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> FStar_Hash.hash_code mm) = fun uu___ -> match uu___ with @@ -866,16 +870,18 @@ and (equal_binder : and (equal_match_returns : (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool)) - -> + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) -> (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) -> Prims.bool) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) -> Prims.bool) = fun uu___ -> fun uu___1 -> @@ -884,15 +890,17 @@ and (equal_match_returns : (equal_binder b1 b2) && (equal_ascription asc1 asc2) and (equal_ascription : ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool) - -> + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool) - -> Prims.bool) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> Prims.bool) = fun x1 -> fun x2 -> @@ -1074,14 +1082,16 @@ and (equal_binder_qualifier : equal_term t1 t2 | uu___ -> false and (equal_branch : - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) FStar_Tuple3.tuple3 + -> + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> Prims.bool) + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple3.tuple3 -> Prims.bool) = fun uu___ -> fun uu___1 -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_InstFV.ml b/ocaml/fstar-lib/generated/FStar_Syntax_InstFV.ml index 62e1324803d..f6224733097 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_InstFV.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_InstFV.ml @@ -344,10 +344,11 @@ and (inst_ascription : -> FStar_Syntax_Syntax.ascription -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) = fun s -> fun asc -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Print.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Print.ml index 2f949c8dab1..31b1a56411f 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Print.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Print.ml @@ -105,8 +105,9 @@ let (version_to_string : FStar_Syntax_Syntax.version -> Prims.string) = FStar_Compiler_Util.format2 "%s.%s" uu___ uu___1 let (univ_uvar_to_string : (FStar_Syntax_Syntax.universe FStar_Pervasives_Native.option - FStar_Unionfind.p_uvar * FStar_Syntax_Syntax.version * - FStar_Compiler_Range_Type.range) -> Prims.string) + FStar_Unionfind.p_uvar, + FStar_Syntax_Syntax.version, FStar_Compiler_Range_Type.range) + FStar_Tuple3.tuple3 -> Prims.string) = fun u -> let uu___ = FStar_Options.hide_uvar_nums () in diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Resugar.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Resugar.ml index 2486c924528..46b4dd70203 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Resugar.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Resugar.ml @@ -1454,12 +1454,14 @@ let rec (resugar_term' : and (resugar_ascription : FStar_Syntax_DsEnv.env -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool) - -> - (FStar_Parser_AST.term * FStar_Parser_AST.term - FStar_Pervasives_Native.option * Prims.bool)) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> + (FStar_Parser_AST.term, + FStar_Parser_AST.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) = fun env -> fun uu___ -> @@ -1727,12 +1729,13 @@ and (resugar_match_returns : FStar_Compiler_Range_Type.range -> (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) FStar_Pervasives_Native.option -> - (FStar_Ident.ident FStar_Pervasives_Native.option * - FStar_Parser_AST.term * Prims.bool) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) FStar_Pervasives_Native.option -> + (FStar_Ident.ident FStar_Pervasives_Native.option, + FStar_Parser_AST.term, Prims.bool) FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun env -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Subst.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Subst.ml index 0ade76e6491..a59b62abe6f 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Subst.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Subst.ml @@ -478,9 +478,10 @@ let (subst_ascription' : FStar_Syntax_Syntax.subst_ts -> FStar_Syntax_Syntax.ascription -> ((FStar_Syntax_Syntax.term, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term - FStar_Pervasives_Native.option * Prims.bool)) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) = fun s -> fun asc -> @@ -1196,8 +1197,8 @@ let (open_binders : let (open_term' : FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.subst_t)) + (FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.subst_t) FStar_Tuple3.tuple3) = fun bs -> fun t -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Syntax.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Syntax.ml index 08a1555e506..99558925079 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Syntax.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Syntax.ml @@ -78,8 +78,9 @@ type universe = | U_max of universe Prims.list | U_bvar of Prims.int | U_name of FStar_Ident.ident - | U_unif of (universe FStar_Pervasives_Native.option FStar_Unionfind.p_uvar - * version * FStar_Compiler_Range_Type.range) + | U_unif of + (universe FStar_Pervasives_Native.option FStar_Unionfind.p_uvar, version, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 | U_unknown [@@deriving yojson,show] let (uu___is_U_zero : universe -> Prims.bool) = fun projectee -> match projectee with | U_zero -> true | uu___ -> false @@ -103,15 +104,16 @@ let (uu___is_U_unif : universe -> Prims.bool) = fun projectee -> match projectee with | U_unif _0 -> true | uu___ -> false let (__proj__U_unif__item___0 : universe -> - (universe FStar_Pervasives_Native.option FStar_Unionfind.p_uvar * version - * FStar_Compiler_Range_Type.range)) + (universe FStar_Pervasives_Native.option FStar_Unionfind.p_uvar, + version, FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | U_unif _0 -> _0 let (uu___is_U_unknown : universe -> Prims.bool) = fun projectee -> match projectee with | U_unknown -> true | uu___ -> false type univ_name = FStar_Ident.ident[@@deriving yojson,show] type universe_uvar = - (universe FStar_Pervasives_Native.option FStar_Unionfind.p_uvar * version * - FStar_Compiler_Range_Type.range)[@@deriving yojson,show] + (universe FStar_Pervasives_Native.option FStar_Unionfind.p_uvar, version, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3[@@deriving + yojson,show] type univ_names = univ_name Prims.list[@@deriving yojson,show] type universes = universe Prims.list[@@deriving yojson,show] type monad_name = FStar_Ident.lident[@@deriving yojson,show] @@ -214,21 +216,22 @@ and term'__Tm_match__payload = { scrutinee: term' syntax ; ret_opt: - (binder * ((term' syntax, comp' syntax) FStar_Pervasives.either * term' - syntax FStar_Pervasives_Native.option * Prims.bool)) - FStar_Pervasives_Native.option + (binder * ((term' syntax, comp' syntax) FStar_Pervasives.either, + term' syntax FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) FStar_Pervasives_Native.option ; brs: - (pat' withinfo_t * term' syntax FStar_Pervasives_Native.option * term' - syntax) Prims.list + (pat' withinfo_t, term' syntax FStar_Pervasives_Native.option, + term' syntax) FStar_Tuple3.tuple3 Prims.list ; rc_opt1: residual_comp FStar_Pervasives_Native.option } and term'__Tm_ascribed__payload = { tm: term' syntax ; asc: - ((term' syntax, comp' syntax) FStar_Pervasives.either * term' syntax - FStar_Pervasives_Native.option * Prims.bool) + ((term' syntax, comp' syntax) FStar_Pervasives.either, + term' syntax FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3 ; eff_opt: FStar_Ident.lident FStar_Pervasives_Native.option } and term'__Tm_let__payload = @@ -267,7 +270,8 @@ and ctx_uvar = { ctx_uvar_head: ((term' syntax FStar_Pervasives_Native.option * uvar_decoration) - FStar_Unionfind.p_uvar * version * FStar_Compiler_Range_Type.range) + FStar_Unionfind.p_uvar, + version, FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 ; ctx_uvar_gamma: binding Prims.list ; ctx_uvar_binders: binder Prims.list ; @@ -284,8 +288,8 @@ and uvar_decoration = uvar_decoration_should_check: should_check_uvar } and pat' = | Pat_constant of sconst - | Pat_cons of (fv * universes FStar_Pervasives_Native.option * (pat' - withinfo_t * Prims.bool) Prims.list) + | Pat_cons of (fv, universes FStar_Pervasives_Native.option, + (pat' withinfo_t * Prims.bool) Prims.list) FStar_Tuple3.tuple3 | Pat_var of bv | Pat_dot_term of term' syntax FStar_Pervasives_Native.option and letbinding = @@ -337,11 +341,12 @@ and metadata = | Meta_pattern of (term' syntax Prims.list * (term' syntax * arg_qualifier FStar_Pervasives_Native.option) Prims.list Prims.list) | Meta_named of FStar_Ident.lident - | Meta_labeled of (Prims.string * FStar_Compiler_Range_Type.range * - Prims.bool) + | Meta_labeled of (Prims.string, FStar_Compiler_Range_Type.range, + Prims.bool) FStar_Tuple3.tuple3 | Meta_desugared of meta_source_info | Meta_monadic of (monad_name * term' syntax) - | Meta_monadic_lift of (monad_name * monad_name * term' syntax) + | Meta_monadic_lift of (monad_name, monad_name, term' syntax) + FStar_Tuple3.tuple3 and meta_source_info = | Sequence | Primop @@ -467,17 +472,17 @@ let (__proj__Mkterm'__Tm_match__payload__item__scrutinee : | { scrutinee; ret_opt; brs; rc_opt1 = rc_opt;_} -> scrutinee let (__proj__Mkterm'__Tm_match__payload__item__ret_opt : term'__Tm_match__payload -> - (binder * ((term' syntax, comp' syntax) FStar_Pervasives.either * term' - syntax FStar_Pervasives_Native.option * Prims.bool)) - FStar_Pervasives_Native.option) + (binder * ((term' syntax, comp' syntax) FStar_Pervasives.either, + term' syntax FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) FStar_Pervasives_Native.option) = fun projectee -> match projectee with | { scrutinee; ret_opt; brs; rc_opt1 = rc_opt;_} -> ret_opt let (__proj__Mkterm'__Tm_match__payload__item__brs : term'__Tm_match__payload -> - (pat' withinfo_t * term' syntax FStar_Pervasives_Native.option * term' - syntax) Prims.list) + (pat' withinfo_t, term' syntax FStar_Pervasives_Native.option, + term' syntax) FStar_Tuple3.tuple3 Prims.list) = fun projectee -> match projectee with @@ -492,8 +497,9 @@ let (__proj__Mkterm'__Tm_ascribed__payload__item__tm : fun projectee -> match projectee with | { tm; asc; eff_opt;_} -> tm let (__proj__Mkterm'__Tm_ascribed__payload__item__asc : term'__Tm_ascribed__payload -> - ((term' syntax, comp' syntax) FStar_Pervasives.either * term' syntax - FStar_Pervasives_Native.option * Prims.bool)) + ((term' syntax, comp' syntax) FStar_Pervasives.either, + term' syntax FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | { tm; asc; eff_opt;_} -> asc let (__proj__Mkterm'__Tm_ascribed__payload__item__eff_opt : term'__Tm_ascribed__payload -> @@ -605,7 +611,8 @@ let (uu___is_Tm_unknown : term' -> Prims.bool) = let (__proj__Mkctx_uvar__item__ctx_uvar_head : ctx_uvar -> ((term' syntax FStar_Pervasives_Native.option * uvar_decoration) - FStar_Unionfind.p_uvar * version * FStar_Compiler_Range_Type.range)) + FStar_Unionfind.p_uvar, + version, FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3) = fun projectee -> match projectee with @@ -679,8 +686,8 @@ let (uu___is_Pat_cons : pat' -> Prims.bool) = match projectee with | Pat_cons _0 -> true | uu___ -> false let (__proj__Pat_cons__item___0 : pat' -> - (fv * universes FStar_Pervasives_Native.option * (pat' withinfo_t * - Prims.bool) Prims.list)) + (fv, universes FStar_Pervasives_Native.option, + (pat' withinfo_t * Prims.bool) Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Pat_cons _0 -> _0 let (uu___is_Pat_var : pat' -> Prims.bool) = fun projectee -> match projectee with | Pat_var _0 -> true | uu___ -> false @@ -849,7 +856,9 @@ let (uu___is_Meta_labeled : metadata -> Prims.bool) = fun projectee -> match projectee with | Meta_labeled _0 -> true | uu___ -> false let (__proj__Meta_labeled__item___0 : - metadata -> (Prims.string * FStar_Compiler_Range_Type.range * Prims.bool)) + metadata -> + (Prims.string, FStar_Compiler_Range_Type.range, Prims.bool) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Meta_labeled _0 -> _0 let (uu___is_Meta_desugared : metadata -> Prims.bool) = fun projectee -> @@ -866,7 +875,7 @@ let (uu___is_Meta_monadic_lift : metadata -> Prims.bool) = fun projectee -> match projectee with | Meta_monadic_lift _0 -> true | uu___ -> false let (__proj__Meta_monadic_lift__item___0 : - metadata -> (monad_name * monad_name * term' syntax)) = + metadata -> (monad_name, monad_name, term' syntax) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Meta_monadic_lift _0 -> _0 let (uu___is_Sequence : meta_source_info -> Prims.bool) = fun projectee -> match projectee with | Sequence -> true | uu___ -> false @@ -1127,19 +1136,22 @@ type ctx_uvar_and_subst = type term = term' syntax type uvar = ((term' syntax FStar_Pervasives_Native.option * uvar_decoration) - FStar_Unionfind.p_uvar * version * FStar_Compiler_Range_Type.range) + FStar_Unionfind.p_uvar, + version, FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 type uvars = ctx_uvar FStar_Compiler_Set.t type comp = comp' syntax type ascription = - ((term' syntax, comp' syntax) FStar_Pervasives.either * term' syntax - FStar_Pervasives_Native.option * Prims.bool) + ((term' syntax, comp' syntax) FStar_Pervasives.either, + term' syntax FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3 type match_returns_ascription = - (binder * ((term' syntax, comp' syntax) FStar_Pervasives.either * term' - syntax FStar_Pervasives_Native.option * Prims.bool)) + (binder * ((term' syntax, comp' syntax) FStar_Pervasives.either, + term' syntax FStar_Pervasives_Native.option, Prims.bool) + FStar_Tuple3.tuple3) type pat = pat' withinfo_t type branch = - (pat' withinfo_t * term' syntax FStar_Pervasives_Native.option * term' - syntax) + (pat' withinfo_t, term' syntax FStar_Pervasives_Native.option, + term' syntax) FStar_Tuple3.tuple3 type antiquotations = (Prims.int * term' syntax Prims.list) type typ = term' syntax type aqual = arg_qualifier FStar_Pervasives_Native.option @@ -1333,7 +1345,7 @@ let (is_internal_qualifier : qualifier -> Prims.bool) = | OnlyName -> true | InternalAssumption -> true | uu___ -> false -type tycon = (FStar_Ident.lident * binders * typ) +type tycon = (FStar_Ident.lident, binders, typ) FStar_Tuple3.tuple3 type monad_abbrev = { mabbrev: FStar_Ident.lident ; parms: binders ; @@ -1539,16 +1551,19 @@ type layered_eff_combinators = l_repr: (tscheme * tscheme) ; l_return: (tscheme * tscheme) ; l_bind: - (tscheme * tscheme * indexed_effect_combinator_kind - FStar_Pervasives_Native.option) + (tscheme, tscheme, + indexed_effect_combinator_kind FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 ; l_subcomp: - (tscheme * tscheme * indexed_effect_combinator_kind - FStar_Pervasives_Native.option) + (tscheme, tscheme, + indexed_effect_combinator_kind FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 ; l_if_then_else: - (tscheme * tscheme * indexed_effect_combinator_kind - FStar_Pervasives_Native.option) + (tscheme, tscheme, + indexed_effect_combinator_kind FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 ; l_close: (tscheme * tscheme) FStar_Pervasives_Native.option } let (__proj__Mklayered_eff_combinators__item__l_repr : @@ -1565,8 +1580,9 @@ let (__proj__Mklayered_eff_combinators__item__l_return : l_return let (__proj__Mklayered_eff_combinators__item__l_bind : layered_eff_combinators -> - (tscheme * tscheme * indexed_effect_combinator_kind - FStar_Pervasives_Native.option)) + (tscheme, tscheme, + indexed_effect_combinator_kind FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with @@ -1574,8 +1590,9 @@ let (__proj__Mklayered_eff_combinators__item__l_bind : l_bind let (__proj__Mklayered_eff_combinators__item__l_subcomp : layered_eff_combinators -> - (tscheme * tscheme * indexed_effect_combinator_kind - FStar_Pervasives_Native.option)) + (tscheme, tscheme, + indexed_effect_combinator_kind FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with @@ -1583,8 +1600,9 @@ let (__proj__Mklayered_eff_combinators__item__l_subcomp : l_subcomp let (__proj__Mklayered_eff_combinators__item__l_if_then_else : layered_eff_combinators -> - (tscheme * tscheme * indexed_effect_combinator_kind - FStar_Pervasives_Native.option)) + (tscheme, tscheme, + indexed_effect_combinator_kind FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with @@ -2421,8 +2439,9 @@ let (mk_Total : typ -> comp) = fun t -> mk (Total t) t.pos let (mk_GTotal : typ -> comp) = fun t -> mk (GTotal t) t.pos let (mk_Comp : comp_typ -> comp) = fun ct -> mk (Comp ct) (ct.result_typ).pos let (mk_lb : - (lbname * univ_name Prims.list * FStar_Ident.lident * typ * term * - attribute Prims.list * FStar_Compiler_Range_Type.range) -> letbinding) + (lbname, univ_name Prims.list, FStar_Ident.lident, typ, term, + attribute Prims.list, FStar_Compiler_Range_Type.range) + FStar_Tuple7.tuple7 -> letbinding) = fun uu___ -> match uu___ with diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Unionfind.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Unionfind.ml index c3b09cef646..71c1669bc16 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Unionfind.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Unionfind.ml @@ -279,8 +279,9 @@ let (get_univ_graph : unit -> ugraph) = fun uu___ -> let uu___1 = get () in uu___1.univ_graph let chk_v_u : 'uuuuu . - ('uuuuu FStar_Unionfind.p_uvar * FStar_Syntax_Syntax.version * - FStar_Compiler_Range_Type.range) -> 'uuuuu FStar_Unionfind.p_uvar + ('uuuuu FStar_Unionfind.p_uvar, FStar_Syntax_Syntax.version, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 -> + 'uuuuu FStar_Unionfind.p_uvar = fun uu___ -> match uu___ with diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_Util.ml b/ocaml/fstar-lib/generated/FStar_Syntax_Util.ml index 76502672fc3..a25eead52b0 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_Util.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_Util.ml @@ -421,7 +421,8 @@ let (comp_flags : | FStar_Syntax_Syntax.Comp ct -> ct.FStar_Syntax_Syntax.flags let (comp_eff_name_res_and_args : FStar_Syntax_Syntax.comp -> - (FStar_Ident.lident * FStar_Syntax_Syntax.typ * FStar_Syntax_Syntax.args)) + (FStar_Ident.lident, FStar_Syntax_Syntax.typ, FStar_Syntax_Syntax.args) + FStar_Tuple3.tuple3) = fun c -> match c.FStar_Syntax_Syntax.n with @@ -469,8 +470,8 @@ let (effect_indices_from_repr : | uu___1 -> err1 ()) let (destruct_comp : FStar_Syntax_Syntax.comp_typ -> - (FStar_Syntax_Syntax.universe * FStar_Syntax_Syntax.typ * - FStar_Syntax_Syntax.typ)) + (FStar_Syntax_Syntax.universe, FStar_Syntax_Syntax.typ, + FStar_Syntax_Syntax.typ) FStar_Tuple3.tuple3) = fun c -> let wp = @@ -814,10 +815,12 @@ let rec (unascribe : FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.term) = let rec (ascribe : FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool) - -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) = fun t -> fun k -> @@ -1188,14 +1191,16 @@ and (eq_antiquotations : (match uu___1 with | NotEqual -> NotEqual | uu___2 -> Unknown) | Equal -> eq_antiquotations a11 a21) and (branch_matches : - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) FStar_Tuple3.tuple3 + -> + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> eq_result) + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple3.tuple3 -> eq_result) = fun b1 -> fun b2 -> @@ -2026,8 +2031,9 @@ let (let_rec_arity : let (abs_formals_maybe_unascribe_body : Prims.bool -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option)) + (FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun maybe_unascribe -> fun t -> @@ -2074,8 +2080,9 @@ let (abs_formals_maybe_unascribe_body : (bs1, t2, abs_body_lcomp1)) let (abs_formals : FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option)) + (FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun t -> abs_formals_maybe_unascribe_body true t let (remove_inacc : FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.term) = fun t -> @@ -2180,8 +2187,9 @@ let (open_univ_vars_binders_and_comp : FStar_Syntax_Syntax.univ_names -> FStar_Syntax_Syntax.binder Prims.list -> FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax -> - (FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.binder - Prims.list * FStar_Syntax_Syntax.comp)) + (FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.binder Prims.list, FStar_Syntax_Syntax.comp) + FStar_Tuple3.tuple3) = fun uvs -> fun binders -> @@ -3749,14 +3757,16 @@ and (comp_eq_dbg : && true) and (branch_eq_dbg : Prims.bool -> - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple3.tuple3 -> + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> Prims.bool) + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple3.tuple3 -> Prims.bool) = fun dbg -> fun uu___ -> @@ -4108,10 +4118,11 @@ let rec (unbound_variables : FStar_Compiler_List.op_At uu___ uu___1 and (unbound_variables_ascription : ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * Prims.bool) - -> FStar_Syntax_Syntax.bv Prims.list) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> FStar_Syntax_Syntax.bv Prims.list) = fun asc -> let uu___ = asc in @@ -4571,9 +4582,9 @@ let (get_bind_vc_combinator : | FStar_Syntax_Syntax.DM4F_eff combs -> ((combs.FStar_Syntax_Syntax.bind_wp), FStar_Pervasives_Native.None) | FStar_Syntax_Syntax.Layered_eff combs -> - ((FStar_Pervasives_Native.__proj__Mktuple3__item___2 + ((FStar_Tuple3.__proj__Mktuple3__item___2 combs.FStar_Syntax_Syntax.l_bind), - (FStar_Pervasives_Native.__proj__Mktuple3__item___3 + (FStar_Tuple3.__proj__Mktuple3__item___3 combs.FStar_Syntax_Syntax.l_bind)) let (get_return_vc_combinator : FStar_Syntax_Syntax.eff_decl -> FStar_Syntax_Syntax.tscheme) = @@ -4596,7 +4607,7 @@ let (get_bind_repr : combs.FStar_Syntax_Syntax.bind_repr | FStar_Syntax_Syntax.Layered_eff combs -> FStar_Pervasives_Native.Some - (FStar_Pervasives_Native.__proj__Mktuple3__item___1 + (FStar_Tuple3.__proj__Mktuple3__item___1 combs.FStar_Syntax_Syntax.l_bind) let (get_return_repr : FStar_Syntax_Syntax.eff_decl -> @@ -4632,9 +4643,9 @@ let (get_layered_if_then_else_combinator : match ed.FStar_Syntax_Syntax.combinators with | FStar_Syntax_Syntax.Layered_eff combs -> FStar_Pervasives_Native.Some - ((FStar_Pervasives_Native.__proj__Mktuple3__item___1 + ((FStar_Tuple3.__proj__Mktuple3__item___1 combs.FStar_Syntax_Syntax.l_if_then_else), - (FStar_Pervasives_Native.__proj__Mktuple3__item___3 + (FStar_Tuple3.__proj__Mktuple3__item___3 combs.FStar_Syntax_Syntax.l_if_then_else)) | uu___ -> FStar_Pervasives_Native.None let (get_wp_if_then_else_combinator : @@ -4672,9 +4683,9 @@ let (get_stronger_vc_combinator : | FStar_Syntax_Syntax.DM4F_eff combs -> ((combs.FStar_Syntax_Syntax.stronger), FStar_Pervasives_Native.None) | FStar_Syntax_Syntax.Layered_eff combs -> - ((FStar_Pervasives_Native.__proj__Mktuple3__item___2 + ((FStar_Tuple3.__proj__Mktuple3__item___2 combs.FStar_Syntax_Syntax.l_subcomp), - (FStar_Pervasives_Native.__proj__Mktuple3__item___3 + (FStar_Tuple3.__proj__Mktuple3__item___3 combs.FStar_Syntax_Syntax.l_subcomp)) let (get_stronger_repr : FStar_Syntax_Syntax.eff_decl -> @@ -4686,7 +4697,7 @@ let (get_stronger_repr : | FStar_Syntax_Syntax.DM4F_eff uu___ -> FStar_Pervasives_Native.None | FStar_Syntax_Syntax.Layered_eff combs -> FStar_Pervasives_Native.Some - (FStar_Pervasives_Native.__proj__Mktuple3__item___1 + (FStar_Tuple3.__proj__Mktuple3__item___1 combs.FStar_Syntax_Syntax.l_subcomp) let (aqual_is_erasable : FStar_Syntax_Syntax.aqual -> Prims.bool) = fun aq -> diff --git a/ocaml/fstar-lib/generated/FStar_Syntax_VisitM.ml b/ocaml/fstar-lib/generated/FStar_Syntax_VisitM.ml index a51590443a2..60e997a33d4 100644 --- a/ocaml/fstar-lib/generated/FStar_Syntax_VisitM.ml +++ b/ocaml/fstar-lib/generated/FStar_Syntax_VisitM.ml @@ -892,9 +892,9 @@ let rec on_sub_pat : 'm . 'm lvm -> FStar_Syntax_Syntax.pat -> 'm = let on_sub_br : 'm . 'm lvm -> - (FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.term - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term) -> - 'm + (FStar_Syntax_Syntax.pat, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3 -> 'm = fun d -> fun br -> @@ -1379,7 +1379,8 @@ let mapTuple2 : let mapTuple3 : 'a 'b 'c 'd 'e 'f 'm . 'm FStar_Class_Monad.monad -> - ('a -> 'm) -> ('c -> 'm) -> ('e -> 'm) -> ('a * 'c * 'e) -> 'm + ('a -> 'm) -> + ('c -> 'm) -> ('e -> 'm) -> ('a, 'c, 'e) FStar_Tuple3.tuple3 -> 'm = fun uu___ -> fun f1 -> @@ -1388,8 +1389,7 @@ let mapTuple3 : fun t -> let uu___1 = let uu___2 = - let uu___3 = - f1 (FStar_Pervasives_Native.__proj__Mktuple3__item___1 t) in + let uu___3 = f1 (FStar_Tuple3.__proj__Mktuple3__item___1 t) in FStar_Class_Monad.op_Less_Dollar_Greater uu___ () () (fun uu___4 -> (fun uu___4 -> @@ -1398,12 +1398,10 @@ let mapTuple3 : (fun uu___5 -> fun uu___6 -> (uu___4, uu___5, uu___6))) uu___4) uu___3 in - let uu___3 = - g (FStar_Pervasives_Native.__proj__Mktuple3__item___2 t) in + let uu___3 = g (FStar_Tuple3.__proj__Mktuple3__item___2 t) in FStar_Class_Monad.op_Less_Star_Greater uu___ () () uu___2 uu___3 in - let uu___2 = - h (FStar_Pervasives_Native.__proj__Mktuple3__item___3 t) in + let uu___2 = h (FStar_Tuple3.__proj__Mktuple3__item___3 t) in FStar_Class_Monad.op_Less_Star_Greater uu___ () () uu___1 uu___2 let on_sub_layered_eff_combinators : 'm . 'm lvm -> FStar_Syntax_Syntax.layered_eff_combinators -> 'm = diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoid.ml b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoid.ml index cedf5cd79fd..715ba120a5f 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoid.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoid.ml @@ -185,8 +185,8 @@ let rec reification_aux : FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> - ((exp * FStar_Tactics_NamedView.term Prims.list * ( - 'a, 'b) vmap), + ((exp, FStar_Tactics_NamedView.term Prims.list, + ('a, 'b) vmap) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr = fun unquotea -> diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple.ml b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple.ml index 3e6710a5072..146709d86a2 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple.ml @@ -167,7 +167,8 @@ let rec reification_aux : FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> - ((exp * FStar_Tactics_NamedView.term Prims.list * 'a amap), + ((exp, FStar_Tactics_NamedView.term Prims.list, 'a amap) + FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr = fun ts -> @@ -518,7 +519,8 @@ let reification : FStar_Tactics_NamedView.term Prims.list -> 'a amap -> FStar_Tactics_NamedView.term -> - ((exp * FStar_Tactics_NamedView.term Prims.list * 'a amap), + ((exp, FStar_Tactics_NamedView.term Prims.list, 'a amap) + FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr = fun m -> diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple_Equiv.ml b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple_Equiv.ml index c2a3ad598c4..00ea46a7120 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple_Equiv.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommMonoidSimple_Equiv.ml @@ -151,8 +151,8 @@ let (fatom : FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term Prims.list -> FStar_Tactics_NamedView.term amap -> - ((exp * FStar_Tactics_NamedView.term Prims.list * - FStar_Tactics_NamedView.term amap), + ((exp, FStar_Tactics_NamedView.term Prims.list, + FStar_Tactics_NamedView.term amap) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun t -> @@ -236,8 +236,8 @@ let rec (reification_aux : FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> - ((exp * FStar_Tactics_NamedView.term Prims.list * - FStar_Tactics_NamedView.term amap), + ((exp, FStar_Tactics_NamedView.term Prims.list, + FStar_Tactics_NamedView.term amap) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun ts -> @@ -446,8 +446,8 @@ let (reification : FStar_Tactics_NamedView.term Prims.list -> FStar_Tactics_NamedView.term amap -> FStar_Tactics_NamedView.term -> - ((exp * FStar_Tactics_NamedView.term Prims.list * - FStar_Tactics_NamedView.term amap), + ((exp, FStar_Tactics_NamedView.term Prims.list, + FStar_Tactics_NamedView.term amap) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr) = fun eq -> diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommSemiring.ml b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommSemiring.ml index 5b091bd956a..451227313fa 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommSemiring.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_CanonCommSemiring.ml @@ -1171,8 +1171,8 @@ let make_fvar : -> FStar_Tactics_NamedView.term Prims.list -> 'a vmap -> - (('a polynomial * FStar_Tactics_NamedView.term Prims.list * 'a - vmap), + (('a polynomial, FStar_Tactics_NamedView.term Prims.list, + 'a vmap) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr = fun t -> @@ -1261,8 +1261,8 @@ let rec reification_aux : FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> FStar_Tactics_NamedView.term -> - (('a polynomial * FStar_Tactics_NamedView.term Prims.list - * 'a vmap), + (('a polynomial, FStar_Tactics_NamedView.term Prims.list, + 'a vmap) FStar_Tuple3.tuple3, unit) FStar_Tactics_Effect.tac_repr = fun unquotea -> diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_Hooks.ml b/ocaml/fstar-lib/generated/FStar_Tactics_Hooks.ml index 6ac85787093..358e759055e 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_Hooks.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_Hooks.ml @@ -70,7 +70,7 @@ let (uu___is_Both : pol -> Prims.bool) = type 'a tres_m = | Unchanged of 'a | Simplified of ('a * FStar_Tactics_Types.goal Prims.list) - | Dual of ('a * 'a * FStar_Tactics_Types.goal Prims.list) + | Dual of ('a, 'a, FStar_Tactics_Types.goal Prims.list) FStar_Tuple3.tuple3 let uu___is_Unchanged : 'a . 'a tres_m -> Prims.bool = fun projectee -> match projectee with | Unchanged _0 -> true | uu___ -> false @@ -85,8 +85,10 @@ let __proj__Simplified__item___0 : let uu___is_Dual : 'a . 'a tres_m -> Prims.bool = fun projectee -> match projectee with | Dual _0 -> true | uu___ -> false let __proj__Dual__item___0 : - 'a . 'a tres_m -> ('a * 'a * FStar_Tactics_Types.goal Prims.list) = - fun projectee -> match projectee with | Dual _0 -> _0 + 'a . + 'a tres_m -> + ('a, 'a, FStar_Tactics_Types.goal Prims.list) FStar_Tuple3.tuple3 + = fun projectee -> match projectee with | Dual _0 -> _0 type tres = FStar_Syntax_Syntax.term tres_m let tpure : 'uuuuu . 'uuuuu -> 'uuuuu tres_m = fun x -> Unchanged x let (flip : pol -> pol) = @@ -231,7 +233,10 @@ let (by_tactic_interp : Simplified (uvtm, gs)))) | uu___2 -> Unchanged t) let explode : - 'a . 'a tres_m -> ('a * 'a * FStar_Tactics_Types.goal Prims.list) = + 'a . + 'a tres_m -> + ('a, 'a, FStar_Tactics_Types.goal Prims.list) FStar_Tuple3.tuple3 + = fun t -> match t with | Unchanged t1 -> (t1, t1, []) @@ -547,8 +552,8 @@ let rec (traverse : let (preprocess : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (Prims.bool * (FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.term * - FStar_Options.optionstate) Prims.list)) + (Prims.bool * (FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.term, + FStar_Options.optionstate) FStar_Tuple3.tuple3 Prims.list)) = fun env -> fun goal -> diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_NamedView.ml b/ocaml/fstar-lib/generated/FStar_Tactics_NamedView.ml index 64e156dbccd..51d1c62d0da 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_NamedView.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_NamedView.ml @@ -483,8 +483,8 @@ let (__proj__Pat_Dot_Term__item___0 : fun projectee -> match projectee with | Pat_Dot_Term _0 -> _0 type branch = (pattern * term) type match_returns_ascription = - (binder * ((term, comp) FStar_Pervasives.either * term - FStar_Pervasives_Native.option * Prims.bool)) + (binder * ((term, comp) FStar_Pervasives.either, + term FStar_Pervasives_Native.option, Prims.bool) FStar_Tuple3.tuple3) type named_term_view = | Tv_Var of namedv | Tv_BVar of bv diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_PatternMatching.ml b/ocaml/fstar-lib/generated/FStar_Tactics_PatternMatching.ml index 736d1dc744f..90cb5a40e8d 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_PatternMatching.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_PatternMatching.ml @@ -638,8 +638,8 @@ let rec (string_of_pattern : pattern -> Prims.string) = type match_exception = | NameMismatch of (qn * qn) | SimpleMismatch of (pattern * FStar_Tactics_NamedView.term) - | NonLinearMismatch of (varname * FStar_Tactics_NamedView.term * - FStar_Tactics_NamedView.term) + | NonLinearMismatch of (varname, FStar_Tactics_NamedView.term, + FStar_Tactics_NamedView.term) FStar_Tuple3.tuple3 | UnsupportedTermInPattern of FStar_Tactics_NamedView.term | IncorrectTypeInAbsPatBinder of FStar_Reflection_Types.typ let (uu___is_NameMismatch : match_exception -> Prims.bool) = @@ -658,7 +658,8 @@ let (uu___is_NonLinearMismatch : match_exception -> Prims.bool) = match projectee with | NonLinearMismatch _0 -> true | uu___ -> false let (__proj__NonLinearMismatch__item___0 : match_exception -> - (varname * FStar_Tactics_NamedView.term * FStar_Tactics_NamedView.term)) + (varname, FStar_Tactics_NamedView.term, FStar_Tactics_NamedView.term) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | NonLinearMismatch _0 -> _0 let (uu___is_UnsupportedTermInPattern : match_exception -> Prims.bool) = fun projectee -> diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_V1_Basic.ml b/ocaml/fstar-lib/generated/FStar_Tactics_V1_Basic.ml index b4a4b0c5353..9485b926d93 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_V1_Basic.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_V1_Basic.ml @@ -1432,8 +1432,9 @@ let (curms : unit -> FStar_BigInt.t FStar_Tactics_Monad.tac) = let (__tc : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Common.guard_t) FStar_Tactics_Monad.tac) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 + FStar_Tactics_Monad.tac) = fun e -> fun t -> @@ -1579,8 +1580,9 @@ let (__tc : let (__tc_ghost : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Common.guard_t) FStar_Tactics_Monad.tac) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 + FStar_Tactics_Monad.tac) = fun e -> fun t -> @@ -1836,8 +1838,9 @@ let (__tc_ghost : let (__tc_lax : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Common.guard_t) FStar_Tactics_Monad.tac) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 + FStar_Tactics_Monad.tac) = fun e -> fun t -> @@ -2440,8 +2443,9 @@ let (bnorm_and_replace : let (arrow_one : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.binder * - FStar_Syntax_Syntax.comp) FStar_Pervasives_Native.option) + (FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.binder, + FStar_Syntax_Syntax.comp) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun env1 -> fun t -> @@ -3216,8 +3220,8 @@ let (try_unify_by_application : FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.term -> FStar_Compiler_Range_Type.range -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.aqual * - FStar_Syntax_Syntax.ctx_uvar) Prims.list + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.aqual, + FStar_Syntax_Syntax.ctx_uvar) FStar_Tuple3.tuple3 Prims.list FStar_Tactics_Monad.tac) = fun should_check -> @@ -4402,8 +4406,8 @@ let (t_apply_lemma : let (split_env : FStar_Syntax_Syntax.bv -> env -> - (env * FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.bv Prims.list) - FStar_Pervasives_Native.option) + (env, FStar_Syntax_Syntax.bv, FStar_Syntax_Syntax.bv Prims.list) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun bvar -> fun e -> @@ -5708,7 +5712,8 @@ let longest_prefix : 'a . ('a -> 'a -> Prims.bool) -> 'a Prims.list -> - 'a Prims.list -> ('a Prims.list * 'a Prims.list * 'a Prims.list) + 'a Prims.list -> + ('a Prims.list, 'a Prims.list, 'a Prims.list) FStar_Tuple3.tuple3 = fun f -> fun l1 -> diff --git a/ocaml/fstar-lib/generated/FStar_Tactics_V2_Basic.ml b/ocaml/fstar-lib/generated/FStar_Tactics_V2_Basic.ml index 0a8aa9d6ed8..2f6a7a2fade 100644 --- a/ocaml/fstar-lib/generated/FStar_Tactics_V2_Basic.ml +++ b/ocaml/fstar-lib/generated/FStar_Tactics_V2_Basic.ml @@ -1729,8 +1729,9 @@ let (curms : unit -> FStar_BigInt.t FStar_Tactics_Monad.tac) = let (__tc : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Common.guard_t) FStar_Tactics_Monad.tac) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 + FStar_Tactics_Monad.tac) = fun uu___1 -> fun uu___ -> @@ -1904,8 +1905,9 @@ let (__tc : let (__tc_ghost : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Common.guard_t) FStar_Tactics_Monad.tac) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 + FStar_Tactics_Monad.tac) = fun uu___1 -> fun uu___ -> @@ -2195,8 +2197,9 @@ let (__tc_ghost : let (__tc_lax : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Common.guard_t) FStar_Tactics_Monad.tac) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 + FStar_Tactics_Monad.tac) = fun uu___1 -> fun uu___ -> @@ -3062,8 +3065,9 @@ let (binding_to_binder : let (arrow_one : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.binder * - FStar_Syntax_Syntax.comp) FStar_Pervasives_Native.option) + (FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.binder, + FStar_Syntax_Syntax.comp) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun env1 -> fun t -> @@ -3078,8 +3082,9 @@ let (arrow_one : let (arrow_one_whnf : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.binder * - FStar_Syntax_Syntax.comp) FStar_Pervasives_Native.option) + (FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.binder, + FStar_Syntax_Syntax.comp) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun env1 -> fun t -> @@ -3871,8 +3876,8 @@ let (try_unify_by_application : FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.term -> FStar_Compiler_Range_Type.range -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.aqual * - FStar_Syntax_Syntax.ctx_uvar) Prims.list + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.aqual, + FStar_Syntax_Syntax.ctx_uvar) FStar_Tuple3.tuple3 Prims.list FStar_Tactics_Monad.tac) = fun should_check -> @@ -5111,8 +5116,8 @@ let (t_apply_lemma : let (split_env : FStar_Syntax_Syntax.bv -> env -> - (env * FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.bv Prims.list) - FStar_Pervasives_Native.option) + (env, FStar_Syntax_Syntax.bv, FStar_Syntax_Syntax.bv Prims.list) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun bvar -> fun e -> @@ -6446,7 +6451,8 @@ let longest_prefix : 'a . ('a -> 'a -> Prims.bool) -> 'a Prims.list -> - 'a Prims.list -> ('a Prims.list * 'a Prims.list * 'a Prims.list) + 'a Prims.list -> + ('a Prims.list, 'a Prims.list, 'a Prims.list) FStar_Tuple3.tuple3 = fun f -> fun l1 -> @@ -11204,9 +11210,10 @@ let (refl_check_match_complete : let (refl_instantiate_implicits : env -> FStar_Syntax_Syntax.term -> - (((FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.typ) Prims.list * - FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ) - FStar_Pervasives_Native.option * issues) FStar_Tactics_Monad.tac) + (((FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.typ) Prims.list, + FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option * issues) + FStar_Tactics_Monad.tac) = fun uu___1 -> fun uu___ -> diff --git a/ocaml/fstar-lib/generated/FStar_ToSyntax_ToSyntax.ml b/ocaml/fstar-lib/generated/FStar_ToSyntax_ToSyntax.ml index 70c5bc1635d..f9687af12f5 100644 --- a/ocaml/fstar-lib/generated/FStar_ToSyntax_ToSyntax.ml +++ b/ocaml/fstar-lib/generated/FStar_ToSyntax_ToSyntax.ml @@ -12,9 +12,9 @@ let (tun_r : FStar_Compiler_Range_Type.range -> FStar_Syntax_Syntax.term) = (FStar_Syntax_Syntax.tun.FStar_Syntax_Syntax.hash_code) } type annotated_pat = - (FStar_Syntax_Syntax.pat * (FStar_Syntax_Syntax.bv * - FStar_Syntax_Syntax.typ * FStar_Syntax_Syntax.term Prims.list) - Prims.list) + (FStar_Syntax_Syntax.pat * (FStar_Syntax_Syntax.bv, + FStar_Syntax_Syntax.typ, FStar_Syntax_Syntax.term Prims.list) + FStar_Tuple3.tuple3 Prims.list) let (mk_thunk : FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) @@ -94,8 +94,9 @@ let (qualify_field_names : let desugar_disjunctive_pattern : 'uuuuu . (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * - (FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax * 'uuuuu) Prims.list) Prims.list -> + (FStar_Syntax_Syntax.bv, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, 'uuuuu) + FStar_Tuple3.tuple3 Prims.list) Prims.list -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option -> FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.branch Prims.list @@ -852,10 +853,11 @@ let rec (destruct_app_pattern : env_t -> Prims.bool -> FStar_Parser_AST.pattern -> - ((FStar_Ident.ident, FStar_Ident.lid) FStar_Pervasives.either * - FStar_Parser_AST.pattern Prims.list * (FStar_Parser_AST.term * - FStar_Parser_AST.term FStar_Pervasives_Native.option) - FStar_Pervasives_Native.option)) + ((FStar_Ident.ident, FStar_Ident.lid) FStar_Pervasives.either, + FStar_Parser_AST.pattern Prims.list, + (FStar_Parser_AST.term * FStar_Parser_AST.term + FStar_Pervasives_Native.option) FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun env -> fun is_top_level -> @@ -923,8 +925,8 @@ let (gather_pattern_bound_vars : let acc = FStar_Compiler_Set.empty FStar_Syntax_Syntax.ord_ident () in fun p -> gather_pattern_bound_vars_maybe_top acc p type bnd = - | LocalBinder of (FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.bqual * - FStar_Syntax_Syntax.term Prims.list) + | LocalBinder of (FStar_Syntax_Syntax.bv, FStar_Syntax_Syntax.bqual, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple3.tuple3 | LetBinder of (FStar_Ident.lident * (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term FStar_Pervasives_Native.option)) let (uu___is_LocalBinder : bnd -> Prims.bool) = @@ -932,8 +934,8 @@ let (uu___is_LocalBinder : bnd -> Prims.bool) = match projectee with | LocalBinder _0 -> true | uu___ -> false let (__proj__LocalBinder__item___0 : bnd -> - (FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.bqual * - FStar_Syntax_Syntax.term Prims.list)) + (FStar_Syntax_Syntax.bv, FStar_Syntax_Syntax.bqual, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | LocalBinder _0 -> _0 let (uu___is_LetBinder : bnd -> Prims.bool) = fun projectee -> @@ -953,19 +955,20 @@ let (is_implicit : bnd -> Prims.bool) = | uu___ -> false let (binder_of_bnd : bnd -> - (FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.bqual * - FStar_Syntax_Syntax.term Prims.list)) + (FStar_Syntax_Syntax.bv, FStar_Syntax_Syntax.bqual, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple3.tuple3) = fun uu___ -> match uu___ with | LocalBinder (a, aq, attrs) -> (a, aq, attrs) | uu___1 -> FStar_Compiler_Effect.failwith "Impossible" let (mk_lb : - (FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax Prims.list * - (FStar_Syntax_Syntax.bv, FStar_Syntax_Syntax.fv) FStar_Pervasives.either - * FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax * - FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax * - FStar_Compiler_Range_Type.range) -> FStar_Syntax_Syntax.letbinding) + (FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax Prims.list, + (FStar_Syntax_Syntax.bv, FStar_Syntax_Syntax.fv) FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, + FStar_Compiler_Range_Type.range) FStar_Tuple5.tuple5 -> + FStar_Syntax_Syntax.letbinding) = fun uu___ -> match uu___ with @@ -1771,7 +1774,8 @@ let rec (desugar_data_pat : Prims.bool -> env_t -> FStar_Parser_AST.pattern -> - ((env_t * bnd * annotated_pat Prims.list) * antiquotations_temp)) + ((env_t, bnd, annotated_pat Prims.list) FStar_Tuple3.tuple3 * + antiquotations_temp)) = fun top_level_ascr_allowed -> fun env -> @@ -2189,7 +2193,8 @@ and (desugar_binding_pat_maybe_top : Prims.bool -> FStar_Syntax_DsEnv.env -> FStar_Parser_AST.pattern -> - ((env_t * bnd * annotated_pat Prims.list) * antiquotations_temp)) + ((env_t, bnd, annotated_pat Prims.list) FStar_Tuple3.tuple3 * + antiquotations_temp)) = fun top -> fun env -> @@ -2271,7 +2276,8 @@ and (desugar_binding_pat_maybe_top : and (desugar_binding_pat_aq : FStar_Syntax_DsEnv.env -> FStar_Parser_AST.pattern -> - ((env_t * bnd * annotated_pat Prims.list) * antiquotations_temp)) + ((env_t, bnd, annotated_pat Prims.list) FStar_Tuple3.tuple3 * + antiquotations_temp)) = fun env -> fun p -> desugar_binding_pat_maybe_top false env p and (desugar_match_pat_maybe_top : Prims.bool -> @@ -3213,128 +3219,59 @@ and (desugar_term_maybe_top : | (FStar_Pervasives_Native.Some p1, FStar_Pervasives_Native.Some (sc, p')) -> - (match ((sc.FStar_Syntax_Syntax.n), - (p'.FStar_Syntax_Syntax.v)) - with - | (FStar_Syntax_Syntax.Tm_name - uu___6, uu___7) -> - let tup2 = - let uu___8 = - FStar_Parser_Const.mk_tuple_data_lid - (Prims.of_int (2)) - top.FStar_Parser_AST.range in - FStar_Syntax_Syntax.lid_and_dd_as_fv - uu___8 - FStar_Syntax_Syntax.delta_constant - (FStar_Pervasives_Native.Some - FStar_Syntax_Syntax.Data_ctor) in - let sc1 = - let uu___8 = - let uu___9 = - let uu___10 = - mk - (FStar_Syntax_Syntax.Tm_fvar - tup2) in - let uu___11 = - let uu___12 = - FStar_Syntax_Syntax.as_arg - sc in - let uu___13 = - let uu___14 = - let uu___15 = - FStar_Syntax_Syntax.bv_to_name - x in - FStar_Syntax_Syntax.as_arg - uu___15 in - [uu___14] in - uu___12 :: uu___13 in - { - FStar_Syntax_Syntax.hd - = uu___10; - FStar_Syntax_Syntax.args - = uu___11 - } in - FStar_Syntax_Syntax.Tm_app - uu___9 in - FStar_Syntax_Syntax.mk uu___8 - top.FStar_Parser_AST.range in - let p2 = - let uu___8 = - FStar_Compiler_Range_Ops.union_ranges - p'.FStar_Syntax_Syntax.p - p1.FStar_Syntax_Syntax.p in - FStar_Syntax_Syntax.withinfo - (FStar_Syntax_Syntax.Pat_cons - (tup2, - FStar_Pervasives_Native.None, - [(p', false); - (p1, false)])) uu___8 in - FStar_Pervasives_Native.Some - (sc1, p2) - | (FStar_Syntax_Syntax.Tm_app - { - FStar_Syntax_Syntax.hd = - uu___6; - FStar_Syntax_Syntax.args = - args;_}, - FStar_Syntax_Syntax.Pat_cons - (uu___7, uu___8, pats1)) -> - let tupn = - let uu___9 = - FStar_Parser_Const.mk_tuple_data_lid - (Prims.int_one + - (FStar_Compiler_List.length - args)) - top.FStar_Parser_AST.range in - FStar_Syntax_Syntax.lid_and_dd_as_fv - uu___9 - FStar_Syntax_Syntax.delta_constant - (FStar_Pervasives_Native.Some - FStar_Syntax_Syntax.Data_ctor) in - let sc1 = - let uu___9 = - let uu___10 = - let uu___11 = - mk - (FStar_Syntax_Syntax.Tm_fvar - tupn) in - let uu___12 = - let uu___13 = - let uu___14 = - let uu___15 = - FStar_Syntax_Syntax.bv_to_name - x in - FStar_Syntax_Syntax.as_arg - uu___15 in - [uu___14] in - FStar_Compiler_List.op_At - args uu___13 in - { - FStar_Syntax_Syntax.hd - = uu___11; - FStar_Syntax_Syntax.args - = uu___12 - } in - FStar_Syntax_Syntax.Tm_app - uu___10 in - mk uu___9 in - let p2 = - let uu___9 = - FStar_Compiler_Range_Ops.union_ranges - p'.FStar_Syntax_Syntax.p - p1.FStar_Syntax_Syntax.p in - FStar_Syntax_Syntax.withinfo - (FStar_Syntax_Syntax.Pat_cons - (tupn, - FStar_Pervasives_Native.None, - (FStar_Compiler_List.op_At - pats1 [(p1, false)]))) - uu___9 in - FStar_Pervasives_Native.Some - (sc1, p2) - | uu___6 -> - FStar_Compiler_Effect.failwith - "Impossible") in + let tup2 = + let uu___6 = + FStar_Parser_Const.mk_tuple_data_lid + (Prims.of_int (2)) + top.FStar_Parser_AST.range in + FStar_Syntax_Syntax.lid_and_dd_as_fv + uu___6 + FStar_Syntax_Syntax.delta_constant + (FStar_Pervasives_Native.Some + FStar_Syntax_Syntax.Data_ctor) in + let sc1 = + let uu___6 = + let uu___7 = + let uu___8 = + mk + (FStar_Syntax_Syntax.Tm_fvar + tup2) in + let uu___9 = + let uu___10 = + FStar_Syntax_Syntax.as_arg + sc in + let uu___11 = + let uu___12 = + let uu___13 = + FStar_Syntax_Syntax.bv_to_name + x in + FStar_Syntax_Syntax.as_arg + uu___13 in + [uu___12] in + uu___10 :: uu___11 in + { + FStar_Syntax_Syntax.hd = + uu___8; + FStar_Syntax_Syntax.args = + uu___9 + } in + FStar_Syntax_Syntax.Tm_app + uu___7 in + FStar_Syntax_Syntax.mk uu___6 + top.FStar_Parser_AST.range in + let p2 = + let uu___6 = + FStar_Compiler_Range_Ops.union_ranges + p'.FStar_Syntax_Syntax.p + p1.FStar_Syntax_Syntax.p in + FStar_Syntax_Syntax.withinfo + (FStar_Syntax_Syntax.Pat_cons + (tup2, + FStar_Pervasives_Native.None, + [(p', false); (p1, false)])) + uu___6 in + FStar_Pervasives_Native.Some + (sc1, p2) in let uu___6 = mk_binder_with_attrs x aq1 attrs in (uu___6, sc_pat_opt1) in @@ -5226,14 +5163,16 @@ and (desugar_term_maybe_top : and (desugar_match_returns : env_t -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> - (FStar_Ident.ident FStar_Pervasives_Native.option * - FStar_Parser_AST.term * Prims.bool) FStar_Pervasives_Native.option -> + (FStar_Ident.ident FStar_Pervasives_Native.option, + FStar_Parser_AST.term, Prims.bool) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option -> ((FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) FStar_Pervasives_Native.option * + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) FStar_Pervasives_Native.option * (FStar_Syntax_Syntax.bv * FStar_Syntax_Syntax.term) Prims.list)) = fun env -> @@ -6083,9 +6022,9 @@ and (desugar_formula : and (desugar_binder_aq : FStar_Syntax_DsEnv.env -> FStar_Parser_AST.binder -> - ((FStar_Ident.ident FStar_Pervasives_Native.option * - FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.attribute Prims.list) - * antiquotations_temp)) + ((FStar_Ident.ident FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.attribute Prims.list) + FStar_Tuple3.tuple3 * antiquotations_temp)) = fun env -> fun b -> @@ -6125,8 +6064,9 @@ and (desugar_binder_aq : and (desugar_binder : FStar_Syntax_DsEnv.env -> FStar_Parser_AST.binder -> - (FStar_Ident.ident FStar_Pervasives_Native.option * - FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.attribute Prims.list)) + (FStar_Ident.ident FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.attribute Prims.list) + FStar_Tuple3.tuple3) = fun env -> fun b -> @@ -6157,9 +6097,10 @@ and (desugar_vquote : and (as_binder : FStar_Syntax_DsEnv.env -> FStar_Parser_AST.arg_qualifier FStar_Pervasives_Native.option -> - (FStar_Ident.ident FStar_Pervasives_Native.option * - FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.attribute Prims.list) - -> (FStar_Syntax_Syntax.binder * FStar_Syntax_DsEnv.env)) + (FStar_Ident.ident FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.attribute Prims.list) + FStar_Tuple3.tuple3 -> + (FStar_Syntax_Syntax.binder * FStar_Syntax_DsEnv.env)) = fun env -> fun imp -> @@ -10046,7 +9987,7 @@ let (desugar_modul_common : FStar_Syntax_Syntax.modul FStar_Pervasives_Native.option -> FStar_Syntax_DsEnv.env -> FStar_Parser_AST.modul -> - (env_t * FStar_Syntax_Syntax.modul * Prims.bool)) + (env_t, FStar_Syntax_Syntax.modul, Prims.bool) FStar_Tuple3.tuple3) = fun curmod -> fun env -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Common.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Common.ml index 456504c264b..e300d7ab8c5 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Common.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Common.ml @@ -257,7 +257,8 @@ let (showable_deferred_reason : deferred_reason FStar_Class_Show.showable) = | Deferred_delay_match_heuristic -> "Deferred_delay_match_heuristic" | Deferred_to_user_tac -> "Deferred_to_user_tac") } -type deferred = (deferred_reason * Prims.string * prob) Prims.list +type deferred = + (deferred_reason, Prims.string, prob) FStar_Tuple3.tuple3 Prims.list type univ_ineq = (FStar_Syntax_Syntax.universe * FStar_Syntax_Syntax.universe) type identifier_info = diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Core.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Core.ml index e2c80eed8dd..13c4b31c22c 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Core.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Core.ml @@ -92,8 +92,8 @@ let (fresh_binder : let (open_binders : env -> FStar_Syntax_Syntax.binders -> - (env * FStar_Syntax_Syntax.binder Prims.list * - FStar_Syntax_Syntax.subst_elt Prims.list)) + (env, FStar_Syntax_Syntax.binder Prims.list, + FStar_Syntax_Syntax.subst_elt Prims.list) FStar_Tuple3.tuple3) = fun g -> fun bs -> @@ -147,7 +147,8 @@ let (open_binders : let (open_pat : env -> FStar_Syntax_Syntax.pat -> - (env * FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.subst_t)) + (env, FStar_Syntax_Syntax.pat, FStar_Syntax_Syntax.subst_t) + FStar_Tuple3.tuple3) = fun g -> fun p -> @@ -217,7 +218,8 @@ let (open_term : env -> FStar_Syntax_Syntax.binder -> FStar_Syntax_Syntax.term -> - (env * FStar_Syntax_Syntax.binder * FStar_Syntax_Syntax.term)) + (env, FStar_Syntax_Syntax.binder, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) = fun g -> fun b -> @@ -234,7 +236,8 @@ let (open_term_binders : env -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.term -> - (env * FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.term)) + (env, FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) = fun g -> fun bs -> @@ -248,7 +251,8 @@ let (open_comp : env -> FStar_Syntax_Syntax.binder -> FStar_Syntax_Syntax.comp -> - (env * FStar_Syntax_Syntax.binder * FStar_Syntax_Syntax.comp)) + (env, FStar_Syntax_Syntax.binder, FStar_Syntax_Syntax.comp) + FStar_Tuple3.tuple3) = fun g -> fun b -> @@ -265,7 +269,8 @@ let (open_comp_binders : env -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.comp -> - (env * FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.comp)) + (env, FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.comp) + FStar_Tuple3.tuple3) = fun g -> fun bs -> @@ -277,8 +282,8 @@ let (open_comp_binders : let (arrow_formals_comp : env -> FStar_Syntax_Syntax.term -> - (env * FStar_Syntax_Syntax.binder Prims.list * - FStar_Syntax_Syntax.comp)) + (env, FStar_Syntax_Syntax.binder Prims.list, FStar_Syntax_Syntax.comp) + FStar_Tuple3.tuple3) = fun g -> fun c -> @@ -311,10 +316,14 @@ let (open_branches_eq_pat : env -> FStar_Syntax_Syntax.branch -> FStar_Syntax_Syntax.branch -> - (env * (FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.term - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term) * - (FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.term - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term))) + (env, + (FStar_Syntax_Syntax.pat, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3, + (FStar_Syntax_Syntax.pat, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) + FStar_Tuple3.tuple3) = fun g -> fun br0 -> @@ -679,8 +688,8 @@ let (is_type : let rec (is_arrow : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.binder * tot_or_ghost * FStar_Syntax_Syntax.typ) - result) + (FStar_Syntax_Syntax.binder, tot_or_ghost, FStar_Syntax_Syntax.typ) + FStar_Tuple3.tuple3 result) = fun g -> fun t -> @@ -7925,8 +7934,8 @@ let (open_binders_in_term : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.term -> - (FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.binders * - FStar_Syntax_Syntax.term)) + (FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.binders, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) = fun env1 -> fun bs -> @@ -7938,8 +7947,8 @@ let (open_binders_in_comp : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.comp -> - (FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.binders * - FStar_Syntax_Syntax.comp)) + (FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.binders, + FStar_Syntax_Syntax.comp) FStar_Tuple3.tuple3) = fun env1 -> fun bs -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_DMFF.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_DMFF.ml index 504646c325a..d1b26ff779f 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_DMFF.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_DMFF.ml @@ -2122,7 +2122,9 @@ let (is_unknown : FStar_Syntax_Syntax.term' -> Prims.bool) = let rec (check : env -> FStar_Syntax_Syntax.term -> - nm -> (nm * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term)) + nm -> + (nm, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) = fun env1 -> fun e -> @@ -2262,7 +2264,8 @@ let rec (check : and (infer : env -> FStar_Syntax_Syntax.term -> - (nm * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term)) + (nm, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) = fun env1 -> fun e -> @@ -3049,14 +3052,18 @@ and (infer : and (mk_match : env -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> - (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t * + (FStar_Syntax_Syntax.pat' FStar_Syntax_Syntax.withinfo_t, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) Prims.list -> + FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple3.tuple3 Prims.list -> (env -> FStar_Syntax_Syntax.term -> - (nm * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term)) - -> (nm * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term)) + (nm, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) + -> + (nm, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) = fun env1 -> fun e0 -> @@ -3279,13 +3286,16 @@ and (mk_let : FStar_Syntax_Syntax.term -> (env_ -> FStar_Syntax_Syntax.term -> - (nm * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term)) + (nm, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) -> (env_ -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) - -> (nm * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) + -> + (nm, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3) = fun env1 -> fun binding -> @@ -3537,8 +3547,8 @@ and (mk_let : and (check_n : env_ -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.typ * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) + (FStar_Syntax_Syntax.typ, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) = fun env1 -> fun e -> @@ -3554,8 +3564,8 @@ and (check_n : and (check_m : env_ -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.typ * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) + (FStar_Syntax_Syntax.typ, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) = fun env1 -> fun e -> @@ -3841,8 +3851,8 @@ let (star_type : env -> FStar_Syntax_Syntax.typ -> FStar_Syntax_Syntax.typ) = let (star_expr : env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.typ * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.term)) + (FStar_Syntax_Syntax.typ, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3) = fun env1 -> fun t -> let uu___ = n env1.tcenv t in check_n env1 uu___ let (trans_F : env -> @@ -3885,8 +3895,9 @@ let (recheck_debug : let (cps_and_elaborate : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.eff_decl -> - (FStar_Syntax_Syntax.sigelt Prims.list * FStar_Syntax_Syntax.eff_decl * - FStar_Syntax_Syntax.sigelt FStar_Pervasives_Native.option)) + (FStar_Syntax_Syntax.sigelt Prims.list, FStar_Syntax_Syntax.eff_decl, + FStar_Syntax_Syntax.sigelt FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun env1 -> fun ed -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_DeferredImplicits.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_DeferredImplicits.ml index 9492a87af31..2f28b6f2ddf 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_DeferredImplicits.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_DeferredImplicits.ml @@ -26,8 +26,8 @@ type goal_type = | FlexRigid of (FStar_Syntax_Syntax.ctx_uvar * FStar_Syntax_Syntax.term) | FlexFlex of (FStar_Syntax_Syntax.ctx_uvar * FStar_Syntax_Syntax.ctx_uvar) - | Can_be_split_into of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term - * FStar_Syntax_Syntax.ctx_uvar) + | Can_be_split_into of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.ctx_uvar) FStar_Tuple3.tuple3 | Imp of FStar_Syntax_Syntax.ctx_uvar let (uu___is_FlexRigid : goal_type -> Prims.bool) = fun projectee -> @@ -46,8 +46,8 @@ let (uu___is_Can_be_split_into : goal_type -> Prims.bool) = match projectee with | Can_be_split_into _0 -> true | uu___ -> false let (__proj__Can_be_split_into__item___0 : goal_type -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.ctx_uvar)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.ctx_uvar) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Can_be_split_into _0 -> _0 let (uu___is_Imp : goal_type -> Prims.bool) = fun projectee -> match projectee with | Imp _0 -> true | uu___ -> false diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Env.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Env.ml index 4037478c17a..68772d45da8 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Env.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Env.ml @@ -231,24 +231,25 @@ and effects = ; order: edge Prims.list ; joins: - (FStar_Ident.lident * FStar_Ident.lident * FStar_Ident.lident * mlift * - mlift) Prims.list + (FStar_Ident.lident, FStar_Ident.lident, FStar_Ident.lident, mlift, + mlift) FStar_Tuple5.tuple5 Prims.list ; polymonadic_binds: - (FStar_Ident.lident * FStar_Ident.lident * FStar_Ident.lident * - (env -> - FStar_Syntax_Syntax.comp_typ -> - FStar_Syntax_Syntax.bv FStar_Pervasives_Native.option -> - FStar_Syntax_Syntax.comp_typ -> - FStar_Syntax_Syntax.cflag Prims.list -> - FStar_Compiler_Range_Type.range -> - (FStar_Syntax_Syntax.comp * - FStar_TypeChecker_Common.guard_t))) - Prims.list + (FStar_Ident.lident, FStar_Ident.lident, FStar_Ident.lident, + env -> + FStar_Syntax_Syntax.comp_typ -> + FStar_Syntax_Syntax.bv FStar_Pervasives_Native.option -> + FStar_Syntax_Syntax.comp_typ -> + FStar_Syntax_Syntax.cflag Prims.list -> + FStar_Compiler_Range_Type.range -> + (FStar_Syntax_Syntax.comp * + FStar_TypeChecker_Common.guard_t)) + FStar_Tuple4.tuple4 Prims.list ; polymonadic_subcomps: - (FStar_Ident.lident * FStar_Ident.lident * FStar_Syntax_Syntax.tscheme * - FStar_Syntax_Syntax.indexed_effect_combinator_kind) Prims.list + (FStar_Ident.lident, FStar_Ident.lident, FStar_Syntax_Syntax.tscheme, + FStar_Syntax_Syntax.indexed_effect_combinator_kind) FStar_Tuple4.tuple4 + Prims.list } and env = { @@ -267,8 +268,8 @@ and env = effects: effects ; generalize: Prims.bool ; letrecs: - (FStar_Syntax_Syntax.lbname * Prims.int * FStar_Syntax_Syntax.typ * - FStar_Syntax_Syntax.univ_names) Prims.list + (FStar_Syntax_Syntax.lbname, Prims.int, FStar_Syntax_Syntax.typ, + FStar_Syntax_Syntax.univ_names) FStar_Tuple4.tuple4 Prims.list ; top_level: Prims.bool ; check_uvars: Prims.bool ; @@ -286,15 +287,15 @@ and env = tc_term: env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Common.guard_t) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 ; typeof_tot_or_gtot_term: env -> FStar_Syntax_Syntax.term -> must_tot -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Common.guard_t) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3 ; universe_of: env -> FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.universe ; @@ -309,8 +310,9 @@ and env = subtype_nosmt_force: env -> FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.term -> Prims.bool ; qtbl_name_and_index: - ((FStar_Ident.lident * FStar_Syntax_Syntax.typ * Prims.int) - FStar_Pervasives_Native.option * Prims.int FStar_Compiler_Util.smap) + ((FStar_Ident.lident, FStar_Syntax_Syntax.typ, Prims.int) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option * Prims.int + FStar_Compiler_Util.smap) ; normalized_eff_names: FStar_Ident.lident FStar_Compiler_Util.smap ; fv_delta_depths: FStar_Syntax_Syntax.delta_depth FStar_Compiler_Util.smap ; @@ -372,17 +374,21 @@ and solver_t = init: env -> unit ; push: Prims.string -> unit ; pop: Prims.string -> unit ; - snapshot: Prims.string -> ((Prims.int * Prims.int * Prims.int) * unit) ; + snapshot: + Prims.string -> + ((Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3 * unit) + ; rollback: Prims.string -> - (Prims.int * Prims.int * Prims.int) FStar_Pervasives_Native.option -> - unit + (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option -> unit ; encode_sig: env -> FStar_Syntax_Syntax.sigelt -> unit ; preprocess: env -> goal -> - (Prims.bool * (env * goal * FStar_Options.optionstate) Prims.list) + (Prims.bool * (env, goal, FStar_Options.optionstate) + FStar_Tuple3.tuple3 Prims.list) ; spinoff_strictly_positive_goals: (env -> goal -> (env * goal) Prims.list) FStar_Pervasives_Native.option ; @@ -453,8 +459,8 @@ let (__proj__Mkeffects__item__order : effects -> edge Prims.list) = order let (__proj__Mkeffects__item__joins : effects -> - (FStar_Ident.lident * FStar_Ident.lident * FStar_Ident.lident * mlift * - mlift) Prims.list) + (FStar_Ident.lident, FStar_Ident.lident, FStar_Ident.lident, mlift, + mlift) FStar_Tuple5.tuple5 Prims.list) = fun projectee -> match projectee with @@ -462,16 +468,16 @@ let (__proj__Mkeffects__item__joins : joins let (__proj__Mkeffects__item__polymonadic_binds : effects -> - (FStar_Ident.lident * FStar_Ident.lident * FStar_Ident.lident * - (env -> - FStar_Syntax_Syntax.comp_typ -> - FStar_Syntax_Syntax.bv FStar_Pervasives_Native.option -> - FStar_Syntax_Syntax.comp_typ -> - FStar_Syntax_Syntax.cflag Prims.list -> - FStar_Compiler_Range_Type.range -> - (FStar_Syntax_Syntax.comp * - FStar_TypeChecker_Common.guard_t))) - Prims.list) + (FStar_Ident.lident, FStar_Ident.lident, FStar_Ident.lident, + env -> + FStar_Syntax_Syntax.comp_typ -> + FStar_Syntax_Syntax.bv FStar_Pervasives_Native.option -> + FStar_Syntax_Syntax.comp_typ -> + FStar_Syntax_Syntax.cflag Prims.list -> + FStar_Compiler_Range_Type.range -> + (FStar_Syntax_Syntax.comp * + FStar_TypeChecker_Common.guard_t)) + FStar_Tuple4.tuple4 Prims.list) = fun projectee -> match projectee with @@ -479,8 +485,9 @@ let (__proj__Mkeffects__item__polymonadic_binds : polymonadic_binds let (__proj__Mkeffects__item__polymonadic_subcomps : effects -> - (FStar_Ident.lident * FStar_Ident.lident * FStar_Syntax_Syntax.tscheme * - FStar_Syntax_Syntax.indexed_effect_combinator_kind) Prims.list) + (FStar_Ident.lident, FStar_Ident.lident, FStar_Syntax_Syntax.tscheme, + FStar_Syntax_Syntax.indexed_effect_combinator_kind) FStar_Tuple4.tuple4 + Prims.list) = fun projectee -> match projectee with @@ -684,8 +691,8 @@ let (__proj__Mkenv__item__generalize : env -> Prims.bool) = generalize let (__proj__Mkenv__item__letrecs : env -> - (FStar_Syntax_Syntax.lbname * Prims.int * FStar_Syntax_Syntax.typ * - FStar_Syntax_Syntax.univ_names) Prims.list) + (FStar_Syntax_Syntax.lbname, Prims.int, FStar_Syntax_Syntax.typ, + FStar_Syntax_Syntax.univ_names) FStar_Tuple4.tuple4 Prims.list) = fun projectee -> match projectee with @@ -892,8 +899,8 @@ let (__proj__Mkenv__item__tc_term : env -> env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Common.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3) = fun projectee -> match projectee with @@ -913,8 +920,8 @@ let (__proj__Mkenv__item__typeof_tot_or_gtot_term : env -> FStar_Syntax_Syntax.term -> must_tot -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Common.guard_t)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.guard_t) FStar_Tuple3.tuple3) = fun projectee -> match projectee with @@ -1005,8 +1012,9 @@ let (__proj__Mkenv__item__subtype_nosmt_force : subtype_nosmt_force let (__proj__Mkenv__item__qtbl_name_and_index : env -> - ((FStar_Ident.lident * FStar_Syntax_Syntax.typ * Prims.int) - FStar_Pervasives_Native.option * Prims.int FStar_Compiler_Util.smap)) + ((FStar_Ident.lident, FStar_Syntax_Syntax.typ, Prims.int) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option * Prims.int + FStar_Compiler_Util.smap)) = fun projectee -> match projectee with @@ -1354,7 +1362,10 @@ let (__proj__Mksolver_t__item__pop : solver_t -> Prims.string -> unit) = spinoff_strictly_positive_goals; handle_smt_goal; solve; solve_sync; finish; refresh;_} -> pop let (__proj__Mksolver_t__item__snapshot : - solver_t -> Prims.string -> ((Prims.int * Prims.int * Prims.int) * unit)) = + solver_t -> + Prims.string -> + ((Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3 * unit)) + = fun projectee -> match projectee with | { init; push; pop; snapshot; rollback; encode_sig; preprocess; @@ -1363,8 +1374,8 @@ let (__proj__Mksolver_t__item__snapshot : let (__proj__Mksolver_t__item__rollback : solver_t -> Prims.string -> - (Prims.int * Prims.int * Prims.int) FStar_Pervasives_Native.option -> - unit) + (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option -> unit) = fun projectee -> match projectee with @@ -1382,7 +1393,8 @@ let (__proj__Mksolver_t__item__preprocess : solver_t -> env -> goal -> - (Prims.bool * (env * goal * FStar_Options.optionstate) Prims.list)) + (Prims.bool * (env, goal, FStar_Options.optionstate) + FStar_Tuple3.tuple3 Prims.list)) = fun projectee -> match projectee with @@ -1458,7 +1470,7 @@ type polymonadic_bind_t = FStar_Syntax_Syntax.cflag Prims.list -> FStar_Compiler_Range_Type.range -> (FStar_Syntax_Syntax.comp * FStar_TypeChecker_Common.guard_t) -type solver_depth_t = (Prims.int * Prims.int * Prims.int) +type solver_depth_t = (Prims.int, Prims.int, Prims.int) FStar_Tuple3.tuple3 type core_check_t = env -> FStar_Syntax_Syntax.term -> @@ -1469,7 +1481,8 @@ type core_check_t = type implicit = FStar_TypeChecker_Common.implicit type implicits = FStar_TypeChecker_Common.implicits type guard_t = FStar_TypeChecker_Common.guard_t -type tcenv_depth_t = (Prims.int * Prims.int * solver_depth_t * Prims.int) +type tcenv_depth_t = + (Prims.int, Prims.int, solver_depth_t, Prims.int) FStar_Tuple4.tuple4 type qninfo = (((FStar_Syntax_Syntax.universes * FStar_Syntax_Syntax.typ), (FStar_Syntax_Syntax.sigelt * FStar_Syntax_Syntax.universes @@ -1730,13 +1743,14 @@ let (initial_env : FStar_Parser_Dep.deps -> (env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, guard_t) + FStar_Tuple3.tuple3) -> (env -> FStar_Syntax_Syntax.term -> must_tot -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * guard_t)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, guard_t) + FStar_Tuple3.tuple3) -> (env -> FStar_Syntax_Syntax.term -> @@ -4453,7 +4467,8 @@ let (join_opt : env -> FStar_Ident.lident -> FStar_Ident.lident -> - (FStar_Ident.lident * mlift * mlift) FStar_Pervasives_Native.option) + (FStar_Ident.lident, mlift, mlift) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun env1 -> fun l1 -> @@ -4493,7 +4508,8 @@ let (join_opt : let (join : env -> FStar_Ident.lident -> - FStar_Ident.lident -> (FStar_Ident.lident * mlift * mlift)) + FStar_Ident.lident -> + (FStar_Ident.lident, mlift, mlift) FStar_Tuple3.tuple3) = fun env1 -> fun l1 -> @@ -5820,8 +5836,8 @@ let (open_universes_in : env -> FStar_Syntax_Syntax.univ_names -> FStar_Syntax_Syntax.term Prims.list -> - (env * FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.term - Prims.list)) + (env, FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.term Prims.list) FStar_Tuple3.tuple3) = fun env1 -> fun uvs -> @@ -6654,8 +6670,10 @@ let (new_tac_implicit_var : FStar_Syntax_Syntax.ctx_uvar Prims.list -> FStar_Syntax_Syntax.ctx_uvar_meta_t FStar_Pervasives_Native.option -> - (FStar_Syntax_Syntax.term * (FStar_Syntax_Syntax.ctx_uvar * - FStar_Compiler_Range_Type.range) Prims.list * guard_t)) + (FStar_Syntax_Syntax.term, + (FStar_Syntax_Syntax.ctx_uvar * + FStar_Compiler_Range_Type.range) Prims.list, + guard_t) FStar_Tuple3.tuple3) = fun reason -> fun r -> @@ -6728,8 +6746,10 @@ let (new_implicit_var_aux : FStar_Syntax_Syntax.should_check_uvar -> FStar_Syntax_Syntax.ctx_uvar_meta_t FStar_Pervasives_Native.option -> - (FStar_Syntax_Syntax.term * (FStar_Syntax_Syntax.ctx_uvar * - FStar_Compiler_Range_Type.range) Prims.list * guard_t)) + (FStar_Syntax_Syntax.term, + (FStar_Syntax_Syntax.ctx_uvar * + FStar_Compiler_Range_Type.range) Prims.list, + guard_t) FStar_Tuple3.tuple3) = fun reason -> fun r -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Err.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Err.ml index b287d9b06ff..164b3e07bb5 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Err.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Err.ml @@ -4,9 +4,9 @@ let (info_at_pos : Prims.string -> Prims.int -> Prims.int -> - ((Prims.string, FStar_Ident.lid) FStar_Pervasives.either * - FStar_Syntax_Syntax.typ * FStar_Compiler_Range_Type.range) - FStar_Pervasives_Native.option) + ((Prims.string, FStar_Ident.lid) FStar_Pervasives.either, + FStar_Syntax_Syntax.typ, FStar_Compiler_Range_Type.range) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun env -> fun file -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Generalize.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Generalize.ml index fdf1d88d65a..52431526ef5 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Generalize.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Generalize.ml @@ -162,12 +162,12 @@ let (generalize_universes : let (gen : FStar_TypeChecker_Env.env -> Prims.bool -> - (FStar_Syntax_Syntax.lbname * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.comp) Prims.list -> - (FStar_Syntax_Syntax.lbname * FStar_Syntax_Syntax.univ_name - Prims.list * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.binder Prims.list) Prims.list - FStar_Pervasives_Native.option) + (FStar_Syntax_Syntax.lbname, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.comp) FStar_Tuple3.tuple3 Prims.list -> + (FStar_Syntax_Syntax.lbname, + FStar_Syntax_Syntax.univ_name Prims.list, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.comp, FStar_Syntax_Syntax.binder Prims.list) + FStar_Tuple5.tuple5 Prims.list FStar_Pervasives_Native.option) = fun env -> fun is_rec -> @@ -533,11 +533,12 @@ let (gen : let (generalize' : FStar_TypeChecker_Env.env -> Prims.bool -> - (FStar_Syntax_Syntax.lbname * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.comp) Prims.list -> - (FStar_Syntax_Syntax.lbname * FStar_Syntax_Syntax.univ_names * - FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.binder Prims.list) Prims.list) + (FStar_Syntax_Syntax.lbname, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.comp) FStar_Tuple3.tuple3 Prims.list -> + (FStar_Syntax_Syntax.lbname, FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.binder Prims.list) FStar_Tuple5.tuple5 + Prims.list) = fun env -> fun is_rec -> @@ -619,11 +620,12 @@ let (generalize' : let (generalize : FStar_TypeChecker_Env.env -> Prims.bool -> - (FStar_Syntax_Syntax.lbname * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.comp) Prims.list -> - (FStar_Syntax_Syntax.lbname * FStar_Syntax_Syntax.univ_names * - FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.binder Prims.list) Prims.list) + (FStar_Syntax_Syntax.lbname, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.comp) FStar_Tuple3.tuple3 Prims.list -> + (FStar_Syntax_Syntax.lbname, FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.binder Prims.list) FStar_Tuple5.tuple5 + Prims.list) = fun env -> fun is_rec -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_NBE.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_NBE.ml index 11be9a7299b..1d03f794902 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_NBE.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_NBE.ml @@ -403,8 +403,8 @@ let (pickBranch : let (should_reduce_recursive_definition : FStar_TypeChecker_NBETerm.args -> Prims.bool Prims.list -> - (Prims.bool * FStar_TypeChecker_NBETerm.args * - FStar_TypeChecker_NBETerm.args)) + (Prims.bool, FStar_TypeChecker_NBETerm.args, + FStar_TypeChecker_NBETerm.args) FStar_Tuple3.tuple3) = fun arguments -> fun formals_in_decreases -> @@ -2540,8 +2540,9 @@ and (translate_monadic : "Unexpected case in translate_monadic: %s" uu___3 in FStar_Compiler_Effect.failwith uu___2) and (translate_monadic_lift : - (FStar_Syntax_Syntax.monad_name * FStar_Syntax_Syntax.monad_name * - FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) -> + (FStar_Syntax_Syntax.monad_name, FStar_Syntax_Syntax.monad_name, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) FStar_Tuple3.tuple3 + -> config -> FStar_TypeChecker_NBETerm.t Prims.list -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_NBETerm.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_NBETerm.ml index 3d6a728adcb..a04de64b94c 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_NBETerm.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_NBETerm.ml @@ -39,21 +39,22 @@ let (__proj__SConst__item___0 : constant -> FStar_Const.sconst) = fun projectee -> match projectee with | SConst _0 -> _0 type atom = | Var of var - | Match of (t * - (unit -> - FStar_Syntax_Syntax.match_returns_ascription - FStar_Pervasives_Native.option) - * (unit -> FStar_Syntax_Syntax.branch Prims.list) * - (unit -> FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option)) - - | UnreducedLet of (var * t FStar_Thunk.t * t FStar_Thunk.t * t - FStar_Thunk.t * FStar_Syntax_Syntax.letbinding) - | UnreducedLetRec of ((var * t * t) Prims.list * t * - FStar_Syntax_Syntax.letbinding Prims.list) + | Match of (t, + unit -> + FStar_Syntax_Syntax.match_returns_ascription + FStar_Pervasives_Native.option, + unit -> FStar_Syntax_Syntax.branch Prims.list, + unit -> FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option) + FStar_Tuple4.tuple4 + | UnreducedLet of (var, t FStar_Thunk.t, t FStar_Thunk.t, t FStar_Thunk.t, + FStar_Syntax_Syntax.letbinding) FStar_Tuple5.tuple5 + | UnreducedLetRec of ((var, t, t) FStar_Tuple3.tuple3 Prims.list, t, + FStar_Syntax_Syntax.letbinding Prims.list) FStar_Tuple3.tuple3 | UVar of FStar_Syntax_Syntax.term FStar_Thunk.t and lam_shape = - | Lam_bs of (t Prims.list * FStar_Syntax_Syntax.binders * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option) + | Lam_bs of (t Prims.list, FStar_Syntax_Syntax.binders, + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3 | Lam_args of (t * FStar_Syntax_Syntax.aqual) Prims.list | Lam_primop of (FStar_Syntax_Syntax.fv * (t * FStar_Syntax_Syntax.aqual) Prims.list) @@ -65,10 +66,11 @@ and t'__Lam__payload = and t' = | Lam of t'__Lam__payload | Accu of (atom * (t * FStar_Syntax_Syntax.aqual) Prims.list) - | Construct of (FStar_Syntax_Syntax.fv * FStar_Syntax_Syntax.universe - Prims.list * (t * FStar_Syntax_Syntax.aqual) Prims.list) - | FV of (FStar_Syntax_Syntax.fv * FStar_Syntax_Syntax.universe Prims.list * - (t * FStar_Syntax_Syntax.aqual) Prims.list) + | Construct of (FStar_Syntax_Syntax.fv, + FStar_Syntax_Syntax.universe Prims.list, + (t * FStar_Syntax_Syntax.aqual) Prims.list) FStar_Tuple3.tuple3 + | FV of (FStar_Syntax_Syntax.fv, FStar_Syntax_Syntax.universe Prims.list, + (t * FStar_Syntax_Syntax.aqual) Prims.list) FStar_Tuple3.tuple3 | Constant of constant | Type_t of FStar_Syntax_Syntax.universe | Univ of FStar_Syntax_Syntax.universe @@ -83,13 +85,15 @@ and t' = (FStar_Compiler_Dyn.dyn * FStar_Syntax_Syntax.emb_typ)) FStar_Pervasives.either * t FStar_Thunk.t) | Meta of (t * FStar_Syntax_Syntax.metadata FStar_Thunk.t) - | TopLevelLet of (FStar_Syntax_Syntax.letbinding * Prims.int * (t * - FStar_Syntax_Syntax.aqual) Prims.list) - | TopLevelRec of (FStar_Syntax_Syntax.letbinding * Prims.int * Prims.bool - Prims.list * (t * FStar_Syntax_Syntax.aqual) Prims.list) - | LocalLetRec of (Prims.int * FStar_Syntax_Syntax.letbinding * - FStar_Syntax_Syntax.letbinding Prims.list * t Prims.list * (t * - FStar_Syntax_Syntax.aqual) Prims.list * Prims.int * Prims.bool Prims.list) + | TopLevelLet of (FStar_Syntax_Syntax.letbinding, Prims.int, + (t * FStar_Syntax_Syntax.aqual) Prims.list) FStar_Tuple3.tuple3 + | TopLevelRec of (FStar_Syntax_Syntax.letbinding, Prims.int, + Prims.bool Prims.list, (t * FStar_Syntax_Syntax.aqual) Prims.list) + FStar_Tuple4.tuple4 + | LocalLetRec of (Prims.int, FStar_Syntax_Syntax.letbinding, + FStar_Syntax_Syntax.letbinding Prims.list, t Prims.list, + (t * FStar_Syntax_Syntax.aqual) Prims.list, Prims.int, + Prims.bool Prims.list) FStar_Tuple7.tuple7 and t = { nbe_t: t' ; nbe_r: FStar_Compiler_Range_Type.range } @@ -129,29 +133,30 @@ let (uu___is_Match : atom -> Prims.bool) = fun projectee -> match projectee with | Match _0 -> true | uu___ -> false let (__proj__Match__item___0 : atom -> - (t * - (unit -> - FStar_Syntax_Syntax.match_returns_ascription - FStar_Pervasives_Native.option) - * (unit -> FStar_Syntax_Syntax.branch Prims.list) * - (unit -> - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option))) + (t, + unit -> + FStar_Syntax_Syntax.match_returns_ascription + FStar_Pervasives_Native.option, + unit -> FStar_Syntax_Syntax.branch Prims.list, + unit -> + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option) + FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Match _0 -> _0 let (uu___is_UnreducedLet : atom -> Prims.bool) = fun projectee -> match projectee with | UnreducedLet _0 -> true | uu___ -> false let (__proj__UnreducedLet__item___0 : atom -> - (var * t FStar_Thunk.t * t FStar_Thunk.t * t FStar_Thunk.t * - FStar_Syntax_Syntax.letbinding)) + (var, t FStar_Thunk.t, t FStar_Thunk.t, t FStar_Thunk.t, + FStar_Syntax_Syntax.letbinding) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | UnreducedLet _0 -> _0 let (uu___is_UnreducedLetRec : atom -> Prims.bool) = fun projectee -> match projectee with | UnreducedLetRec _0 -> true | uu___ -> false let (__proj__UnreducedLetRec__item___0 : atom -> - ((var * t * t) Prims.list * t * FStar_Syntax_Syntax.letbinding - Prims.list)) + ((var, t, t) FStar_Tuple3.tuple3 Prims.list, t, + FStar_Syntax_Syntax.letbinding Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | UnreducedLetRec _0 -> _0 let (uu___is_UVar : atom -> Prims.bool) = fun projectee -> match projectee with | UVar _0 -> true | uu___ -> false @@ -161,8 +166,9 @@ let (uu___is_Lam_bs : lam_shape -> Prims.bool) = fun projectee -> match projectee with | Lam_bs _0 -> true | uu___ -> false let (__proj__Lam_bs__item___0 : lam_shape -> - (t Prims.list * FStar_Syntax_Syntax.binders * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option)) + (t Prims.list, FStar_Syntax_Syntax.binders, + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Lam_bs _0 -> _0 let (uu___is_Lam_args : lam_shape -> Prims.bool) = fun projectee -> @@ -200,15 +206,15 @@ let (uu___is_Construct : t' -> Prims.bool) = match projectee with | Construct _0 -> true | uu___ -> false let (__proj__Construct__item___0 : t' -> - (FStar_Syntax_Syntax.fv * FStar_Syntax_Syntax.universe Prims.list * (t * - FStar_Syntax_Syntax.aqual) Prims.list)) + (FStar_Syntax_Syntax.fv, FStar_Syntax_Syntax.universe Prims.list, + (t * FStar_Syntax_Syntax.aqual) Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Construct _0 -> _0 let (uu___is_FV : t' -> Prims.bool) = fun projectee -> match projectee with | FV _0 -> true | uu___ -> false let (__proj__FV__item___0 : t' -> - (FStar_Syntax_Syntax.fv * FStar_Syntax_Syntax.universe Prims.list * (t * - FStar_Syntax_Syntax.aqual) Prims.list)) + (FStar_Syntax_Syntax.fv, FStar_Syntax_Syntax.universe Prims.list, + (t * FStar_Syntax_Syntax.aqual) Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | FV _0 -> _0 let (uu___is_Constant : t' -> Prims.bool) = fun projectee -> @@ -266,26 +272,26 @@ let (uu___is_TopLevelLet : t' -> Prims.bool) = match projectee with | TopLevelLet _0 -> true | uu___ -> false let (__proj__TopLevelLet__item___0 : t' -> - (FStar_Syntax_Syntax.letbinding * Prims.int * (t * - FStar_Syntax_Syntax.aqual) Prims.list)) + (FStar_Syntax_Syntax.letbinding, Prims.int, + (t * FStar_Syntax_Syntax.aqual) Prims.list) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | TopLevelLet _0 -> _0 let (uu___is_TopLevelRec : t' -> Prims.bool) = fun projectee -> match projectee with | TopLevelRec _0 -> true | uu___ -> false let (__proj__TopLevelRec__item___0 : t' -> - (FStar_Syntax_Syntax.letbinding * Prims.int * Prims.bool Prims.list * (t - * FStar_Syntax_Syntax.aqual) Prims.list)) + (FStar_Syntax_Syntax.letbinding, Prims.int, Prims.bool Prims.list, + (t * FStar_Syntax_Syntax.aqual) Prims.list) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | TopLevelRec _0 -> _0 let (uu___is_LocalLetRec : t' -> Prims.bool) = fun projectee -> match projectee with | LocalLetRec _0 -> true | uu___ -> false let (__proj__LocalLetRec__item___0 : t' -> - (Prims.int * FStar_Syntax_Syntax.letbinding * - FStar_Syntax_Syntax.letbinding Prims.list * t Prims.list * (t * - FStar_Syntax_Syntax.aqual) Prims.list * Prims.int * Prims.bool - Prims.list)) + (Prims.int, FStar_Syntax_Syntax.letbinding, + FStar_Syntax_Syntax.letbinding Prims.list, t Prims.list, + (t * FStar_Syntax_Syntax.aqual) Prims.list, Prims.int, + Prims.bool Prims.list) FStar_Tuple7.tuple7) = fun projectee -> match projectee with | LocalLetRec _0 -> _0 let (__proj__Mkt__item__nbe_t : t -> t') = fun projectee -> match projectee with | { nbe_t; nbe_r;_} -> nbe_t @@ -1111,7 +1117,9 @@ let e_tuple2 : 'a 'b . 'a embedding -> 'b embedding -> ('a * 'b) embedding = etyp let e_tuple3 : 'a 'b 'c . - 'a embedding -> 'b embedding -> 'c embedding -> ('a * 'b * 'c) embedding + 'a embedding -> + 'b embedding -> + 'c embedding -> ('a, 'b, 'c) FStar_Tuple3.tuple3 embedding = fun ea -> fun eb -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Normalize.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Normalize.ml index 398bc01d33f..7df992fa1ff 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Normalize.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Normalize.ml @@ -58,10 +58,13 @@ let cases : | FStar_Pervasives_Native.None -> d type 'a cfg_memo = (FStar_TypeChecker_Cfg.cfg * 'a) FStar_Syntax_Syntax.memo type closure = - | Clos of ((FStar_Syntax_Syntax.binder FStar_Pervasives_Native.option * - closure) Prims.list * FStar_Syntax_Syntax.term * + | Clos of ((FStar_Syntax_Syntax.binder FStar_Pervasives_Native.option * closure) - Prims.list * FStar_Syntax_Syntax.term) cfg_memo * Prims.bool) + Prims.list, + FStar_Syntax_Syntax.term, + ((FStar_Syntax_Syntax.binder FStar_Pervasives_Native.option * closure) + Prims.list * FStar_Syntax_Syntax.term) cfg_memo, + Prims.bool) FStar_Tuple4.tuple4 | Univ of FStar_Syntax_Syntax.universe | Dummy let (uu___is_Clos : closure -> Prims.bool) = @@ -69,9 +72,11 @@ let (uu___is_Clos : closure -> Prims.bool) = let (__proj__Clos__item___0 : closure -> ((FStar_Syntax_Syntax.binder FStar_Pervasives_Native.option * closure) - Prims.list * FStar_Syntax_Syntax.term * ((FStar_Syntax_Syntax.binder - FStar_Pervasives_Native.option * closure) Prims.list * - FStar_Syntax_Syntax.term) cfg_memo * Prims.bool)) + Prims.list, + FStar_Syntax_Syntax.term, + ((FStar_Syntax_Syntax.binder FStar_Pervasives_Native.option * closure) + Prims.list * FStar_Syntax_Syntax.term) cfg_memo, + Prims.bool) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Clos _0 -> _0 let (uu___is_Univ : closure -> Prims.bool) = fun projectee -> match projectee with | Univ _0 -> true | uu___ -> false @@ -87,36 +92,39 @@ let (dummy : (FStar_Syntax_Syntax.binder FStar_Pervasives_Native.option * closure)) = (FStar_Pervasives_Native.None, Dummy) type branches = - (FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.term - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term) Prims.list + (FStar_Syntax_Syntax.pat, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3 Prims.list type stack_elt = - | Arg of (closure * FStar_Syntax_Syntax.aqual * - FStar_Compiler_Range_Type.range) + | Arg of (closure, FStar_Syntax_Syntax.aqual, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 | UnivArgs of (FStar_Syntax_Syntax.universe Prims.list * FStar_Compiler_Range_Type.range) | MemoLazy of (env * FStar_Syntax_Syntax.term) cfg_memo - | Match of (env * FStar_Syntax_Syntax.match_returns_ascription - FStar_Pervasives_Native.option * branches * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option * - FStar_TypeChecker_Cfg.cfg * FStar_Compiler_Range_Type.range) - | Abs of (env * FStar_Syntax_Syntax.binders * env * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option * - FStar_Compiler_Range_Type.range) - | App of (env * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.aqual * - FStar_Compiler_Range_Type.range) - | CBVApp of (env * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.aqual * - FStar_Compiler_Range_Type.range) - | Meta of (env * FStar_Syntax_Syntax.metadata * - FStar_Compiler_Range_Type.range) - | Let of (env * FStar_Syntax_Syntax.binders * - FStar_Syntax_Syntax.letbinding * FStar_Compiler_Range_Type.range) + | Match of (env, + FStar_Syntax_Syntax.match_returns_ascription FStar_Pervasives_Native.option, + branches, FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option, + FStar_TypeChecker_Cfg.cfg, FStar_Compiler_Range_Type.range) + FStar_Tuple6.tuple6 + | Abs of (env, FStar_Syntax_Syntax.binders, env, + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option, + FStar_Compiler_Range_Type.range) FStar_Tuple5.tuple5 + | App of (env, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.aqual, + FStar_Compiler_Range_Type.range) FStar_Tuple4.tuple4 + | CBVApp of (env, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.aqual, + FStar_Compiler_Range_Type.range) FStar_Tuple4.tuple4 + | Meta of (env, FStar_Syntax_Syntax.metadata, + FStar_Compiler_Range_Type.range) FStar_Tuple3.tuple3 + | Let of (env, FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.letbinding, + FStar_Compiler_Range_Type.range) FStar_Tuple4.tuple4 | Cfg of (FStar_TypeChecker_Cfg.cfg * (FStar_Syntax_Syntax.term * FStar_Compiler_Util.time) FStar_Pervasives_Native.option) let (uu___is_Arg : stack_elt -> Prims.bool) = fun projectee -> match projectee with | Arg _0 -> true | uu___ -> false let (__proj__Arg__item___0 : stack_elt -> - (closure * FStar_Syntax_Syntax.aqual * FStar_Compiler_Range_Type.range)) + (closure, FStar_Syntax_Syntax.aqual, FStar_Compiler_Range_Type.range) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Arg _0 -> _0 let (uu___is_UnivArgs : stack_elt -> Prims.bool) = fun projectee -> @@ -136,45 +144,49 @@ let (uu___is_Match : stack_elt -> Prims.bool) = fun projectee -> match projectee with | Match _0 -> true | uu___ -> false let (__proj__Match__item___0 : stack_elt -> - (env * FStar_Syntax_Syntax.match_returns_ascription - FStar_Pervasives_Native.option * branches * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option * - FStar_TypeChecker_Cfg.cfg * FStar_Compiler_Range_Type.range)) + (env, + FStar_Syntax_Syntax.match_returns_ascription + FStar_Pervasives_Native.option, + branches, + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option, + FStar_TypeChecker_Cfg.cfg, FStar_Compiler_Range_Type.range) + FStar_Tuple6.tuple6) = fun projectee -> match projectee with | Match _0 -> _0 let (uu___is_Abs : stack_elt -> Prims.bool) = fun projectee -> match projectee with | Abs _0 -> true | uu___ -> false let (__proj__Abs__item___0 : stack_elt -> - (env * FStar_Syntax_Syntax.binders * env * - FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option * - FStar_Compiler_Range_Type.range)) + (env, FStar_Syntax_Syntax.binders, env, + FStar_Syntax_Syntax.residual_comp FStar_Pervasives_Native.option, + FStar_Compiler_Range_Type.range) FStar_Tuple5.tuple5) = fun projectee -> match projectee with | Abs _0 -> _0 let (uu___is_App : stack_elt -> Prims.bool) = fun projectee -> match projectee with | App _0 -> true | uu___ -> false let (__proj__App__item___0 : stack_elt -> - (env * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.aqual * - FStar_Compiler_Range_Type.range)) + (env, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.aqual, + FStar_Compiler_Range_Type.range) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | App _0 -> _0 let (uu___is_CBVApp : stack_elt -> Prims.bool) = fun projectee -> match projectee with | CBVApp _0 -> true | uu___ -> false let (__proj__CBVApp__item___0 : stack_elt -> - (env * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.aqual * - FStar_Compiler_Range_Type.range)) + (env, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.aqual, + FStar_Compiler_Range_Type.range) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | CBVApp _0 -> _0 let (uu___is_Meta : stack_elt -> Prims.bool) = fun projectee -> match projectee with | Meta _0 -> true | uu___ -> false let (__proj__Meta__item___0 : stack_elt -> - (env * FStar_Syntax_Syntax.metadata * FStar_Compiler_Range_Type.range)) + (env, FStar_Syntax_Syntax.metadata, FStar_Compiler_Range_Type.range) + FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Meta _0 -> _0 let (uu___is_Let : stack_elt -> Prims.bool) = fun projectee -> match projectee with | Let _0 -> true | uu___ -> false let (__proj__Let__item___0 : stack_elt -> - (env * FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.letbinding * - FStar_Compiler_Range_Type.range)) + (env, FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.letbinding, + FStar_Compiler_Range_Type.range) FStar_Tuple4.tuple4) = fun projectee -> match projectee with | Let _0 -> _0 let (uu___is_Cfg : stack_elt -> Prims.bool) = fun projectee -> match projectee with | Cfg _0 -> true | uu___ -> false @@ -1057,10 +1069,11 @@ and (close_match_returns : FStar_Pervasives_Native.option -> (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) FStar_Pervasives_Native.option) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) FStar_Pervasives_Native.option) = fun cfg -> fun env1 -> @@ -1079,15 +1092,17 @@ and (close_ascription : FStar_TypeChecker_Cfg.cfg -> env -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool) -> + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) = fun cfg -> fun env1 -> @@ -8278,10 +8293,11 @@ and (norm_match_returns : FStar_Pervasives_Native.option -> (FStar_Syntax_Syntax.binder * ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) FStar_Pervasives_Native.option) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) FStar_Pervasives_Native.option) = fun cfg -> fun env1 -> @@ -8303,15 +8319,17 @@ and (norm_ascription : FStar_TypeChecker_Cfg.cfg -> env -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool) -> + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3 -> ((FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax FStar_Pervasives_Native.option * - Prims.bool)) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax + FStar_Pervasives_Native.option, + Prims.bool) FStar_Tuple3.tuple3) = fun cfg -> fun env1 -> @@ -9204,11 +9222,12 @@ let (elim_uvars_aux_tc : FStar_Syntax_Syntax.binders -> (FStar_Syntax_Syntax.typ, FStar_Syntax_Syntax.comp) FStar_Pervasives.either -> - (FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.binder - Prims.list * + (FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.binder Prims.list, (FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, - FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) - FStar_Pervasives.either)) + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Pervasives.either) + FStar_Tuple3.tuple3) = fun env1 -> fun univ_names -> @@ -9274,9 +9293,10 @@ let (elim_uvars_aux_t : FStar_Syntax_Syntax.univ_names -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.typ -> - (FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.binder - Prims.list * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax)) + (FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.binder Prims.list, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple3.tuple3) = fun env1 -> fun univ_names -> @@ -9294,9 +9314,10 @@ let (elim_uvars_aux_c : FStar_Syntax_Syntax.univ_names -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.comp -> - (FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.binder - Prims.list * FStar_Syntax_Syntax.comp' - FStar_Syntax_Syntax.syntax)) + (FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.binder Prims.list, + FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax) + FStar_Tuple3.tuple3) = fun env1 -> fun univ_names -> @@ -9319,8 +9340,7 @@ let rec (elim_uvars : let uu___ = FStar_Compiler_List.map (elim_uvars_aux_t env1 [] []) s.FStar_Syntax_Syntax.sigattrs in - FStar_Compiler_List.map - FStar_Pervasives_Native.__proj__Mktuple3__item___3 uu___ in + FStar_Compiler_List.map FStar_Tuple3.__proj__Mktuple3__item___3 uu___ in let s1 = { FStar_Syntax_Syntax.sigel = (s.FStar_Syntax_Syntax.sigel); diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_PatternUtils.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_PatternUtils.ml index 59d2cb75bff..3559cbb3913 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_PatternUtils.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_PatternUtils.ml @@ -245,8 +245,9 @@ let (pat_as_exp : Prims.bool -> FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.pat -> - (FStar_Syntax_Syntax.bv Prims.list * FStar_Syntax_Syntax.term * - FStar_TypeChecker_Common.guard_t * FStar_Syntax_Syntax.pat)) + (FStar_Syntax_Syntax.bv Prims.list, FStar_Syntax_Syntax.term, + FStar_TypeChecker_Common.guard_t, FStar_Syntax_Syntax.pat) + FStar_Tuple4.tuple4) = fun introduce_bv_uvars -> fun inst_pat_cons_univs -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Positivity.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Positivity.ml index b1a4971caeb..ff76b27590c 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Positivity.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Positivity.ml @@ -122,9 +122,9 @@ let rec (term_as_fv_or_name : let (open_sig_inductive_typ : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.sigelt -> - (FStar_TypeChecker_Env.env * (FStar_Ident.lident * - FStar_Syntax_Syntax.univ_name Prims.list * - FStar_Syntax_Syntax.binders))) + (FStar_TypeChecker_Env.env * (FStar_Ident.lident, + FStar_Syntax_Syntax.univ_name Prims.list, + FStar_Syntax_Syntax.binders) FStar_Tuple3.tuple3)) = fun env -> fun se -> @@ -898,7 +898,8 @@ let (mutuals_unused_in_type : c1.FStar_Syntax_Syntax.effect_args) in ok t type unfolded_memo_elt = - (FStar_Ident.lident * FStar_Syntax_Syntax.args * Prims.int) Prims.list + (FStar_Ident.lident, FStar_Syntax_Syntax.args, Prims.int) + FStar_Tuple3.tuple3 Prims.list type unfolded_memo_t = unfolded_memo_elt FStar_Compiler_Effect.ref let (already_unfolded : FStar_Ident.lident -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops.ml index b99ed97d7ae..726c0cfd443 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops.ml @@ -15,12 +15,12 @@ let arg_as_list : (FStar_Syntax_Embeddings.e_list e) (FStar_Pervasives_Native.fst a1) let (as_primitive_step : Prims.bool -> - (FStar_Ident.lident * Prims.int * Prims.int * - FStar_TypeChecker_Primops_Base.interp_t * - (FStar_Syntax_Syntax.universes -> - FStar_TypeChecker_NBETerm.args -> - FStar_TypeChecker_NBETerm.t FStar_Pervasives_Native.option)) - -> FStar_TypeChecker_Primops_Base.primitive_step) + (FStar_Ident.lident, Prims.int, Prims.int, + FStar_TypeChecker_Primops_Base.interp_t, + FStar_Syntax_Syntax.universes -> + FStar_TypeChecker_NBETerm.args -> + FStar_TypeChecker_NBETerm.t FStar_Pervasives_Native.option) + FStar_Tuple5.tuple5 -> FStar_TypeChecker_Primops_Base.primitive_step) = fun is_strong -> fun uu___ -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops_Base.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops_Base.ml index d1342807be4..233f878fe61 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops_Base.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Primops_Base.ml @@ -127,8 +127,8 @@ let try_unembed_simple : let solve : 'a . 'a -> 'a = fun ev -> ev let (as_primitive_step_nbecbs : Prims.bool -> - (FStar_Ident.lident * Prims.int * Prims.int * interp_t * nbe_interp_t) -> - primitive_step) + (FStar_Ident.lident, Prims.int, Prims.int, interp_t, nbe_interp_t) + FStar_Tuple5.tuple5 -> primitive_step) = fun is_strong -> fun uu___ -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Rel.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Rel.ml index f0de0805ef4..9b6eed0bbd1 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Rel.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Rel.ml @@ -131,12 +131,12 @@ type worklist = { attempting: FStar_TypeChecker_Common.probs ; wl_deferred: - (Prims.int * FStar_TypeChecker_Common.deferred_reason * lstring * - FStar_TypeChecker_Common.prob) Prims.list + (Prims.int, FStar_TypeChecker_Common.deferred_reason, lstring, + FStar_TypeChecker_Common.prob) FStar_Tuple4.tuple4 Prims.list ; wl_deferred_to_tac: - (Prims.int * FStar_TypeChecker_Common.deferred_reason * lstring * - FStar_TypeChecker_Common.prob) Prims.list + (Prims.int, FStar_TypeChecker_Common.deferred_reason, lstring, + FStar_TypeChecker_Common.prob) FStar_Tuple4.tuple4 Prims.list ; ctr: Prims.int ; defer_ok: defer_ok_t ; @@ -155,8 +155,8 @@ let (__proj__Mkworklist__item__attempting : typeclass_variables;_} -> attempting let (__proj__Mkworklist__item__wl_deferred : worklist -> - (Prims.int * FStar_TypeChecker_Common.deferred_reason * lstring * - FStar_TypeChecker_Common.prob) Prims.list) + (Prims.int, FStar_TypeChecker_Common.deferred_reason, lstring, + FStar_TypeChecker_Common.prob) FStar_Tuple4.tuple4 Prims.list) = fun projectee -> match projectee with @@ -165,8 +165,8 @@ let (__proj__Mkworklist__item__wl_deferred : typeclass_variables;_} -> wl_deferred let (__proj__Mkworklist__item__wl_deferred_to_tac : worklist -> - (Prims.int * FStar_TypeChecker_Common.deferred_reason * lstring * - FStar_TypeChecker_Common.prob) Prims.list) + (Prims.int, FStar_TypeChecker_Common.deferred_reason, lstring, + FStar_TypeChecker_Common.prob) FStar_Tuple4.tuple4 Prims.list) = fun projectee -> match projectee with @@ -228,8 +228,8 @@ let (__proj__Mkworklist__item__typeclass_variables : let (debug : worklist -> FStar_Options.debug_level_t -> Prims.bool) = fun wl -> fun lvl -> FStar_TypeChecker_Env.debug wl.tcenv lvl let (as_deferred : - (Prims.int * FStar_TypeChecker_Common.deferred_reason * lstring * - FStar_TypeChecker_Common.prob) Prims.list -> + (Prims.int, FStar_TypeChecker_Common.deferred_reason, lstring, + FStar_TypeChecker_Common.prob) FStar_Tuple4.tuple4 Prims.list -> FStar_TypeChecker_Common.deferred) = fun wl_def -> @@ -241,8 +241,8 @@ let (as_deferred : let (as_wl_deferred : worklist -> FStar_TypeChecker_Common.deferred -> - (Prims.int * FStar_TypeChecker_Common.deferred_reason * lstring * - FStar_TypeChecker_Common.prob) Prims.list) + (Prims.int, FStar_TypeChecker_Common.deferred_reason, lstring, + FStar_TypeChecker_Common.prob) FStar_Tuple4.tuple4 Prims.list) = fun wl -> fun d -> @@ -262,8 +262,8 @@ let (new_uvar : FStar_Syntax_Syntax.should_check_uvar -> FStar_Syntax_Syntax.ctx_uvar_meta_t FStar_Pervasives_Native.option -> - (FStar_Syntax_Syntax.ctx_uvar * FStar_Syntax_Syntax.term * - worklist)) + (FStar_Syntax_Syntax.ctx_uvar, FStar_Syntax_Syntax.term, + worklist) FStar_Tuple3.tuple3) = fun reason -> fun wl -> @@ -333,8 +333,8 @@ let (copy_uvar : FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> worklist -> - (FStar_Syntax_Syntax.ctx_uvar * FStar_Syntax_Syntax.term * - worklist)) + (FStar_Syntax_Syntax.ctx_uvar, FStar_Syntax_Syntax.term, worklist) + FStar_Tuple3.tuple3) = fun u -> fun bs -> @@ -455,15 +455,16 @@ let (copy_uvar : env1.FStar_TypeChecker_Env.gamma uu___ t uu___1 u.FStar_Syntax_Syntax.ctx_uvar_meta type solution = - | Success of (FStar_TypeChecker_Common.deferred * - FStar_TypeChecker_Common.deferred * FStar_TypeChecker_Common.implicits) + | Success of (FStar_TypeChecker_Common.deferred, + FStar_TypeChecker_Common.deferred, FStar_TypeChecker_Common.implicits) + FStar_Tuple3.tuple3 | Failed of (FStar_TypeChecker_Common.prob * lstring) let (uu___is_Success : solution -> Prims.bool) = fun projectee -> match projectee with | Success _0 -> true | uu___ -> false let (__proj__Success__item___0 : solution -> - (FStar_TypeChecker_Common.deferred * FStar_TypeChecker_Common.deferred * - FStar_TypeChecker_Common.implicits)) + (FStar_TypeChecker_Common.deferred, FStar_TypeChecker_Common.deferred, + FStar_TypeChecker_Common.implicits) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Success _0 -> _0 let (uu___is_Failed : solution -> Prims.bool) = fun projectee -> match projectee with | Failed _0 -> true | uu___ -> false @@ -1013,8 +1014,8 @@ let (singleton : let wl_of_guard : 'uuuuu 'uuuuu1 . FStar_TypeChecker_Env.env -> - ('uuuuu * 'uuuuu1 * FStar_TypeChecker_Common.prob) Prims.list -> - worklist + ('uuuuu, 'uuuuu1, FStar_TypeChecker_Common.prob) FStar_Tuple3.tuple3 + Prims.list -> worklist = fun env -> fun g -> @@ -1879,13 +1880,13 @@ let (wl_to_string : worklist -> Prims.string) = FStar_Compiler_Util.format2 "{ attempting = [ %s ];\ndeferred = [ %s ] }\n" uu___ uu___1 type flex_t = - | Flex of (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.ctx_uvar * - FStar_Syntax_Syntax.args) + | Flex of (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.ctx_uvar, + FStar_Syntax_Syntax.args) FStar_Tuple3.tuple3 let (uu___is_Flex : flex_t -> Prims.bool) = fun projectee -> true let (__proj__Flex__item___0 : flex_t -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.ctx_uvar * - FStar_Syntax_Syntax.args)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.ctx_uvar, + FStar_Syntax_Syntax.args) FStar_Tuple3.tuple3) = fun projectee -> match projectee with | Flex _0 -> _0 let (flex_reason : flex_t -> Prims.string) = fun uu___ -> @@ -2338,8 +2339,8 @@ let (occurs : let (occurs_check : FStar_Syntax_Syntax.ctx_uvar -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.ctx_uvar Prims.list * Prims.bool * Prims.string - FStar_Pervasives_Native.option)) + (FStar_Syntax_Syntax.ctx_uvar Prims.list, Prims.bool, + Prims.string FStar_Pervasives_Native.option) FStar_Tuple3.tuple3) = fun uk -> fun t -> @@ -3467,8 +3468,9 @@ let (rank : })) let (next_prob : worklist -> - (FStar_TypeChecker_Common.prob * FStar_TypeChecker_Common.prob Prims.list - * FStar_TypeChecker_Common.rank_t) FStar_Pervasives_Native.option) + (FStar_TypeChecker_Common.prob, FStar_TypeChecker_Common.prob Prims.list, + FStar_TypeChecker_Common.rank_t) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun wl -> let rec aux uu___ probs = @@ -4311,9 +4313,9 @@ let (apply_substitutive_indexed_subcomp : worklist -> Prims.string -> FStar_Compiler_Range_Type.range -> - (FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Common.prob Prims.list * - worklist)) + (FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.prob Prims.list, worklist) + FStar_Tuple3.tuple3) = fun env -> fun k -> @@ -4367,12 +4369,12 @@ let (apply_substitutive_indexed_subcomp : (fun uu___7 -> fun uu___8 -> fun uu___9 -> - match (uu___7, - uu___8, + match ((uu___7, + uu___8), uu___9) with - | ((ps, wl1), - (t1, uu___10), + | (((ps, wl1), + (t1, uu___10)), (t2, uu___11)) -> let uu___12 = @@ -4466,12 +4468,12 @@ let (apply_substitutive_indexed_subcomp : (fun uu___6 -> fun uu___7 -> fun uu___8 -> - match (uu___6, - uu___7, + match ((uu___6, + uu___7), uu___8) with - | ((ps, wl2), - (t1, uu___9), + | (((ps, wl2), + (t1, uu___9)), (t2, uu___10)) -> let uu___11 = sub_prob wl2 t1 @@ -4617,8 +4619,9 @@ let (apply_ad_hoc_indexed_subcomp : worklist -> Prims.string -> FStar_Compiler_Range_Type.range -> - (FStar_Syntax_Syntax.typ * FStar_TypeChecker_Common.prob - Prims.list * worklist)) + (FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Common.prob Prims.list, worklist) + FStar_Tuple3.tuple3) = fun env -> fun bs -> @@ -5308,11 +5311,12 @@ and (solve_rigid_flex_or_flex_rigid_subtyping : (fun uu___10 -> fun uu___11 -> fun uu___12 -> - match (uu___10, uu___11, + match ((uu___10, + uu___11), uu___12) with - | ((probs, wl4), - (a1, uu___13), + | (((probs, wl4), + (a1, uu___13)), (a2, uu___14)) -> let uu___15 = eq_prob a1 a2 wl4 in @@ -7206,13 +7210,13 @@ and (solve_t_flex_rigid_eq : (fun uu___16 -> fun uu___17 -> fun uu___18 -> - match (uu___16, - uu___17, + match ((uu___16, + uu___17), uu___18) with - | ((probs, wl5), - (arg_lhs, - uu___19), + | (((probs, wl5), + (arg_lhs, + uu___19)), (arg_rhs, uu___20)) -> let uu___21 @@ -12197,8 +12201,8 @@ and (solve_c : (fun uu___7 -> fun uu___8 -> fun uu___9 -> - match (uu___7, uu___8, uu___9) with - | ((a1, uu___10), (a2, uu___11), + match ((uu___7, uu___8), uu___9) with + | (((a1, uu___10), (a2, uu___11)), (arg_sub_probs, wl3)) -> let uu___12 = sub_prob wl3 a1 @@ -12477,8 +12481,8 @@ and (solve_c : (fun uu___9 -> fun uu___10 -> fun uu___11 -> - match (uu___9, uu___10, uu___11) with - | ((a1, uu___12), (a2, uu___13), + match ((uu___9, uu___10), uu___11) with + | (((a1, uu___12), (a2, uu___13)), (is_sub_probs, wl2)) -> let uu___14 = is_uvar a1 in if uu___14 @@ -13281,8 +13285,8 @@ let (new_t_prob : FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> FStar_TypeChecker_Common.rel -> FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax -> - (FStar_TypeChecker_Common.prob * FStar_Syntax_Syntax.bv * - worklist)) + (FStar_TypeChecker_Common.prob, FStar_Syntax_Syntax.bv, worklist) + FStar_Tuple3.tuple3) = fun wl -> fun env -> @@ -13302,11 +13306,13 @@ let (new_t_prob : let (solve_and_commit : worklist -> ((FStar_TypeChecker_Common.prob * lstring) -> - (FStar_TypeChecker_Common.deferred * FStar_TypeChecker_Common.deferred - * FStar_TypeChecker_Common.implicits) FStar_Pervasives_Native.option) + (FStar_TypeChecker_Common.deferred, FStar_TypeChecker_Common.deferred, + FStar_TypeChecker_Common.implicits) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) -> - (FStar_TypeChecker_Common.deferred * FStar_TypeChecker_Common.deferred - * FStar_TypeChecker_Common.implicits) FStar_Pervasives_Native.option) + (FStar_TypeChecker_Common.deferred, FStar_TypeChecker_Common.deferred, + FStar_TypeChecker_Common.implicits) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun wl -> fun err -> @@ -13360,9 +13366,10 @@ let (solve_and_commit : let (with_guard : FStar_TypeChecker_Env.env -> FStar_TypeChecker_Common.prob -> - (FStar_TypeChecker_Common.deferred * FStar_TypeChecker_Common.deferred - * FStar_TypeChecker_Common.implicits) FStar_Pervasives_Native.option - -> FStar_TypeChecker_Common.guard_t FStar_Pervasives_Native.option) + (FStar_TypeChecker_Common.deferred, FStar_TypeChecker_Common.deferred, + FStar_TypeChecker_Common.implicits) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option -> + FStar_TypeChecker_Common.guard_t FStar_Pervasives_Native.option) = fun env -> fun prob -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Tc.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Tc.ml index 4c91149d164..d767a1f1071 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Tc.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Tc.ml @@ -822,9 +822,9 @@ let (tc_sig_let : FStar_Syntax_Syntax.sigelt -> (Prims.bool * FStar_Syntax_Syntax.letbinding Prims.list) -> FStar_Ident.lident Prims.list -> - (FStar_Syntax_Syntax.sigelt Prims.list * - FStar_Syntax_Syntax.sigelt Prims.list * - FStar_TypeChecker_Env.env)) + (FStar_Syntax_Syntax.sigelt Prims.list, + FStar_Syntax_Syntax.sigelt Prims.list, + FStar_TypeChecker_Env.env) FStar_Tuple3.tuple3) = fun env -> fun r -> @@ -2106,8 +2106,9 @@ let (tc_sig_let : let (tc_decl' : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.sigelt -> - (FStar_Syntax_Syntax.sigelt Prims.list * FStar_Syntax_Syntax.sigelt - Prims.list * FStar_TypeChecker_Env.env)) + (FStar_Syntax_Syntax.sigelt Prims.list, + FStar_Syntax_Syntax.sigelt Prims.list, FStar_TypeChecker_Env.env) + FStar_Tuple3.tuple3) = fun env0 -> fun se -> @@ -4131,8 +4132,9 @@ let (tc_decl' : let (tc_decl : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.sigelt -> - (FStar_Syntax_Syntax.sigelt Prims.list * FStar_Syntax_Syntax.sigelt - Prims.list * FStar_TypeChecker_Env.env)) + (FStar_Syntax_Syntax.sigelt Prims.list, + FStar_Syntax_Syntax.sigelt Prims.list, FStar_TypeChecker_Env.env) + FStar_Tuple3.tuple3) = fun env -> fun se -> @@ -4916,8 +4918,8 @@ let (uu___914 : unit) = let (snapshot_context : FStar_TypeChecker_Env.env -> Prims.string -> - ((Prims.int * Prims.int * FStar_TypeChecker_Env.solver_depth_t * - Prims.int) * FStar_TypeChecker_Env.env)) + ((Prims.int, Prims.int, FStar_TypeChecker_Env.solver_depth_t, + Prims.int) FStar_Tuple4.tuple4 * FStar_TypeChecker_Env.env)) = fun env -> fun msg -> @@ -4926,8 +4928,8 @@ let (snapshot_context : let (rollback_context : FStar_TypeChecker_Env.solver_t -> Prims.string -> - (Prims.int * Prims.int * FStar_TypeChecker_Env.solver_depth_t * - Prims.int) FStar_Pervasives_Native.option -> + (Prims.int, Prims.int, FStar_TypeChecker_Env.solver_depth_t, Prims.int) + FStar_Tuple4.tuple4 FStar_Pervasives_Native.option -> FStar_TypeChecker_Env.env) = fun solver -> @@ -5106,8 +5108,8 @@ let (tc_more_partial_modul : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.modul -> FStar_Syntax_Syntax.sigelt Prims.list -> - (FStar_Syntax_Syntax.modul * FStar_Syntax_Syntax.sigelt Prims.list * - FStar_TypeChecker_Env.env)) + (FStar_Syntax_Syntax.modul, FStar_Syntax_Syntax.sigelt Prims.list, + FStar_TypeChecker_Env.env) FStar_Tuple3.tuple3) = fun env -> fun modul -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_TcEffect.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_TcEffect.ml index 226e42cdf27..dd999f4e371 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_TcEffect.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_TcEffect.ml @@ -2,8 +2,9 @@ open Prims let (dmff_cps_and_elaborate : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.eff_decl -> - (FStar_Syntax_Syntax.sigelt Prims.list * FStar_Syntax_Syntax.eff_decl * - FStar_Syntax_Syntax.sigelt FStar_Pervasives_Native.option)) + (FStar_Syntax_Syntax.sigelt Prims.list, FStar_Syntax_Syntax.eff_decl, + FStar_Syntax_Syntax.sigelt FStar_Pervasives_Native.option) + FStar_Tuple3.tuple3) = fun env -> fun ed -> FStar_TypeChecker_DMFF.cps_and_elaborate env ed let (check_and_gen : FStar_TypeChecker_Env.env -> @@ -11,8 +12,8 @@ let (check_and_gen : Prims.string -> Prims.int -> (FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.term) -> - (FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.typ)) + (FStar_Syntax_Syntax.univ_names, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.typ) FStar_Tuple3.tuple3) = fun env -> fun eff_name -> @@ -9428,11 +9429,13 @@ let (tc_lift : })))))) let (tc_effect_abbrev : FStar_TypeChecker_Env.env -> - (FStar_Ident.lident * FStar_Syntax_Syntax.univ_names * - FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.comp) -> + (FStar_Ident.lident, FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.comp) + FStar_Tuple4.tuple4 -> FStar_Compiler_Range_Type.range -> - (FStar_Ident.lident * FStar_Syntax_Syntax.univ_names * - FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.comp)) + (FStar_Ident.lident, FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.comp) + FStar_Tuple4.tuple4) = fun env -> fun uu___ -> @@ -9694,8 +9697,9 @@ let (tc_polymonadic_bind : FStar_Ident.lident -> FStar_Ident.lident -> FStar_Syntax_Syntax.tscheme -> - (FStar_Syntax_Syntax.tscheme * FStar_Syntax_Syntax.tscheme * - FStar_Syntax_Syntax.indexed_effect_combinator_kind)) + (FStar_Syntax_Syntax.tscheme, FStar_Syntax_Syntax.tscheme, + FStar_Syntax_Syntax.indexed_effect_combinator_kind) + FStar_Tuple3.tuple3) = fun env -> fun m -> @@ -9794,8 +9798,9 @@ let (tc_polymonadic_subcomp : FStar_Ident.lident -> FStar_Ident.lident -> FStar_Syntax_Syntax.tscheme -> - (FStar_Syntax_Syntax.tscheme * FStar_Syntax_Syntax.tscheme * - FStar_Syntax_Syntax.indexed_effect_combinator_kind)) + (FStar_Syntax_Syntax.tscheme, FStar_Syntax_Syntax.tscheme, + FStar_Syntax_Syntax.indexed_effect_combinator_kind) + FStar_Tuple3.tuple3) = fun env0 -> fun m -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_TcInductive.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_TcInductive.ml index 676e915c74f..a93be06212b 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_TcInductive.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_TcInductive.ml @@ -8,8 +8,9 @@ let (unfold_whnf : let (tc_tycon : FStar_TypeChecker_Env.env_t -> FStar_Syntax_Syntax.sigelt -> - (FStar_TypeChecker_Env.env_t * FStar_Syntax_Syntax.sigelt * - FStar_Syntax_Syntax.universe * FStar_TypeChecker_Common.guard_t)) + (FStar_TypeChecker_Env.env_t, FStar_Syntax_Syntax.sigelt, + FStar_Syntax_Syntax.universe, FStar_TypeChecker_Common.guard_t) + FStar_Tuple4.tuple4) = fun env -> fun s -> @@ -1085,9 +1086,9 @@ let (get_optimized_haseq_axiom : FStar_Syntax_Syntax.sigelt -> FStar_Syntax_Syntax.subst_elt Prims.list -> FStar_Syntax_Syntax.univ_names -> - (FStar_Ident.lident * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.binders * - FStar_Syntax_Syntax.term)) + (FStar_Ident.lident, FStar_Syntax_Syntax.term, + FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.binders, + FStar_Syntax_Syntax.term) FStar_Tuple5.tuple5) = fun en -> fun ty -> @@ -1335,15 +1336,17 @@ let (optimized_haseq_ty : FStar_Syntax_Syntax.sigelts -> FStar_Syntax_Syntax.subst_elt Prims.list -> FStar_Syntax_Syntax.univ_name Prims.list -> - ((FStar_Ident.lident * FStar_Syntax_Syntax.term) Prims.list * - FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax) -> + ((FStar_Ident.lident * FStar_Syntax_Syntax.term) Prims.list, + FStar_TypeChecker_Env.env, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple4.tuple4 -> FStar_Syntax_Syntax.sigelt -> - ((FStar_Ident.lident * FStar_Syntax_Syntax.term) Prims.list * - FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax * FStar_Syntax_Syntax.term' - FStar_Syntax_Syntax.syntax)) + ((FStar_Ident.lident * FStar_Syntax_Syntax.term) Prims.list, + FStar_TypeChecker_Env.env, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) + FStar_Tuple4.tuple4) = fun all_datas_in_the_bundle -> fun usubst -> @@ -1873,8 +1876,8 @@ let (check_inductive_well_typedness : FStar_Syntax_Syntax.sigelt Prims.list -> FStar_Syntax_Syntax.qualifier Prims.list -> FStar_Ident.lident Prims.list -> - (FStar_Syntax_Syntax.sigelt * FStar_Syntax_Syntax.sigelt Prims.list - * FStar_Syntax_Syntax.sigelt Prims.list)) + (FStar_Syntax_Syntax.sigelt, FStar_Syntax_Syntax.sigelt Prims.list, + FStar_Syntax_Syntax.sigelt Prims.list) FStar_Tuple3.tuple3) = fun env -> fun ses -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_TcTerm.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_TcTerm.ml index 4d416a1b54f..e2c9e672609 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_TcTerm.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_TcTerm.ml @@ -486,8 +486,8 @@ let (value_check_expected_typ : (FStar_Syntax_Syntax.typ, FStar_TypeChecker_Common.lcomp) FStar_Pervasives.either -> FStar_TypeChecker_Env.guard_t -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -554,8 +554,8 @@ let (comp_check_expected_typ : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> FStar_TypeChecker_Common.lcomp -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -580,8 +580,8 @@ let (check_expected_effect : Prims.bool -> FStar_Syntax_Syntax.comp FStar_Pervasives_Native.option -> (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp) -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun use_eq -> @@ -839,8 +839,8 @@ let (check_expected_effect : let no_logical_guard : 'uuuuu 'uuuuu1 . FStar_TypeChecker_Env.env -> - ('uuuuu * 'uuuuu1 * FStar_TypeChecker_Env.guard_t) -> - ('uuuuu * 'uuuuu1 * FStar_TypeChecker_Env.guard_t) + ('uuuuu, 'uuuuu1, FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3 -> + ('uuuuu, 'uuuuu1, FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3 = fun env -> fun uu___ -> @@ -1109,8 +1109,8 @@ let (guard_letrecs : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.comp' FStar_Syntax_Syntax.syntax -> - (FStar_Syntax_Syntax.lbname * FStar_Syntax_Syntax.typ * - FStar_Syntax_Syntax.univ_names) Prims.list) + (FStar_Syntax_Syntax.lbname, FStar_Syntax_Syntax.typ, + FStar_Syntax_Syntax.univ_names) FStar_Tuple3.tuple3 Prims.list) = fun env -> fun actuals -> @@ -1633,8 +1633,8 @@ let (wrap_guard_with_tactic_opt : FStar_TypeChecker_Common.mk_by_tactic tactic uu___) let (is_comp_ascribed_reflect : FStar_Syntax_Syntax.term -> - (FStar_Ident.lident * FStar_Syntax_Syntax.term * - FStar_Syntax_Syntax.aqual) FStar_Pervasives_Native.option) + (FStar_Ident.lident, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.aqual) + FStar_Tuple3.tuple3 FStar_Pervasives_Native.option) = fun e -> let uu___ = @@ -1671,8 +1671,8 @@ let (is_comp_ascribed_reflect : let rec (tc_term : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -1841,8 +1841,8 @@ let rec (tc_term : and (tc_maybe_toplevel_term : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -3614,8 +3614,8 @@ and (tc_maybe_toplevel_term : and (tc_match : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun top -> @@ -4167,8 +4167,8 @@ and (tc_synth : FStar_Syntax_Syntax.arg_qualifier FStar_Pervasives_Native.option) Prims.list -> FStar_Compiler_Range_Type.range -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun head -> fun env -> @@ -4280,8 +4280,8 @@ and (tc_tactic : FStar_Syntax_Syntax.typ -> FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun a -> fun b -> @@ -4395,8 +4395,8 @@ and (check_instantiated_fvar : FStar_Syntax_Syntax.fv_qual FStar_Pervasives_Native.option -> FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.typ -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun v -> @@ -4445,8 +4445,8 @@ and (check_instantiated_fvar : and (tc_value : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -4932,8 +4932,8 @@ and (tc_constant : and (tc_comp : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.comp -> - (FStar_Syntax_Syntax.comp * FStar_Syntax_Syntax.universe * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.comp, FStar_Syntax_Syntax.universe, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun c -> @@ -5290,11 +5290,11 @@ and (tc_abs_expected_function_typ : (FStar_Syntax_Syntax.typ * Prims.bool) FStar_Pervasives_Native.option -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.typ FStar_Pervasives_Native.option * - FStar_Syntax_Syntax.binders * FStar_Syntax_Syntax.binders * - FStar_Syntax_Syntax.comp FStar_Pervasives_Native.option * - FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.term * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.typ FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.binders, + FStar_Syntax_Syntax.comp FStar_Pervasives_Native.option, + FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.term, + FStar_TypeChecker_Env.guard_t) FStar_Tuple7.tuple7) = fun env -> fun bs -> @@ -5892,10 +5892,11 @@ and (tc_abs_check_binders : FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.binders -> Prims.bool -> - (FStar_TypeChecker_Env.env * FStar_Syntax_Syntax.binders * + (FStar_TypeChecker_Env.env, FStar_Syntax_Syntax.binders, (FStar_Syntax_Syntax.binders, FStar_Syntax_Syntax.binders) - FStar_Pervasives.either FStar_Pervasives_Native.option * - FStar_TypeChecker_Env.guard_t * FStar_Syntax_Syntax.subst_t)) + FStar_Pervasives.either FStar_Pervasives_Native.option, + FStar_TypeChecker_Env.guard_t, FStar_Syntax_Syntax.subst_t) + FStar_Tuple5.tuple5) = fun env -> fun bs -> @@ -6149,8 +6150,8 @@ and (tc_abs : FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.binders -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun top -> @@ -6644,8 +6645,8 @@ and (check_application_args : Prims.list -> (FStar_Syntax_Syntax.typ * Prims.bool) FStar_Pervasives_Native.option -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun head -> @@ -7969,8 +7970,8 @@ and (check_short_circuit_args : Prims.list -> (FStar_Syntax_Syntax.typ * Prims.bool) FStar_Pervasives_Native.option -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun head -> @@ -8054,10 +8055,10 @@ and (tc_pat : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.typ -> FStar_Syntax_Syntax.pat -> - (FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.bv Prims.list * - FStar_Syntax_Syntax.term Prims.list * FStar_TypeChecker_Env.env * - FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term * - FStar_TypeChecker_Env.guard_t * Prims.bool)) + (FStar_Syntax_Syntax.pat, FStar_Syntax_Syntax.bv Prims.list, + FStar_Syntax_Syntax.term Prims.list, FStar_TypeChecker_Env.env, + FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term, + FStar_TypeChecker_Env.guard_t, Prims.bool) FStar_Tuple8.tuple8) = fun env -> fun pat_t -> @@ -9123,14 +9124,15 @@ and (tc_eqn : FStar_Syntax_Syntax.match_returns_ascription FStar_Pervasives_Native.option -> FStar_Syntax_Syntax.branch -> - ((FStar_Syntax_Syntax.pat * FStar_Syntax_Syntax.term - FStar_Pervasives_Native.option * FStar_Syntax_Syntax.term) * - FStar_Syntax_Syntax.formula * FStar_Ident.lident * + ((FStar_Syntax_Syntax.pat, + FStar_Syntax_Syntax.term FStar_Pervasives_Native.option, + FStar_Syntax_Syntax.term) FStar_Tuple3.tuple3, + FStar_Syntax_Syntax.formula, FStar_Ident.lident, FStar_Syntax_Syntax.cflag Prims.list - FStar_Pervasives_Native.option * + FStar_Pervasives_Native.option, (Prims.bool -> FStar_TypeChecker_Common.lcomp) - FStar_Pervasives_Native.option * FStar_TypeChecker_Env.guard_t * - Prims.bool)) + FStar_Pervasives_Native.option, + FStar_TypeChecker_Env.guard_t, Prims.bool) FStar_Tuple7.tuple7) = fun scrutinee -> fun env -> @@ -10286,8 +10288,8 @@ and (tc_eqn : and (check_top_level_let : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -10464,8 +10466,8 @@ and (maybe_intro_smt_lemma : and (check_inner_let : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -10784,8 +10786,8 @@ and (check_inner_let : and (check_top_level_let_rec : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun top -> @@ -10919,8 +10921,8 @@ and (check_top_level_let_rec : and (check_inner_let_rec : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun top -> @@ -11150,8 +11152,9 @@ and (build_let_rec_env : Prims.bool -> FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.letbinding Prims.list -> - (FStar_Syntax_Syntax.letbinding Prims.list * - FStar_TypeChecker_Env.env_t * FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.letbinding Prims.list, + FStar_TypeChecker_Env.env_t, FStar_TypeChecker_Env.guard_t) + FStar_Tuple3.tuple3) = fun _top_level -> fun env -> @@ -11690,9 +11693,9 @@ and (check_let_bound_def : Prims.bool -> FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.letbinding -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.univ_names * - FStar_TypeChecker_Common.lcomp * FStar_TypeChecker_Env.guard_t * - Prims.bool)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.univ_names, + FStar_TypeChecker_Common.lcomp, FStar_TypeChecker_Env.guard_t, + Prims.bool) FStar_Tuple5.tuple5) = fun top_level -> fun env -> @@ -11860,10 +11863,10 @@ and (check_lbtyp : Prims.bool -> FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.letbinding -> - (FStar_Syntax_Syntax.typ FStar_Pervasives_Native.option * - FStar_TypeChecker_Env.guard_t * FStar_Syntax_Syntax.univ_names * - FStar_Syntax_Syntax.subst_elt Prims.list * - FStar_TypeChecker_Env.env)) + (FStar_Syntax_Syntax.typ FStar_Pervasives_Native.option, + FStar_TypeChecker_Env.guard_t, FStar_Syntax_Syntax.univ_names, + FStar_Syntax_Syntax.subst_elt Prims.list, + FStar_TypeChecker_Env.env) FStar_Tuple5.tuple5) = fun top_level -> fun env -> @@ -11937,8 +11940,9 @@ and (check_lbtyp : and (tc_binder : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.binder -> - (FStar_Syntax_Syntax.binder * FStar_TypeChecker_Env.env * - FStar_TypeChecker_Env.guard_t * FStar_Syntax_Syntax.universe)) + (FStar_Syntax_Syntax.binder, FStar_TypeChecker_Env.env, + FStar_TypeChecker_Env.guard_t, FStar_Syntax_Syntax.universe) + FStar_Tuple4.tuple4) = fun env -> fun uu___ -> @@ -12016,8 +12020,9 @@ and (tc_binder : and (tc_binders : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.binders -> - (FStar_Syntax_Syntax.binders * FStar_TypeChecker_Env.env * - FStar_TypeChecker_Env.guard_t * FStar_Syntax_Syntax.universes)) + (FStar_Syntax_Syntax.binders, FStar_TypeChecker_Env.env, + FStar_TypeChecker_Env.guard_t, FStar_Syntax_Syntax.universes) + FStar_Tuple4.tuple4) = fun env -> fun bs -> @@ -12084,8 +12089,8 @@ and (tc_tot_or_gtot_term_maybe_solve_deferred : FStar_Syntax_Syntax.term -> Prims.string -> Prims.bool -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -12154,8 +12159,8 @@ and (tc_tot_or_gtot_term' : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> Prims.string -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -12163,16 +12168,16 @@ and (tc_tot_or_gtot_term' : and (tc_tot_or_gtot_term : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> tc_tot_or_gtot_term' env e "" and (tc_check_tot_or_gtot_term : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.typ -> Prims.string -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -12226,8 +12231,8 @@ let (typeof_tot_or_gtot_term : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> Prims.bool -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -13013,8 +13018,8 @@ let (universe_of : let (tc_tparams : FStar_TypeChecker_Env.env_t -> FStar_Syntax_Syntax.binders -> - (FStar_Syntax_Syntax.binders * FStar_TypeChecker_Env.env * - FStar_Syntax_Syntax.universes)) + (FStar_Syntax_Syntax.binders, FStar_TypeChecker_Env.env, + FStar_Syntax_Syntax.universes) FStar_Tuple3.tuple3) = fun env0 -> fun tps -> diff --git a/ocaml/fstar-lib/generated/FStar_TypeChecker_Util.ml b/ocaml/fstar-lib/generated/FStar_TypeChecker_Util.ml index e77cba8301c..379381f0f93 100644 --- a/ocaml/fstar-lib/generated/FStar_TypeChecker_Util.ml +++ b/ocaml/fstar-lib/generated/FStar_TypeChecker_Util.ml @@ -13,9 +13,10 @@ let (new_implicit_var : FStar_Compiler_Range_Type.range -> FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.typ -> - (FStar_Syntax_Syntax.term * (FStar_Syntax_Syntax.ctx_uvar * - FStar_Compiler_Range_Type.range) Prims.list * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, + (FStar_Syntax_Syntax.ctx_uvar * FStar_Compiler_Range_Type.range) + Prims.list, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun reason -> fun r -> @@ -133,8 +134,8 @@ let (check_uvars : let (extract_let_rec_annotation : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.letbinding -> - (FStar_Syntax_Syntax.univ_names * FStar_Syntax_Syntax.typ * - FStar_Syntax_Syntax.term * Prims.bool)) + (FStar_Syntax_Syntax.univ_names, FStar_Syntax_Syntax.typ, + FStar_Syntax_Syntax.term, Prims.bool) FStar_Tuple4.tuple4) = fun env -> fun uu___ -> @@ -641,8 +642,8 @@ let (lcomp_univ_opt : match uu___ with | (c, g) -> ((comp_univ_opt c), g) let (destruct_wp_comp : FStar_Syntax_Syntax.comp_typ -> - (FStar_Syntax_Syntax.universe * FStar_Syntax_Syntax.typ * - FStar_Syntax_Syntax.typ)) + (FStar_Syntax_Syntax.universe, FStar_Syntax_Syntax.typ, + FStar_Syntax_Syntax.typ) FStar_Tuple3.tuple3) = fun c -> FStar_Syntax_Util.destruct_comp c let (mk_comp_l : FStar_Ident.lident -> @@ -923,9 +924,9 @@ let (lift_comps_sep_guards : FStar_Syntax_Syntax.comp -> FStar_Syntax_Syntax.bv FStar_Pervasives_Native.option -> Prims.bool -> - (FStar_Ident.lident * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.comp * FStar_TypeChecker_Env.guard_t * - FStar_TypeChecker_Env.guard_t)) + (FStar_Ident.lident, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.comp, FStar_TypeChecker_Env.guard_t, + FStar_TypeChecker_Env.guard_t) FStar_Tuple5.tuple5) = fun env -> fun c1 -> @@ -985,8 +986,9 @@ let (lift_comps : FStar_Syntax_Syntax.comp -> FStar_Syntax_Syntax.bv FStar_Pervasives_Native.option -> Prims.bool -> - (FStar_Ident.lident * FStar_Syntax_Syntax.comp * - FStar_Syntax_Syntax.comp * FStar_TypeChecker_Env.guard_t)) + (FStar_Ident.lident, FStar_Syntax_Syntax.comp, + FStar_Syntax_Syntax.comp, FStar_TypeChecker_Env.guard_t) + FStar_Tuple4.tuple4) = fun env -> fun c1 -> @@ -4318,9 +4320,10 @@ let (get_neg_branch_conds : let (bind_cases : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.typ -> - (FStar_Syntax_Syntax.typ * FStar_Ident.lident * - FStar_Syntax_Syntax.cflag Prims.list * - (Prims.bool -> FStar_TypeChecker_Common.lcomp)) Prims.list -> + (FStar_Syntax_Syntax.typ, FStar_Ident.lident, + FStar_Syntax_Syntax.cflag Prims.list, + Prims.bool -> FStar_TypeChecker_Common.lcomp) FStar_Tuple4.tuple4 + Prims.list -> FStar_Syntax_Syntax.bv -> FStar_TypeChecker_Common.lcomp) = fun env0 -> @@ -4637,8 +4640,8 @@ let (check_comp : FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.comp -> FStar_Syntax_Syntax.comp -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.comp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.comp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun use_eq -> @@ -4725,8 +4728,8 @@ let (universe_of_comp : let (check_trivial_precondition_wp : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.comp -> - (FStar_Syntax_Syntax.comp_typ * FStar_Syntax_Syntax.formula * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.comp_typ, FStar_Syntax_Syntax.formula, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun c -> @@ -5037,8 +5040,9 @@ let (find_coercion : FStar_TypeChecker_Common.lcomp -> FStar_Syntax_Syntax.typ -> FStar_Syntax_Syntax.term -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t) FStar_Pervasives_Native.option) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3 + FStar_Pervasives_Native.option) = fun env -> fun checked -> @@ -5514,8 +5518,8 @@ let (maybe_coerce_lc : FStar_Syntax_Syntax.term -> FStar_TypeChecker_Common.lcomp -> FStar_Syntax_Syntax.typ -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -5658,8 +5662,8 @@ let (weaken_result_typ : FStar_TypeChecker_Common.lcomp -> FStar_Syntax_Syntax.typ -> Prims.bool -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -6277,8 +6281,8 @@ let (maybe_instantiate : FStar_TypeChecker_Env.env -> FStar_Syntax_Syntax.term -> FStar_Syntax_Syntax.typ -> - (FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.typ * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.typ, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -6558,8 +6562,8 @@ let (check_has_type_maybe_coerce : FStar_TypeChecker_Common.lcomp -> FStar_Syntax_Syntax.typ -> Prims.bool -> - (FStar_Syntax_Syntax.term * FStar_TypeChecker_Common.lcomp * - FStar_TypeChecker_Env.guard_t)) + (FStar_Syntax_Syntax.term, FStar_TypeChecker_Common.lcomp, + FStar_TypeChecker_Env.guard_t) FStar_Tuple3.tuple3) = fun env -> fun e -> @@ -8502,8 +8506,8 @@ let (find_record_or_dc_from_typ : FStar_Syntax_Syntax.typ FStar_Pervasives_Native.option -> FStar_Syntax_Syntax.unresolved_constructor -> FStar_Compiler_Range_Type.range -> - (FStar_Syntax_DsEnv.record_or_dc * FStar_Ident.lident * - FStar_Syntax_Syntax.fv)) + (FStar_Syntax_DsEnv.record_or_dc, FStar_Ident.lident, + FStar_Syntax_Syntax.fv) FStar_Tuple3.tuple3) = fun env -> fun t -> diff --git a/ocaml/fstar-lib/generated/FStar_Universal.ml b/ocaml/fstar-lib/generated/FStar_Universal.ml index 34d55f874e0..f26c55d9e24 100644 --- a/ocaml/fstar-lib/generated/FStar_Universal.ml +++ b/ocaml/fstar-lib/generated/FStar_Universal.ml @@ -1006,8 +1006,9 @@ let (tc_one_file : Prims.string FStar_Pervasives_Native.option -> Prims.string -> FStar_Parser_Dep.parsing_data -> - (FStar_CheckedFiles.tc_result * FStar_Extraction_ML_Syntax.mllib - FStar_Pervasives_Native.option * uenv)) + (FStar_CheckedFiles.tc_result, + FStar_Extraction_ML_Syntax.mllib FStar_Pervasives_Native.option, + uenv) FStar_Tuple3.tuple3) = fun env -> fun pre_fn -> @@ -1305,9 +1306,9 @@ let (tc_one_file_from_remaining : Prims.string Prims.list -> uenv -> FStar_Parser_Dep.deps -> - (Prims.string Prims.list * FStar_CheckedFiles.tc_result * - FStar_Extraction_ML_Syntax.mllib FStar_Pervasives_Native.option * - uenv)) + (Prims.string Prims.list, FStar_CheckedFiles.tc_result, + FStar_Extraction_ML_Syntax.mllib FStar_Pervasives_Native.option, + uenv) FStar_Tuple4.tuple4) = fun remaining -> fun env -> @@ -1337,11 +1338,13 @@ let (tc_one_file_from_remaining : (remaining1, nmods, mllib, env1) let rec (tc_fold_interleave : FStar_Parser_Dep.deps -> - (FStar_CheckedFiles.tc_result Prims.list * (uenv * - FStar_Extraction_ML_Syntax.mllib) Prims.list * uenv) -> + (FStar_CheckedFiles.tc_result Prims.list, + (uenv * FStar_Extraction_ML_Syntax.mllib) Prims.list, uenv) + FStar_Tuple3.tuple3 -> Prims.string Prims.list -> - (FStar_CheckedFiles.tc_result Prims.list * (uenv * - FStar_Extraction_ML_Syntax.mllib) Prims.list * uenv)) + (FStar_CheckedFiles.tc_result Prims.list, + (uenv * FStar_Extraction_ML_Syntax.mllib) Prims.list, uenv) + FStar_Tuple3.tuple3) = fun deps -> fun acc -> @@ -1378,7 +1381,8 @@ let rec (tc_fold_interleave : let (batch_mode_tc : Prims.string Prims.list -> FStar_Parser_Dep.deps -> - (FStar_CheckedFiles.tc_result Prims.list * uenv * (uenv -> uenv))) + (FStar_CheckedFiles.tc_result Prims.list, uenv, uenv -> uenv) + FStar_Tuple3.tuple3) = fun filenames -> fun dep_graph -> diff --git a/ocaml/fstar-lib/generated/LowStar_BufferView.ml b/ocaml/fstar-lib/generated/LowStar_BufferView.ml index 130cf325e68..07a561da97e 100644 --- a/ocaml/fstar-lib/generated/LowStar_BufferView.ml +++ b/ocaml/fstar-lib/generated/LowStar_BufferView.ml @@ -22,7 +22,7 @@ let __proj__BufferView__item__v : fun projectee -> match projectee with | BufferView (buf, v) -> v type 'dest buffer = (unit, unit, unit, (Obj.t, Obj.t, Obj.t, 'dest) buffer_view) - FStar_Pervasives.dtuple4 + FStar_DTuple4.dtuple4 type ('dest, 'b) as_buffer_t = (unit, unit, unit) LowStar_Monotonic_Buffer.mbuffer let as_buffer : 'b . 'b buffer -> ('b, unit) as_buffer_t = @@ -30,13 +30,13 @@ let as_buffer : 'b . 'b buffer -> ('b, unit) as_buffer_t = (fun v -> Obj.magic (__proj__BufferView__item__buf - (FStar_Pervasives.__proj__Mkdtuple4__item___4 v))) uu___ + (FStar_DTuple4.__proj__Mkdtuple4__item___4 v))) uu___ let get_view : 'b . 'b buffer -> (unit, 'b) view = fun uu___ -> (fun v -> Obj.magic (__proj__BufferView__item__v - (FStar_Pervasives.__proj__Mkdtuple4__item___4 v))) uu___ + (FStar_DTuple4.__proj__Mkdtuple4__item___4 v))) uu___ type ('b, 'h, 'vb) live = (unit, unit, unit, unit, unit) LowStar_Monotonic_Buffer.live type ('b, 'vb, 'h, 'hu) modifies = diff --git a/ocaml/fstar-lib/generated/LowStar_BufferView_Down.ml b/ocaml/fstar-lib/generated/LowStar_BufferView_Down.ml index 90dafda1b5d..db8c0f80019 100644 --- a/ocaml/fstar-lib/generated/LowStar_BufferView_Down.ml +++ b/ocaml/fstar-lib/generated/LowStar_BufferView_Down.ml @@ -24,7 +24,7 @@ let __proj__BufferView__item__v : = fun projectee -> match projectee with | BufferView (buf, v) -> v type 'dest buffer = (unit, unit, unit, (Obj.t, Obj.t, Obj.t, 'dest) buffer_view) - FStar_Pervasives.dtuple4 + FStar_DTuple4.dtuple4 type ('dest, 'b) as_buffer_t = (unit, unit, unit) LowStar_Monotonic_Buffer.mbuffer let as_buffer : 'b . 'b buffer -> ('b, unit) as_buffer_t = @@ -32,7 +32,7 @@ let as_buffer : 'b . 'b buffer -> ('b, unit) as_buffer_t = (fun v -> let uu___ = v in match uu___ with - | FStar_Pervasives.Mkdtuple4 + | FStar_DTuple4.Mkdtuple4 (uu___1, uu___2, uu___3, BufferView (b1, uu___4)) -> Obj.magic b1) uu___ let get_view : 'b . 'b buffer -> (unit, 'b) view = @@ -40,7 +40,7 @@ let get_view : 'b . 'b buffer -> (unit, 'b) view = (fun bv -> let uu___ = bv in match uu___ with - | FStar_Pervasives.Mkdtuple4 + | FStar_DTuple4.Mkdtuple4 (uu___1, uu___2, uu___3, BufferView (uu___4, v)) -> Obj.magic v) uu___ type ('b, 'h, 'vb) live = diff --git a/ocaml/fstar-lib/generated/LowStar_Monotonic_Buffer.ml b/ocaml/fstar-lib/generated/LowStar_Monotonic_Buffer.ml index a253fa8960d..b675696234c 100644 --- a/ocaml/fstar-lib/generated/LowStar_Monotonic_Buffer.ml +++ b/ocaml/fstar-lib/generated/LowStar_Monotonic_Buffer.ml @@ -103,9 +103,9 @@ type ('s1, 's2) loc_includes = type ('s1, 's2) loc_disjoint = (unit, unit, unit, unit) FStar_ModifiesGen.loc_disjoint type buf_t = - (unit, unit, unit, (Obj.t, Obj.t, Obj.t) mbuffer) FStar_Pervasives.dtuple4 + (unit, unit, unit, (Obj.t, Obj.t, Obj.t) mbuffer) FStar_DTuple4.dtuple4 let buf : 'a 'rrel 'rel . ('a, 'rrel, 'rel) mbuffer -> buf_t = - fun b -> FStar_Pervasives.Mkdtuple4 ((), (), (), (Obj.magic b)) + fun b -> FStar_DTuple4.Mkdtuple4 ((), (), (), (Obj.magic b)) type ('h, 'l) all_live = Obj.t type 'l all_disjoint = Obj.t type 'l loc_pairwise_disjoint = Obj.t diff --git a/ocaml/fstar-tests/generated/FStar_Tests_Norm.ml b/ocaml/fstar-tests/generated/FStar_Tests_Norm.ml index e6be8d4072a..12019efe880 100644 --- a/ocaml/fstar-tests/generated/FStar_Tests_Norm.ml +++ b/ocaml/fstar-tests/generated/FStar_Tests_Norm.ml @@ -266,8 +266,9 @@ let (encode_nat : Prims.int -> FStar_Syntax_Syntax.term) = else (let uu___1 = snat out in aux uu___1 (n1 - Prims.int_one)) in aux znat n let (default_tests : - (Prims.int * FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax * - FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) Prims.list) + (Prims.int, FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax, + FStar_Syntax_Syntax.term' FStar_Syntax_Syntax.syntax) FStar_Tuple3.tuple3 + Prims.list) = FStar_Tests_Pars.pars_and_tc_fragment "let rec copy (x:list int) : Tot (list int) = match x with | [] -> [] | hd::tl -> hd::copy tl"; @@ -1349,7 +1350,7 @@ let (run_nbe_with_time : (i, uu___) let run_tests : 'uuuuu 'uuuuu1 'uuuuu2 'uuuuu3 . - ('uuuuu * 'uuuuu1 * 'uuuuu2) Prims.list -> + ('uuuuu, 'uuuuu1, 'uuuuu2) FStar_Tuple3.tuple3 Prims.list -> ('uuuuu -> 'uuuuu1 -> 'uuuuu2 -> 'uuuuu3) -> 'uuuuu3 Prims.list = fun tests -> @@ -1361,8 +1362,8 @@ let run_tests : match uu___1 with | (no, test, res) -> run no test res) tests in FStar_Options.__clear_unit_tests (); l) let (whnf_tests : - (Prims.int * FStar_Syntax_Syntax.term * FStar_Syntax_Syntax.term) - Prims.list) + (Prims.int, FStar_Syntax_Syntax.term, FStar_Syntax_Syntax.term) + FStar_Tuple3.tuple3 Prims.list) = FStar_Tests_Pars.pars_and_tc_fragment "assume val def : Type0"; FStar_Tests_Pars.pars_and_tc_fragment "assume val pred : Type0";