diff options
| author | Guillaume Boisseau | 2024-05-28 11:56:39 +0200 |
|---|---|---|
| committer | GitHub | 2024-05-28 11:56:39 +0200 |
| commit | ef7792c106a1f33397c206fcb5124b5ddfe64378 (patch) | |
| tree | a72fae46702fc4c2eb32e1361a2538eb7a5f5545 /tests | |
| parent | 4f26c7f6f1e554d8ec2f46e868d5dc66c4160d16 (diff) | |
| parent | c4d2af051c18c4c81b1e57a45210c37c89c8330f (diff) | |
Merge pull request #213 from AeneasVerif/cleanup-tests
Diffstat (limited to '')
83 files changed, 837 insertions, 4394 deletions
diff --git a/tests/coq/betree/BetreeMain_Funs.v b/tests/coq/betree/Betree_Funs.v index e0a1d8a2..b965d423 100644 --- a/tests/coq/betree/BetreeMain_Funs.v +++ b/tests/coq/betree/Betree_Funs.v @@ -1,18 +1,18 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: function definitions *) +(** [betree]: function definitions *) Require Import Primitives. Import Primitives. Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Require Import BetreeMain_Types. -Include BetreeMain_Types. -Require Import BetreeMain_FunsExternal. -Include BetreeMain_FunsExternal. -Module BetreeMain_Funs. +Require Import Betree_Types. +Include Betree_Types. +Require Import Betree_FunsExternal. +Include Betree_FunsExternal. +Module Betree_Funs. -(** [betree_main::betree::load_internal_node]: +(** [betree::betree::load_internal_node]: Source: 'src/betree.rs', lines 36:0-36:52 *) Definition betree_load_internal_node (id : u64) (st : state) : @@ -21,7 +21,7 @@ Definition betree_load_internal_node betree_utils_load_internal_node id st . -(** [betree_main::betree::store_internal_node]: +(** [betree::betree::store_internal_node]: Source: 'src/betree.rs', lines 41:0-41:60 *) Definition betree_store_internal_node (id : u64) (content : betree_List_t (u64 * betree_Message_t)) (st : state) : @@ -30,14 +30,14 @@ Definition betree_store_internal_node betree_utils_store_internal_node id content st . -(** [betree_main::betree::load_leaf_node]: +(** [betree::betree::load_leaf_node]: Source: 'src/betree.rs', lines 46:0-46:44 *) Definition betree_load_leaf_node (id : u64) (st : state) : result (state * (betree_List_t (u64 * u64))) := betree_utils_load_leaf_node id st . -(** [betree_main::betree::store_leaf_node]: +(** [betree::betree::store_leaf_node]: Source: 'src/betree.rs', lines 51:0-51:52 *) Definition betree_store_leaf_node (id : u64) (content : betree_List_t (u64 * u64)) (st : state) : @@ -46,19 +46,19 @@ Definition betree_store_leaf_node betree_utils_store_leaf_node id content st . -(** [betree_main::betree::fresh_node_id]: +(** [betree::betree::fresh_node_id]: Source: 'src/betree.rs', lines 55:0-55:48 *) Definition betree_fresh_node_id (counter : u64) : result (u64 * u64) := counter1 <- u64_add counter 1%u64; Ok (counter, counter1) . -(** [betree_main::betree::{betree_main::betree::NodeIdCounter}::new]: +(** [betree::betree::{betree::betree::NodeIdCounter}::new]: Source: 'src/betree.rs', lines 206:4-206:20 *) Definition betree_NodeIdCounter_new : result betree_NodeIdCounter_t := Ok {| betree_NodeIdCounter_next_node_id := 0%u64 |} . -(** [betree_main::betree::{betree_main::betree::NodeIdCounter}::fresh_id]: +(** [betree::betree::{betree::betree::NodeIdCounter}::fresh_id]: Source: 'src/betree.rs', lines 210:4-210:36 *) Definition betree_NodeIdCounter_fresh_id (self : betree_NodeIdCounter_t) : result (u64 * betree_NodeIdCounter_t) := @@ -67,7 +67,7 @@ Definition betree_NodeIdCounter_fresh_id {| betree_NodeIdCounter_next_node_id := i |}) . -(** [betree_main::betree::upsert_update]: +(** [betree::betree::upsert_update]: Source: 'src/betree.rs', lines 234:0-234:70 *) Definition betree_upsert_update (prev : option u64) (st : betree_UpsertFunState_t) : result u64 := @@ -88,7 +88,7 @@ Definition betree_upsert_update end . -(** [betree_main::betree::{betree_main::betree::List<T>#1}::len]: +(** [betree::betree::{betree::betree::List<T>#1}::len]: Source: 'src/betree.rs', lines 276:4-276:24 *) Fixpoint betree_List_len (T : Type) (n : nat) (self : betree_List_t T) : result u64 := @@ -102,7 +102,7 @@ Fixpoint betree_List_len end . -(** [betree_main::betree::{betree_main::betree::List<T>#1}::split_at]: +(** [betree::betree::{betree::betree::List<T>#1}::split_at]: Source: 'src/betree.rs', lines 284:4-284:51 *) Fixpoint betree_List_split_at (T : Type) (n : nat) (self : betree_List_t T) (n1 : u64) : @@ -125,7 +125,7 @@ Fixpoint betree_List_split_at end . -(** [betree_main::betree::{betree_main::betree::List<T>#1}::push_front]: +(** [betree::betree::{betree::betree::List<T>#1}::push_front]: Source: 'src/betree.rs', lines 299:4-299:34 *) Definition betree_List_push_front (T : Type) (self : betree_List_t T) (x : T) : result (betree_List_t T) := @@ -133,7 +133,7 @@ Definition betree_List_push_front Ok (Betree_List_Cons x tl) . -(** [betree_main::betree::{betree_main::betree::List<T>#1}::pop_front]: +(** [betree::betree::{betree::betree::List<T>#1}::pop_front]: Source: 'src/betree.rs', lines 306:4-306:32 *) Definition betree_List_pop_front (T : Type) (self : betree_List_t T) : result (T * (betree_List_t T)) := @@ -144,7 +144,7 @@ Definition betree_List_pop_front end . -(** [betree_main::betree::{betree_main::betree::List<T>#1}::hd]: +(** [betree::betree::{betree::betree::List<T>#1}::hd]: Source: 'src/betree.rs', lines 318:4-318:22 *) Definition betree_List_hd (T : Type) (self : betree_List_t T) : result T := match self with @@ -153,7 +153,7 @@ Definition betree_List_hd (T : Type) (self : betree_List_t T) : result T := end . -(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::head_has_key]: +(** [betree::betree::{betree::betree::List<(u64, T)>#2}::head_has_key]: Source: 'src/betree.rs', lines 327:4-327:44 *) Definition betree_ListPairU64T_head_has_key (T : Type) (self : betree_List_t (u64 * T)) (key : u64) : result bool := @@ -163,7 +163,7 @@ Definition betree_ListPairU64T_head_has_key end . -(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::partition_at_pivot]: +(** [betree::betree::{betree::betree::List<(u64, T)>#2}::partition_at_pivot]: Source: 'src/betree.rs', lines 339:4-339:73 *) Fixpoint betree_ListPairU64T_partition_at_pivot (T : Type) (n : nat) (self : betree_List_t (u64 * T)) (pivot : u64) : @@ -186,7 +186,7 @@ Fixpoint betree_ListPairU64T_partition_at_pivot end . -(** [betree_main::betree::{betree_main::betree::Leaf#3}::split]: +(** [betree::betree::{betree::betree::Leaf#3}::split]: Source: 'src/betree.rs', lines 359:4-364:17 *) Definition betree_Leaf_split (n : nat) (self : betree_Leaf_t) (content : betree_List_t (u64 * u64)) @@ -222,7 +222,7 @@ Definition betree_Leaf_split node_id_cnt2)) . -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]: +(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_for_key]: Source: 'src/betree.rs', lines 789:4-792:34 *) Fixpoint betree_Node_lookup_first_message_for_key (n : nat) (key : u64) (msgs : betree_List_t (u64 * betree_Message_t)) : @@ -250,7 +250,7 @@ Fixpoint betree_Node_lookup_first_message_for_key end . -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: +(** [betree::betree::{betree::betree::Node#5}::lookup_in_bindings]: Source: 'src/betree.rs', lines 636:4-636:80 *) Fixpoint betree_Node_lookup_in_bindings (n : nat) (key : u64) (bindings : betree_List_t (u64 * u64)) : @@ -271,7 +271,7 @@ Fixpoint betree_Node_lookup_in_bindings end . -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: +(** [betree::betree::{betree::betree::Node#5}::apply_upserts]: Source: 'src/betree.rs', lines 819:4-819:90 *) Fixpoint betree_Node_apply_upserts (n : nat) (msgs : betree_List_t (u64 * betree_Message_t)) (prev : option u64) @@ -303,7 +303,7 @@ Fixpoint betree_Node_apply_upserts end . -(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: +(** [betree::betree::{betree::betree::Internal#4}::lookup_in_children]: Source: 'src/betree.rs', lines 395:4-395:63 *) Fixpoint betree_Internal_lookup_in_children (n : nat) (self : betree_Internal_t) (key : u64) (st : state) : @@ -327,7 +327,7 @@ Fixpoint betree_Internal_lookup_in_children self.(betree_Internal_pivot) self.(betree_Internal_left) n2))) end -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup]: +(** [betree::betree::{betree::betree::Node#5}::lookup]: Source: 'src/betree.rs', lines 709:4-709:58 *) with betree_Node_lookup (n : nat) (self : betree_Node_t) (key : u64) (st : state) : @@ -394,7 +394,7 @@ with betree_Node_lookup end . -(** [betree_main::betree::{betree_main::betree::Node#5}::filter_messages_for_key]: +(** [betree::betree::{betree::betree::Node#5}::filter_messages_for_key]: Source: 'src/betree.rs', lines 674:4-674:77 *) Fixpoint betree_Node_filter_messages_for_key (n : nat) (key : u64) (msgs : betree_List_t (u64 * betree_Message_t)) : @@ -419,7 +419,7 @@ Fixpoint betree_Node_filter_messages_for_key end . -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]: +(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_after_key]: Source: 'src/betree.rs', lines 689:4-692:34 *) Fixpoint betree_Node_lookup_first_message_after_key (n : nat) (key : u64) (msgs : betree_List_t (u64 * betree_Message_t)) : @@ -447,7 +447,7 @@ Fixpoint betree_Node_lookup_first_message_after_key end . -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_to_internal]: +(** [betree::betree::{betree::betree::Node#5}::apply_to_internal]: Source: 'src/betree.rs', lines 521:4-521:89 *) Definition betree_Node_apply_to_internal (n : nat) (msgs : betree_List_t (u64 * betree_Message_t)) (key : u64) @@ -508,7 +508,7 @@ Definition betree_Node_apply_to_internal lookup_first_message_for_key_back msgs2) . -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_internal]: +(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_internal]: Source: 'src/betree.rs', lines 502:4-505:5 *) Fixpoint betree_Node_apply_messages_to_internal (n : nat) (msgs : betree_List_t (u64 * betree_Message_t)) @@ -528,7 +528,7 @@ Fixpoint betree_Node_apply_messages_to_internal end . -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]: +(** [betree::betree::{betree::betree::Node#5}::lookup_mut_in_bindings]: Source: 'src/betree.rs', lines 653:4-656:32 *) Fixpoint betree_Node_lookup_mut_in_bindings (n : nat) (key : u64) (bindings : betree_List_t (u64 * u64)) : @@ -556,7 +556,7 @@ Fixpoint betree_Node_lookup_mut_in_bindings end . -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_to_leaf]: +(** [betree::betree::{betree::betree::Node#5}::apply_to_leaf]: Source: 'src/betree.rs', lines 460:4-460:87 *) Definition betree_Node_apply_to_leaf (n : nat) (bindings : betree_List_t (u64 * u64)) (key : u64) @@ -594,7 +594,7 @@ Definition betree_Node_apply_to_leaf end . -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_leaf]: +(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_leaf]: Source: 'src/betree.rs', lines 444:4-447:5 *) Fixpoint betree_Node_apply_messages_to_leaf (n : nat) (bindings : betree_List_t (u64 * u64)) @@ -614,7 +614,7 @@ Fixpoint betree_Node_apply_messages_to_leaf end . -(** [betree_main::betree::{betree_main::betree::Internal#4}::flush]: +(** [betree::betree::{betree::betree::Internal#4}::flush]: Source: 'src/betree.rs', lines 410:4-415:26 *) Fixpoint betree_Internal_flush (n : nat) (self : betree_Internal_t) (params : betree_Params_t) @@ -664,7 +664,7 @@ Fixpoint betree_Internal_flush node_id_cnt1)))) end -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]: +(** [betree::betree::{betree::betree::Node#5}::apply_messages]: Source: 'src/betree.rs', lines 588:4-593:5 *) with betree_Node_apply_messages (n : nat) (self : betree_Node_t) (params : betree_Params_t) @@ -720,7 +720,7 @@ with betree_Node_apply_messages end . -(** [betree_main::betree::{betree_main::betree::Node#5}::apply]: +(** [betree::betree::{betree::betree::Node#5}::apply]: Source: 'src/betree.rs', lines 576:4-582:5 *) Definition betree_Node_apply (n : nat) (self : betree_Node_t) (params : betree_Params_t) @@ -736,7 +736,7 @@ Definition betree_Node_apply Ok (st1, (self1, node_id_cnt1)) . -(** [betree_main::betree::{betree_main::betree::BeTree#6}::new]: +(** [betree::betree::{betree::betree::BeTree#6}::new]: Source: 'src/betree.rs', lines 849:4-849:60 *) Definition betree_BeTree_new (min_flush_size : u64) (split_size : u64) (st : state) : @@ -761,7 +761,7 @@ Definition betree_BeTree_new |}) . -(** [betree_main::betree::{betree_main::betree::BeTree#6}::apply]: +(** [betree::betree::{betree::betree::BeTree#6}::apply]: Source: 'src/betree.rs', lines 868:4-868:47 *) Definition betree_BeTree_apply (n : nat) (self : betree_BeTree_t) (key : u64) (msg : betree_Message_t) @@ -781,7 +781,7 @@ Definition betree_BeTree_apply |}) . -(** [betree_main::betree::{betree_main::betree::BeTree#6}::insert]: +(** [betree::betree::{betree::betree::BeTree#6}::insert]: Source: 'src/betree.rs', lines 874:4-874:52 *) Definition betree_BeTree_insert (n : nat) (self : betree_BeTree_t) (key : u64) (value : u64) (st : state) : @@ -790,7 +790,7 @@ Definition betree_BeTree_insert betree_BeTree_apply n self key (Betree_Message_Insert value) st . -(** [betree_main::betree::{betree_main::betree::BeTree#6}::delete]: +(** [betree::betree::{betree::betree::BeTree#6}::delete]: Source: 'src/betree.rs', lines 880:4-880:38 *) Definition betree_BeTree_delete (n : nat) (self : betree_BeTree_t) (key : u64) (st : state) : @@ -799,7 +799,7 @@ Definition betree_BeTree_delete betree_BeTree_apply n self key Betree_Message_Delete st . -(** [betree_main::betree::{betree_main::betree::BeTree#6}::upsert]: +(** [betree::betree::{betree::betree::BeTree#6}::upsert]: Source: 'src/betree.rs', lines 886:4-886:59 *) Definition betree_BeTree_upsert (n : nat) (self : betree_BeTree_t) (key : u64) @@ -809,7 +809,7 @@ Definition betree_BeTree_upsert betree_BeTree_apply n self key (Betree_Message_Upsert upd) st . -(** [betree_main::betree::{betree_main::betree::BeTree#6}::lookup]: +(** [betree::betree::{betree::betree::BeTree#6}::lookup]: Source: 'src/betree.rs', lines 895:4-895:62 *) Definition betree_BeTree_lookup (n : nat) (self : betree_BeTree_t) (key : u64) (st : state) : @@ -826,12 +826,12 @@ Definition betree_BeTree_lookup |})) . -(** [betree_main::main]: +(** [betree::main]: Source: 'src/main.rs', lines 4:0-4:9 *) Definition main : result unit := Ok tt. -(** Unit test for [betree_main::main] *) +(** Unit test for [betree::main] *) Check (main )%return. -End BetreeMain_Funs. +End Betree_Funs. diff --git a/tests/coq/betree/BetreeMain_FunsExternal.v b/tests/coq/betree/Betree_FunsExternal.v index 099a2e8f..0263c272 100644 --- a/tests/coq/betree/BetreeMain_FunsExternal.v +++ b/tests/coq/betree/Betree_FunsExternal.v @@ -6,9 +6,9 @@ Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Require Export BetreeMain_Types. -Import BetreeMain_Types. -Module BetreeMain_FunsExternal. +Require Export Betree_Types. +Import Betree_Types. +Module Betree_FunsExternal. (** [betree_main::betree_utils::load_internal_node]: forward function Source: 'src/betree_utils.rs', lines 98:0-98:63 *) @@ -36,4 +36,4 @@ Axiom betree_utils_store_leaf_node : u64 -> betree_List_t (u64 * u64) -> state -> result (state * unit) . -End BetreeMain_FunsExternal. +End Betree_FunsExternal. diff --git a/tests/coq/betree/BetreeMain_FunsExternal_Template.v b/tests/coq/betree/Betree_FunsExternal_Template.v index 58be2733..2a2fddfc 100644 --- a/tests/coq/betree/BetreeMain_FunsExternal_Template.v +++ b/tests/coq/betree/Betree_FunsExternal_Template.v @@ -1,5 +1,5 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: external functions. +(** [betree]: external functions. -- This is a template file: rename it to "FunsExternal.lean" and fill the holes. *) Require Import Primitives. Import Primitives. @@ -7,17 +7,17 @@ Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Require Import BetreeMain_Types. -Include BetreeMain_Types. -Module BetreeMain_FunsExternal_Template. +Require Import Betree_Types. +Include Betree_Types. +Module Betree_FunsExternal_Template. -(** [betree_main::betree_utils::load_internal_node]: +(** [betree::betree_utils::load_internal_node]: Source: 'src/betree_utils.rs', lines 98:0-98:63 *) Axiom betree_utils_load_internal_node : u64 -> state -> result (state * (betree_List_t (u64 * betree_Message_t))) . -(** [betree_main::betree_utils::store_internal_node]: +(** [betree::betree_utils::store_internal_node]: Source: 'src/betree_utils.rs', lines 115:0-115:71 *) Axiom betree_utils_store_internal_node : @@ -25,16 +25,16 @@ Axiom betree_utils_store_internal_node unit) . -(** [betree_main::betree_utils::load_leaf_node]: +(** [betree::betree_utils::load_leaf_node]: Source: 'src/betree_utils.rs', lines 132:0-132:55 *) Axiom betree_utils_load_leaf_node : u64 -> state -> result (state * (betree_List_t (u64 * u64))) . -(** [betree_main::betree_utils::store_leaf_node]: +(** [betree::betree_utils::store_leaf_node]: Source: 'src/betree_utils.rs', lines 145:0-145:63 *) Axiom betree_utils_store_leaf_node : u64 -> betree_List_t (u64 * u64) -> state -> result (state * unit) . -End BetreeMain_FunsExternal_Template. +End Betree_FunsExternal_Template. diff --git a/tests/coq/betree/BetreeMain_Types.v b/tests/coq/betree/Betree_Types.v index acbc2085..aa39d8e4 100644 --- a/tests/coq/betree/BetreeMain_Types.v +++ b/tests/coq/betree/Betree_Types.v @@ -1,16 +1,16 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: type definitions *) +(** [betree]: type definitions *) Require Import Primitives. Import Primitives. Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Require Import BetreeMain_TypesExternal. -Include BetreeMain_TypesExternal. -Module BetreeMain_Types. +Require Import Betree_TypesExternal. +Include Betree_TypesExternal. +Module Betree_Types. -(** [betree_main::betree::List] +(** [betree::betree::List] Source: 'src/betree.rs', lines 17:0-17:23 *) Inductive betree_List_t (T : Type) := | Betree_List_Cons : T -> betree_List_t T -> betree_List_t T @@ -20,14 +20,14 @@ Inductive betree_List_t (T : Type) := Arguments Betree_List_Cons { _ }. Arguments Betree_List_Nil { _ }. -(** [betree_main::betree::UpsertFunState] +(** [betree::betree::UpsertFunState] Source: 'src/betree.rs', lines 63:0-63:23 *) Inductive betree_UpsertFunState_t := | Betree_UpsertFunState_Add : u64 -> betree_UpsertFunState_t | Betree_UpsertFunState_Sub : u64 -> betree_UpsertFunState_t . -(** [betree_main::betree::Message] +(** [betree::betree::Message] Source: 'src/betree.rs', lines 69:0-69:23 *) Inductive betree_Message_t := | Betree_Message_Insert : u64 -> betree_Message_t @@ -35,7 +35,7 @@ Inductive betree_Message_t := | Betree_Message_Upsert : betree_UpsertFunState_t -> betree_Message_t . -(** [betree_main::betree::Leaf] +(** [betree::betree::Leaf] Source: 'src/betree.rs', lines 167:0-167:11 *) Record betree_Leaf_t := mkbetree_Leaf_t { @@ -43,7 +43,7 @@ mkbetree_Leaf_t { } . -(** [betree_main::betree::Internal] +(** [betree::betree::Internal] Source: 'src/betree.rs', lines 156:0-156:15 *) Inductive betree_Internal_t := | mkbetree_Internal_t : @@ -53,7 +53,7 @@ Inductive betree_Internal_t := betree_Node_t -> betree_Internal_t -(** [betree_main::betree::Node] +(** [betree::betree::Node] Source: 'src/betree.rs', lines 179:0-179:9 *) with betree_Node_t := | Betree_Node_Internal : betree_Internal_t -> betree_Node_t @@ -89,7 +89,7 @@ Notation "x2 .(betree_Internal_right)" := (betree_Internal_right x2) (at level 9) . -(** [betree_main::betree::Params] +(** [betree::betree::Params] Source: 'src/betree.rs', lines 187:0-187:13 *) Record betree_Params_t := mkbetree_Params_t { @@ -97,7 +97,7 @@ mkbetree_Params_t { } . -(** [betree_main::betree::NodeIdCounter] +(** [betree::betree::NodeIdCounter] Source: 'src/betree.rs', lines 201:0-201:20 *) Record betree_NodeIdCounter_t := mkbetree_NodeIdCounter_t { @@ -105,7 +105,7 @@ mkbetree_NodeIdCounter_t { } . -(** [betree_main::betree::BeTree] +(** [betree::betree::BeTree] Source: 'src/betree.rs', lines 218:0-218:17 *) Record betree_BeTree_t := mkbetree_BeTree_t { @@ -115,4 +115,4 @@ mkbetree_BeTree_t { } . -End BetreeMain_Types. +End Betree_Types. diff --git a/tests/coq/betree/BetreeMain_TypesExternal.v b/tests/coq/betree/Betree_TypesExternal.v index 870d2601..37487d6d 100644 --- a/tests/coq/betree/BetreeMain_TypesExternal.v +++ b/tests/coq/betree/Betree_TypesExternal.v @@ -6,9 +6,9 @@ Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Module BetreeMain_TypesExternal. +Module Betree_TypesExternal. (** The state type used in the state-error monad *) Axiom state : Type. -End BetreeMain_TypesExternal. +End Betree_TypesExternal. diff --git a/tests/coq/betree/BetreeMain_TypesExternal_Template.v b/tests/coq/betree/Betree_TypesExternal_Template.v index 651de2b7..a40811cb 100644 --- a/tests/coq/betree/BetreeMain_TypesExternal_Template.v +++ b/tests/coq/betree/Betree_TypesExternal_Template.v @@ -1,5 +1,5 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: external types. +(** [betree]: external types. -- This is a template file: rename it to "TypesExternal.lean" and fill the holes. *) Require Import Primitives. Import Primitives. @@ -7,9 +7,9 @@ Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Module BetreeMain_TypesExternal_Template. +Module Betree_TypesExternal_Template. (** The state type used in the state-error monad *) Axiom state : Type. -End BetreeMain_TypesExternal_Template. +End Betree_TypesExternal_Template. diff --git a/tests/coq/betree/_CoqProject b/tests/coq/betree/_CoqProject index b14bed66..9fb7fe64 100644 --- a/tests/coq/betree/_CoqProject +++ b/tests/coq/betree/_CoqProject @@ -3,10 +3,10 @@ -arg -w -arg all -BetreeMain_TypesExternal_Template.v -BetreeMain_Types.v +Betree_TypesExternal_Template.v +Betree_Types.v Primitives.v -BetreeMain_FunsExternal_Template.v -BetreeMain_Funs.v -BetreeMain_TypesExternal.v -BetreeMain_FunsExternal.v +Betree_FunsExternal_Template.v +Betree_Funs.v +Betree_TypesExternal.v +Betree_FunsExternal.v diff --git a/tests/coq/hashmap/Hashmap_Funs.v b/tests/coq/hashmap/Hashmap_Funs.v index 778b9d56..04df873a 100644 --- a/tests/coq/hashmap/Hashmap_Funs.v +++ b/tests/coq/hashmap/Hashmap_Funs.v @@ -8,15 +8,17 @@ Import ListNotations. Local Open Scope Primitives_scope. Require Import Hashmap_Types. Include Hashmap_Types. +Require Import Hashmap_FunsExternal. +Include Hashmap_FunsExternal. Module Hashmap_Funs. (** [hashmap::hash_key]: - Source: 'tests/src/hashmap.rs', lines 35:0-35:32 *) + Source: 'tests/src/hashmap.rs', lines 37:0-37:32 *) Definition hash_key (k : usize) : result usize := Ok k. (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0: - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 *) + Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *) Fixpoint hashMap_allocate_slots_loop (T : Type) (n : nat) (slots : alloc_vec_Vec (List_t T)) (n1 : usize) : result (alloc_vec_Vec (List_t T)) @@ -34,7 +36,7 @@ Fixpoint hashMap_allocate_slots_loop . (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: - Source: 'tests/src/hashmap.rs', lines 58:4-58:76 *) + Source: 'tests/src/hashmap.rs', lines 60:4-60:76 *) Definition hashMap_allocate_slots (T : Type) (n : nat) (slots : alloc_vec_Vec (List_t T)) (n1 : usize) : result (alloc_vec_Vec (List_t T)) @@ -43,7 +45,7 @@ Definition hashMap_allocate_slots . (** [hashmap::{hashmap::HashMap<T>}::new_with_capacity]: - Source: 'tests/src/hashmap.rs', lines 67:4-71:13 *) + Source: 'tests/src/hashmap.rs', lines 69:4-73:13 *) Definition hashMap_new_with_capacity (T : Type) (n : nat) (capacity : usize) (max_load_dividend : usize) (max_load_divisor : usize) : @@ -62,13 +64,13 @@ Definition hashMap_new_with_capacity . (** [hashmap::{hashmap::HashMap<T>}::new]: - Source: 'tests/src/hashmap.rs', lines 83:4-83:24 *) + Source: 'tests/src/hashmap.rs', lines 85:4-85:24 *) Definition hashMap_new (T : Type) (n : nat) : result (HashMap_t T) := hashMap_new_with_capacity T n 32%usize 4%usize 5%usize . (** [hashmap::{hashmap::HashMap<T>}::clear]: loop 0: - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 *) + Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *) Fixpoint hashMap_clear_loop (T : Type) (n : nat) (slots : alloc_vec_Vec (List_t T)) (i : usize) : result (alloc_vec_Vec (List_t T)) @@ -91,7 +93,7 @@ Fixpoint hashMap_clear_loop . (** [hashmap::{hashmap::HashMap<T>}::clear]: - Source: 'tests/src/hashmap.rs', lines 88:4-88:27 *) + Source: 'tests/src/hashmap.rs', lines 90:4-90:27 *) Definition hashMap_clear (T : Type) (n : nat) (self : HashMap_t T) : result (HashMap_t T) := hm <- hashMap_clear_loop T n self.(hashMap_slots) 0%usize; @@ -105,13 +107,13 @@ Definition hashMap_clear . (** [hashmap::{hashmap::HashMap<T>}::len]: - Source: 'tests/src/hashmap.rs', lines 98:4-98:30 *) + Source: 'tests/src/hashmap.rs', lines 100:4-100:30 *) Definition hashMap_len (T : Type) (self : HashMap_t T) : result usize := Ok self.(hashMap_num_entries) . (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 *) + Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *) Fixpoint hashMap_insert_in_list_loop (T : Type) (n : nat) (key : usize) (value : T) (ls : List_t T) : result (bool * (List_t T)) @@ -133,7 +135,7 @@ Fixpoint hashMap_insert_in_list_loop . (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: - Source: 'tests/src/hashmap.rs', lines 105:4-105:71 *) + Source: 'tests/src/hashmap.rs', lines 107:4-107:71 *) Definition hashMap_insert_in_list (T : Type) (n : nat) (key : usize) (value : T) (ls : List_t T) : result (bool * (List_t T)) @@ -142,7 +144,7 @@ Definition hashMap_insert_in_list . (** [hashmap::{hashmap::HashMap<T>}::insert_no_resize]: - Source: 'tests/src/hashmap.rs', lines 125:4-125:54 *) + Source: 'tests/src/hashmap.rs', lines 127:4-127:54 *) Definition hashMap_insert_no_resize (T : Type) (n : nat) (self : HashMap_t T) (key : usize) (value : T) : result (HashMap_t T) @@ -180,7 +182,7 @@ Definition hashMap_insert_no_resize . (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 *) + Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *) Fixpoint hashMap_move_elements_from_list_loop (T : Type) (n : nat) (ntable : HashMap_t T) (ls : List_t T) : result (HashMap_t T) @@ -198,7 +200,7 @@ Fixpoint hashMap_move_elements_from_list_loop . (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: - Source: 'tests/src/hashmap.rs', lines 191:4-191:72 *) + Source: 'tests/src/hashmap.rs', lines 193:4-193:72 *) Definition hashMap_move_elements_from_list (T : Type) (n : nat) (ntable : HashMap_t T) (ls : List_t T) : result (HashMap_t T) @@ -207,7 +209,7 @@ Definition hashMap_move_elements_from_list . (** [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0: - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 *) + Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *) Fixpoint hashMap_move_elements_loop (T : Type) (n : nat) (ntable : HashMap_t T) (slots : alloc_vec_Vec (List_t T)) (i : usize) : @@ -233,7 +235,7 @@ Fixpoint hashMap_move_elements_loop . (** [hashmap::{hashmap::HashMap<T>}::move_elements]: - Source: 'tests/src/hashmap.rs', lines 179:4-179:95 *) + Source: 'tests/src/hashmap.rs', lines 181:4-181:95 *) Definition hashMap_move_elements (T : Type) (n : nat) (ntable : HashMap_t T) (slots : alloc_vec_Vec (List_t T)) (i : usize) : @@ -243,7 +245,7 @@ Definition hashMap_move_elements . (** [hashmap::{hashmap::HashMap<T>}::try_resize]: - Source: 'tests/src/hashmap.rs', lines 148:4-148:28 *) + Source: 'tests/src/hashmap.rs', lines 150:4-150:28 *) Definition hashMap_try_resize (T : Type) (n : nat) (self : HashMap_t T) : result (HashMap_t T) := max_usize <- scalar_cast U32 Usize core_u32_max; @@ -275,7 +277,7 @@ Definition hashMap_try_resize . (** [hashmap::{hashmap::HashMap<T>}::insert]: - Source: 'tests/src/hashmap.rs', lines 137:4-137:48 *) + Source: 'tests/src/hashmap.rs', lines 139:4-139:48 *) Definition hashMap_insert (T : Type) (n : nat) (self : HashMap_t T) (key : usize) (value : T) : result (HashMap_t T) @@ -288,7 +290,7 @@ Definition hashMap_insert . (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 *) + Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *) Fixpoint hashMap_contains_key_in_list_loop (T : Type) (n : nat) (key : usize) (ls : List_t T) : result bool := match n with @@ -305,14 +307,14 @@ Fixpoint hashMap_contains_key_in_list_loop . (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: - Source: 'tests/src/hashmap.rs', lines 214:4-214:68 *) + Source: 'tests/src/hashmap.rs', lines 216:4-216:68 *) Definition hashMap_contains_key_in_list (T : Type) (n : nat) (key : usize) (ls : List_t T) : result bool := hashMap_contains_key_in_list_loop T n key ls . (** [hashmap::{hashmap::HashMap<T>}::contains_key]: - Source: 'tests/src/hashmap.rs', lines 207:4-207:49 *) + Source: 'tests/src/hashmap.rs', lines 209:4-209:49 *) Definition hashMap_contains_key (T : Type) (n : nat) (self : HashMap_t T) (key : usize) : result bool := hash <- hash_key key; @@ -326,7 +328,7 @@ Definition hashMap_contains_key . (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 *) + Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *) Fixpoint hashMap_get_in_list_loop (T : Type) (n : nat) (key : usize) (ls : List_t T) : result T := match n with @@ -341,14 +343,14 @@ Fixpoint hashMap_get_in_list_loop . (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: - Source: 'tests/src/hashmap.rs', lines 232:4-232:70 *) + Source: 'tests/src/hashmap.rs', lines 234:4-234:70 *) Definition hashMap_get_in_list (T : Type) (n : nat) (key : usize) (ls : List_t T) : result T := hashMap_get_in_list_loop T n key ls . (** [hashmap::{hashmap::HashMap<T>}::get]: - Source: 'tests/src/hashmap.rs', lines 247:4-247:55 *) + Source: 'tests/src/hashmap.rs', lines 249:4-249:55 *) Definition hashMap_get (T : Type) (n : nat) (self : HashMap_t T) (key : usize) : result T := hash <- hash_key key; @@ -362,7 +364,7 @@ Definition hashMap_get . (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 *) + Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *) Fixpoint hashMap_get_mut_in_list_loop (T : Type) (n : nat) (ls : List_t T) (key : usize) : result (T * (T -> result (List_t T))) @@ -388,7 +390,7 @@ Fixpoint hashMap_get_mut_in_list_loop . (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: - Source: 'tests/src/hashmap.rs', lines 253:4-253:86 *) + Source: 'tests/src/hashmap.rs', lines 255:4-255:86 *) Definition hashMap_get_mut_in_list (T : Type) (n : nat) (ls : List_t T) (key : usize) : result (T * (T -> result (List_t T))) @@ -397,7 +399,7 @@ Definition hashMap_get_mut_in_list . (** [hashmap::{hashmap::HashMap<T>}::get_mut]: - Source: 'tests/src/hashmap.rs', lines 265:4-265:67 *) + Source: 'tests/src/hashmap.rs', lines 267:4-267:67 *) Definition hashMap_get_mut (T : Type) (n : nat) (self : HashMap_t T) (key : usize) : result (T * (T -> result (HashMap_t T))) @@ -427,7 +429,7 @@ Definition hashMap_get_mut . (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 *) + Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *) Fixpoint hashMap_remove_from_list_loop (T : Type) (n : nat) (key : usize) (ls : List_t T) : result ((option T) * (List_t T)) @@ -455,7 +457,7 @@ Fixpoint hashMap_remove_from_list_loop . (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: - Source: 'tests/src/hashmap.rs', lines 273:4-273:69 *) + Source: 'tests/src/hashmap.rs', lines 275:4-275:69 *) Definition hashMap_remove_from_list (T : Type) (n : nat) (key : usize) (ls : List_t T) : result ((option T) * (List_t T)) @@ -464,7 +466,7 @@ Definition hashMap_remove_from_list . (** [hashmap::{hashmap::HashMap<T>}::remove]: - Source: 'tests/src/hashmap.rs', lines 302:4-302:52 *) + Source: 'tests/src/hashmap.rs', lines 304:4-304:52 *) Definition hashMap_remove (T : Type) (n : nat) (self : HashMap_t T) (key : usize) : result ((option T) * (HashMap_t T)) @@ -502,8 +504,18 @@ Definition hashMap_remove end . +(** [hashmap::insert_on_disk]: + Source: 'tests/src/hashmap.rs', lines 335:0-335:43 *) +Definition insert_on_disk + (n : nat) (key : usize) (value : u64) (st : state) : result (state * unit) := + p <- utils_deserialize st; + let (st1, hm) := p in + hm1 <- hashMap_insert u64 n hm key value; + utils_serialize hm1 st1 +. + (** [hashmap::test1]: - Source: 'tests/src/hashmap.rs', lines 323:0-323:10 *) + Source: 'tests/src/hashmap.rs', lines 350:0-350:10 *) Definition test1 (n : nat) : result unit := hm <- hashMap_new u64 n; hm1 <- hashMap_insert u64 n hm 0%usize 42%u64; diff --git a/tests/coq/hashmap/Hashmap_FunsExternal.v b/tests/coq/hashmap/Hashmap_FunsExternal.v new file mode 100644 index 00000000..3bc6c98a --- /dev/null +++ b/tests/coq/hashmap/Hashmap_FunsExternal.v @@ -0,0 +1,21 @@ +(** [hashmap]: external functions. *) +Require Import Primitives. +Import Primitives. +Require Import Coq.ZArith.ZArith. +Require Import List. +Import ListNotations. +Local Open Scope Primitives_scope. +Require Export Hashmap_Types. +Import Hashmap_Types. +Module Hashmap_FunsExternal. + +(** [hashmap::utils::deserialize]: + Source: 'tests/src/hashmap.rs', lines 330:4-330:47 *) +Axiom utils_deserialize : state -> result (state * (HashMap_t u64)). + +(** [hashmap::utils::serialize]: + Source: 'tests/src/hashmap.rs', lines 325:4-325:46 *) +Axiom utils_serialize : HashMap_t u64 -> state -> result (state * unit) +. + +End Hashmap_FunsExternal. diff --git a/tests/coq/hashmap/Hashmap_FunsExternal_Template.v b/tests/coq/hashmap/Hashmap_FunsExternal_Template.v new file mode 100644 index 00000000..c58b021d --- /dev/null +++ b/tests/coq/hashmap/Hashmap_FunsExternal_Template.v @@ -0,0 +1,22 @@ +(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) +(** [hashmap]: external functions. +-- This is a template file: rename it to "FunsExternal.lean" and fill the holes. *) +Require Import Primitives. +Import Primitives. +Require Import Coq.ZArith.ZArith. +Require Import List. +Import ListNotations. +Local Open Scope Primitives_scope. +Require Import Hashmap_Types. +Include Hashmap_Types. +Module Hashmap_FunsExternal_Template. + +(** [hashmap::utils::deserialize]: + Source: 'tests/src/hashmap.rs', lines 330:4-330:47 *) +Axiom utils_deserialize : state -> result (state * (HashMap_t u64)). + +(** [hashmap::utils::serialize]: + Source: 'tests/src/hashmap.rs', lines 325:4-325:46 *) +Axiom utils_serialize : HashMap_t u64 -> state -> result (state * unit). + +End Hashmap_FunsExternal_Template. diff --git a/tests/coq/hashmap/Hashmap_Types.v b/tests/coq/hashmap/Hashmap_Types.v index 8a8137d5..452d56f8 100644 --- a/tests/coq/hashmap/Hashmap_Types.v +++ b/tests/coq/hashmap/Hashmap_Types.v @@ -6,10 +6,12 @@ Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. +Require Import Hashmap_TypesExternal. +Include Hashmap_TypesExternal. Module Hashmap_Types. (** [hashmap::List] - Source: 'tests/src/hashmap.rs', lines 27:0-27:16 *) + Source: 'tests/src/hashmap.rs', lines 29:0-29:16 *) Inductive List_t (T : Type) := | List_Cons : usize -> T -> List_t T -> List_t T | List_Nil : List_t T @@ -19,7 +21,7 @@ Arguments List_Cons { _ }. Arguments List_Nil { _ }. (** [hashmap::HashMap] - Source: 'tests/src/hashmap.rs', lines 43:0-43:21 *) + Source: 'tests/src/hashmap.rs', lines 45:0-45:21 *) Record HashMap_t (T : Type) := mkHashMap_t { hashMap_num_entries : usize; diff --git a/tests/coq/hashmap_main/HashmapMain_TypesExternal.v b/tests/coq/hashmap/Hashmap_TypesExternal.v index 28651c14..0aa52a5d 100644 --- a/tests/coq/hashmap_main/HashmapMain_TypesExternal.v +++ b/tests/coq/hashmap/Hashmap_TypesExternal.v @@ -1,14 +1,13 @@ -(** [hashmap_main]: external types. --- This is a template file: rename it to "TypesExternal.lean" and fill the holes. *) +(** [hashmap]: external types. *) Require Import Primitives. Import Primitives. Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Module HashmapMain_TypesExternal. +Module Hashmap_TypesExternal. (** The state type used in the state-error monad *) Axiom state : Type. -End HashmapMain_TypesExternal. +End Hashmap_TypesExternal. diff --git a/tests/coq/hashmap_main/HashmapMain_TypesExternal_Template.v b/tests/coq/hashmap/Hashmap_TypesExternal_Template.v index 391b2775..a8051adb 100644 --- a/tests/coq/hashmap_main/HashmapMain_TypesExternal_Template.v +++ b/tests/coq/hashmap/Hashmap_TypesExternal_Template.v @@ -1,5 +1,5 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: external types. +(** [hashmap]: external types. -- This is a template file: rename it to "TypesExternal.lean" and fill the holes. *) Require Import Primitives. Import Primitives. @@ -7,9 +7,9 @@ Require Import Coq.ZArith.ZArith. Require Import List. Import ListNotations. Local Open Scope Primitives_scope. -Module HashmapMain_TypesExternal_Template. +Module Hashmap_TypesExternal_Template. (** The state type used in the state-error monad *) Axiom state : Type. -End HashmapMain_TypesExternal_Template. +End Hashmap_TypesExternal_Template. diff --git a/tests/coq/hashmap_main/HashmapMain_Funs.v b/tests/coq/hashmap_main/HashmapMain_Funs.v deleted file mode 100644 index f6467d5a..00000000 --- a/tests/coq/hashmap_main/HashmapMain_Funs.v +++ /dev/null @@ -1,589 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: function definitions *) -Require Import Primitives. -Import Primitives. -Require Import Coq.ZArith.ZArith. -Require Import List. -Import ListNotations. -Local Open Scope Primitives_scope. -Require Import HashmapMain_Types. -Include HashmapMain_Types. -Require Import HashmapMain_FunsExternal. -Include HashmapMain_FunsExternal. -Module HashmapMain_Funs. - -(** [hashmap_main::hashmap::hash_key]: - Source: 'tests/src/hashmap.rs', lines 35:0-35:32 *) -Definition hashmap_hash_key (k : usize) : result usize := - Ok k. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: loop 0: - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 *) -Fixpoint hashmap_HashMap_allocate_slots_loop - (T : Type) (n : nat) (slots : alloc_vec_Vec (hashmap_List_t T)) (n1 : usize) - : - result (alloc_vec_Vec (hashmap_List_t T)) - := - match n with - | O => Fail_ OutOfFuel - | S n2 => - if n1 s> 0%usize - then ( - slots1 <- alloc_vec_Vec_push (hashmap_List_t T) slots Hashmap_List_Nil; - n3 <- usize_sub n1 1%usize; - hashmap_HashMap_allocate_slots_loop T n2 slots1 n3) - else Ok slots - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: - Source: 'tests/src/hashmap.rs', lines 58:4-58:76 *) -Definition hashmap_HashMap_allocate_slots - (T : Type) (n : nat) (slots : alloc_vec_Vec (hashmap_List_t T)) (n1 : usize) - : - result (alloc_vec_Vec (hashmap_List_t T)) - := - hashmap_HashMap_allocate_slots_loop T n slots n1 -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new_with_capacity]: - Source: 'tests/src/hashmap.rs', lines 67:4-71:13 *) -Definition hashmap_HashMap_new_with_capacity - (T : Type) (n : nat) (capacity : usize) (max_load_dividend : usize) - (max_load_divisor : usize) : - result (hashmap_HashMap_t T) - := - slots <- - hashmap_HashMap_allocate_slots T n (alloc_vec_Vec_new (hashmap_List_t T)) - capacity; - i <- usize_mul capacity max_load_dividend; - i1 <- usize_div i max_load_divisor; - Ok - {| - hashmap_HashMap_num_entries := 0%usize; - hashmap_HashMap_max_load_factor := (max_load_dividend, max_load_divisor); - hashmap_HashMap_max_load := i1; - hashmap_HashMap_slots := slots - |} -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new]: - Source: 'tests/src/hashmap.rs', lines 83:4-83:24 *) -Definition hashmap_HashMap_new - (T : Type) (n : nat) : result (hashmap_HashMap_t T) := - hashmap_HashMap_new_with_capacity T n 32%usize 4%usize 5%usize -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: loop 0: - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 *) -Fixpoint hashmap_HashMap_clear_loop - (T : Type) (n : nat) (slots : alloc_vec_Vec (hashmap_List_t T)) (i : usize) : - result (alloc_vec_Vec (hashmap_List_t T)) - := - match n with - | O => Fail_ OutOfFuel - | S n1 => - let i1 := alloc_vec_Vec_len (hashmap_List_t T) slots in - if i s< i1 - then ( - p <- - alloc_vec_Vec_index_mut (hashmap_List_t T) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t T)) slots - i; - let (_, index_mut_back) := p in - i2 <- usize_add i 1%usize; - slots1 <- index_mut_back Hashmap_List_Nil; - hashmap_HashMap_clear_loop T n1 slots1 i2) - else Ok slots - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: - Source: 'tests/src/hashmap.rs', lines 88:4-88:27 *) -Definition hashmap_HashMap_clear - (T : Type) (n : nat) (self : hashmap_HashMap_t T) : - result (hashmap_HashMap_t T) - := - hm <- hashmap_HashMap_clear_loop T n self.(hashmap_HashMap_slots) 0%usize; - Ok - {| - hashmap_HashMap_num_entries := 0%usize; - hashmap_HashMap_max_load_factor := self.(hashmap_HashMap_max_load_factor); - hashmap_HashMap_max_load := self.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := hm - |} -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::len]: - Source: 'tests/src/hashmap.rs', lines 98:4-98:30 *) -Definition hashmap_HashMap_len - (T : Type) (self : hashmap_HashMap_t T) : result usize := - Ok self.(hashmap_HashMap_num_entries) -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 *) -Fixpoint hashmap_HashMap_insert_in_list_loop - (T : Type) (n : nat) (key : usize) (value : T) (ls : hashmap_List_t T) : - result (bool * (hashmap_List_t T)) - := - match n with - | O => Fail_ OutOfFuel - | S n1 => - match ls with - | Hashmap_List_Cons ckey cvalue tl => - if ckey s= key - then Ok (false, Hashmap_List_Cons ckey value tl) - else ( - p <- hashmap_HashMap_insert_in_list_loop T n1 key value tl; - let (b, tl1) := p in - Ok (b, Hashmap_List_Cons ckey cvalue tl1)) - | Hashmap_List_Nil => - Ok (true, Hashmap_List_Cons key value Hashmap_List_Nil) - end - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: - Source: 'tests/src/hashmap.rs', lines 105:4-105:71 *) -Definition hashmap_HashMap_insert_in_list - (T : Type) (n : nat) (key : usize) (value : T) (ls : hashmap_List_t T) : - result (bool * (hashmap_List_t T)) - := - hashmap_HashMap_insert_in_list_loop T n key value ls -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_no_resize]: - Source: 'tests/src/hashmap.rs', lines 125:4-125:54 *) -Definition hashmap_HashMap_insert_no_resize - (T : Type) (n : nat) (self : hashmap_HashMap_t T) (key : usize) (value : T) : - result (hashmap_HashMap_t T) - := - hash <- hashmap_hash_key key; - let i := alloc_vec_Vec_len (hashmap_List_t T) self.(hashmap_HashMap_slots) in - hash_mod <- usize_rem hash i; - p <- - alloc_vec_Vec_index_mut (hashmap_List_t T) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t T)) - self.(hashmap_HashMap_slots) hash_mod; - let (l, index_mut_back) := p in - p1 <- hashmap_HashMap_insert_in_list T n key value l; - let (inserted, l1) := p1 in - if inserted - then ( - i1 <- usize_add self.(hashmap_HashMap_num_entries) 1%usize; - v <- index_mut_back l1; - Ok - {| - hashmap_HashMap_num_entries := i1; - hashmap_HashMap_max_load_factor := - self.(hashmap_HashMap_max_load_factor); - hashmap_HashMap_max_load := self.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := v - |}) - else ( - v <- index_mut_back l1; - Ok - {| - hashmap_HashMap_num_entries := self.(hashmap_HashMap_num_entries); - hashmap_HashMap_max_load_factor := - self.(hashmap_HashMap_max_load_factor); - hashmap_HashMap_max_load := self.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := v - |}) -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 *) -Fixpoint hashmap_HashMap_move_elements_from_list_loop - (T : Type) (n : nat) (ntable : hashmap_HashMap_t T) (ls : hashmap_List_t T) : - result (hashmap_HashMap_t T) - := - match n with - | O => Fail_ OutOfFuel - | S n1 => - match ls with - | Hashmap_List_Cons k v tl => - ntable1 <- hashmap_HashMap_insert_no_resize T n1 ntable k v; - hashmap_HashMap_move_elements_from_list_loop T n1 ntable1 tl - | Hashmap_List_Nil => Ok ntable - end - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: - Source: 'tests/src/hashmap.rs', lines 191:4-191:72 *) -Definition hashmap_HashMap_move_elements_from_list - (T : Type) (n : nat) (ntable : hashmap_HashMap_t T) (ls : hashmap_List_t T) : - result (hashmap_HashMap_t T) - := - hashmap_HashMap_move_elements_from_list_loop T n ntable ls -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: loop 0: - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 *) -Fixpoint hashmap_HashMap_move_elements_loop - (T : Type) (n : nat) (ntable : hashmap_HashMap_t T) - (slots : alloc_vec_Vec (hashmap_List_t T)) (i : usize) : - result ((hashmap_HashMap_t T) * (alloc_vec_Vec (hashmap_List_t T))) - := - match n with - | O => Fail_ OutOfFuel - | S n1 => - let i1 := alloc_vec_Vec_len (hashmap_List_t T) slots in - if i s< i1 - then ( - p <- - alloc_vec_Vec_index_mut (hashmap_List_t T) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t T)) slots - i; - let (l, index_mut_back) := p in - let (ls, l1) := core_mem_replace (hashmap_List_t T) l Hashmap_List_Nil in - ntable1 <- hashmap_HashMap_move_elements_from_list T n1 ntable ls; - i2 <- usize_add i 1%usize; - slots1 <- index_mut_back l1; - hashmap_HashMap_move_elements_loop T n1 ntable1 slots1 i2) - else Ok (ntable, slots) - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: - Source: 'tests/src/hashmap.rs', lines 179:4-179:95 *) -Definition hashmap_HashMap_move_elements - (T : Type) (n : nat) (ntable : hashmap_HashMap_t T) - (slots : alloc_vec_Vec (hashmap_List_t T)) (i : usize) : - result ((hashmap_HashMap_t T) * (alloc_vec_Vec (hashmap_List_t T))) - := - hashmap_HashMap_move_elements_loop T n ntable slots i -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::try_resize]: - Source: 'tests/src/hashmap.rs', lines 148:4-148:28 *) -Definition hashmap_HashMap_try_resize - (T : Type) (n : nat) (self : hashmap_HashMap_t T) : - result (hashmap_HashMap_t T) - := - max_usize <- scalar_cast U32 Usize core_u32_max; - let capacity := - alloc_vec_Vec_len (hashmap_List_t T) self.(hashmap_HashMap_slots) in - n1 <- usize_div max_usize 2%usize; - let (i, i1) := self.(hashmap_HashMap_max_load_factor) in - i2 <- usize_div n1 i; - if capacity s<= i2 - then ( - i3 <- usize_mul capacity 2%usize; - ntable <- hashmap_HashMap_new_with_capacity T n i3 i i1; - p <- - hashmap_HashMap_move_elements T n ntable self.(hashmap_HashMap_slots) - 0%usize; - let (ntable1, _) := p in - Ok - {| - hashmap_HashMap_num_entries := self.(hashmap_HashMap_num_entries); - hashmap_HashMap_max_load_factor := (i, i1); - hashmap_HashMap_max_load := ntable1.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := ntable1.(hashmap_HashMap_slots) - |}) - else - Ok - {| - hashmap_HashMap_num_entries := self.(hashmap_HashMap_num_entries); - hashmap_HashMap_max_load_factor := (i, i1); - hashmap_HashMap_max_load := self.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := self.(hashmap_HashMap_slots) - |} -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert]: - Source: 'tests/src/hashmap.rs', lines 137:4-137:48 *) -Definition hashmap_HashMap_insert - (T : Type) (n : nat) (self : hashmap_HashMap_t T) (key : usize) (value : T) : - result (hashmap_HashMap_t T) - := - self1 <- hashmap_HashMap_insert_no_resize T n self key value; - i <- hashmap_HashMap_len T self1; - if i s> self1.(hashmap_HashMap_max_load) - then hashmap_HashMap_try_resize T n self1 - else Ok self1 -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 *) -Fixpoint hashmap_HashMap_contains_key_in_list_loop - (T : Type) (n : nat) (key : usize) (ls : hashmap_List_t T) : result bool := - match n with - | O => Fail_ OutOfFuel - | S n1 => - match ls with - | Hashmap_List_Cons ckey _ tl => - if ckey s= key - then Ok true - else hashmap_HashMap_contains_key_in_list_loop T n1 key tl - | Hashmap_List_Nil => Ok false - end - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: - Source: 'tests/src/hashmap.rs', lines 214:4-214:68 *) -Definition hashmap_HashMap_contains_key_in_list - (T : Type) (n : nat) (key : usize) (ls : hashmap_List_t T) : result bool := - hashmap_HashMap_contains_key_in_list_loop T n key ls -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key]: - Source: 'tests/src/hashmap.rs', lines 207:4-207:49 *) -Definition hashmap_HashMap_contains_key - (T : Type) (n : nat) (self : hashmap_HashMap_t T) (key : usize) : - result bool - := - hash <- hashmap_hash_key key; - let i := alloc_vec_Vec_len (hashmap_List_t T) self.(hashmap_HashMap_slots) in - hash_mod <- usize_rem hash i; - l <- - alloc_vec_Vec_index (hashmap_List_t T) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t T)) - self.(hashmap_HashMap_slots) hash_mod; - hashmap_HashMap_contains_key_in_list T n key l -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 *) -Fixpoint hashmap_HashMap_get_in_list_loop - (T : Type) (n : nat) (key : usize) (ls : hashmap_List_t T) : result T := - match n with - | O => Fail_ OutOfFuel - | S n1 => - match ls with - | Hashmap_List_Cons ckey cvalue tl => - if ckey s= key - then Ok cvalue - else hashmap_HashMap_get_in_list_loop T n1 key tl - | Hashmap_List_Nil => Fail_ Failure - end - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: - Source: 'tests/src/hashmap.rs', lines 232:4-232:70 *) -Definition hashmap_HashMap_get_in_list - (T : Type) (n : nat) (key : usize) (ls : hashmap_List_t T) : result T := - hashmap_HashMap_get_in_list_loop T n key ls -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get]: - Source: 'tests/src/hashmap.rs', lines 247:4-247:55 *) -Definition hashmap_HashMap_get - (T : Type) (n : nat) (self : hashmap_HashMap_t T) (key : usize) : result T := - hash <- hashmap_hash_key key; - let i := alloc_vec_Vec_len (hashmap_List_t T) self.(hashmap_HashMap_slots) in - hash_mod <- usize_rem hash i; - l <- - alloc_vec_Vec_index (hashmap_List_t T) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t T)) - self.(hashmap_HashMap_slots) hash_mod; - hashmap_HashMap_get_in_list T n key l -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 *) -Fixpoint hashmap_HashMap_get_mut_in_list_loop - (T : Type) (n : nat) (ls : hashmap_List_t T) (key : usize) : - result (T * (T -> result (hashmap_List_t T))) - := - match n with - | O => Fail_ OutOfFuel - | S n1 => - match ls with - | Hashmap_List_Cons ckey cvalue tl => - if ckey s= key - then - let back := fun (ret : T) => Ok (Hashmap_List_Cons ckey ret tl) in - Ok (cvalue, back) - else ( - p <- hashmap_HashMap_get_mut_in_list_loop T n1 tl key; - let (t, back) := p in - let back1 := - fun (ret : T) => - tl1 <- back ret; Ok (Hashmap_List_Cons ckey cvalue tl1) in - Ok (t, back1)) - | Hashmap_List_Nil => Fail_ Failure - end - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: - Source: 'tests/src/hashmap.rs', lines 253:4-253:86 *) -Definition hashmap_HashMap_get_mut_in_list - (T : Type) (n : nat) (ls : hashmap_List_t T) (key : usize) : - result (T * (T -> result (hashmap_List_t T))) - := - hashmap_HashMap_get_mut_in_list_loop T n ls key -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]: - Source: 'tests/src/hashmap.rs', lines 265:4-265:67 *) -Definition hashmap_HashMap_get_mut - (T : Type) (n : nat) (self : hashmap_HashMap_t T) (key : usize) : - result (T * (T -> result (hashmap_HashMap_t T))) - := - hash <- hashmap_hash_key key; - let i := alloc_vec_Vec_len (hashmap_List_t T) self.(hashmap_HashMap_slots) in - hash_mod <- usize_rem hash i; - p <- - alloc_vec_Vec_index_mut (hashmap_List_t T) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t T)) - self.(hashmap_HashMap_slots) hash_mod; - let (l, index_mut_back) := p in - p1 <- hashmap_HashMap_get_mut_in_list T n l key; - let (t, get_mut_in_list_back) := p1 in - let back := - fun (ret : T) => - l1 <- get_mut_in_list_back ret; - v <- index_mut_back l1; - Ok - {| - hashmap_HashMap_num_entries := self.(hashmap_HashMap_num_entries); - hashmap_HashMap_max_load_factor := - self.(hashmap_HashMap_max_load_factor); - hashmap_HashMap_max_load := self.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := v - |} in - Ok (t, back) -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 *) -Fixpoint hashmap_HashMap_remove_from_list_loop - (T : Type) (n : nat) (key : usize) (ls : hashmap_List_t T) : - result ((option T) * (hashmap_List_t T)) - := - match n with - | O => Fail_ OutOfFuel - | S n1 => - match ls with - | Hashmap_List_Cons ckey t tl => - if ckey s= key - then - let (mv_ls, _) := - core_mem_replace (hashmap_List_t T) (Hashmap_List_Cons ckey t tl) - Hashmap_List_Nil in - match mv_ls with - | Hashmap_List_Cons _ cvalue tl1 => Ok (Some cvalue, tl1) - | Hashmap_List_Nil => Fail_ Failure - end - else ( - p <- hashmap_HashMap_remove_from_list_loop T n1 key tl; - let (o, tl1) := p in - Ok (o, Hashmap_List_Cons ckey t tl1)) - | Hashmap_List_Nil => Ok (None, Hashmap_List_Nil) - end - end -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: - Source: 'tests/src/hashmap.rs', lines 273:4-273:69 *) -Definition hashmap_HashMap_remove_from_list - (T : Type) (n : nat) (key : usize) (ls : hashmap_List_t T) : - result ((option T) * (hashmap_List_t T)) - := - hashmap_HashMap_remove_from_list_loop T n key ls -. - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove]: - Source: 'tests/src/hashmap.rs', lines 302:4-302:52 *) -Definition hashmap_HashMap_remove - (T : Type) (n : nat) (self : hashmap_HashMap_t T) (key : usize) : - result ((option T) * (hashmap_HashMap_t T)) - := - hash <- hashmap_hash_key key; - let i := alloc_vec_Vec_len (hashmap_List_t T) self.(hashmap_HashMap_slots) in - hash_mod <- usize_rem hash i; - p <- - alloc_vec_Vec_index_mut (hashmap_List_t T) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t T)) - self.(hashmap_HashMap_slots) hash_mod; - let (l, index_mut_back) := p in - p1 <- hashmap_HashMap_remove_from_list T n key l; - let (x, l1) := p1 in - match x with - | None => - v <- index_mut_back l1; - Ok (None, - {| - hashmap_HashMap_num_entries := self.(hashmap_HashMap_num_entries); - hashmap_HashMap_max_load_factor := - self.(hashmap_HashMap_max_load_factor); - hashmap_HashMap_max_load := self.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := v - |}) - | Some x1 => - i1 <- usize_sub self.(hashmap_HashMap_num_entries) 1%usize; - v <- index_mut_back l1; - Ok (Some x1, - {| - hashmap_HashMap_num_entries := i1; - hashmap_HashMap_max_load_factor := - self.(hashmap_HashMap_max_load_factor); - hashmap_HashMap_max_load := self.(hashmap_HashMap_max_load); - hashmap_HashMap_slots := v - |}) - end -. - -(** [hashmap_main::hashmap::test1]: - Source: 'tests/src/hashmap.rs', lines 323:0-323:10 *) -Definition hashmap_test1 (n : nat) : result unit := - hm <- hashmap_HashMap_new u64 n; - hm1 <- hashmap_HashMap_insert u64 n hm 0%usize 42%u64; - hm2 <- hashmap_HashMap_insert u64 n hm1 128%usize 18%u64; - hm3 <- hashmap_HashMap_insert u64 n hm2 1024%usize 138%u64; - hm4 <- hashmap_HashMap_insert u64 n hm3 1056%usize 256%u64; - i <- hashmap_HashMap_get u64 n hm4 128%usize; - if negb (i s= 18%u64) - then Fail_ Failure - else ( - p <- hashmap_HashMap_get_mut u64 n hm4 1024%usize; - let (_, get_mut_back) := p in - hm5 <- get_mut_back 56%u64; - i1 <- hashmap_HashMap_get u64 n hm5 1024%usize; - if negb (i1 s= 56%u64) - then Fail_ Failure - else ( - p1 <- hashmap_HashMap_remove u64 n hm5 1024%usize; - let (x, hm6) := p1 in - match x with - | None => Fail_ Failure - | Some x1 => - if negb (x1 s= 56%u64) - then Fail_ Failure - else ( - i2 <- hashmap_HashMap_get u64 n hm6 0%usize; - if negb (i2 s= 42%u64) - then Fail_ Failure - else ( - i3 <- hashmap_HashMap_get u64 n hm6 128%usize; - if negb (i3 s= 18%u64) - then Fail_ Failure - else ( - i4 <- hashmap_HashMap_get u64 n hm6 1056%usize; - if negb (i4 s= 256%u64) then Fail_ Failure else Ok tt))) - end)) -. - -(** [hashmap_main::insert_on_disk]: - Source: 'tests/src/hashmap_main.rs', lines 13:0-13:43 *) -Definition insert_on_disk - (n : nat) (key : usize) (value : u64) (st : state) : result (state * unit) := - p <- hashmap_utils_deserialize st; - let (st1, hm) := p in - hm1 <- hashmap_HashMap_insert u64 n hm key value; - hashmap_utils_serialize hm1 st1 -. - -(** [hashmap_main::main]: - Source: 'tests/src/hashmap_main.rs', lines 22:0-22:13 *) -Definition main : result unit := - Ok tt. - -End HashmapMain_Funs. diff --git a/tests/coq/hashmap_main/HashmapMain_FunsExternal.v b/tests/coq/hashmap_main/HashmapMain_FunsExternal.v deleted file mode 100644 index fb5f23cd..00000000 --- a/tests/coq/hashmap_main/HashmapMain_FunsExternal.v +++ /dev/null @@ -1,24 +0,0 @@ -(** [hashmap_main]: external function declarations *) -Require Import Primitives. -Import Primitives. -Require Import Coq.ZArith.ZArith. -Require Import List. -Import ListNotations. -Local Open Scope Primitives_scope. -Require Export HashmapMain_Types. -Import HashmapMain_Types. -Module HashmapMain_FunsExternal. - -(** [hashmap_main::hashmap_utils::deserialize]: forward function - Source: 'src/hashmap_utils.rs', lines 10:0-10:43 *) -Axiom hashmap_utils_deserialize - : state -> result (state * (hashmap_HashMap_t u64)) -. - -(** [hashmap_main::hashmap_utils::serialize]: forward function - Source: 'src/hashmap_utils.rs', lines 5:0-5:42 *) -Axiom hashmap_utils_serialize - : hashmap_HashMap_t u64 -> state -> result (state * unit) -. - -End HashmapMain_FunsExternal. diff --git a/tests/coq/hashmap_main/HashmapMain_FunsExternal_Template.v b/tests/coq/hashmap_main/HashmapMain_FunsExternal_Template.v deleted file mode 100644 index 66835e8c..00000000 --- a/tests/coq/hashmap_main/HashmapMain_FunsExternal_Template.v +++ /dev/null @@ -1,26 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: external functions. --- This is a template file: rename it to "FunsExternal.lean" and fill the holes. *) -Require Import Primitives. -Import Primitives. -Require Import Coq.ZArith.ZArith. -Require Import List. -Import ListNotations. -Local Open Scope Primitives_scope. -Require Import HashmapMain_Types. -Include HashmapMain_Types. -Module HashmapMain_FunsExternal_Template. - -(** [hashmap_main::hashmap_utils::deserialize]: - Source: 'tests/src/hashmap_utils.rs', lines 11:0-11:43 *) -Axiom hashmap_utils_deserialize - : state -> result (state * (hashmap_HashMap_t u64)) -. - -(** [hashmap_main::hashmap_utils::serialize]: - Source: 'tests/src/hashmap_utils.rs', lines 6:0-6:42 *) -Axiom hashmap_utils_serialize - : hashmap_HashMap_t u64 -> state -> result (state * unit) -. - -End HashmapMain_FunsExternal_Template. diff --git a/tests/coq/hashmap_main/HashmapMain_Types.v b/tests/coq/hashmap_main/HashmapMain_Types.v deleted file mode 100644 index 5656bd9c..00000000 --- a/tests/coq/hashmap_main/HashmapMain_Types.v +++ /dev/null @@ -1,40 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: type definitions *) -Require Import Primitives. -Import Primitives. -Require Import Coq.ZArith.ZArith. -Require Import List. -Import ListNotations. -Local Open Scope Primitives_scope. -Require Import HashmapMain_TypesExternal. -Include HashmapMain_TypesExternal. -Module HashmapMain_Types. - -(** [hashmap_main::hashmap::List] - Source: 'tests/src/hashmap.rs', lines 27:0-27:16 *) -Inductive hashmap_List_t (T : Type) := -| Hashmap_List_Cons : usize -> T -> hashmap_List_t T -> hashmap_List_t T -| Hashmap_List_Nil : hashmap_List_t T -. - -Arguments Hashmap_List_Cons { _ }. -Arguments Hashmap_List_Nil { _ }. - -(** [hashmap_main::hashmap::HashMap] - Source: 'tests/src/hashmap.rs', lines 43:0-43:21 *) -Record hashmap_HashMap_t (T : Type) := -mkhashmap_HashMap_t { - hashmap_HashMap_num_entries : usize; - hashmap_HashMap_max_load_factor : (usize * usize); - hashmap_HashMap_max_load : usize; - hashmap_HashMap_slots : alloc_vec_Vec (hashmap_List_t T); -} -. - -Arguments mkhashmap_HashMap_t { _ }. -Arguments hashmap_HashMap_num_entries { _ }. -Arguments hashmap_HashMap_max_load_factor { _ }. -Arguments hashmap_HashMap_max_load { _ }. -Arguments hashmap_HashMap_slots { _ }. - -End HashmapMain_Types. diff --git a/tests/coq/hashmap_main/Makefile b/tests/coq/hashmap_main/Makefile deleted file mode 100644 index 1a5aee4a..00000000 --- a/tests/coq/hashmap_main/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# This file was automatically generated - modify ../Makefile.template instead -# Makefile originally taken from coq-club - -%: Makefile.coq phony - +make -f Makefile.coq $@ - -all: Makefile.coq - +make -f Makefile.coq all - -clean: Makefile.coq - +make -f Makefile.coq clean - rm -f Makefile.coq - -Makefile.coq: _CoqProject Makefile - coq_makefile -f _CoqProject | sed 's/$$(COQCHK) $$(COQCHKFLAGS) $$(COQLIBS)/$$(COQCHK) $$(COQCHKFLAGS) $$(subst -Q,-R,$$(COQLIBS))/' > Makefile.coq - -_CoqProject: ; - -Makefile: ; - -phony: ; - -.PHONY: all clean phony diff --git a/tests/coq/hashmap_main/Primitives.v b/tests/coq/hashmap_main/Primitives.v deleted file mode 100644 index b29fce43..00000000 --- a/tests/coq/hashmap_main/Primitives.v +++ /dev/null @@ -1,981 +0,0 @@ -Require Import Lia. -Require Coq.Strings.Ascii. -Require Coq.Strings.String. -Require Import Coq.Program.Equality. -Require Import Coq.ZArith.ZArith. -Require Import Coq.ZArith.Znat. -Require Import List. -Import ListNotations. - -Module Primitives. - - (* TODO: use more *) -Declare Scope Primitives_scope. - -(*** Result *) - -Inductive error := - | Failure - | OutOfFuel. - -Inductive result A := - | Ok : A -> result A - | Fail_ : error -> result A. - -Arguments Ok {_} a. -Arguments Fail_ {_}. - -Definition bind {A B} (m: result A) (f: A -> result B) : result B := - match m with - | Fail_ e => Fail_ e - | Ok x => f x - end. - -Definition return_ {A: Type} (x: A) : result A := Ok x. -Definition fail_ {A: Type} (e: error) : result A := Fail_ e. - -Notation "x <- c1 ; c2" := (bind c1 (fun x => c2)) - (at level 61, c1 at next level, right associativity). - -(** Monadic assert *) -Definition massert (b: bool) : result unit := - if b then Ok tt else Fail_ Failure. - -(** Normalize and unwrap a successful result (used for globals) *) -Definition eval_result_refl {A} {x} (a: result A) (p: a = Ok x) : A := - match a as r return (r = Ok x -> A) with - | Ok a' => fun _ => a' - | Fail_ e => fun p' => - False_rect _ (eq_ind (Fail_ e) - (fun e : result A => - match e with - | Ok _ => False - | Fail_ e => True - end) - I (Ok x) p') - end p. - -Notation "x %global" := (eval_result_refl x eq_refl) (at level 40). -Notation "x %return" := (eval_result_refl x eq_refl) (at level 40). - -(* Sanity check *) -Check (if true then Ok (1 + 2) else Fail_ Failure)%global = 3. - -(*** Misc *) - -Definition string := Coq.Strings.String.string. -Definition char := Coq.Strings.Ascii.ascii. -Definition char_of_byte := Coq.Strings.Ascii.ascii_of_byte. - -Definition core_mem_replace (a : Type) (x : a) (y : a) : a * a := (x, x) . - -Record mut_raw_ptr (T : Type) := { mut_raw_ptr_v : T }. -Record const_raw_ptr (T : Type) := { const_raw_ptr_v : T }. - -(*** Scalars *) - -Definition i8_min : Z := -128%Z. -Definition i8_max : Z := 127%Z. -Definition i16_min : Z := -32768%Z. -Definition i16_max : Z := 32767%Z. -Definition i32_min : Z := -2147483648%Z. -Definition i32_max : Z := 2147483647%Z. -Definition i64_min : Z := -9223372036854775808%Z. -Definition i64_max : Z := 9223372036854775807%Z. -Definition i128_min : Z := -170141183460469231731687303715884105728%Z. -Definition i128_max : Z := 170141183460469231731687303715884105727%Z. -Definition u8_min : Z := 0%Z. -Definition u8_max : Z := 255%Z. -Definition u16_min : Z := 0%Z. -Definition u16_max : Z := 65535%Z. -Definition u32_min : Z := 0%Z. -Definition u32_max : Z := 4294967295%Z. -Definition u64_min : Z := 0%Z. -Definition u64_max : Z := 18446744073709551615%Z. -Definition u128_min : Z := 0%Z. -Definition u128_max : Z := 340282366920938463463374607431768211455%Z. - -(** The bounds of [isize] and [usize] vary with the architecture. *) -Axiom isize_min : Z. -Axiom isize_max : Z. -Definition usize_min : Z := 0%Z. -Axiom usize_max : Z. - -Open Scope Z_scope. - -(** We provide those lemmas to reason about the bounds of [isize] and [usize] *) -Axiom isize_min_bound : isize_min <= i32_min. -Axiom isize_max_bound : i32_max <= isize_max. -Axiom usize_max_bound : u32_max <= usize_max. - -Inductive scalar_ty := - | Isize - | I8 - | I16 - | I32 - | I64 - | I128 - | Usize - | U8 - | U16 - | U32 - | U64 - | U128 -. - -Definition scalar_min (ty: scalar_ty) : Z := - match ty with - | Isize => isize_min - | I8 => i8_min - | I16 => i16_min - | I32 => i32_min - | I64 => i64_min - | I128 => i128_min - | Usize => usize_min - | U8 => u8_min - | U16 => u16_min - | U32 => u32_min - | U64 => u64_min - | U128 => u128_min -end. - -Definition scalar_max (ty: scalar_ty) : Z := - match ty with - | Isize => isize_max - | I8 => i8_max - | I16 => i16_max - | I32 => i32_max - | I64 => i64_max - | I128 => i128_max - | Usize => usize_max - | U8 => u8_max - | U16 => u16_max - | U32 => u32_max - | U64 => u64_max - | U128 => u128_max -end. - -(** We use the following conservative bounds to make sure we can compute bound - checks in most situations *) -Definition scalar_min_cons (ty: scalar_ty) : Z := - match ty with - | Isize => i32_min - | Usize => u32_min - | _ => scalar_min ty -end. - -Definition scalar_max_cons (ty: scalar_ty) : Z := - match ty with - | Isize => i32_max - | Usize => u32_max - | _ => scalar_max ty -end. - -Lemma scalar_min_cons_valid : forall ty, scalar_min ty <= scalar_min_cons ty . -Proof. - destruct ty; unfold scalar_min_cons, scalar_min; try lia. - - pose isize_min_bound; lia. - - apply Z.le_refl. -Qed. - -Lemma scalar_max_cons_valid : forall ty, scalar_max ty >= scalar_max_cons ty . -Proof. - destruct ty; unfold scalar_max_cons, scalar_max; try lia. - - pose isize_max_bound; lia. - - pose usize_max_bound. lia. -Qed. - -Definition scalar (ty: scalar_ty) : Type := - { x: Z | scalar_min ty <= x <= scalar_max ty }. - -Definition to_Z {ty} (x: scalar ty) : Z := proj1_sig x. - -(** Bounds checks: we start by using the conservative bounds, to make sure we - can compute in most situations, then we use the real bounds (for [isize] - and [usize]). *) -Definition scalar_ge_min (ty: scalar_ty) (x: Z) : bool := - Z.leb (scalar_min_cons ty) x || Z.leb (scalar_min ty) x. - -Definition scalar_le_max (ty: scalar_ty) (x: Z) : bool := - Z.leb x (scalar_max_cons ty) || Z.leb x (scalar_max ty). - -Lemma scalar_ge_min_valid (ty: scalar_ty) (x: Z) : - scalar_ge_min ty x = true -> scalar_min ty <= x . -Proof. - unfold scalar_ge_min. - pose (scalar_min_cons_valid ty). - lia. -Qed. - -Lemma scalar_le_max_valid (ty: scalar_ty) (x: Z) : - scalar_le_max ty x = true -> x <= scalar_max ty . -Proof. - unfold scalar_le_max. - pose (scalar_max_cons_valid ty). - lia. -Qed. - -Definition scalar_in_bounds (ty: scalar_ty) (x: Z) : bool := - scalar_ge_min ty x && scalar_le_max ty x . - -Lemma scalar_in_bounds_valid (ty: scalar_ty) (x: Z) : - scalar_in_bounds ty x = true -> scalar_min ty <= x <= scalar_max ty . -Proof. - unfold scalar_in_bounds. - intros H. - destruct (scalar_ge_min ty x) eqn:Hmin. - - destruct (scalar_le_max ty x) eqn:Hmax. - + pose (scalar_ge_min_valid ty x Hmin). - pose (scalar_le_max_valid ty x Hmax). - lia. - + inversion H. - - inversion H. -Qed. - -Import Sumbool. - -Definition mk_scalar (ty: scalar_ty) (x: Z) : result (scalar ty) := - match sumbool_of_bool (scalar_in_bounds ty x) with - | left H => Ok (exist _ x (scalar_in_bounds_valid _ _ H)) - | right _ => Fail_ Failure - end. - -Definition scalar_add {ty} (x y: scalar ty) : result (scalar ty) := mk_scalar ty (to_Z x + to_Z y). - -Definition scalar_sub {ty} (x y: scalar ty) : result (scalar ty) := mk_scalar ty (to_Z x - to_Z y). - -Definition scalar_mul {ty} (x y: scalar ty) : result (scalar ty) := mk_scalar ty (to_Z x * to_Z y). - -Definition scalar_div {ty} (x y: scalar ty) : result (scalar ty) := - if to_Z y =? 0 then Fail_ Failure else - mk_scalar ty (to_Z x / to_Z y). - -Definition scalar_rem {ty} (x y: scalar ty) : result (scalar ty) := mk_scalar ty (Z.rem (to_Z x) (to_Z y)). - -Definition scalar_neg {ty} (x: scalar ty) : result (scalar ty) := mk_scalar ty (-(to_Z x)). - -Axiom scalar_xor : forall ty, scalar ty -> scalar ty -> scalar ty. (* TODO *) -Axiom scalar_or : forall ty, scalar ty -> scalar ty -> scalar ty. (* TODO *) -Axiom scalar_and : forall ty, scalar ty -> scalar ty -> scalar ty. (* TODO *) -Axiom scalar_shl : forall ty0 ty1, scalar ty0 -> scalar ty1 -> result (scalar ty0). (* TODO *) -Axiom scalar_shr : forall ty0 ty1, scalar ty0 -> scalar ty1 -> result (scalar ty0). (* TODO *) - -(** Cast an integer from a [src_ty] to a [tgt_ty] *) -(* TODO: check the semantics of casts in Rust *) -Definition scalar_cast (src_ty tgt_ty : scalar_ty) (x : scalar src_ty) : result (scalar tgt_ty) := - mk_scalar tgt_ty (to_Z x). - -(* This can't fail, but for now we make all casts faillible (easier for the translation) *) -Definition scalar_cast_bool (tgt_ty : scalar_ty) (x : bool) : result (scalar tgt_ty) := - mk_scalar tgt_ty (if x then 1 else 0). - -(** Comparisons *) -Definition scalar_leb {ty : scalar_ty} (x : scalar ty) (y : scalar ty) : bool := - Z.leb (to_Z x) (to_Z y) . - -Definition scalar_ltb {ty : scalar_ty} (x : scalar ty) (y : scalar ty) : bool := - Z.ltb (to_Z x) (to_Z y) . - -Definition scalar_geb {ty : scalar_ty} (x : scalar ty) (y : scalar ty) : bool := - Z.geb (to_Z x) (to_Z y) . - -Definition scalar_gtb {ty : scalar_ty} (x : scalar ty) (y : scalar ty) : bool := - Z.gtb (to_Z x) (to_Z y) . - -Definition scalar_eqb {ty : scalar_ty} (x : scalar ty) (y : scalar ty) : bool := - Z.eqb (to_Z x) (to_Z y) . - -Definition scalar_neqb {ty : scalar_ty} (x : scalar ty) (y : scalar ty) : bool := - negb (Z.eqb (to_Z x) (to_Z y)) . - - -(** The scalar types *) -Definition isize := scalar Isize. -Definition i8 := scalar I8. -Definition i16 := scalar I16. -Definition i32 := scalar I32. -Definition i64 := scalar I64. -Definition i128 := scalar I128. -Definition usize := scalar Usize. -Definition u8 := scalar U8. -Definition u16 := scalar U16. -Definition u32 := scalar U32. -Definition u64 := scalar U64. -Definition u128 := scalar U128. - -(** Negaion *) -Definition isize_neg := @scalar_neg Isize. -Definition i8_neg := @scalar_neg I8. -Definition i16_neg := @scalar_neg I16. -Definition i32_neg := @scalar_neg I32. -Definition i64_neg := @scalar_neg I64. -Definition i128_neg := @scalar_neg I128. - -(** Division *) -Definition isize_div := @scalar_div Isize. -Definition i8_div := @scalar_div I8. -Definition i16_div := @scalar_div I16. -Definition i32_div := @scalar_div I32. -Definition i64_div := @scalar_div I64. -Definition i128_div := @scalar_div I128. -Definition usize_div := @scalar_div Usize. -Definition u8_div := @scalar_div U8. -Definition u16_div := @scalar_div U16. -Definition u32_div := @scalar_div U32. -Definition u64_div := @scalar_div U64. -Definition u128_div := @scalar_div U128. - -(** Remainder *) -Definition isize_rem := @scalar_rem Isize. -Definition i8_rem := @scalar_rem I8. -Definition i16_rem := @scalar_rem I16. -Definition i32_rem := @scalar_rem I32. -Definition i64_rem := @scalar_rem I64. -Definition i128_rem := @scalar_rem I128. -Definition usize_rem := @scalar_rem Usize. -Definition u8_rem := @scalar_rem U8. -Definition u16_rem := @scalar_rem U16. -Definition u32_rem := @scalar_rem U32. -Definition u64_rem := @scalar_rem U64. -Definition u128_rem := @scalar_rem U128. - -(** Addition *) -Definition isize_add := @scalar_add Isize. -Definition i8_add := @scalar_add I8. -Definition i16_add := @scalar_add I16. -Definition i32_add := @scalar_add I32. -Definition i64_add := @scalar_add I64. -Definition i128_add := @scalar_add I128. -Definition usize_add := @scalar_add Usize. -Definition u8_add := @scalar_add U8. -Definition u16_add := @scalar_add U16. -Definition u32_add := @scalar_add U32. -Definition u64_add := @scalar_add U64. -Definition u128_add := @scalar_add U128. - -(** Substraction *) -Definition isize_sub := @scalar_sub Isize. -Definition i8_sub := @scalar_sub I8. -Definition i16_sub := @scalar_sub I16. -Definition i32_sub := @scalar_sub I32. -Definition i64_sub := @scalar_sub I64. -Definition i128_sub := @scalar_sub I128. -Definition usize_sub := @scalar_sub Usize. -Definition u8_sub := @scalar_sub U8. -Definition u16_sub := @scalar_sub U16. -Definition u32_sub := @scalar_sub U32. -Definition u64_sub := @scalar_sub U64. -Definition u128_sub := @scalar_sub U128. - -(** Multiplication *) -Definition isize_mul := @scalar_mul Isize. -Definition i8_mul := @scalar_mul I8. -Definition i16_mul := @scalar_mul I16. -Definition i32_mul := @scalar_mul I32. -Definition i64_mul := @scalar_mul I64. -Definition i128_mul := @scalar_mul I128. -Definition usize_mul := @scalar_mul Usize. -Definition u8_mul := @scalar_mul U8. -Definition u16_mul := @scalar_mul U16. -Definition u32_mul := @scalar_mul U32. -Definition u64_mul := @scalar_mul U64. -Definition u128_mul := @scalar_mul U128. - -(** Xor *) -Definition u8_xor := @scalar_xor U8. -Definition u16_xor := @scalar_xor U16. -Definition u32_xor := @scalar_xor U32. -Definition u64_xor := @scalar_xor U64. -Definition u128_xor := @scalar_xor U128. -Definition usize_xor := @scalar_xor Usize. -Definition i8_xor := @scalar_xor I8. -Definition i16_xor := @scalar_xor I16. -Definition i32_xor := @scalar_xor I32. -Definition i64_xor := @scalar_xor I64. -Definition i128_xor := @scalar_xor I128. -Definition isize_xor := @scalar_xor Isize. - -(** Or *) -Definition u8_or := @scalar_or U8. -Definition u16_or := @scalar_or U16. -Definition u32_or := @scalar_or U32. -Definition u64_or := @scalar_or U64. -Definition u128_or := @scalar_or U128. -Definition usize_or := @scalar_or Usize. -Definition i8_or := @scalar_or I8. -Definition i16_or := @scalar_or I16. -Definition i32_or := @scalar_or I32. -Definition i64_or := @scalar_or I64. -Definition i128_or := @scalar_or I128. -Definition isize_or := @scalar_or Isize. - -(** And *) -Definition u8_and := @scalar_and U8. -Definition u16_and := @scalar_and U16. -Definition u32_and := @scalar_and U32. -Definition u64_and := @scalar_and U64. -Definition u128_and := @scalar_and U128. -Definition usize_and := @scalar_and Usize. -Definition i8_and := @scalar_and I8. -Definition i16_and := @scalar_and I16. -Definition i32_and := @scalar_and I32. -Definition i64_and := @scalar_and I64. -Definition i128_and := @scalar_and I128. -Definition isize_and := @scalar_and Isize. - -(** Shift left *) -Definition u8_shl {ty} := @scalar_shl U8 ty. -Definition u16_shl {ty} := @scalar_shl U16 ty. -Definition u32_shl {ty} := @scalar_shl U32 ty. -Definition u64_shl {ty} := @scalar_shl U64 ty. -Definition u128_shl {ty} := @scalar_shl U128 ty. -Definition usize_shl {ty} := @scalar_shl Usize ty. -Definition i8_shl {ty} := @scalar_shl I8 ty. -Definition i16_shl {ty} := @scalar_shl I16 ty. -Definition i32_shl {ty} := @scalar_shl I32 ty. -Definition i64_shl {ty} := @scalar_shl I64 ty. -Definition i128_shl {ty} := @scalar_shl I128 ty. -Definition isize_shl {ty} := @scalar_shl Isize ty. - -(** Shift right *) -Definition u8_shr {ty} := @scalar_shr U8 ty. -Definition u16_shr {ty} := @scalar_shr U16 ty. -Definition u32_shr {ty} := @scalar_shr U32 ty. -Definition u64_shr {ty} := @scalar_shr U64 ty. -Definition u128_shr {ty} := @scalar_shr U128 ty. -Definition usize_shr {ty} := @scalar_shr Usize ty. -Definition i8_shr {ty} := @scalar_shr I8 ty. -Definition i16_shr {ty} := @scalar_shr I16 ty. -Definition i32_shr {ty} := @scalar_shr I32 ty. -Definition i64_shr {ty} := @scalar_shr I64 ty. -Definition i128_shr {ty} := @scalar_shr I128 ty. -Definition isize_shr {ty} := @scalar_shr Isize ty. - -(** Small utility *) -Definition usize_to_nat (x: usize) : nat := Z.to_nat (to_Z x). - -(** Notations *) -Notation "x %isize" := ((mk_scalar Isize x)%return) (at level 9). -Notation "x %i8" := ((mk_scalar I8 x)%return) (at level 9). -Notation "x %i16" := ((mk_scalar I16 x)%return) (at level 9). -Notation "x %i32" := ((mk_scalar I32 x)%return) (at level 9). -Notation "x %i64" := ((mk_scalar I64 x)%return) (at level 9). -Notation "x %i128" := ((mk_scalar I128 x)%return) (at level 9). -Notation "x %usize" := ((mk_scalar Usize x)%return) (at level 9). -Notation "x %u8" := ((mk_scalar U8 x)%return) (at level 9). -Notation "x %u16" := ((mk_scalar U16 x)%return) (at level 9). -Notation "x %u32" := ((mk_scalar U32 x)%return) (at level 9). -Notation "x %u64" := ((mk_scalar U64 x)%return) (at level 9). -Notation "x %u128" := ((mk_scalar U128 x)%return) (at level 9). - -Notation "x s= y" := (scalar_eqb x y) (at level 80) : Primitives_scope. -Notation "x s<> y" := (scalar_neqb x y) (at level 80) : Primitives_scope. -Notation "x s<= y" := (scalar_leb x y) (at level 80) : Primitives_scope. -Notation "x s< y" := (scalar_ltb x y) (at level 80) : Primitives_scope. -Notation "x s>= y" := (scalar_geb x y) (at level 80) : Primitives_scope. -Notation "x s> y" := (scalar_gtb x y) (at level 80) : Primitives_scope. - -(** Constants *) -Definition core_u8_max := u8_max %u32. -Definition core_u16_max := u16_max %u32. -Definition core_u32_max := u32_max %u32. -Definition core_u64_max := u64_max %u64. -Definition core_u128_max := u64_max %u128. -Axiom core_usize_max : usize. (** TODO *) -Definition core_i8_max := i8_max %i32. -Definition core_i16_max := i16_max %i32. -Definition core_i32_max := i32_max %i32. -Definition core_i64_max := i64_max %i64. -Definition core_i128_max := i64_max %i128. -Axiom core_isize_max : isize. (** TODO *) - -(*** core *) - -(** Trait declaration: [core::clone::Clone] *) -Record core_clone_Clone (self : Type) := { - clone : self -> result self -}. - -Definition core_clone_impls_CloneBool_clone (b : bool) : bool := b. - -Definition core_clone_CloneBool : core_clone_Clone bool := {| - clone := fun b => Ok (core_clone_impls_CloneBool_clone b) -|}. - -Definition core_clone_impls_CloneUsize_clone (x : usize) : usize := x. -Definition core_clone_impls_CloneU8_clone (x : u8) : u8 := x. -Definition core_clone_impls_CloneU16_clone (x : u16) : u16 := x. -Definition core_clone_impls_CloneU32_clone (x : u32) : u32 := x. -Definition core_clone_impls_CloneU64_clone (x : u64) : u64 := x. -Definition core_clone_impls_CloneU128_clone (x : u128) : u128 := x. - -Definition core_clone_impls_CloneIsize_clone (x : isize) : isize := x. -Definition core_clone_impls_CloneI8_clone (x : i8) : i8 := x. -Definition core_clone_impls_CloneI16_clone (x : i16) : i16 := x. -Definition core_clone_impls_CloneI32_clone (x : i32) : i32 := x. -Definition core_clone_impls_CloneI64_clone (x : i64) : i64 := x. -Definition core_clone_impls_CloneI128_clone (x : i128) : i128 := x. - -Definition core_clone_CloneUsize : core_clone_Clone usize := {| - clone := fun x => Ok (core_clone_impls_CloneUsize_clone x) -|}. - -Definition core_clone_CloneU8 : core_clone_Clone u8 := {| - clone := fun x => Ok (core_clone_impls_CloneU8_clone x) -|}. - -Definition core_clone_CloneU16 : core_clone_Clone u16 := {| - clone := fun x => Ok (core_clone_impls_CloneU16_clone x) -|}. - -Definition core_clone_CloneU32 : core_clone_Clone u32 := {| - clone := fun x => Ok (core_clone_impls_CloneU32_clone x) -|}. - -Definition core_clone_CloneU64 : core_clone_Clone u64 := {| - clone := fun x => Ok (core_clone_impls_CloneU64_clone x) -|}. - -Definition core_clone_CloneU128 : core_clone_Clone u128 := {| - clone := fun x => Ok (core_clone_impls_CloneU128_clone x) -|}. - -Definition core_clone_CloneIsize : core_clone_Clone isize := {| - clone := fun x => Ok (core_clone_impls_CloneIsize_clone x) -|}. - -Definition core_clone_CloneI8 : core_clone_Clone i8 := {| - clone := fun x => Ok (core_clone_impls_CloneI8_clone x) -|}. - -Definition core_clone_CloneI16 : core_clone_Clone i16 := {| - clone := fun x => Ok (core_clone_impls_CloneI16_clone x) -|}. - -Definition core_clone_CloneI32 : core_clone_Clone i32 := {| - clone := fun x => Ok (core_clone_impls_CloneI32_clone x) -|}. - -Definition core_clone_CloneI64 : core_clone_Clone i64 := {| - clone := fun x => Ok (core_clone_impls_CloneI64_clone x) -|}. - -Definition core_clone_CloneI128 : core_clone_Clone i128 := {| - clone := fun x => Ok (core_clone_impls_CloneI128_clone x) -|}. - -(** [core::option::{core::option::Option<T>}::unwrap] *) -Definition core_option_Option_unwrap (T : Type) (x : option T) : result T := - match x with - | None => Fail_ Failure - | Some x => Ok x - end. - -(*** core::ops *) - -(* Trait declaration: [core::ops::index::Index] *) -Record core_ops_index_Index (Self Idx : Type) := mk_core_ops_index_Index { - core_ops_index_Index_Output : Type; - core_ops_index_Index_index : Self -> Idx -> result core_ops_index_Index_Output; -}. -Arguments mk_core_ops_index_Index {_ _}. -Arguments core_ops_index_Index_Output {_ _}. -Arguments core_ops_index_Index_index {_ _}. - -(* Trait declaration: [core::ops::index::IndexMut] *) -Record core_ops_index_IndexMut (Self Idx : Type) := mk_core_ops_index_IndexMut { - core_ops_index_IndexMut_indexInst : core_ops_index_Index Self Idx; - core_ops_index_IndexMut_index_mut : - Self -> - Idx -> - result (core_ops_index_IndexMut_indexInst.(core_ops_index_Index_Output) * - (core_ops_index_IndexMut_indexInst.(core_ops_index_Index_Output) -> result Self)); -}. -Arguments mk_core_ops_index_IndexMut {_ _}. -Arguments core_ops_index_IndexMut_indexInst {_ _}. -Arguments core_ops_index_IndexMut_index_mut {_ _}. - -(* Trait declaration [core::ops::deref::Deref] *) -Record core_ops_deref_Deref (Self : Type) := mk_core_ops_deref_Deref { - core_ops_deref_Deref_target : Type; - core_ops_deref_Deref_deref : Self -> result core_ops_deref_Deref_target; -}. -Arguments mk_core_ops_deref_Deref {_}. -Arguments core_ops_deref_Deref_target {_}. -Arguments core_ops_deref_Deref_deref {_}. - -(* Trait declaration [core::ops::deref::DerefMut] *) -Record core_ops_deref_DerefMut (Self : Type) := mk_core_ops_deref_DerefMut { - core_ops_deref_DerefMut_derefInst : core_ops_deref_Deref Self; - core_ops_deref_DerefMut_deref_mut : - Self -> - result (core_ops_deref_DerefMut_derefInst.(core_ops_deref_Deref_target) * - (core_ops_deref_DerefMut_derefInst.(core_ops_deref_Deref_target) -> result Self)); -}. -Arguments mk_core_ops_deref_DerefMut {_}. -Arguments core_ops_deref_DerefMut_derefInst {_}. -Arguments core_ops_deref_DerefMut_deref_mut {_}. - -Record core_ops_range_Range (T : Type) := mk_core_ops_range_Range { - core_ops_range_Range_start : T; - core_ops_range_Range_end_ : T; -}. -Arguments mk_core_ops_range_Range {_}. -Arguments core_ops_range_Range_start {_}. -Arguments core_ops_range_Range_end_ {_}. - -(*** [alloc] *) - -Definition alloc_boxed_Box_deref (T : Type) (x : T) : result T := Ok x. -Definition alloc_boxed_Box_deref_mut (T : Type) (x : T) : result (T * (T -> result T)) := - Ok (x, fun x => Ok x). - -(* Trait instance *) -Definition alloc_boxed_Box_coreopsDerefInst (Self : Type) : core_ops_deref_Deref Self := {| - core_ops_deref_Deref_target := Self; - core_ops_deref_Deref_deref := alloc_boxed_Box_deref Self; -|}. - -(* Trait instance *) -Definition alloc_boxed_Box_coreopsDerefMutInst (Self : Type) : core_ops_deref_DerefMut Self := {| - core_ops_deref_DerefMut_derefInst := alloc_boxed_Box_coreopsDerefInst Self; - core_ops_deref_DerefMut_deref_mut := alloc_boxed_Box_deref_mut Self; -|}. - - -(*** Arrays *) -Definition array T (n : usize) := { l: list T | Z.of_nat (length l) = to_Z n}. - -Lemma le_0_usize_max : 0 <= usize_max. -Proof. - pose (H := usize_max_bound). - unfold u32_max in H. - lia. -Qed. - -Lemma eqb_imp_eq (x y : Z) : Z.eqb x y = true -> x = y. -Proof. - lia. -Qed. - -(* TODO: finish the definitions *) -Axiom mk_array : forall (T : Type) (n : usize) (l : list T), array T n. - -(* For initialization *) -Axiom array_repeat : forall (T : Type) (n : usize) (x : T), array T n. - -Axiom array_index_usize : forall (T : Type) (n : usize) (x : array T n) (i : usize), result T. -Axiom array_update_usize : forall (T : Type) (n : usize) (x : array T n) (i : usize) (nx : T), result (array T n). - -Definition array_index_mut_usize (T : Type) (n : usize) (a : array T n) (i : usize) : - result (T * (T -> result (array T n))) := - match array_index_usize T n a i with - | Fail_ e => Fail_ e - | Ok x => Ok (x, array_update_usize T n a i) - end. - -(*** Slice *) -Definition slice T := { l: list T | Z.of_nat (length l) <= usize_max}. - -Axiom slice_len : forall (T : Type) (s : slice T), usize. -Axiom slice_index_usize : forall (T : Type) (x : slice T) (i : usize), result T. -Axiom slice_update_usize : forall (T : Type) (x : slice T) (i : usize) (nx : T), result (slice T). - -Definition slice_index_mut_usize (T : Type) (s : slice T) (i : usize) : - result (T * (T -> result (slice T))) := - match slice_index_usize T s i with - | Fail_ e => Fail_ e - | Ok x => Ok (x, slice_update_usize T s i) - end. - -(*** Subslices *) - -Axiom array_to_slice : forall (T : Type) (n : usize) (x : array T n), result (slice T). -Axiom array_from_slice : forall (T : Type) (n : usize) (x : array T n) (s : slice T), result (array T n). - -Definition array_to_slice_mut (T : Type) (n : usize) (a : array T n) : - result (slice T * (slice T -> result (array T n))) := - match array_to_slice T n a with - | Fail_ e => Fail_ e - | Ok x => Ok (x, array_from_slice T n a) - end. - -Axiom array_subslice: forall (T : Type) (n : usize) (x : array T n) (r : core_ops_range_Range usize), result (slice T). -Axiom array_update_subslice: forall (T : Type) (n : usize) (x : array T n) (r : core_ops_range_Range usize) (ns : slice T), result (array T n). - -Axiom slice_subslice: forall (T : Type) (x : slice T) (r : core_ops_range_Range usize), result (slice T). -Axiom slice_update_subslice: forall (T : Type) (x : slice T) (r : core_ops_range_Range usize) (ns : slice T), result (slice T). - -(*** Vectors *) - -Definition alloc_vec_Vec T := { l: list T | Z.of_nat (length l) <= usize_max }. - -Definition alloc_vec_Vec_to_list {T: Type} (v: alloc_vec_Vec T) : list T := proj1_sig v. - -Definition alloc_vec_Vec_length {T: Type} (v: alloc_vec_Vec T) : Z := Z.of_nat (length (alloc_vec_Vec_to_list v)). - -Definition alloc_vec_Vec_new (T: Type) : alloc_vec_Vec T := (exist _ [] le_0_usize_max). - -Lemma alloc_vec_Vec_len_in_usize {T} (v: alloc_vec_Vec T) : usize_min <= alloc_vec_Vec_length v <= usize_max. -Proof. - unfold alloc_vec_Vec_length, usize_min. - split. - - lia. - - apply (proj2_sig v). -Qed. - -Definition alloc_vec_Vec_len (T: Type) (v: alloc_vec_Vec T) : usize := - exist _ (alloc_vec_Vec_length v) (alloc_vec_Vec_len_in_usize v). - -Fixpoint list_update {A} (l: list A) (n: nat) (a: A) - : list A := - match l with - | [] => [] - | x :: t => match n with - | 0%nat => a :: t - | S m => x :: (list_update t m a) -end end. - -Definition alloc_vec_Vec_bind {A B} (v: alloc_vec_Vec A) (f: list A -> result (list B)) : result (alloc_vec_Vec B) := - l <- f (alloc_vec_Vec_to_list v) ; - match sumbool_of_bool (scalar_le_max Usize (Z.of_nat (length l))) with - | left H => Ok (exist _ l (scalar_le_max_valid _ _ H)) - | right _ => Fail_ Failure - end. - -Definition alloc_vec_Vec_push (T: Type) (v: alloc_vec_Vec T) (x: T) : result (alloc_vec_Vec T) := - alloc_vec_Vec_bind v (fun l => Ok (l ++ [x])). - -Definition alloc_vec_Vec_insert (T: Type) (v: alloc_vec_Vec T) (i: usize) (x: T) : result (alloc_vec_Vec T) := - alloc_vec_Vec_bind v (fun l => - if to_Z i <? Z.of_nat (length l) - then Ok (list_update l (usize_to_nat i) x) - else Fail_ Failure). - -(* Helper *) -Axiom alloc_vec_Vec_index_usize : forall {T : Type} (v : alloc_vec_Vec T) (i : usize), result T. - -(* Helper *) -Axiom alloc_vec_Vec_update_usize : forall {T : Type} (v : alloc_vec_Vec T) (i : usize) (x : T), result (alloc_vec_Vec T). - -Definition alloc_vec_Vec_index_mut_usize {T : Type} (v: alloc_vec_Vec T) (i: usize) : - result (T * (T -> result (alloc_vec_Vec T))) := - match alloc_vec_Vec_index_usize v i with - | Ok x => - Ok (x, alloc_vec_Vec_update_usize v i) - | Fail_ e => Fail_ e - end. - -(* Trait declaration: [core::slice::index::private_slice_index::Sealed] *) -Definition core_slice_index_private_slice_index_Sealed (self : Type) := unit. - -(* Trait declaration: [core::slice::index::SliceIndex] *) -Record core_slice_index_SliceIndex (Self T : Type) := mk_core_slice_index_SliceIndex { - core_slice_index_SliceIndex_sealedInst : core_slice_index_private_slice_index_Sealed Self; - core_slice_index_SliceIndex_Output : Type; - core_slice_index_SliceIndex_get : Self -> T -> result (option core_slice_index_SliceIndex_Output); - core_slice_index_SliceIndex_get_mut : - Self -> T -> result (option core_slice_index_SliceIndex_Output * (option core_slice_index_SliceIndex_Output -> result T)); - core_slice_index_SliceIndex_get_unchecked : Self -> const_raw_ptr T -> result (const_raw_ptr core_slice_index_SliceIndex_Output); - core_slice_index_SliceIndex_get_unchecked_mut : Self -> mut_raw_ptr T -> result (mut_raw_ptr core_slice_index_SliceIndex_Output); - core_slice_index_SliceIndex_index : Self -> T -> result core_slice_index_SliceIndex_Output; - core_slice_index_SliceIndex_index_mut : - Self -> T -> result (core_slice_index_SliceIndex_Output * (core_slice_index_SliceIndex_Output -> result T)); -}. -Arguments mk_core_slice_index_SliceIndex {_ _}. -Arguments core_slice_index_SliceIndex_sealedInst {_ _}. -Arguments core_slice_index_SliceIndex_Output {_ _}. -Arguments core_slice_index_SliceIndex_get {_ _}. -Arguments core_slice_index_SliceIndex_get_mut {_ _}. -Arguments core_slice_index_SliceIndex_get_unchecked {_ _}. -Arguments core_slice_index_SliceIndex_get_unchecked_mut {_ _}. -Arguments core_slice_index_SliceIndex_index {_ _}. -Arguments core_slice_index_SliceIndex_index_mut {_ _}. - -(* [core::slice::index::[T]::index]: forward function *) -Definition core_slice_index_Slice_index - (T Idx : Type) (inst : core_slice_index_SliceIndex Idx (slice T)) - (s : slice T) (i : Idx) : result inst.(core_slice_index_SliceIndex_Output) := - x <- inst.(core_slice_index_SliceIndex_get) i s; - match x with - | None => Fail_ Failure - | Some x => Ok x - end. - -(* [core::slice::index::Range:::get]: forward function *) -Axiom core_slice_index_RangeUsize_get : forall (T : Type) (i : core_ops_range_Range usize) (s : slice T), result (option (slice T)). - -(* [core::slice::index::Range::get_mut]: forward function *) -Axiom core_slice_index_RangeUsize_get_mut : - forall (T : Type), - core_ops_range_Range usize -> slice T -> - result (option (slice T) * (option (slice T) -> result (slice T))). - -(* [core::slice::index::Range::get_unchecked]: forward function *) -Definition core_slice_index_RangeUsize_get_unchecked - (T : Type) : - core_ops_range_Range usize -> const_raw_ptr (slice T) -> result (const_raw_ptr (slice T)) := - (* Don't know what the model should be - for now we always fail to make - sure code which uses it fails *) - fun _ _ => Fail_ Failure. - -(* [core::slice::index::Range::get_unchecked_mut]: forward function *) -Definition core_slice_index_RangeUsize_get_unchecked_mut - (T : Type) : - core_ops_range_Range usize -> mut_raw_ptr (slice T) -> result (mut_raw_ptr (slice T)) := - (* Don't know what the model should be - for now we always fail to make - sure code which uses it fails *) - fun _ _ => Fail_ Failure. - -(* [core::slice::index::Range::index]: forward function *) -Axiom core_slice_index_RangeUsize_index : - forall (T : Type), core_ops_range_Range usize -> slice T -> result (slice T). - -(* [core::slice::index::Range::index_mut]: forward function *) -Axiom core_slice_index_RangeUsize_index_mut : - forall (T : Type), core_ops_range_Range usize -> slice T -> result (slice T * (slice T -> result (slice T))). - -(* [core::slice::index::[T]::index_mut]: forward function *) -Axiom core_slice_index_Slice_index_mut : - forall (T Idx : Type) (inst : core_slice_index_SliceIndex Idx (slice T)), - slice T -> Idx -> - result (inst.(core_slice_index_SliceIndex_Output) * - (inst.(core_slice_index_SliceIndex_Output) -> result (slice T))). - -(* [core::array::[T; N]::index]: forward function *) -Axiom core_array_Array_index : - forall (T Idx : Type) (N : usize) (inst : core_ops_index_Index (slice T) Idx) - (a : array T N) (i : Idx), result inst.(core_ops_index_Index_Output). - -(* [core::array::[T; N]::index_mut]: forward function *) -Axiom core_array_Array_index_mut : - forall (T Idx : Type) (N : usize) (inst : core_ops_index_IndexMut (slice T) Idx) - (a : array T N) (i : Idx), - result (inst.(core_ops_index_IndexMut_indexInst).(core_ops_index_Index_Output) * - (inst.(core_ops_index_IndexMut_indexInst).(core_ops_index_Index_Output) -> result (array T N))). - -(* Trait implementation: [core::slice::index::private_slice_index::Range] *) -Definition core_slice_index_private_slice_index_SealedRangeUsizeInst - : core_slice_index_private_slice_index_Sealed (core_ops_range_Range usize) := tt. - -(* Trait implementation: [core::slice::index::Range] *) -Definition core_slice_index_SliceIndexRangeUsizeSliceTInst (T : Type) : - core_slice_index_SliceIndex (core_ops_range_Range usize) (slice T) := {| - core_slice_index_SliceIndex_sealedInst := core_slice_index_private_slice_index_SealedRangeUsizeInst; - core_slice_index_SliceIndex_Output := slice T; - core_slice_index_SliceIndex_get := core_slice_index_RangeUsize_get T; - core_slice_index_SliceIndex_get_mut := core_slice_index_RangeUsize_get_mut T; - core_slice_index_SliceIndex_get_unchecked := core_slice_index_RangeUsize_get_unchecked T; - core_slice_index_SliceIndex_get_unchecked_mut := core_slice_index_RangeUsize_get_unchecked_mut T; - core_slice_index_SliceIndex_index := core_slice_index_RangeUsize_index T; - core_slice_index_SliceIndex_index_mut := core_slice_index_RangeUsize_index_mut T; -|}. - -(* Trait implementation: [core::slice::index::[T]] *) -Definition core_ops_index_IndexSliceTIInst (T Idx : Type) - (inst : core_slice_index_SliceIndex Idx (slice T)) : - core_ops_index_Index (slice T) Idx := {| - core_ops_index_Index_Output := inst.(core_slice_index_SliceIndex_Output); - core_ops_index_Index_index := core_slice_index_Slice_index T Idx inst; -|}. - -(* Trait implementation: [core::slice::index::[T]] *) -Definition core_ops_index_IndexMutSliceTIInst (T Idx : Type) - (inst : core_slice_index_SliceIndex Idx (slice T)) : - core_ops_index_IndexMut (slice T) Idx := {| - core_ops_index_IndexMut_indexInst := core_ops_index_IndexSliceTIInst T Idx inst; - core_ops_index_IndexMut_index_mut := core_slice_index_Slice_index_mut T Idx inst; -|}. - -(* Trait implementation: [core::array::[T; N]] *) -Definition core_ops_index_IndexArrayInst (T Idx : Type) (N : usize) - (inst : core_ops_index_Index (slice T) Idx) : - core_ops_index_Index (array T N) Idx := {| - core_ops_index_Index_Output := inst.(core_ops_index_Index_Output); - core_ops_index_Index_index := core_array_Array_index T Idx N inst; -|}. - -(* Trait implementation: [core::array::[T; N]] *) -Definition core_ops_index_IndexMutArrayInst (T Idx : Type) (N : usize) - (inst : core_ops_index_IndexMut (slice T) Idx) : - core_ops_index_IndexMut (array T N) Idx := {| - core_ops_index_IndexMut_indexInst := core_ops_index_IndexArrayInst T Idx N inst.(core_ops_index_IndexMut_indexInst); - core_ops_index_IndexMut_index_mut := core_array_Array_index_mut T Idx N inst; -|}. - -(* [core::slice::index::usize::get]: forward function *) -Axiom core_slice_index_usize_get : forall (T : Type), usize -> slice T -> result (option T). - -(* [core::slice::index::usize::get_mut]: forward function *) -Axiom core_slice_index_usize_get_mut : - forall (T : Type), usize -> slice T -> result (option T * (option T -> result (slice T))). - -(* [core::slice::index::usize::get_unchecked]: forward function *) -Axiom core_slice_index_usize_get_unchecked : - forall (T : Type), usize -> const_raw_ptr (slice T) -> result (const_raw_ptr T). - -(* [core::slice::index::usize::get_unchecked_mut]: forward function *) -Axiom core_slice_index_usize_get_unchecked_mut : - forall (T : Type), usize -> mut_raw_ptr (slice T) -> result (mut_raw_ptr T). - -(* [core::slice::index::usize::index]: forward function *) -Axiom core_slice_index_usize_index : forall (T : Type), usize -> slice T -> result T. - -(* [core::slice::index::usize::index_mut]: forward function *) -Axiom core_slice_index_usize_index_mut : - forall (T : Type), usize -> slice T -> result (T * (T -> result (slice T))). - -(* Trait implementation: [core::slice::index::private_slice_index::usize] *) -Definition core_slice_index_private_slice_index_SealedUsizeInst - : core_slice_index_private_slice_index_Sealed usize := tt. - -(* Trait implementation: [core::slice::index::usize] *) -Definition core_slice_index_SliceIndexUsizeSliceTInst (T : Type) : - core_slice_index_SliceIndex usize (slice T) := {| - core_slice_index_SliceIndex_sealedInst := core_slice_index_private_slice_index_SealedUsizeInst; - core_slice_index_SliceIndex_Output := T; - core_slice_index_SliceIndex_get := core_slice_index_usize_get T; - core_slice_index_SliceIndex_get_mut := core_slice_index_usize_get_mut T; - core_slice_index_SliceIndex_get_unchecked := core_slice_index_usize_get_unchecked T; - core_slice_index_SliceIndex_get_unchecked_mut := core_slice_index_usize_get_unchecked_mut T; - core_slice_index_SliceIndex_index := core_slice_index_usize_index T; - core_slice_index_SliceIndex_index_mut := core_slice_index_usize_index_mut T; -|}. - -(* [alloc::vec::Vec::index]: forward function *) -Axiom alloc_vec_Vec_index : forall (T Idx : Type) (inst : core_slice_index_SliceIndex Idx (slice T)) - (Self : alloc_vec_Vec T) (i : Idx), result inst.(core_slice_index_SliceIndex_Output). - -(* [alloc::vec::Vec::index_mut]: forward function *) -Axiom alloc_vec_Vec_index_mut : forall (T Idx : Type) (inst : core_slice_index_SliceIndex Idx (slice T)) - (Self : alloc_vec_Vec T) (i : Idx), - result (inst.(core_slice_index_SliceIndex_Output) * - (inst.(core_slice_index_SliceIndex_Output) -> result (alloc_vec_Vec T))). - -(* Trait implementation: [alloc::vec::Vec] *) -Definition alloc_vec_Vec_coreopsindexIndexInst (T Idx : Type) - (inst : core_slice_index_SliceIndex Idx (slice T)) : - core_ops_index_Index (alloc_vec_Vec T) Idx := {| - core_ops_index_Index_Output := inst.(core_slice_index_SliceIndex_Output); - core_ops_index_Index_index := alloc_vec_Vec_index T Idx inst; -|}. - -(* Trait implementation: [alloc::vec::Vec] *) -Definition alloc_vec_Vec_coreopsindexIndexMutInst (T Idx : Type) - (inst : core_slice_index_SliceIndex Idx (slice T)) : - core_ops_index_IndexMut (alloc_vec_Vec T) Idx := {| - core_ops_index_IndexMut_indexInst := alloc_vec_Vec_coreopsindexIndexInst T Idx inst; - core_ops_index_IndexMut_index_mut := alloc_vec_Vec_index_mut T Idx inst; -|}. - -(*** Theorems *) - -Axiom alloc_vec_Vec_index_eq : forall {a : Type} (v : alloc_vec_Vec a) (i : usize) (x : a), - alloc_vec_Vec_index a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i = - alloc_vec_Vec_index_usize v i. - -Axiom alloc_vec_Vec_index_mut_eq : forall {a : Type} (v : alloc_vec_Vec a) (i : usize) (x : a), - alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i = - alloc_vec_Vec_index_mut_usize v i. - -End Primitives. diff --git a/tests/coq/hashmap_main/_CoqProject b/tests/coq/hashmap_main/_CoqProject deleted file mode 100644 index d73541d9..00000000 --- a/tests/coq/hashmap_main/_CoqProject +++ /dev/null @@ -1,12 +0,0 @@ -# This file was automatically generated - see ../Makefile --R . Lib --arg -w --arg all - -HashmapMain_Types.v -HashmapMain_FunsExternal_Template.v -Primitives.v -HashmapMain_Funs.v -HashmapMain_TypesExternal.v -HashmapMain_FunsExternal.v -HashmapMain_TypesExternal_Template.v diff --git a/tests/coq/misc/Issue194RecursiveStructProjector.v b/tests/coq/misc/Issue194RecursiveStructProjector.v new file mode 100644 index 00000000..d1a07449 --- /dev/null +++ b/tests/coq/misc/Issue194RecursiveStructProjector.v @@ -0,0 +1,54 @@ +(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) +(** [issue_194_recursive_struct_projector] *) +Require Import Primitives. +Import Primitives. +Require Import Coq.ZArith.ZArith. +Require Import List. +Import ListNotations. +Local Open Scope Primitives_scope. +Module Issue194RecursiveStructProjector. + +(** [issue_194_recursive_struct_projector::AVLNode] + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 2:0-2:17 *) +Inductive AVLNode_t (T : Type) := +| mkAVLNode_t : + T -> + option (AVLNode_t T) -> + option (AVLNode_t T) -> + AVLNode_t T +. + +Arguments mkAVLNode_t { _ }. + +Definition aVLNode_value {T : Type} (x : AVLNode_t T) := + match x with | mkAVLNode_t x1 _ _ => x1 end +. + +Notation "x2 .(aVLNode_value)" := (aVLNode_value x2) (at level 9). + +Definition aVLNode_left {T : Type} (x : AVLNode_t T) := + match x with | mkAVLNode_t _ x1 _ => x1 end +. + +Notation "x2 .(aVLNode_left)" := (aVLNode_left x2) (at level 9). + +Definition aVLNode_right {T : Type} (x : AVLNode_t T) := + match x with | mkAVLNode_t _ _ x1 => x1 end +. + +Notation "x2 .(aVLNode_right)" := (aVLNode_right x2) (at level 9). + +(** [issue_194_recursive_struct_projector::get_val]: + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 10:0-10:33 *) +Definition get_val (T : Type) (x : AVLNode_t T) : result T := + Ok x.(aVLNode_value) +. + +(** [issue_194_recursive_struct_projector::get_left]: + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 14:0-14:43 *) +Definition get_left + (T : Type) (x : AVLNode_t T) : result (option (AVLNode_t T)) := + Ok x.(aVLNode_left) +. + +End Issue194RecursiveStructProjector. diff --git a/tests/fstar/betree/BetreeMain.Clauses.Template.fst b/tests/fstar/betree/Betree.Clauses.Template.fst index b317dca4..fad8c5ba 100644 --- a/tests/fstar/betree/BetreeMain.Clauses.Template.fst +++ b/tests/fstar/betree/Betree.Clauses.Template.fst @@ -1,46 +1,46 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: templates for the decreases clauses *) -module BetreeMain.Clauses.Template +(** [betree]: templates for the decreases clauses *) +module Betree.Clauses.Template open Primitives -open BetreeMain.Types +open Betree.Types #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" -(** [betree_main::betree::{betree_main::betree::List<T>#1}::len]: decreases clause +(** [betree::betree::{betree::betree::List<T>#1}::len]: decreases clause Source: 'src/betree.rs', lines 276:4-276:24 *) unfold let betree_List_len_decreases (t : Type0) (self : betree_List_t t) : nat = admit () -(** [betree_main::betree::{betree_main::betree::List<T>#1}::split_at]: decreases clause +(** [betree::betree::{betree::betree::List<T>#1}::split_at]: decreases clause Source: 'src/betree.rs', lines 284:4-284:51 *) unfold let betree_List_split_at_decreases (t : Type0) (self : betree_List_t t) (n : u64) : nat = admit () -(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::partition_at_pivot]: decreases clause +(** [betree::betree::{betree::betree::List<(u64, T)>#2}::partition_at_pivot]: decreases clause Source: 'src/betree.rs', lines 339:4-339:73 *) unfold let betree_ListPairU64T_partition_at_pivot_decreases (t : Type0) (self : betree_List_t (u64 & t)) (pivot : u64) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_for_key]: decreases clause Source: 'src/betree.rs', lines 789:4-792:34 *) unfold let betree_Node_lookup_first_message_for_key_decreases (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::lookup_in_bindings]: decreases clause Source: 'src/betree.rs', lines 636:4-636:80 *) unfold let betree_Node_lookup_in_bindings_decreases (key : u64) (bindings : betree_List_t (u64 & u64)) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::apply_upserts]: decreases clause Source: 'src/betree.rs', lines 819:4-819:90 *) unfold let betree_Node_apply_upserts_decreases @@ -48,35 +48,35 @@ let betree_Node_apply_upserts_decreases (key : u64) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: decreases clause +(** [betree::betree::{betree::betree::Internal#4}::lookup_in_children]: decreases clause Source: 'src/betree.rs', lines 395:4-395:63 *) unfold let betree_Internal_lookup_in_children_decreases (self : betree_Internal_t) (key : u64) (st : state) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::lookup]: decreases clause Source: 'src/betree.rs', lines 709:4-709:58 *) unfold let betree_Node_lookup_decreases (self : betree_Node_t) (key : u64) (st : state) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::filter_messages_for_key]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::filter_messages_for_key]: decreases clause Source: 'src/betree.rs', lines 674:4-674:77 *) unfold let betree_Node_filter_messages_for_key_decreases (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_after_key]: decreases clause Source: 'src/betree.rs', lines 689:4-692:34 *) unfold let betree_Node_lookup_first_message_after_key_decreases (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_internal]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_internal]: decreases clause Source: 'src/betree.rs', lines 502:4-505:5 *) unfold let betree_Node_apply_messages_to_internal_decreases @@ -84,14 +84,14 @@ let betree_Node_apply_messages_to_internal_decreases (new_msgs : betree_List_t (u64 & betree_Message_t)) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::lookup_mut_in_bindings]: decreases clause Source: 'src/betree.rs', lines 653:4-656:32 *) unfold let betree_Node_lookup_mut_in_bindings_decreases (key : u64) (bindings : betree_List_t (u64 & u64)) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_leaf]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_leaf]: decreases clause Source: 'src/betree.rs', lines 444:4-447:5 *) unfold let betree_Node_apply_messages_to_leaf_decreases @@ -99,7 +99,7 @@ let betree_Node_apply_messages_to_leaf_decreases (new_msgs : betree_List_t (u64 & betree_Message_t)) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Internal#4}::flush]: decreases clause +(** [betree::betree::{betree::betree::Internal#4}::flush]: decreases clause Source: 'src/betree.rs', lines 410:4-415:26 *) unfold let betree_Internal_flush_decreases (self : betree_Internal_t) @@ -107,7 +107,7 @@ let betree_Internal_flush_decreases (self : betree_Internal_t) (content : betree_List_t (u64 & betree_Message_t)) (st : state) : nat = admit () -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]: decreases clause +(** [betree::betree::{betree::betree::Node#5}::apply_messages]: decreases clause Source: 'src/betree.rs', lines 588:4-593:5 *) unfold let betree_Node_apply_messages_decreases (self : betree_Node_t) diff --git a/tests/fstar/betree/BetreeMain.Clauses.fst b/tests/fstar/betree/Betree.Clauses.fst index b95d4c7e..ae201cee 100644 --- a/tests/fstar/betree/BetreeMain.Clauses.fst +++ b/tests/fstar/betree/Betree.Clauses.fst @@ -1,7 +1,7 @@ (** [betree_main]: templates for the decreases clauses *) -module BetreeMain.Clauses +module Betree.Clauses open Primitives -open BetreeMain.Types +open Betree.Types #set-options "--z3rlimit 50 --fuel 0 --ifuel 1" diff --git a/tests/fstar/betree/BetreeMain.Funs.fst b/tests/fstar/betree/Betree.Funs.fst index 9942ef68..07f561f5 100644 --- a/tests/fstar/betree/BetreeMain.Funs.fst +++ b/tests/fstar/betree/Betree.Funs.fst @@ -1,14 +1,14 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: function definitions *) -module BetreeMain.Funs +(** [betree]: function definitions *) +module Betree.Funs open Primitives -include BetreeMain.Types -include BetreeMain.FunsExternal -include BetreeMain.Clauses +include Betree.Types +include Betree.FunsExternal +include Betree.Clauses #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" -(** [betree_main::betree::load_internal_node]: +(** [betree::betree::load_internal_node]: Source: 'src/betree.rs', lines 36:0-36:52 *) let betree_load_internal_node (id : u64) (st : state) : @@ -16,7 +16,7 @@ let betree_load_internal_node = betree_utils_load_internal_node id st -(** [betree_main::betree::store_internal_node]: +(** [betree::betree::store_internal_node]: Source: 'src/betree.rs', lines 41:0-41:60 *) let betree_store_internal_node (id : u64) (content : betree_List_t (u64 & betree_Message_t)) (st : state) : @@ -24,13 +24,13 @@ let betree_store_internal_node = betree_utils_store_internal_node id content st -(** [betree_main::betree::load_leaf_node]: +(** [betree::betree::load_leaf_node]: Source: 'src/betree.rs', lines 46:0-46:44 *) let betree_load_leaf_node (id : u64) (st : state) : result (state & (betree_List_t (u64 & u64))) = betree_utils_load_leaf_node id st -(** [betree_main::betree::store_leaf_node]: +(** [betree::betree::store_leaf_node]: Source: 'src/betree.rs', lines 51:0-51:52 *) let betree_store_leaf_node (id : u64) (content : betree_List_t (u64 & u64)) (st : state) : @@ -38,24 +38,24 @@ let betree_store_leaf_node = betree_utils_store_leaf_node id content st -(** [betree_main::betree::fresh_node_id]: +(** [betree::betree::fresh_node_id]: Source: 'src/betree.rs', lines 55:0-55:48 *) let betree_fresh_node_id (counter : u64) : result (u64 & u64) = let* counter1 = u64_add counter 1 in Ok (counter, counter1) -(** [betree_main::betree::{betree_main::betree::NodeIdCounter}::new]: +(** [betree::betree::{betree::betree::NodeIdCounter}::new]: Source: 'src/betree.rs', lines 206:4-206:20 *) let betree_NodeIdCounter_new : result betree_NodeIdCounter_t = Ok { next_node_id = 0 } -(** [betree_main::betree::{betree_main::betree::NodeIdCounter}::fresh_id]: +(** [betree::betree::{betree::betree::NodeIdCounter}::fresh_id]: Source: 'src/betree.rs', lines 210:4-210:36 *) let betree_NodeIdCounter_fresh_id (self : betree_NodeIdCounter_t) : result (u64 & betree_NodeIdCounter_t) = let* i = u64_add self.next_node_id 1 in Ok (self.next_node_id, { next_node_id = i }) -(** [betree_main::betree::upsert_update]: +(** [betree::betree::upsert_update]: Source: 'src/betree.rs', lines 234:0-234:70 *) let betree_upsert_update (prev : option u64) (st : betree_UpsertFunState_t) : result u64 = @@ -75,7 +75,7 @@ let betree_upsert_update end end -(** [betree_main::betree::{betree_main::betree::List<T>#1}::len]: +(** [betree::betree::{betree::betree::List<T>#1}::len]: Source: 'src/betree.rs', lines 276:4-276:24 *) let rec betree_List_len (t : Type0) (self : betree_List_t t) : @@ -86,7 +86,7 @@ let rec betree_List_len | Betree_List_Nil -> Ok 0 end -(** [betree_main::betree::{betree_main::betree::List<T>#1}::split_at]: +(** [betree::betree::{betree::betree::List<T>#1}::split_at]: Source: 'src/betree.rs', lines 284:4-284:51 *) let rec betree_List_split_at (t : Type0) (self : betree_List_t t) (n : u64) : @@ -105,14 +105,14 @@ let rec betree_List_split_at | Betree_List_Nil -> Fail Failure end -(** [betree_main::betree::{betree_main::betree::List<T>#1}::push_front]: +(** [betree::betree::{betree::betree::List<T>#1}::push_front]: Source: 'src/betree.rs', lines 299:4-299:34 *) let betree_List_push_front (t : Type0) (self : betree_List_t t) (x : t) : result (betree_List_t t) = let (tl, _) = core_mem_replace (betree_List_t t) self Betree_List_Nil in Ok (Betree_List_Cons x tl) -(** [betree_main::betree::{betree_main::betree::List<T>#1}::pop_front]: +(** [betree::betree::{betree::betree::List<T>#1}::pop_front]: Source: 'src/betree.rs', lines 306:4-306:32 *) let betree_List_pop_front (t : Type0) (self : betree_List_t t) : result (t & (betree_List_t t)) = @@ -122,7 +122,7 @@ let betree_List_pop_front | Betree_List_Nil -> Fail Failure end -(** [betree_main::betree::{betree_main::betree::List<T>#1}::hd]: +(** [betree::betree::{betree::betree::List<T>#1}::hd]: Source: 'src/betree.rs', lines 318:4-318:22 *) let betree_List_hd (t : Type0) (self : betree_List_t t) : result t = begin match self with @@ -130,7 +130,7 @@ let betree_List_hd (t : Type0) (self : betree_List_t t) : result t = | Betree_List_Nil -> Fail Failure end -(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::head_has_key]: +(** [betree::betree::{betree::betree::List<(u64, T)>#2}::head_has_key]: Source: 'src/betree.rs', lines 327:4-327:44 *) let betree_ListPairU64T_head_has_key (t : Type0) (self : betree_List_t (u64 & t)) (key : u64) : result bool = @@ -139,7 +139,7 @@ let betree_ListPairU64T_head_has_key | Betree_List_Nil -> Ok false end -(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::partition_at_pivot]: +(** [betree::betree::{betree::betree::List<(u64, T)>#2}::partition_at_pivot]: Source: 'src/betree.rs', lines 339:4-339:73 *) let rec betree_ListPairU64T_partition_at_pivot (t : Type0) (self : betree_List_t (u64 & t)) (pivot : u64) : @@ -158,7 +158,7 @@ let rec betree_ListPairU64T_partition_at_pivot | Betree_List_Nil -> Ok (Betree_List_Nil, Betree_List_Nil) end -(** [betree_main::betree::{betree_main::betree::Leaf#3}::split]: +(** [betree::betree::{betree::betree::Leaf#3}::split]: Source: 'src/betree.rs', lines 359:4-364:17 *) let betree_Leaf_split (self : betree_Leaf_t) (content : betree_List_t (u64 & u64)) @@ -179,7 +179,7 @@ let betree_Leaf_split Ok (st2, ({ id = self.id; pivot = pivot; left = n; right = n1 }, node_id_cnt2)) -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]: +(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_for_key]: Source: 'src/betree.rs', lines 789:4-792:34 *) let rec betree_Node_lookup_first_message_for_key (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) : @@ -203,7 +203,7 @@ let rec betree_Node_lookup_first_message_for_key | Betree_List_Nil -> Ok (Betree_List_Nil, Ok) end -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: +(** [betree::betree::{betree::betree::Node#5}::lookup_in_bindings]: Source: 'src/betree.rs', lines 636:4-636:80 *) let rec betree_Node_lookup_in_bindings (key : u64) (bindings : betree_List_t (u64 & u64)) : @@ -219,7 +219,7 @@ let rec betree_Node_lookup_in_bindings | Betree_List_Nil -> Ok None end -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: +(** [betree::betree::{betree::betree::Node#5}::apply_upserts]: Source: 'src/betree.rs', lines 819:4-819:90 *) let rec betree_Node_apply_upserts (msgs : betree_List_t (u64 & betree_Message_t)) (prev : option u64) @@ -246,7 +246,7 @@ let rec betree_Node_apply_upserts Betree_Message_Insert v) in Ok (v, msgs1) -(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: +(** [betree::betree::{betree::betree::Internal#4}::lookup_in_children]: Source: 'src/betree.rs', lines 395:4-395:63 *) let rec betree_Internal_lookup_in_children (self : betree_Internal_t) (key : u64) (st : state) : @@ -261,7 +261,7 @@ let rec betree_Internal_lookup_in_children let* (st1, (o, n)) = betree_Node_lookup self.right key st in Ok (st1, (o, { self with right = n })) -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup]: +(** [betree::betree::{betree::betree::Node#5}::lookup]: Source: 'src/betree.rs', lines 709:4-709:58 *) and betree_Node_lookup (self : betree_Node_t) (key : u64) (st : state) : @@ -317,7 +317,7 @@ and betree_Node_lookup Ok (st1, (o, Betree_Node_Leaf node)) end -(** [betree_main::betree::{betree_main::betree::Node#5}::filter_messages_for_key]: +(** [betree::betree::{betree::betree::Node#5}::filter_messages_for_key]: Source: 'src/betree.rs', lines 674:4-674:77 *) let rec betree_Node_filter_messages_for_key (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) : @@ -337,7 +337,7 @@ let rec betree_Node_filter_messages_for_key | Betree_List_Nil -> Ok Betree_List_Nil end -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]: +(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_after_key]: Source: 'src/betree.rs', lines 689:4-692:34 *) let rec betree_Node_lookup_first_message_after_key (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) : @@ -361,7 +361,7 @@ let rec betree_Node_lookup_first_message_after_key | Betree_List_Nil -> Ok (Betree_List_Nil, Ok) end -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_to_internal]: +(** [betree::betree::{betree::betree::Node#5}::apply_to_internal]: Source: 'src/betree.rs', lines 521:4-521:89 *) let betree_Node_apply_to_internal (msgs : betree_List_t (u64 & betree_Message_t)) (key : u64) @@ -421,7 +421,7 @@ let betree_Node_apply_to_internal betree_List_push_front (u64 & betree_Message_t) msgs1 (key, new_msg) in lookup_first_message_for_key_back msgs2 -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_internal]: +(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_internal]: Source: 'src/betree.rs', lines 502:4-505:5 *) let rec betree_Node_apply_messages_to_internal (msgs : betree_List_t (u64 & betree_Message_t)) @@ -437,7 +437,7 @@ let rec betree_Node_apply_messages_to_internal | Betree_List_Nil -> Ok msgs end -(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]: +(** [betree::betree::{betree::betree::Node#5}::lookup_mut_in_bindings]: Source: 'src/betree.rs', lines 653:4-656:32 *) let rec betree_Node_lookup_mut_in_bindings (key : u64) (bindings : betree_List_t (u64 & u64)) : @@ -461,7 +461,7 @@ let rec betree_Node_lookup_mut_in_bindings | Betree_List_Nil -> Ok (Betree_List_Nil, Ok) end -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_to_leaf]: +(** [betree::betree::{betree::betree::Node#5}::apply_to_leaf]: Source: 'src/betree.rs', lines 460:4-460:87 *) let betree_Node_apply_to_leaf (bindings : betree_List_t (u64 & u64)) (key : u64) @@ -497,7 +497,7 @@ let betree_Node_apply_to_leaf lookup_mut_in_bindings_back bindings2 end -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_leaf]: +(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_leaf]: Source: 'src/betree.rs', lines 444:4-447:5 *) let rec betree_Node_apply_messages_to_leaf (bindings : betree_List_t (u64 & u64)) @@ -513,7 +513,7 @@ let rec betree_Node_apply_messages_to_leaf | Betree_List_Nil -> Ok bindings end -(** [betree_main::betree::{betree_main::betree::Internal#4}::flush]: +(** [betree::betree::{betree::betree::Internal#4}::flush]: Source: 'src/betree.rs', lines 410:4-415:26 *) let rec betree_Internal_flush (self : betree_Internal_t) (params : betree_Params_t) @@ -550,7 +550,7 @@ let rec betree_Internal_flush let (n, node_id_cnt1) = p1 in Ok (st1, (msgs_left, ({ self with right = n }, node_id_cnt1))) -(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]: +(** [betree::betree::{betree::betree::Node#5}::apply_messages]: Source: 'src/betree.rs', lines 588:4-593:5 *) and betree_Node_apply_messages (self : betree_Node_t) (params : betree_Params_t) @@ -591,7 +591,7 @@ and betree_Node_apply_messages Ok (st2, (Betree_Node_Leaf { node with size = len }, node_id_cnt)) end -(** [betree_main::betree::{betree_main::betree::Node#5}::apply]: +(** [betree::betree::{betree::betree::Node#5}::apply]: Source: 'src/betree.rs', lines 576:4-582:5 *) let betree_Node_apply (self : betree_Node_t) (params : betree_Params_t) @@ -605,7 +605,7 @@ let betree_Node_apply let (self1, node_id_cnt1) = p in Ok (st1, (self1, node_id_cnt1)) -(** [betree_main::betree::{betree_main::betree::BeTree#6}::new]: +(** [betree::betree::{betree::betree::BeTree#6}::new]: Source: 'src/betree.rs', lines 849:4-849:60 *) let betree_BeTree_new (min_flush_size : u64) (split_size : u64) (st : state) : @@ -621,7 +621,7 @@ let betree_BeTree_new root = (Betree_Node_Leaf { id = id; size = 0 }) }) -(** [betree_main::betree::{betree_main::betree::BeTree#6}::apply]: +(** [betree::betree::{betree::betree::BeTree#6}::apply]: Source: 'src/betree.rs', lines 868:4-868:47 *) let betree_BeTree_apply (self : betree_BeTree_t) (key : u64) (msg : betree_Message_t) (st : state) : @@ -632,7 +632,7 @@ let betree_BeTree_apply let (n, nic) = p in Ok (st1, { self with node_id_cnt = nic; root = n }) -(** [betree_main::betree::{betree_main::betree::BeTree#6}::insert]: +(** [betree::betree::{betree::betree::BeTree#6}::insert]: Source: 'src/betree.rs', lines 874:4-874:52 *) let betree_BeTree_insert (self : betree_BeTree_t) (key : u64) (value : u64) (st : state) : @@ -640,7 +640,7 @@ let betree_BeTree_insert = betree_BeTree_apply self key (Betree_Message_Insert value) st -(** [betree_main::betree::{betree_main::betree::BeTree#6}::delete]: +(** [betree::betree::{betree::betree::BeTree#6}::delete]: Source: 'src/betree.rs', lines 880:4-880:38 *) let betree_BeTree_delete (self : betree_BeTree_t) (key : u64) (st : state) : @@ -648,7 +648,7 @@ let betree_BeTree_delete = betree_BeTree_apply self key Betree_Message_Delete st -(** [betree_main::betree::{betree_main::betree::BeTree#6}::upsert]: +(** [betree::betree::{betree::betree::BeTree#6}::upsert]: Source: 'src/betree.rs', lines 886:4-886:59 *) let betree_BeTree_upsert (self : betree_BeTree_t) (key : u64) (upd : betree_UpsertFunState_t) @@ -657,7 +657,7 @@ let betree_BeTree_upsert = betree_BeTree_apply self key (Betree_Message_Upsert upd) st -(** [betree_main::betree::{betree_main::betree::BeTree#6}::lookup]: +(** [betree::betree::{betree::betree::BeTree#6}::lookup]: Source: 'src/betree.rs', lines 895:4-895:62 *) let betree_BeTree_lookup (self : betree_BeTree_t) (key : u64) (st : state) : @@ -666,11 +666,11 @@ let betree_BeTree_lookup let* (st1, (o, n)) = betree_Node_lookup self.root key st in Ok (st1, (o, { self with root = n })) -(** [betree_main::main]: +(** [betree::main]: Source: 'src/main.rs', lines 4:0-4:9 *) let main : result unit = Ok () -(** Unit test for [betree_main::main] *) +(** Unit test for [betree::main] *) let _ = assert_norm (main = Ok ()) diff --git a/tests/fstar/betree/BetreeMain.FunsExternal.fsti b/tests/fstar/betree/Betree.FunsExternal.fsti index 8be98acf..db96eead 100644 --- a/tests/fstar/betree/BetreeMain.FunsExternal.fsti +++ b/tests/fstar/betree/Betree.FunsExternal.fsti @@ -1,29 +1,29 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: external function declarations *) -module BetreeMain.FunsExternal +(** [betree]: external function declarations *) +module Betree.FunsExternal open Primitives -include BetreeMain.Types +include Betree.Types #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" -(** [betree_main::betree_utils::load_internal_node]: +(** [betree::betree_utils::load_internal_node]: Source: 'src/betree_utils.rs', lines 98:0-98:63 *) val betree_utils_load_internal_node : u64 -> state -> result (state & (betree_List_t (u64 & betree_Message_t))) -(** [betree_main::betree_utils::store_internal_node]: +(** [betree::betree_utils::store_internal_node]: Source: 'src/betree_utils.rs', lines 115:0-115:71 *) val betree_utils_store_internal_node : u64 -> betree_List_t (u64 & betree_Message_t) -> state -> result (state & unit) -(** [betree_main::betree_utils::load_leaf_node]: +(** [betree::betree_utils::load_leaf_node]: Source: 'src/betree_utils.rs', lines 132:0-132:55 *) val betree_utils_load_leaf_node : u64 -> state -> result (state & (betree_List_t (u64 & u64))) -(** [betree_main::betree_utils::store_leaf_node]: +(** [betree::betree_utils::store_leaf_node]: Source: 'src/betree_utils.rs', lines 145:0-145:63 *) val betree_utils_store_leaf_node : u64 -> betree_List_t (u64 & u64) -> state -> result (state & unit) diff --git a/tests/fstar/betree/BetreeMain.Types.fst b/tests/fstar/betree/Betree.Types.fst index b87219b2..6b8e063b 100644 --- a/tests/fstar/betree/BetreeMain.Types.fst +++ b/tests/fstar/betree/Betree.Types.fst @@ -1,56 +1,56 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: type definitions *) -module BetreeMain.Types +(** [betree]: type definitions *) +module Betree.Types open Primitives -include BetreeMain.TypesExternal +include Betree.TypesExternal #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" -(** [betree_main::betree::List] +(** [betree::betree::List] Source: 'src/betree.rs', lines 17:0-17:23 *) type betree_List_t (t : Type0) = | Betree_List_Cons : t -> betree_List_t t -> betree_List_t t | Betree_List_Nil : betree_List_t t -(** [betree_main::betree::UpsertFunState] +(** [betree::betree::UpsertFunState] Source: 'src/betree.rs', lines 63:0-63:23 *) type betree_UpsertFunState_t = | Betree_UpsertFunState_Add : u64 -> betree_UpsertFunState_t | Betree_UpsertFunState_Sub : u64 -> betree_UpsertFunState_t -(** [betree_main::betree::Message] +(** [betree::betree::Message] Source: 'src/betree.rs', lines 69:0-69:23 *) type betree_Message_t = | Betree_Message_Insert : u64 -> betree_Message_t | Betree_Message_Delete : betree_Message_t | Betree_Message_Upsert : betree_UpsertFunState_t -> betree_Message_t -(** [betree_main::betree::Leaf] +(** [betree::betree::Leaf] Source: 'src/betree.rs', lines 167:0-167:11 *) type betree_Leaf_t = { id : u64; size : u64; } -(** [betree_main::betree::Internal] +(** [betree::betree::Internal] Source: 'src/betree.rs', lines 156:0-156:15 *) type betree_Internal_t = { id : u64; pivot : u64; left : betree_Node_t; right : betree_Node_t; } -(** [betree_main::betree::Node] +(** [betree::betree::Node] Source: 'src/betree.rs', lines 179:0-179:9 *) and betree_Node_t = | Betree_Node_Internal : betree_Internal_t -> betree_Node_t | Betree_Node_Leaf : betree_Leaf_t -> betree_Node_t -(** [betree_main::betree::Params] +(** [betree::betree::Params] Source: 'src/betree.rs', lines 187:0-187:13 *) type betree_Params_t = { min_flush_size : u64; split_size : u64; } -(** [betree_main::betree::NodeIdCounter] +(** [betree::betree::NodeIdCounter] Source: 'src/betree.rs', lines 201:0-201:20 *) type betree_NodeIdCounter_t = { next_node_id : u64; } -(** [betree_main::betree::BeTree] +(** [betree::betree::BeTree] Source: 'src/betree.rs', lines 218:0-218:17 *) type betree_BeTree_t = { diff --git a/tests/fstar/betree/BetreeMain.TypesExternal.fsti b/tests/fstar/betree/Betree.TypesExternal.fsti index 1b2c53a6..39e53ec9 100644 --- a/tests/fstar/betree/BetreeMain.TypesExternal.fsti +++ b/tests/fstar/betree/Betree.TypesExternal.fsti @@ -1,6 +1,6 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: external type declarations *) -module BetreeMain.TypesExternal +(** [betree]: external type declarations *) +module Betree.TypesExternal open Primitives #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" diff --git a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst index 3119ded8..57003613 100644 --- a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst +++ b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst @@ -7,63 +7,63 @@ open Hashmap.Types #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: decreases clause - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 *) + Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *) unfold let hashMap_allocate_slots_loop_decreases (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::clear]: decreases clause - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 *) + Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *) unfold let hashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (list_t t)) (i : usize) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 *) + Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *) unfold let hashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) (value : t) (ls : list_t t) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 *) + Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *) unfold let hashMap_move_elements_from_list_loop_decreases (t : Type0) (ntable : hashMap_t t) (ls : list_t t) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::move_elements]: decreases clause - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 *) + Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *) unfold let hashMap_move_elements_loop_decreases (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t)) (i : usize) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 *) + Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *) unfold let hashMap_contains_key_in_list_loop_decreases (t : Type0) (key : usize) (ls : list_t t) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 *) + Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *) unfold let hashMap_get_in_list_loop_decreases (t : Type0) (key : usize) (ls : list_t t) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 *) + Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *) unfold let hashMap_get_mut_in_list_loop_decreases (t : Type0) (ls : list_t t) (key : usize) : nat = admit () (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 *) + Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *) unfold let hashMap_remove_from_list_loop_decreases (t : Type0) (key : usize) (ls : list_t t) : nat = diff --git a/tests/fstar/hashmap/Hashmap.Funs.fst b/tests/fstar/hashmap/Hashmap.Funs.fst index 06cdf7f3..0e991720 100644 --- a/tests/fstar/hashmap/Hashmap.Funs.fst +++ b/tests/fstar/hashmap/Hashmap.Funs.fst @@ -3,17 +3,18 @@ module Hashmap.Funs open Primitives include Hashmap.Types +include Hashmap.FunsExternal include Hashmap.Clauses #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" (** [hashmap::hash_key]: - Source: 'tests/src/hashmap.rs', lines 35:0-35:32 *) + Source: 'tests/src/hashmap.rs', lines 37:0-37:32 *) let hash_key (k : usize) : result usize = Ok k (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0: - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 *) + Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *) let rec hashMap_allocate_slots_loop (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) : Tot (result (alloc_vec_Vec (list_t t))) @@ -27,7 +28,7 @@ let rec hashMap_allocate_slots_loop else Ok slots (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: - Source: 'tests/src/hashmap.rs', lines 58:4-58:76 *) + Source: 'tests/src/hashmap.rs', lines 60:4-60:76 *) let hashMap_allocate_slots (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) : result (alloc_vec_Vec (list_t t)) @@ -35,7 +36,7 @@ let hashMap_allocate_slots hashMap_allocate_slots_loop t slots n (** [hashmap::{hashmap::HashMap<T>}::new_with_capacity]: - Source: 'tests/src/hashmap.rs', lines 67:4-71:13 *) + Source: 'tests/src/hashmap.rs', lines 69:4-73:13 *) let hashMap_new_with_capacity (t : Type0) (capacity : usize) (max_load_dividend : usize) (max_load_divisor : usize) : @@ -54,12 +55,12 @@ let hashMap_new_with_capacity } (** [hashmap::{hashmap::HashMap<T>}::new]: - Source: 'tests/src/hashmap.rs', lines 83:4-83:24 *) + Source: 'tests/src/hashmap.rs', lines 85:4-85:24 *) let hashMap_new (t : Type0) : result (hashMap_t t) = hashMap_new_with_capacity t 32 4 5 (** [hashmap::{hashmap::HashMap<T>}::clear]: loop 0: - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 *) + Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *) let rec hashMap_clear_loop (t : Type0) (slots : alloc_vec_Vec (list_t t)) (i : usize) : Tot (result (alloc_vec_Vec (list_t t))) @@ -77,18 +78,18 @@ let rec hashMap_clear_loop else Ok slots (** [hashmap::{hashmap::HashMap<T>}::clear]: - Source: 'tests/src/hashmap.rs', lines 88:4-88:27 *) + Source: 'tests/src/hashmap.rs', lines 90:4-90:27 *) let hashMap_clear (t : Type0) (self : hashMap_t t) : result (hashMap_t t) = let* hm = hashMap_clear_loop t self.slots 0 in Ok { self with num_entries = 0; slots = hm } (** [hashmap::{hashmap::HashMap<T>}::len]: - Source: 'tests/src/hashmap.rs', lines 98:4-98:30 *) + Source: 'tests/src/hashmap.rs', lines 100:4-100:30 *) let hashMap_len (t : Type0) (self : hashMap_t t) : result usize = Ok self.num_entries (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 *) + Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *) let rec hashMap_insert_in_list_loop (t : Type0) (key : usize) (value : t) (ls : list_t t) : Tot (result (bool & (list_t t))) @@ -105,7 +106,7 @@ let rec hashMap_insert_in_list_loop end (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: - Source: 'tests/src/hashmap.rs', lines 105:4-105:71 *) + Source: 'tests/src/hashmap.rs', lines 107:4-107:71 *) let hashMap_insert_in_list (t : Type0) (key : usize) (value : t) (ls : list_t t) : result (bool & (list_t t)) @@ -113,7 +114,7 @@ let hashMap_insert_in_list hashMap_insert_in_list_loop t key value ls (** [hashmap::{hashmap::HashMap<T>}::insert_no_resize]: - Source: 'tests/src/hashmap.rs', lines 125:4-125:54 *) + Source: 'tests/src/hashmap.rs', lines 127:4-127:54 *) let hashMap_insert_no_resize (t : Type0) (self : hashMap_t t) (key : usize) (value : t) : result (hashMap_t t) @@ -134,7 +135,7 @@ let hashMap_insert_no_resize else let* v = index_mut_back l1 in Ok { self with slots = v } (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 *) + Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *) let rec hashMap_move_elements_from_list_loop (t : Type0) (ntable : hashMap_t t) (ls : list_t t) : Tot (result (hashMap_t t)) @@ -148,13 +149,13 @@ let rec hashMap_move_elements_from_list_loop end (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: - Source: 'tests/src/hashmap.rs', lines 191:4-191:72 *) + Source: 'tests/src/hashmap.rs', lines 193:4-193:72 *) let hashMap_move_elements_from_list (t : Type0) (ntable : hashMap_t t) (ls : list_t t) : result (hashMap_t t) = hashMap_move_elements_from_list_loop t ntable ls (** [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0: - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 *) + Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *) let rec hashMap_move_elements_loop (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t)) (i : usize) : @@ -175,7 +176,7 @@ let rec hashMap_move_elements_loop else Ok (ntable, slots) (** [hashmap::{hashmap::HashMap<T>}::move_elements]: - Source: 'tests/src/hashmap.rs', lines 179:4-179:95 *) + Source: 'tests/src/hashmap.rs', lines 181:4-181:95 *) let hashMap_move_elements (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t)) (i : usize) : @@ -184,7 +185,7 @@ let hashMap_move_elements hashMap_move_elements_loop t ntable slots i (** [hashmap::{hashmap::HashMap<T>}::try_resize]: - Source: 'tests/src/hashmap.rs', lines 148:4-148:28 *) + Source: 'tests/src/hashmap.rs', lines 150:4-150:28 *) let hashMap_try_resize (t : Type0) (self : hashMap_t t) : result (hashMap_t t) = let* max_usize = scalar_cast U32 Usize core_u32_max in @@ -204,7 +205,7 @@ let hashMap_try_resize else Ok { self with max_load_factor = (i, i1) } (** [hashmap::{hashmap::HashMap<T>}::insert]: - Source: 'tests/src/hashmap.rs', lines 137:4-137:48 *) + Source: 'tests/src/hashmap.rs', lines 139:4-139:48 *) let hashMap_insert (t : Type0) (self : hashMap_t t) (key : usize) (value : t) : result (hashMap_t t) @@ -214,7 +215,7 @@ let hashMap_insert if i > self1.max_load then hashMap_try_resize t self1 else Ok self1 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 *) + Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *) let rec hashMap_contains_key_in_list_loop (t : Type0) (key : usize) (ls : list_t t) : Tot (result bool) @@ -227,13 +228,13 @@ let rec hashMap_contains_key_in_list_loop end (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: - Source: 'tests/src/hashmap.rs', lines 214:4-214:68 *) + Source: 'tests/src/hashmap.rs', lines 216:4-216:68 *) let hashMap_contains_key_in_list (t : Type0) (key : usize) (ls : list_t t) : result bool = hashMap_contains_key_in_list_loop t key ls (** [hashmap::{hashmap::HashMap<T>}::contains_key]: - Source: 'tests/src/hashmap.rs', lines 207:4-207:49 *) + Source: 'tests/src/hashmap.rs', lines 209:4-209:49 *) let hashMap_contains_key (t : Type0) (self : hashMap_t t) (key : usize) : result bool = let* hash = hash_key key in @@ -246,7 +247,7 @@ let hashMap_contains_key hashMap_contains_key_in_list t key l (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 *) + Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *) let rec hashMap_get_in_list_loop (t : Type0) (key : usize) (ls : list_t t) : Tot (result t) (decreases (hashMap_get_in_list_loop_decreases t key ls)) @@ -258,12 +259,12 @@ let rec hashMap_get_in_list_loop end (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: - Source: 'tests/src/hashmap.rs', lines 232:4-232:70 *) + Source: 'tests/src/hashmap.rs', lines 234:4-234:70 *) let hashMap_get_in_list (t : Type0) (key : usize) (ls : list_t t) : result t = hashMap_get_in_list_loop t key ls (** [hashmap::{hashmap::HashMap<T>}::get]: - Source: 'tests/src/hashmap.rs', lines 247:4-247:55 *) + Source: 'tests/src/hashmap.rs', lines 249:4-249:55 *) let hashMap_get (t : Type0) (self : hashMap_t t) (key : usize) : result t = let* hash = hash_key key in let i = alloc_vec_Vec_len (list_t t) self.slots in @@ -275,7 +276,7 @@ let hashMap_get (t : Type0) (self : hashMap_t t) (key : usize) : result t = hashMap_get_in_list t key l (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 *) + Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *) let rec hashMap_get_mut_in_list_loop (t : Type0) (ls : list_t t) (key : usize) : Tot (result (t & (t -> result (list_t t)))) @@ -294,7 +295,7 @@ let rec hashMap_get_mut_in_list_loop end (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: - Source: 'tests/src/hashmap.rs', lines 253:4-253:86 *) + Source: 'tests/src/hashmap.rs', lines 255:4-255:86 *) let hashMap_get_mut_in_list (t : Type0) (ls : list_t t) (key : usize) : result (t & (t -> result (list_t t))) @@ -302,7 +303,7 @@ let hashMap_get_mut_in_list hashMap_get_mut_in_list_loop t ls key (** [hashmap::{hashmap::HashMap<T>}::get_mut]: - Source: 'tests/src/hashmap.rs', lines 265:4-265:67 *) + Source: 'tests/src/hashmap.rs', lines 267:4-267:67 *) let hashMap_get_mut (t : Type0) (self : hashMap_t t) (key : usize) : result (t & (t -> result (hashMap_t t))) @@ -323,7 +324,7 @@ let hashMap_get_mut Ok (x, back) (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 *) + Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *) let rec hashMap_remove_from_list_loop (t : Type0) (key : usize) (ls : list_t t) : Tot (result ((option t) & (list_t t))) @@ -346,7 +347,7 @@ let rec hashMap_remove_from_list_loop end (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: - Source: 'tests/src/hashmap.rs', lines 273:4-273:69 *) + Source: 'tests/src/hashmap.rs', lines 275:4-275:69 *) let hashMap_remove_from_list (t : Type0) (key : usize) (ls : list_t t) : result ((option t) & (list_t t)) @@ -354,7 +355,7 @@ let hashMap_remove_from_list hashMap_remove_from_list_loop t key ls (** [hashmap::{hashmap::HashMap<T>}::remove]: - Source: 'tests/src/hashmap.rs', lines 302:4-302:52 *) + Source: 'tests/src/hashmap.rs', lines 304:4-304:52 *) let hashMap_remove (t : Type0) (self : hashMap_t t) (key : usize) : result ((option t) & (hashMap_t t)) @@ -375,8 +376,16 @@ let hashMap_remove Ok (Some x1, { self with num_entries = i1; slots = v }) end +(** [hashmap::insert_on_disk]: + Source: 'tests/src/hashmap.rs', lines 335:0-335:43 *) +let insert_on_disk + (key : usize) (value : u64) (st : state) : result (state & unit) = + let* (st1, hm) = utils_deserialize st in + let* hm1 = hashMap_insert u64 hm key value in + utils_serialize hm1 st1 + (** [hashmap::test1]: - Source: 'tests/src/hashmap.rs', lines 323:0-323:10 *) + Source: 'tests/src/hashmap.rs', lines 350:0-350:10 *) let test1 : result unit = let* hm = hashMap_new u64 in let* hm1 = hashMap_insert u64 hm 0 42 in diff --git a/tests/fstar/hashmap/Hashmap.FunsExternal.fsti b/tests/fstar/hashmap/Hashmap.FunsExternal.fsti new file mode 100644 index 00000000..f2f305e6 --- /dev/null +++ b/tests/fstar/hashmap/Hashmap.FunsExternal.fsti @@ -0,0 +1,16 @@ +(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) +(** [hashmap]: external function declarations *) +module Hashmap.FunsExternal +open Primitives +include Hashmap.Types + +#set-options "--z3rlimit 50 --fuel 1 --ifuel 1" + +(** [hashmap::utils::deserialize]: + Source: 'tests/src/hashmap.rs', lines 330:4-330:47 *) +val utils_deserialize : state -> result (state & (hashMap_t u64)) + +(** [hashmap::utils::serialize]: + Source: 'tests/src/hashmap.rs', lines 325:4-325:46 *) +val utils_serialize : hashMap_t u64 -> state -> result (state & unit) + diff --git a/tests/fstar/hashmap_main/HashmapMain.Properties.fst b/tests/fstar/hashmap/Hashmap.Properties.fst index beb3dc2c..ed118c46 100644 --- a/tests/fstar/hashmap_main/HashmapMain.Properties.fst +++ b/tests/fstar/hashmap/Hashmap.Properties.fst @@ -1,7 +1,7 @@ (** Properties about the hashmap written on disk *) -module HashmapMain.Properties +module Hashmap.Properties open Primitives -open HashmapMain.Funs +open Hashmap.Funs #set-options "--z3rlimit 50 --fuel 0 --ifuel 1" @@ -13,23 +13,23 @@ open HashmapMain.Funs /// [state_v] gives us the hash map currently stored on disk assume -val state_v : state -> hashmap_HashMap_t u64 +val state_v : state -> hashMap_t u64 /// [serialize] updates the hash map stored on disk assume -val serialize_lem (hm : hashmap_HashMap_t u64) (st : state) : Lemma ( - match hashmap_utils_serialize hm st with +val serialize_lem (hm : hashMap_t u64) (st : state) : Lemma ( + match utils_serialize hm st with | Fail _ -> True | Ok (st', ()) -> state_v st' == hm) - [SMTPat (hashmap_utils_serialize hm st)] + [SMTPat (utils_serialize hm st)] /// [deserialize] gives us the hash map stored on disk, without updating it assume val deserialize_lem (st : state) : Lemma ( - match hashmap_utils_deserialize st with + match utils_deserialize st with | Fail _ -> True | Ok (st', hm) -> hm == state_v st /\ st' == st) - [SMTPat (hashmap_utils_deserialize st)] + [SMTPat (utils_deserialize st)] (*** Lemmas *) @@ -41,7 +41,7 @@ val insert_on_disk_lem (key : usize) (value : u64) (st : state) : Lemma ( | Fail _ -> True | Ok (st', ()) -> let hm = state_v st in - match hashmap_HashMap_insert u64 hm key value with + match hashMap_insert u64 hm key value with | Fail _ -> False | Ok hm' -> hm' == state_v st') diff --git a/tests/fstar/hashmap/Hashmap.Types.fst b/tests/fstar/hashmap/Hashmap.Types.fst index 962fbee2..818cb9d1 100644 --- a/tests/fstar/hashmap/Hashmap.Types.fst +++ b/tests/fstar/hashmap/Hashmap.Types.fst @@ -2,17 +2,18 @@ (** [hashmap]: type definitions *) module Hashmap.Types open Primitives +include Hashmap.TypesExternal #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" (** [hashmap::List] - Source: 'tests/src/hashmap.rs', lines 27:0-27:16 *) + Source: 'tests/src/hashmap.rs', lines 29:0-29:16 *) type list_t (t : Type0) = | List_Cons : usize -> t -> list_t t -> list_t t | List_Nil : list_t t (** [hashmap::HashMap] - Source: 'tests/src/hashmap.rs', lines 43:0-43:21 *) + Source: 'tests/src/hashmap.rs', lines 45:0-45:21 *) type hashMap_t (t : Type0) = { num_entries : usize; diff --git a/tests/fstar/hashmap_main/HashmapMain.TypesExternal.fsti b/tests/fstar/hashmap/Hashmap.TypesExternal.fsti index 75747408..66cb659b 100644 --- a/tests/fstar/hashmap_main/HashmapMain.TypesExternal.fsti +++ b/tests/fstar/hashmap/Hashmap.TypesExternal.fsti @@ -1,6 +1,6 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: external type declarations *) -module HashmapMain.TypesExternal +(** [hashmap]: external type declarations *) +module Hashmap.TypesExternal open Primitives #set-options "--z3rlimit 50 --fuel 1 --ifuel 1" diff --git a/tests/fstar/hashmap_main/HashmapMain.Clauses.Template.fst b/tests/fstar/hashmap_main/HashmapMain.Clauses.Template.fst deleted file mode 100644 index cdd73210..00000000 --- a/tests/fstar/hashmap_main/HashmapMain.Clauses.Template.fst +++ /dev/null @@ -1,72 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: templates for the decreases clauses *) -module HashmapMain.Clauses.Template -open Primitives -open HashmapMain.Types - -#set-options "--z3rlimit 50 --fuel 1 --ifuel 1" - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: decreases clause - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 *) -unfold -let hashmap_HashMap_allocate_slots_loop_decreases (t : Type0) - (slots : alloc_vec_Vec (hashmap_List_t t)) (n : usize) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: decreases clause - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 *) -unfold -let hashmap_HashMap_clear_loop_decreases (t : Type0) - (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 *) -unfold -let hashmap_HashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) - (value : t) (ls : hashmap_List_t t) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 *) -unfold -let hashmap_HashMap_move_elements_from_list_loop_decreases (t : Type0) - (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: decreases clause - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 *) -unfold -let hashmap_HashMap_move_elements_loop_decreases (t : Type0) - (ntable : hashmap_HashMap_t t) (slots : alloc_vec_Vec (hashmap_List_t t)) - (i : usize) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 *) -unfold -let hashmap_HashMap_contains_key_in_list_loop_decreases (t : Type0) - (key : usize) (ls : hashmap_List_t t) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 *) -unfold -let hashmap_HashMap_get_in_list_loop_decreases (t : Type0) (key : usize) - (ls : hashmap_List_t t) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 *) -unfold -let hashmap_HashMap_get_mut_in_list_loop_decreases (t : Type0) - (ls : hashmap_List_t t) (key : usize) : nat = - admit () - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: decreases clause - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 *) -unfold -let hashmap_HashMap_remove_from_list_loop_decreases (t : Type0) (key : usize) - (ls : hashmap_List_t t) : nat = - admit () - diff --git a/tests/fstar/hashmap_main/HashmapMain.Clauses.fst b/tests/fstar/hashmap_main/HashmapMain.Clauses.fst deleted file mode 100644 index be5a4ab1..00000000 --- a/tests/fstar/hashmap_main/HashmapMain.Clauses.fst +++ /dev/null @@ -1,61 +0,0 @@ -(** [hashmap]: the decreases clauses *) -module HashmapMain.Clauses -open Primitives -open FStar.List.Tot -open HashmapMain.Types - -#set-options "--z3rlimit 50 --fuel 0 --ifuel 1" - -(** [hashmap::HashMap::allocate_slots]: decreases clause *) -unfold -let hashmap_HashMap_allocate_slots_loop_decreases (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) - (n : usize) : nat = n - -(** [hashmap::HashMap::clear]: decreases clause *) -unfold -let hashmap_HashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) - (i : usize) : nat = - if i < length slots then length slots - i else 0 - -(** [hashmap::HashMap::insert_in_list]: decreases clause *) -unfold -let hashmap_HashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) (value : t) - (ls : hashmap_List_t t) : hashmap_List_t t = - ls - -(** [hashmap::HashMap::move_elements_from_list]: decreases clause *) -unfold -let hashmap_HashMap_move_elements_from_list_loop_decreases (t : Type0) - (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) : hashmap_List_t t = - ls - -(** [hashmap::HashMap::move_elements]: decreases clause *) -unfold -let hashmap_HashMap_move_elements_loop_decreases (t : Type0) (ntable : hashmap_HashMap_t t) - (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) : nat = - if i < length slots then length slots - i else 0 - -(** [hashmap::HashMap::contains_key_in_list]: decreases clause *) -unfold -let hashmap_HashMap_contains_key_in_list_loop_decreases (t : Type0) (key : usize) - (ls : hashmap_List_t t) : hashmap_List_t t = - ls - -(** [hashmap::HashMap::get_in_list]: decreases clause *) -unfold -let hashmap_HashMap_get_in_list_loop_decreases (t : Type0) (key : usize) (ls : hashmap_List_t t) : - hashmap_List_t t = - ls - -(** [hashmap::HashMap::get_mut_in_list]: decreases clause *) -unfold -let hashmap_HashMap_get_mut_in_list_loop_decreases (t : Type0) - (ls : hashmap_List_t t) (key : usize) : hashmap_List_t t = - ls - -(** [hashmap::HashMap::remove_from_list]: decreases clause *) -unfold -let hashmap_HashMap_remove_from_list_loop_decreases (t : Type0) (key : usize) - (ls : hashmap_List_t t) : hashmap_List_t t = - ls - diff --git a/tests/fstar/hashmap_main/HashmapMain.Funs.fst b/tests/fstar/hashmap_main/HashmapMain.Funs.fst deleted file mode 100644 index c88a746e..00000000 --- a/tests/fstar/hashmap_main/HashmapMain.Funs.fst +++ /dev/null @@ -1,446 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: function definitions *) -module HashmapMain.Funs -open Primitives -include HashmapMain.Types -include HashmapMain.FunsExternal -include HashmapMain.Clauses - -#set-options "--z3rlimit 50 --fuel 1 --ifuel 1" - -(** [hashmap_main::hashmap::hash_key]: - Source: 'tests/src/hashmap.rs', lines 35:0-35:32 *) -let hashmap_hash_key (k : usize) : result usize = - Ok k - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: loop 0: - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 *) -let rec hashmap_HashMap_allocate_slots_loop - (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) (n : usize) : - Tot (result (alloc_vec_Vec (hashmap_List_t t))) - (decreases (hashmap_HashMap_allocate_slots_loop_decreases t slots n)) - = - if n > 0 - then - let* slots1 = alloc_vec_Vec_push (hashmap_List_t t) slots Hashmap_List_Nil - in - let* n1 = usize_sub n 1 in - hashmap_HashMap_allocate_slots_loop t slots1 n1 - else Ok slots - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: - Source: 'tests/src/hashmap.rs', lines 58:4-58:76 *) -let hashmap_HashMap_allocate_slots - (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) (n : usize) : - result (alloc_vec_Vec (hashmap_List_t t)) - = - hashmap_HashMap_allocate_slots_loop t slots n - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new_with_capacity]: - Source: 'tests/src/hashmap.rs', lines 67:4-71:13 *) -let hashmap_HashMap_new_with_capacity - (t : Type0) (capacity : usize) (max_load_dividend : usize) - (max_load_divisor : usize) : - result (hashmap_HashMap_t t) - = - let* slots = - hashmap_HashMap_allocate_slots t (alloc_vec_Vec_new (hashmap_List_t t)) - capacity in - let* i = usize_mul capacity max_load_dividend in - let* i1 = usize_div i max_load_divisor in - Ok - { - num_entries = 0; - max_load_factor = (max_load_dividend, max_load_divisor); - max_load = i1; - slots = slots - } - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new]: - Source: 'tests/src/hashmap.rs', lines 83:4-83:24 *) -let hashmap_HashMap_new (t : Type0) : result (hashmap_HashMap_t t) = - hashmap_HashMap_new_with_capacity t 32 4 5 - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: loop 0: - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 *) -let rec hashmap_HashMap_clear_loop - (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) : - Tot (result (alloc_vec_Vec (hashmap_List_t t))) - (decreases (hashmap_HashMap_clear_loop_decreases t slots i)) - = - let i1 = alloc_vec_Vec_len (hashmap_List_t t) slots in - if i < i1 - then - let* (_, index_mut_back) = - alloc_vec_Vec_index_mut (hashmap_List_t t) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) slots i - in - let* i2 = usize_add i 1 in - let* slots1 = index_mut_back Hashmap_List_Nil in - hashmap_HashMap_clear_loop t slots1 i2 - else Ok slots - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: - Source: 'tests/src/hashmap.rs', lines 88:4-88:27 *) -let hashmap_HashMap_clear - (t : Type0) (self : hashmap_HashMap_t t) : result (hashmap_HashMap_t t) = - let* hm = hashmap_HashMap_clear_loop t self.slots 0 in - Ok { self with num_entries = 0; slots = hm } - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::len]: - Source: 'tests/src/hashmap.rs', lines 98:4-98:30 *) -let hashmap_HashMap_len - (t : Type0) (self : hashmap_HashMap_t t) : result usize = - Ok self.num_entries - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 *) -let rec hashmap_HashMap_insert_in_list_loop - (t : Type0) (key : usize) (value : t) (ls : hashmap_List_t t) : - Tot (result (bool & (hashmap_List_t t))) - (decreases (hashmap_HashMap_insert_in_list_loop_decreases t key value ls)) - = - begin match ls with - | Hashmap_List_Cons ckey cvalue tl -> - if ckey = key - then Ok (false, Hashmap_List_Cons ckey value tl) - else - let* (b, tl1) = hashmap_HashMap_insert_in_list_loop t key value tl in - Ok (b, Hashmap_List_Cons ckey cvalue tl1) - | Hashmap_List_Nil -> Ok (true, Hashmap_List_Cons key value Hashmap_List_Nil) - end - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: - Source: 'tests/src/hashmap.rs', lines 105:4-105:71 *) -let hashmap_HashMap_insert_in_list - (t : Type0) (key : usize) (value : t) (ls : hashmap_List_t t) : - result (bool & (hashmap_List_t t)) - = - hashmap_HashMap_insert_in_list_loop t key value ls - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_no_resize]: - Source: 'tests/src/hashmap.rs', lines 125:4-125:54 *) -let hashmap_HashMap_insert_no_resize - (t : Type0) (self : hashmap_HashMap_t t) (key : usize) (value : t) : - result (hashmap_HashMap_t t) - = - let* hash = hashmap_hash_key key in - let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in - let* hash_mod = usize_rem hash i in - let* (l, index_mut_back) = - alloc_vec_Vec_index_mut (hashmap_List_t t) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) - self.slots hash_mod in - let* (inserted, l1) = hashmap_HashMap_insert_in_list t key value l in - if inserted - then - let* i1 = usize_add self.num_entries 1 in - let* v = index_mut_back l1 in - Ok { self with num_entries = i1; slots = v } - else let* v = index_mut_back l1 in Ok { self with slots = v } - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 *) -let rec hashmap_HashMap_move_elements_from_list_loop - (t : Type0) (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) : - Tot (result (hashmap_HashMap_t t)) - (decreases ( - hashmap_HashMap_move_elements_from_list_loop_decreases t ntable ls)) - = - begin match ls with - | Hashmap_List_Cons k v tl -> - let* ntable1 = hashmap_HashMap_insert_no_resize t ntable k v in - hashmap_HashMap_move_elements_from_list_loop t ntable1 tl - | Hashmap_List_Nil -> Ok ntable - end - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: - Source: 'tests/src/hashmap.rs', lines 191:4-191:72 *) -let hashmap_HashMap_move_elements_from_list - (t : Type0) (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) : - result (hashmap_HashMap_t t) - = - hashmap_HashMap_move_elements_from_list_loop t ntable ls - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: loop 0: - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 *) -let rec hashmap_HashMap_move_elements_loop - (t : Type0) (ntable : hashmap_HashMap_t t) - (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) : - Tot (result ((hashmap_HashMap_t t) & (alloc_vec_Vec (hashmap_List_t t)))) - (decreases (hashmap_HashMap_move_elements_loop_decreases t ntable slots i)) - = - let i1 = alloc_vec_Vec_len (hashmap_List_t t) slots in - if i < i1 - then - let* (l, index_mut_back) = - alloc_vec_Vec_index_mut (hashmap_List_t t) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) slots i - in - let (ls, l1) = core_mem_replace (hashmap_List_t t) l Hashmap_List_Nil in - let* ntable1 = hashmap_HashMap_move_elements_from_list t ntable ls in - let* i2 = usize_add i 1 in - let* slots1 = index_mut_back l1 in - hashmap_HashMap_move_elements_loop t ntable1 slots1 i2 - else Ok (ntable, slots) - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: - Source: 'tests/src/hashmap.rs', lines 179:4-179:95 *) -let hashmap_HashMap_move_elements - (t : Type0) (ntable : hashmap_HashMap_t t) - (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) : - result ((hashmap_HashMap_t t) & (alloc_vec_Vec (hashmap_List_t t))) - = - hashmap_HashMap_move_elements_loop t ntable slots i - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::try_resize]: - Source: 'tests/src/hashmap.rs', lines 148:4-148:28 *) -let hashmap_HashMap_try_resize - (t : Type0) (self : hashmap_HashMap_t t) : result (hashmap_HashMap_t t) = - let* max_usize = scalar_cast U32 Usize core_u32_max in - let capacity = alloc_vec_Vec_len (hashmap_List_t t) self.slots in - let* n1 = usize_div max_usize 2 in - let (i, i1) = self.max_load_factor in - let* i2 = usize_div n1 i in - if capacity <= i2 - then - let* i3 = usize_mul capacity 2 in - let* ntable = hashmap_HashMap_new_with_capacity t i3 i i1 in - let* p = hashmap_HashMap_move_elements t ntable self.slots 0 in - let (ntable1, _) = p in - Ok - { ntable1 with num_entries = self.num_entries; max_load_factor = (i, i1) - } - else Ok { self with max_load_factor = (i, i1) } - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert]: - Source: 'tests/src/hashmap.rs', lines 137:4-137:48 *) -let hashmap_HashMap_insert - (t : Type0) (self : hashmap_HashMap_t t) (key : usize) (value : t) : - result (hashmap_HashMap_t t) - = - let* self1 = hashmap_HashMap_insert_no_resize t self key value in - let* i = hashmap_HashMap_len t self1 in - if i > self1.max_load then hashmap_HashMap_try_resize t self1 else Ok self1 - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 *) -let rec hashmap_HashMap_contains_key_in_list_loop - (t : Type0) (key : usize) (ls : hashmap_List_t t) : - Tot (result bool) - (decreases (hashmap_HashMap_contains_key_in_list_loop_decreases t key ls)) - = - begin match ls with - | Hashmap_List_Cons ckey _ tl -> - if ckey = key - then Ok true - else hashmap_HashMap_contains_key_in_list_loop t key tl - | Hashmap_List_Nil -> Ok false - end - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: - Source: 'tests/src/hashmap.rs', lines 214:4-214:68 *) -let hashmap_HashMap_contains_key_in_list - (t : Type0) (key : usize) (ls : hashmap_List_t t) : result bool = - hashmap_HashMap_contains_key_in_list_loop t key ls - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key]: - Source: 'tests/src/hashmap.rs', lines 207:4-207:49 *) -let hashmap_HashMap_contains_key - (t : Type0) (self : hashmap_HashMap_t t) (key : usize) : result bool = - let* hash = hashmap_hash_key key in - let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in - let* hash_mod = usize_rem hash i in - let* l = - alloc_vec_Vec_index (hashmap_List_t t) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) - self.slots hash_mod in - hashmap_HashMap_contains_key_in_list t key l - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 *) -let rec hashmap_HashMap_get_in_list_loop - (t : Type0) (key : usize) (ls : hashmap_List_t t) : - Tot (result t) - (decreases (hashmap_HashMap_get_in_list_loop_decreases t key ls)) - = - begin match ls with - | Hashmap_List_Cons ckey cvalue tl -> - if ckey = key then Ok cvalue else hashmap_HashMap_get_in_list_loop t key tl - | Hashmap_List_Nil -> Fail Failure - end - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: - Source: 'tests/src/hashmap.rs', lines 232:4-232:70 *) -let hashmap_HashMap_get_in_list - (t : Type0) (key : usize) (ls : hashmap_List_t t) : result t = - hashmap_HashMap_get_in_list_loop t key ls - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get]: - Source: 'tests/src/hashmap.rs', lines 247:4-247:55 *) -let hashmap_HashMap_get - (t : Type0) (self : hashmap_HashMap_t t) (key : usize) : result t = - let* hash = hashmap_hash_key key in - let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in - let* hash_mod = usize_rem hash i in - let* l = - alloc_vec_Vec_index (hashmap_List_t t) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) - self.slots hash_mod in - hashmap_HashMap_get_in_list t key l - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 *) -let rec hashmap_HashMap_get_mut_in_list_loop - (t : Type0) (ls : hashmap_List_t t) (key : usize) : - Tot (result (t & (t -> result (hashmap_List_t t)))) - (decreases (hashmap_HashMap_get_mut_in_list_loop_decreases t ls key)) - = - begin match ls with - | Hashmap_List_Cons ckey cvalue tl -> - if ckey = key - then - let back = fun ret -> Ok (Hashmap_List_Cons ckey ret tl) in - Ok (cvalue, back) - else - let* (x, back) = hashmap_HashMap_get_mut_in_list_loop t tl key in - let back1 = - fun ret -> - let* tl1 = back ret in Ok (Hashmap_List_Cons ckey cvalue tl1) in - Ok (x, back1) - | Hashmap_List_Nil -> Fail Failure - end - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: - Source: 'tests/src/hashmap.rs', lines 253:4-253:86 *) -let hashmap_HashMap_get_mut_in_list - (t : Type0) (ls : hashmap_List_t t) (key : usize) : - result (t & (t -> result (hashmap_List_t t))) - = - hashmap_HashMap_get_mut_in_list_loop t ls key - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]: - Source: 'tests/src/hashmap.rs', lines 265:4-265:67 *) -let hashmap_HashMap_get_mut - (t : Type0) (self : hashmap_HashMap_t t) (key : usize) : - result (t & (t -> result (hashmap_HashMap_t t))) - = - let* hash = hashmap_hash_key key in - let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in - let* hash_mod = usize_rem hash i in - let* (l, index_mut_back) = - alloc_vec_Vec_index_mut (hashmap_List_t t) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) - self.slots hash_mod in - let* (x, get_mut_in_list_back) = hashmap_HashMap_get_mut_in_list t l key in - let back = - fun ret -> - let* l1 = get_mut_in_list_back ret in - let* v = index_mut_back l1 in - Ok { self with slots = v } in - Ok (x, back) - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 *) -let rec hashmap_HashMap_remove_from_list_loop - (t : Type0) (key : usize) (ls : hashmap_List_t t) : - Tot (result ((option t) & (hashmap_List_t t))) - (decreases (hashmap_HashMap_remove_from_list_loop_decreases t key ls)) - = - begin match ls with - | Hashmap_List_Cons ckey x tl -> - if ckey = key - then - let (mv_ls, _) = - core_mem_replace (hashmap_List_t t) (Hashmap_List_Cons ckey x tl) - Hashmap_List_Nil in - begin match mv_ls with - | Hashmap_List_Cons _ cvalue tl1 -> Ok (Some cvalue, tl1) - | Hashmap_List_Nil -> Fail Failure - end - else - let* (o, tl1) = hashmap_HashMap_remove_from_list_loop t key tl in - Ok (o, Hashmap_List_Cons ckey x tl1) - | Hashmap_List_Nil -> Ok (None, Hashmap_List_Nil) - end - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: - Source: 'tests/src/hashmap.rs', lines 273:4-273:69 *) -let hashmap_HashMap_remove_from_list - (t : Type0) (key : usize) (ls : hashmap_List_t t) : - result ((option t) & (hashmap_List_t t)) - = - hashmap_HashMap_remove_from_list_loop t key ls - -(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove]: - Source: 'tests/src/hashmap.rs', lines 302:4-302:52 *) -let hashmap_HashMap_remove - (t : Type0) (self : hashmap_HashMap_t t) (key : usize) : - result ((option t) & (hashmap_HashMap_t t)) - = - let* hash = hashmap_hash_key key in - let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in - let* hash_mod = usize_rem hash i in - let* (l, index_mut_back) = - alloc_vec_Vec_index_mut (hashmap_List_t t) usize - (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) - self.slots hash_mod in - let* (x, l1) = hashmap_HashMap_remove_from_list t key l in - begin match x with - | None -> let* v = index_mut_back l1 in Ok (None, { self with slots = v }) - | Some x1 -> - let* i1 = usize_sub self.num_entries 1 in - let* v = index_mut_back l1 in - Ok (Some x1, { self with num_entries = i1; slots = v }) - end - -(** [hashmap_main::hashmap::test1]: - Source: 'tests/src/hashmap.rs', lines 323:0-323:10 *) -let hashmap_test1 : result unit = - let* hm = hashmap_HashMap_new u64 in - let* hm1 = hashmap_HashMap_insert u64 hm 0 42 in - let* hm2 = hashmap_HashMap_insert u64 hm1 128 18 in - let* hm3 = hashmap_HashMap_insert u64 hm2 1024 138 in - let* hm4 = hashmap_HashMap_insert u64 hm3 1056 256 in - let* i = hashmap_HashMap_get u64 hm4 128 in - if not (i = 18) - then Fail Failure - else - let* (_, get_mut_back) = hashmap_HashMap_get_mut u64 hm4 1024 in - let* hm5 = get_mut_back 56 in - let* i1 = hashmap_HashMap_get u64 hm5 1024 in - if not (i1 = 56) - then Fail Failure - else - let* (x, hm6) = hashmap_HashMap_remove u64 hm5 1024 in - begin match x with - | None -> Fail Failure - | Some x1 -> - if not (x1 = 56) - then Fail Failure - else - let* i2 = hashmap_HashMap_get u64 hm6 0 in - if not (i2 = 42) - then Fail Failure - else - let* i3 = hashmap_HashMap_get u64 hm6 128 in - if not (i3 = 18) - then Fail Failure - else - let* i4 = hashmap_HashMap_get u64 hm6 1056 in - if not (i4 = 256) then Fail Failure else Ok () - end - -(** [hashmap_main::insert_on_disk]: - Source: 'tests/src/hashmap_main.rs', lines 13:0-13:43 *) -let insert_on_disk - (key : usize) (value : u64) (st : state) : result (state & unit) = - let* (st1, hm) = hashmap_utils_deserialize st in - let* hm1 = hashmap_HashMap_insert u64 hm key value in - hashmap_utils_serialize hm1 st1 - -(** [hashmap_main::main]: - Source: 'tests/src/hashmap_main.rs', lines 22:0-22:13 *) -let main : result unit = - Ok () - diff --git a/tests/fstar/hashmap_main/HashmapMain.FunsExternal.fsti b/tests/fstar/hashmap_main/HashmapMain.FunsExternal.fsti deleted file mode 100644 index cc20d988..00000000 --- a/tests/fstar/hashmap_main/HashmapMain.FunsExternal.fsti +++ /dev/null @@ -1,18 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: external function declarations *) -module HashmapMain.FunsExternal -open Primitives -include HashmapMain.Types - -#set-options "--z3rlimit 50 --fuel 1 --ifuel 1" - -(** [hashmap_main::hashmap_utils::deserialize]: - Source: 'tests/src/hashmap_utils.rs', lines 11:0-11:43 *) -val hashmap_utils_deserialize - : state -> result (state & (hashmap_HashMap_t u64)) - -(** [hashmap_main::hashmap_utils::serialize]: - Source: 'tests/src/hashmap_utils.rs', lines 6:0-6:42 *) -val hashmap_utils_serialize - : hashmap_HashMap_t u64 -> state -> result (state & unit) - diff --git a/tests/fstar/hashmap_main/HashmapMain.Types.fst b/tests/fstar/hashmap_main/HashmapMain.Types.fst deleted file mode 100644 index 85bcaeea..00000000 --- a/tests/fstar/hashmap_main/HashmapMain.Types.fst +++ /dev/null @@ -1,24 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [hashmap_main]: type definitions *) -module HashmapMain.Types -open Primitives -include HashmapMain.TypesExternal - -#set-options "--z3rlimit 50 --fuel 1 --ifuel 1" - -(** [hashmap_main::hashmap::List] - Source: 'tests/src/hashmap.rs', lines 27:0-27:16 *) -type hashmap_List_t (t : Type0) = -| Hashmap_List_Cons : usize -> t -> hashmap_List_t t -> hashmap_List_t t -| Hashmap_List_Nil : hashmap_List_t t - -(** [hashmap_main::hashmap::HashMap] - Source: 'tests/src/hashmap.rs', lines 43:0-43:21 *) -type hashmap_HashMap_t (t : Type0) = -{ - num_entries : usize; - max_load_factor : (usize & usize); - max_load : usize; - slots : alloc_vec_Vec (hashmap_List_t t); -} - diff --git a/tests/fstar/hashmap_main/Makefile b/tests/fstar/hashmap_main/Makefile deleted file mode 100644 index fa7d1f36..00000000 --- a/tests/fstar/hashmap_main/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# This file was automatically generated - modify ../Makefile.template instead -INCLUDE_DIRS = . - -FSTAR_INCLUDES = $(addprefix --include ,$(INCLUDE_DIRS)) - -FSTAR_HINTS ?= --use_hints --use_hint_hashes --record_hints - -FSTAR_OPTIONS = $(FSTAR_HINTS) \ - --cache_checked_modules $(FSTAR_INCLUDES) --cmi \ - --warn_error '+241@247+285-274' \ - -FSTAR_EXE ?= fstar.exe -FSTAR_NO_FLAGS = $(FSTAR_EXE) --already_cached 'Prims FStar LowStar Steel' --odir obj --cache_dir obj - -FSTAR = $(FSTAR_NO_FLAGS) $(FSTAR_OPTIONS) - -# The F* roots are used to compute the dependency graph, and generate the .depend file -FSTAR_ROOTS ?= $(wildcard *.fst *.fsti) - -# Build all the files -all: $(addprefix obj/,$(addsuffix .checked,$(FSTAR_ROOTS))) - -# This is the right way to ensure the .depend file always gets re-built. -ifeq (,$(filter %-in,$(MAKECMDGOALS))) -ifndef NODEPEND -ifndef MAKE_RESTARTS -.depend: .FORCE - $(FSTAR_NO_FLAGS) --dep full $(notdir $(FSTAR_ROOTS)) > $@ - -.PHONY: .FORCE -.FORCE: -endif -endif - -include .depend -endif - -# For the interactive mode -%.fst-in %.fsti-in: - @echo $(FSTAR_OPTIONS) - -# Generete the .checked files in batch mode -%.checked: - $(FSTAR) $(FSTAR_OPTIONS) $< && \ - touch -c $@ - -.PHONY: clean -clean: - rm -f obj/* diff --git a/tests/fstar/hashmap_main/Primitives.fst b/tests/fstar/hashmap_main/Primitives.fst deleted file mode 100644 index 9951ccc3..00000000 --- a/tests/fstar/hashmap_main/Primitives.fst +++ /dev/null @@ -1,929 +0,0 @@ -/// This file lists primitive and assumed functions and types -module Primitives -open FStar.Mul -open FStar.List.Tot - -#set-options "--z3rlimit 15 --fuel 0 --ifuel 1" - -(*** Utilities *) -val list_update (#a : Type0) (ls : list a) (i : nat{i < length ls}) (x : a) : - ls':list a{ - length ls' = length ls /\ - index ls' i == x - } -#push-options "--fuel 1" -let rec list_update #a ls i x = - match ls with - | x' :: ls -> if i = 0 then x :: ls else x' :: list_update ls (i-1) x -#pop-options - -(*** Result *) -type error : Type0 = -| Failure -| OutOfFuel - -type result (a : Type0) : Type0 = -| Ok : v:a -> result a -| Fail : e:error -> result a - -// Monadic return operator -unfold let return (#a : Type0) (x : a) : result a = Ok x - -// Monadic bind operator. -// Allows to use the notation: -// ``` -// let* x = y in -// ... -// ``` -unfold let (let*) (#a #b : Type0) (m: result a) - (f: (x:a) -> Pure (result b) (requires (m == Ok x)) (ensures fun _ -> True)) : - result b = - match m with - | Ok x -> f x - | Fail e -> Fail e - -// Monadic assert(...) -let massert (b:bool) : result unit = if b then Ok () else Fail Failure - -// Normalize and unwrap a successful result (used for globals). -let eval_global (#a : Type0) (x : result a{Ok? (normalize_term x)}) : a = Ok?.v x - -(*** Misc *) -type char = FStar.Char.char -type string = string - -let is_zero (n: nat) : bool = n = 0 -let decrease (n: nat{n > 0}) : nat = n - 1 - -let core_mem_replace (a : Type0) (x : a) (y : a) : a & a = (x, x) - -// We don't really use raw pointers for now -type mut_raw_ptr (t : Type0) = { v : t } -type const_raw_ptr (t : Type0) = { v : t } - -(*** Scalars *) -/// Rem.: most of the following code was partially generated - -assume val size_numbits : pos - -// TODO: we could use FStar.Int.int_t and FStar.UInt.int_t - -let isize_min : int = -9223372036854775808 // TODO: should be opaque -let isize_max : int = 9223372036854775807 // TODO: should be opaque -let i8_min : int = -128 -let i8_max : int = 127 -let i16_min : int = -32768 -let i16_max : int = 32767 -let i32_min : int = -2147483648 -let i32_max : int = 2147483647 -let i64_min : int = -9223372036854775808 -let i64_max : int = 9223372036854775807 -let i128_min : int = -170141183460469231731687303715884105728 -let i128_max : int = 170141183460469231731687303715884105727 -let usize_min : int = 0 -let usize_max : int = 4294967295 // TODO: should be opaque -let u8_min : int = 0 -let u8_max : int = 255 -let u16_min : int = 0 -let u16_max : int = 65535 -let u32_min : int = 0 -let u32_max : int = 4294967295 -let u64_min : int = 0 -let u64_max : int = 18446744073709551615 -let u128_min : int = 0 -let u128_max : int = 340282366920938463463374607431768211455 - -type scalar_ty = -| Isize -| I8 -| I16 -| I32 -| I64 -| I128 -| Usize -| U8 -| U16 -| U32 -| U64 -| U128 - -let is_unsigned = function - | Isize | I8 | I16 | I32 | I64 | I128 -> false - | Usize | U8 | U16 | U32 | U64 | U128 -> true - -let scalar_min (ty : scalar_ty) : int = - match ty with - | Isize -> isize_min - | I8 -> i8_min - | I16 -> i16_min - | I32 -> i32_min - | I64 -> i64_min - | I128 -> i128_min - | Usize -> usize_min - | U8 -> u8_min - | U16 -> u16_min - | U32 -> u32_min - | U64 -> u64_min - | U128 -> u128_min - -let scalar_max (ty : scalar_ty) : int = - match ty with - | Isize -> isize_max - | I8 -> i8_max - | I16 -> i16_max - | I32 -> i32_max - | I64 -> i64_max - | I128 -> i128_max - | Usize -> usize_max - | U8 -> u8_max - | U16 -> u16_max - | U32 -> u32_max - | U64 -> u64_max - | U128 -> u128_max - -type scalar (ty : scalar_ty) : eqtype = x:int{scalar_min ty <= x && x <= scalar_max ty} - -let mk_scalar (ty : scalar_ty) (x : int) : result (scalar ty) = - if scalar_min ty <= x && scalar_max ty >= x then Ok x else Fail Failure - -let scalar_neg (#ty : scalar_ty) (x : scalar ty) : result (scalar ty) = mk_scalar ty (-x) - -let scalar_div (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) = - if y <> 0 then mk_scalar ty (x / y) else Fail Failure - -/// The remainder operation -let int_rem (x : int) (y : int{y <> 0}) : int = - if x >= 0 then (x % y) else -(x % y) - -(* Checking consistency with Rust *) -let _ = assert_norm(int_rem 1 2 = 1) -let _ = assert_norm(int_rem (-1) 2 = -1) -let _ = assert_norm(int_rem 1 (-2) = 1) -let _ = assert_norm(int_rem (-1) (-2) = -1) - -let scalar_rem (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) = - if y <> 0 then mk_scalar ty (int_rem x y) else Fail Failure - -let scalar_add (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) = - mk_scalar ty (x + y) - -let scalar_sub (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) = - mk_scalar ty (x - y) - -let scalar_mul (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) = - mk_scalar ty (x * y) - -let scalar_xor (#ty : scalar_ty) - (x : scalar ty) (y : scalar ty) : scalar ty = - match ty with - | U8 -> FStar.UInt.logxor #8 x y - | U16 -> FStar.UInt.logxor #16 x y - | U32 -> FStar.UInt.logxor #32 x y - | U64 -> FStar.UInt.logxor #64 x y - | U128 -> FStar.UInt.logxor #128 x y - | Usize -> admit() // TODO - | I8 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 8); - normalize_spec (scalar I8); - FStar.Int.logxor #8 x y - | I16 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 16); - normalize_spec (scalar I16); - FStar.Int.logxor #16 x y - | I32 -> FStar.Int.logxor #32 x y - | I64 -> FStar.Int.logxor #64 x y - | I128 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 128); - normalize_spec (scalar I128); - FStar.Int.logxor #128 x y - | Isize -> admit() // TODO - -let scalar_or (#ty : scalar_ty) - (x : scalar ty) (y : scalar ty) : scalar ty = - match ty with - | U8 -> FStar.UInt.logor #8 x y - | U16 -> FStar.UInt.logor #16 x y - | U32 -> FStar.UInt.logor #32 x y - | U64 -> FStar.UInt.logor #64 x y - | U128 -> FStar.UInt.logor #128 x y - | Usize -> admit() // TODO - | I8 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 8); - normalize_spec (scalar I8); - FStar.Int.logor #8 x y - | I16 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 16); - normalize_spec (scalar I16); - FStar.Int.logor #16 x y - | I32 -> FStar.Int.logor #32 x y - | I64 -> FStar.Int.logor #64 x y - | I128 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 128); - normalize_spec (scalar I128); - FStar.Int.logor #128 x y - | Isize -> admit() // TODO - -let scalar_and (#ty : scalar_ty) - (x : scalar ty) (y : scalar ty) : scalar ty = - match ty with - | U8 -> FStar.UInt.logand #8 x y - | U16 -> FStar.UInt.logand #16 x y - | U32 -> FStar.UInt.logand #32 x y - | U64 -> FStar.UInt.logand #64 x y - | U128 -> FStar.UInt.logand #128 x y - | Usize -> admit() // TODO - | I8 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 8); - normalize_spec (scalar I8); - FStar.Int.logand #8 x y - | I16 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 16); - normalize_spec (scalar I16); - FStar.Int.logand #16 x y - | I32 -> FStar.Int.logand #32 x y - | I64 -> FStar.Int.logand #64 x y - | I128 -> - // Encoding issues... - normalize_spec (FStar.Int.int_t 128); - normalize_spec (scalar I128); - FStar.Int.logand #128 x y - | Isize -> admit() // TODO - -// Shift left -let scalar_shl (#ty0 #ty1 : scalar_ty) - (x : scalar ty0) (y : scalar ty1) : result (scalar ty0) = - admit() - -// Shift right -let scalar_shr (#ty0 #ty1 : scalar_ty) - (x : scalar ty0) (y : scalar ty1) : result (scalar ty0) = - admit() - -(** Cast an integer from a [src_ty] to a [tgt_ty] *) -// TODO: check the semantics of casts in Rust -let scalar_cast (src_ty : scalar_ty) (tgt_ty : scalar_ty) (x : scalar src_ty) : result (scalar tgt_ty) = - mk_scalar tgt_ty x - -// This can't fail, but for now we make all casts faillible (easier for the translation) -let scalar_cast_bool (tgt_ty : scalar_ty) (x : bool) : result (scalar tgt_ty) = - mk_scalar tgt_ty (if x then 1 else 0) - -/// The scalar types -type isize : eqtype = scalar Isize -type i8 : eqtype = scalar I8 -type i16 : eqtype = scalar I16 -type i32 : eqtype = scalar I32 -type i64 : eqtype = scalar I64 -type i128 : eqtype = scalar I128 -type usize : eqtype = scalar Usize -type u8 : eqtype = scalar U8 -type u16 : eqtype = scalar U16 -type u32 : eqtype = scalar U32 -type u64 : eqtype = scalar U64 -type u128 : eqtype = scalar U128 - - -let core_isize_min : isize = isize_min -let core_isize_max : isize = isize_max -let core_i8_min : i8 = i8_min -let core_i8_max : i8 = i8_max -let core_i16_min : i16 = i16_min -let core_i16_max : i16 = i16_max -let core_i32_min : i32 = i32_min -let core_i32_max : i32 = i32_max -let core_i64_min : i64 = i64_min -let core_i64_max : i64 = i64_max -let core_i128_min : i128 = i128_min -let core_i128_max : i128 = i128_max - -let core_usize_min : usize = usize_min -let core_usize_max : usize = usize_max -let core_u8_min : u8 = u8_min -let core_u8_max : u8 = u8_max -let core_u16_min : u16 = u16_min -let core_u16_max : u16 = u16_max -let core_u32_min : u32 = u32_min -let core_u32_max : u32 = u32_max -let core_u64_min : u64 = u64_min -let core_u64_max : u64 = u64_max -let core_u128_min : u128 = u128_min -let core_u128_max : u128 = u128_max - -/// Negation -let isize_neg = scalar_neg #Isize -let i8_neg = scalar_neg #I8 -let i16_neg = scalar_neg #I16 -let i32_neg = scalar_neg #I32 -let i64_neg = scalar_neg #I64 -let i128_neg = scalar_neg #I128 - -/// Division -let isize_div = scalar_div #Isize -let i8_div = scalar_div #I8 -let i16_div = scalar_div #I16 -let i32_div = scalar_div #I32 -let i64_div = scalar_div #I64 -let i128_div = scalar_div #I128 -let usize_div = scalar_div #Usize -let u8_div = scalar_div #U8 -let u16_div = scalar_div #U16 -let u32_div = scalar_div #U32 -let u64_div = scalar_div #U64 -let u128_div = scalar_div #U128 - -/// Remainder -let isize_rem = scalar_rem #Isize -let i8_rem = scalar_rem #I8 -let i16_rem = scalar_rem #I16 -let i32_rem = scalar_rem #I32 -let i64_rem = scalar_rem #I64 -let i128_rem = scalar_rem #I128 -let usize_rem = scalar_rem #Usize -let u8_rem = scalar_rem #U8 -let u16_rem = scalar_rem #U16 -let u32_rem = scalar_rem #U32 -let u64_rem = scalar_rem #U64 -let u128_rem = scalar_rem #U128 - -/// Addition -let isize_add = scalar_add #Isize -let i8_add = scalar_add #I8 -let i16_add = scalar_add #I16 -let i32_add = scalar_add #I32 -let i64_add = scalar_add #I64 -let i128_add = scalar_add #I128 -let usize_add = scalar_add #Usize -let u8_add = scalar_add #U8 -let u16_add = scalar_add #U16 -let u32_add = scalar_add #U32 -let u64_add = scalar_add #U64 -let u128_add = scalar_add #U128 - -/// Subtraction -let isize_sub = scalar_sub #Isize -let i8_sub = scalar_sub #I8 -let i16_sub = scalar_sub #I16 -let i32_sub = scalar_sub #I32 -let i64_sub = scalar_sub #I64 -let i128_sub = scalar_sub #I128 -let usize_sub = scalar_sub #Usize -let u8_sub = scalar_sub #U8 -let u16_sub = scalar_sub #U16 -let u32_sub = scalar_sub #U32 -let u64_sub = scalar_sub #U64 -let u128_sub = scalar_sub #U128 - -/// Multiplication -let isize_mul = scalar_mul #Isize -let i8_mul = scalar_mul #I8 -let i16_mul = scalar_mul #I16 -let i32_mul = scalar_mul #I32 -let i64_mul = scalar_mul #I64 -let i128_mul = scalar_mul #I128 -let usize_mul = scalar_mul #Usize -let u8_mul = scalar_mul #U8 -let u16_mul = scalar_mul #U16 -let u32_mul = scalar_mul #U32 -let u64_mul = scalar_mul #U64 -let u128_mul = scalar_mul #U128 - -/// Xor -let u8_xor = scalar_xor #U8 -let u16_xor = scalar_xor #U16 -let u32_xor = scalar_xor #U32 -let u64_xor = scalar_xor #U64 -let u128_xor = scalar_xor #U128 -let usize_xor = scalar_xor #Usize -let i8_xor = scalar_xor #I8 -let i16_xor = scalar_xor #I16 -let i32_xor = scalar_xor #I32 -let i64_xor = scalar_xor #I64 -let i128_xor = scalar_xor #I128 -let isize_xor = scalar_xor #Isize - -/// Or -let u8_or = scalar_or #U8 -let u16_or = scalar_or #U16 -let u32_or = scalar_or #U32 -let u64_or = scalar_or #U64 -let u128_or = scalar_or #U128 -let usize_or = scalar_or #Usize -let i8_or = scalar_or #I8 -let i16_or = scalar_or #I16 -let i32_or = scalar_or #I32 -let i64_or = scalar_or #I64 -let i128_or = scalar_or #I128 -let isize_or = scalar_or #Isize - -/// And -let u8_and = scalar_and #U8 -let u16_and = scalar_and #U16 -let u32_and = scalar_and #U32 -let u64_and = scalar_and #U64 -let u128_and = scalar_and #U128 -let usize_and = scalar_and #Usize -let i8_and = scalar_and #I8 -let i16_and = scalar_and #I16 -let i32_and = scalar_and #I32 -let i64_and = scalar_and #I64 -let i128_and = scalar_and #I128 -let isize_and = scalar_and #Isize - -/// Shift left -let u8_shl #ty = scalar_shl #U8 #ty -let u16_shl #ty = scalar_shl #U16 #ty -let u32_shl #ty = scalar_shl #U32 #ty -let u64_shl #ty = scalar_shl #U64 #ty -let u128_shl #ty = scalar_shl #U128 #ty -let usize_shl #ty = scalar_shl #Usize #ty -let i8_shl #ty = scalar_shl #I8 #ty -let i16_shl #ty = scalar_shl #I16 #ty -let i32_shl #ty = scalar_shl #I32 #ty -let i64_shl #ty = scalar_shl #I64 #ty -let i128_shl #ty = scalar_shl #I128 #ty -let isize_shl #ty = scalar_shl #Isize #ty - -/// Shift right -let u8_shr #ty = scalar_shr #U8 #ty -let u16_shr #ty = scalar_shr #U16 #ty -let u32_shr #ty = scalar_shr #U32 #ty -let u64_shr #ty = scalar_shr #U64 #ty -let u128_shr #ty = scalar_shr #U128 #ty -let usize_shr #ty = scalar_shr #Usize #ty -let i8_shr #ty = scalar_shr #I8 #ty -let i16_shr #ty = scalar_shr #I16 #ty -let i32_shr #ty = scalar_shr #I32 #ty -let i64_shr #ty = scalar_shr #I64 #ty -let i128_shr #ty = scalar_shr #I128 #ty -let isize_shr #ty = scalar_shr #Isize #ty - -(*** core *) - -/// Trait declaration: [core::clone::Clone] -noeq type core_clone_Clone (self : Type0) = { - clone : self → result self -} - -let core_clone_impls_CloneBool_clone (b : bool) : bool = b - -let core_clone_CloneBool : core_clone_Clone bool = { - clone = fun b -> Ok (core_clone_impls_CloneBool_clone b) -} - -let core_clone_impls_CloneUsize_clone (x : usize) : usize = x -let core_clone_impls_CloneU8_clone (x : u8) : u8 = x -let core_clone_impls_CloneU16_clone (x : u16) : u16 = x -let core_clone_impls_CloneU32_clone (x : u32) : u32 = x -let core_clone_impls_CloneU64_clone (x : u64) : u64 = x -let core_clone_impls_CloneU128_clone (x : u128) : u128 = x - -let core_clone_impls_CloneIsize_clone (x : isize) : isize = x -let core_clone_impls_CloneI8_clone (x : i8) : i8 = x -let core_clone_impls_CloneI16_clone (x : i16) : i16 = x -let core_clone_impls_CloneI32_clone (x : i32) : i32 = x -let core_clone_impls_CloneI64_clone (x : i64) : i64 = x -let core_clone_impls_CloneI128_clone (x : i128) : i128 = x - -let core_clone_CloneUsize : core_clone_Clone usize = { - clone = fun x -> Ok (core_clone_impls_CloneUsize_clone x) -} - -let core_clone_CloneU8 : core_clone_Clone u8 = { - clone = fun x -> Ok (core_clone_impls_CloneU8_clone x) -} - -let core_clone_CloneU16 : core_clone_Clone u16 = { - clone = fun x -> Ok (core_clone_impls_CloneU16_clone x) -} - -let core_clone_CloneU32 : core_clone_Clone u32 = { - clone = fun x -> Ok (core_clone_impls_CloneU32_clone x) -} - -let core_clone_CloneU64 : core_clone_Clone u64 = { - clone = fun x -> Ok (core_clone_impls_CloneU64_clone x) -} - -let core_clone_CloneU128 : core_clone_Clone u128 = { - clone = fun x -> Ok (core_clone_impls_CloneU128_clone x) -} - -let core_clone_CloneIsize : core_clone_Clone isize = { - clone = fun x -> Ok (core_clone_impls_CloneIsize_clone x) -} - -let core_clone_CloneI8 : core_clone_Clone i8 = { - clone = fun x -> Ok (core_clone_impls_CloneI8_clone x) -} - -let core_clone_CloneI16 : core_clone_Clone i16 = { - clone = fun x -> Ok (core_clone_impls_CloneI16_clone x) -} - -let core_clone_CloneI32 : core_clone_Clone i32 = { - clone = fun x -> Ok (core_clone_impls_CloneI32_clone x) -} - -let core_clone_CloneI64 : core_clone_Clone i64 = { - clone = fun x -> Ok (core_clone_impls_CloneI64_clone x) -} - -let core_clone_CloneI128 : core_clone_Clone i128 = { - clone = fun x -> Ok (core_clone_impls_CloneI128_clone x) -} - -(** [core::option::{core::option::Option<T>}::unwrap] *) -let core_option_Option_unwrap (t : Type0) (x : option t) : result t = - match x with - | None -> Fail Failure - | Some x -> Ok x - -(*** core::ops *) - -// Trait declaration: [core::ops::index::Index] -noeq type core_ops_index_Index (self idx : Type0) = { - output : Type0; - index : self → idx → result output -} - -// Trait declaration: [core::ops::index::IndexMut] -noeq type core_ops_index_IndexMut (self idx : Type0) = { - indexInst : core_ops_index_Index self idx; - index_mut : self → idx → result (indexInst.output & (indexInst.output → result self)); -} - -// Trait declaration [core::ops::deref::Deref] -noeq type core_ops_deref_Deref (self : Type0) = { - target : Type0; - deref : self → result target; -} - -// Trait declaration [core::ops::deref::DerefMut] -noeq type core_ops_deref_DerefMut (self : Type0) = { - derefInst : core_ops_deref_Deref self; - deref_mut : self → result (derefInst.target & (derefInst.target → result self)); -} - -type core_ops_range_Range (a : Type0) = { - start : a; - end_ : a; -} - -(*** [alloc] *) - -let alloc_boxed_Box_deref (t : Type0) (x : t) : result t = Ok x -let alloc_boxed_Box_deref_mut (t : Type0) (x : t) : result (t & (t -> result t)) = - Ok (x, (fun x -> Ok x)) - -// Trait instance -let alloc_boxed_Box_coreopsDerefInst (self : Type0) : core_ops_deref_Deref self = { - target = self; - deref = alloc_boxed_Box_deref self; -} - -// Trait instance -let alloc_boxed_Box_coreopsDerefMutInst (self : Type0) : core_ops_deref_DerefMut self = { - derefInst = alloc_boxed_Box_coreopsDerefInst self; - deref_mut = alloc_boxed_Box_deref_mut self; -} - -(*** Array *) -type array (a : Type0) (n : usize) = s:list a{length s = n} - -// We tried putting the normalize_term condition as a refinement on the list -// but it didn't work. It works with the requires clause. -let mk_array (a : Type0) (n : usize) - (l : list a) : - Pure (array a n) - (requires (normalize_term(FStar.List.Tot.length l) = n)) - (ensures (fun _ -> True)) = - normalize_term_spec (FStar.List.Tot.length l); - l - -let array_index_usize (a : Type0) (n : usize) (x : array a n) (i : usize) : result a = - if i < length x then Ok (index x i) - else Fail Failure - -let array_update_usize (a : Type0) (n : usize) (x : array a n) (i : usize) (nx : a) : - result (array a n) = - if i < length x then Ok (list_update x i nx) - else Fail Failure - -let array_index_mut_usize (a : Type0) (n : usize) (x : array a n) (i : usize) : - result (a & (a -> result (array a n))) = - match array_index_usize a n x i with - | Fail e -> Fail e - | Ok v -> - Ok (v, array_update_usize a n x i) - -(*** Slice *) -type slice (a : Type0) = s:list a{length s <= usize_max} - -let slice_len (a : Type0) (s : slice a) : usize = length s - -let slice_index_usize (a : Type0) (x : slice a) (i : usize) : result a = - if i < length x then Ok (index x i) - else Fail Failure - -let slice_update_usize (a : Type0) (x : slice a) (i : usize) (nx : a) : result (slice a) = - if i < length x then Ok (list_update x i nx) - else Fail Failure - -let slice_index_mut_usize (a : Type0) (s : slice a) (i : usize) : - result (a & (a -> result (slice a))) = - match slice_index_usize a s i with - | Fail e -> Fail e - | Ok x -> - Ok (x, slice_update_usize a s i) - -(*** Subslices *) - -let array_to_slice (a : Type0) (n : usize) (x : array a n) : result (slice a) = Ok x -let array_from_slice (a : Type0) (n : usize) (x : array a n) (s : slice a) : result (array a n) = - if length s = n then Ok s - else Fail Failure - -let array_to_slice_mut (a : Type0) (n : usize) (x : array a n) : - result (slice a & (slice a -> result (array a n))) = - Ok (x, array_from_slice a n x) - -// TODO: finish the definitions below (there lacks [List.drop] and [List.take] in the standard library *) -let array_subslice (a : Type0) (n : usize) (x : array a n) (r : core_ops_range_Range usize) : result (slice a) = - admit() - -let array_update_subslice (a : Type0) (n : usize) (x : array a n) (r : core_ops_range_Range usize) (ns : slice a) : result (array a n) = - admit() - -let array_repeat (a : Type0) (n : usize) (x : a) : array a n = - admit() - -let slice_subslice (a : Type0) (x : slice a) (r : core_ops_range_Range usize) : result (slice a) = - admit() - -let slice_update_subslice (a : Type0) (x : slice a) (r : core_ops_range_Range usize) (ns : slice a) : result (slice a) = - admit() - -(*** Vector *) -type alloc_vec_Vec (a : Type0) = v:list a{length v <= usize_max} - -let alloc_vec_Vec_new (a : Type0) : alloc_vec_Vec a = assert_norm(length #a [] == 0); [] -let alloc_vec_Vec_len (a : Type0) (v : alloc_vec_Vec a) : usize = length v - -// Helper -let alloc_vec_Vec_index_usize (#a : Type0) (v : alloc_vec_Vec a) (i : usize) : result a = - if i < length v then Ok (index v i) else Fail Failure -// Helper -let alloc_vec_Vec_update_usize (#a : Type0) (v : alloc_vec_Vec a) (i : usize) (x : a) : result (alloc_vec_Vec a) = - if i < length v then Ok (list_update v i x) else Fail Failure - -let alloc_vec_Vec_index_mut_usize (#a : Type0) (v: alloc_vec_Vec a) (i: usize) : - result (a & (a → result (alloc_vec_Vec a))) = - match alloc_vec_Vec_index_usize v i with - | Ok x -> - Ok (x, alloc_vec_Vec_update_usize v i) - | Fail e -> Fail e - -let alloc_vec_Vec_push (a : Type0) (v : alloc_vec_Vec a) (x : a) : - Pure (result (alloc_vec_Vec a)) - (requires True) - (ensures (fun res -> - match res with - | Fail e -> e == Failure - | Ok v' -> length v' = length v + 1)) = - if length v < usize_max then begin - (**) assert_norm(length [x] == 1); - (**) append_length v [x]; - (**) assert(length (append v [x]) = length v + 1); - Ok (append v [x]) - end - else Fail Failure - -let alloc_vec_Vec_insert (a : Type0) (v : alloc_vec_Vec a) (i : usize) (x : a) : result (alloc_vec_Vec a) = - if i < length v then Ok (list_update v i x) else Fail Failure - -// Trait declaration: [core::slice::index::private_slice_index::Sealed] -type core_slice_index_private_slice_index_Sealed (self : Type0) = unit - -// Trait declaration: [core::slice::index::SliceIndex] -noeq type core_slice_index_SliceIndex (self t : Type0) = { - sealedInst : core_slice_index_private_slice_index_Sealed self; - output : Type0; - get : self → t → result (option output); - get_mut : self → t → result (option output & (option output -> result t)); - get_unchecked : self → const_raw_ptr t → result (const_raw_ptr output); - get_unchecked_mut : self → mut_raw_ptr t → result (mut_raw_ptr output); - index : self → t → result output; - index_mut : self → t → result (output & (output -> result t)); -} - -// [core::slice::index::[T]::index]: forward function -let core_slice_index_Slice_index - (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t)) - (s : slice t) (i : idx) : result inst.output = - let* x = inst.get i s in - match x with - | None -> Fail Failure - | Some x -> Ok x - -// [core::slice::index::Range:::get]: forward function -let core_slice_index_RangeUsize_get (t : Type0) (i : core_ops_range_Range usize) (s : slice t) : - result (option (slice t)) = - admit () // TODO - -// [core::slice::index::Range::get_mut]: forward function -let core_slice_index_RangeUsize_get_mut (t : Type0) : - core_ops_range_Range usize → slice t → result (option (slice t) & (option (slice t) -> result (slice t))) = - admit () // TODO - -// [core::slice::index::Range::get_unchecked]: forward function -let core_slice_index_RangeUsize_get_unchecked - (t : Type0) : - core_ops_range_Range usize → const_raw_ptr (slice t) → result (const_raw_ptr (slice t)) = - // Don't know what the model should be - for now we always fail to make - // sure code which uses it fails - fun _ _ -> Fail Failure - -// [core::slice::index::Range::get_unchecked_mut]: forward function -let core_slice_index_RangeUsize_get_unchecked_mut - (t : Type0) : - core_ops_range_Range usize → mut_raw_ptr (slice t) → result (mut_raw_ptr (slice t)) = - // Don't know what the model should be - for now we always fail to make - // sure code which uses it fails - fun _ _ -> Fail Failure - -// [core::slice::index::Range::index]: forward function -let core_slice_index_RangeUsize_index - (t : Type0) : core_ops_range_Range usize → slice t → result (slice t) = - admit () // TODO - -// [core::slice::index::Range::index_mut]: forward function -let core_slice_index_RangeUsize_index_mut (t : Type0) : - core_ops_range_Range usize → slice t → result (slice t & (slice t -> result (slice t))) = - admit () // TODO - -// [core::slice::index::[T]::index_mut]: forward function -let core_slice_index_Slice_index_mut - (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t)) : - slice t → idx → result (inst.output & (inst.output -> result (slice t))) = - admit () // - -// [core::array::[T; N]::index]: forward function -let core_array_Array_index - (t idx : Type0) (n : usize) (inst : core_ops_index_Index (slice t) idx) - (a : array t n) (i : idx) : result inst.output = - admit () // TODO - -// [core::array::[T; N]::index_mut]: forward function -let core_array_Array_index_mut - (t idx : Type0) (n : usize) (inst : core_ops_index_IndexMut (slice t) idx) - (a : array t n) (i : idx) : - result (inst.indexInst.output & (inst.indexInst.output -> result (array t n))) = - admit () // TODO - -// Trait implementation: [core::slice::index::private_slice_index::Range] -let core_slice_index_private_slice_index_SealedRangeUsizeInst - : core_slice_index_private_slice_index_Sealed (core_ops_range_Range usize) = () - -// Trait implementation: [core::slice::index::Range] -let core_slice_index_SliceIndexRangeUsizeSliceTInst (t : Type0) : - core_slice_index_SliceIndex (core_ops_range_Range usize) (slice t) = { - sealedInst = core_slice_index_private_slice_index_SealedRangeUsizeInst; - output = slice t; - get = core_slice_index_RangeUsize_get t; - get_mut = core_slice_index_RangeUsize_get_mut t; - get_unchecked = core_slice_index_RangeUsize_get_unchecked t; - get_unchecked_mut = core_slice_index_RangeUsize_get_unchecked_mut t; - index = core_slice_index_RangeUsize_index t; - index_mut = core_slice_index_RangeUsize_index_mut t; -} - -// Trait implementation: [core::slice::index::[T]] -let core_ops_index_IndexSliceTIInst (t idx : Type0) - (inst : core_slice_index_SliceIndex idx (slice t)) : - core_ops_index_Index (slice t) idx = { - output = inst.output; - index = core_slice_index_Slice_index t idx inst; -} - -// Trait implementation: [core::slice::index::[T]] -let core_ops_index_IndexMutSliceTIInst (t idx : Type0) - (inst : core_slice_index_SliceIndex idx (slice t)) : - core_ops_index_IndexMut (slice t) idx = { - indexInst = core_ops_index_IndexSliceTIInst t idx inst; - index_mut = core_slice_index_Slice_index_mut t idx inst; -} - -// Trait implementation: [core::array::[T; N]] -let core_ops_index_IndexArrayInst (t idx : Type0) (n : usize) - (inst : core_ops_index_Index (slice t) idx) : - core_ops_index_Index (array t n) idx = { - output = inst.output; - index = core_array_Array_index t idx n inst; -} - -// Trait implementation: [core::array::[T; N]] -let core_ops_index_IndexMutArrayIInst (t idx : Type0) (n : usize) - (inst : core_ops_index_IndexMut (slice t) idx) : - core_ops_index_IndexMut (array t n) idx = { - indexInst = core_ops_index_IndexArrayInst t idx n inst.indexInst; - index_mut = core_array_Array_index_mut t idx n inst; -} - -// [core::slice::index::usize::get]: forward function -let core_slice_index_usize_get - (t : Type0) : usize → slice t → result (option t) = - admit () // TODO - -// [core::slice::index::usize::get_mut]: forward function -let core_slice_index_usize_get_mut (t : Type0) : - usize → slice t → result (option t & (option t -> result (slice t))) = - admit () // TODO - -// [core::slice::index::usize::get_unchecked]: forward function -let core_slice_index_usize_get_unchecked - (t : Type0) : usize → const_raw_ptr (slice t) → result (const_raw_ptr t) = - admit () // TODO - -// [core::slice::index::usize::get_unchecked_mut]: forward function -let core_slice_index_usize_get_unchecked_mut - (t : Type0) : usize → mut_raw_ptr (slice t) → result (mut_raw_ptr t) = - admit () // TODO - -// [core::slice::index::usize::index]: forward function -let core_slice_index_usize_index (t : Type0) : usize → slice t → result t = - admit () // TODO - -// [core::slice::index::usize::index_mut]: forward function -let core_slice_index_usize_index_mut (t : Type0) : - usize → slice t → result (t & (t -> result (slice t))) = - admit () // TODO - -// Trait implementation: [core::slice::index::private_slice_index::usize] -let core_slice_index_private_slice_index_SealedUsizeInst - : core_slice_index_private_slice_index_Sealed usize = () - -// Trait implementation: [core::slice::index::usize] -let core_slice_index_SliceIndexUsizeSliceTInst (t : Type0) : - core_slice_index_SliceIndex usize (slice t) = { - sealedInst = core_slice_index_private_slice_index_SealedUsizeInst; - output = t; - get = core_slice_index_usize_get t; - get_mut = core_slice_index_usize_get_mut t; - get_unchecked = core_slice_index_usize_get_unchecked t; - get_unchecked_mut = core_slice_index_usize_get_unchecked_mut t; - index = core_slice_index_usize_index t; - index_mut = core_slice_index_usize_index_mut t; -} - -// [alloc::vec::Vec::index]: forward function -let alloc_vec_Vec_index (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t)) - (self : alloc_vec_Vec t) (i : idx) : result inst.output = - admit () // TODO - -// [alloc::vec::Vec::index_mut]: forward function -let alloc_vec_Vec_index_mut (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t)) - (self : alloc_vec_Vec t) (i : idx) : - result (inst.output & (inst.output -> result (alloc_vec_Vec t))) = - admit () // TODO - -// Trait implementation: [alloc::vec::Vec] -let alloc_vec_Vec_coreopsindexIndexInst (t idx : Type0) - (inst : core_slice_index_SliceIndex idx (slice t)) : - core_ops_index_Index (alloc_vec_Vec t) idx = { - output = inst.output; - index = alloc_vec_Vec_index t idx inst; -} - -// Trait implementation: [alloc::vec::Vec] -let alloc_vec_Vec_coreopsindexIndexMutInst (t idx : Type0) - (inst : core_slice_index_SliceIndex idx (slice t)) : - core_ops_index_IndexMut (alloc_vec_Vec t) idx = { - indexInst = alloc_vec_Vec_coreopsindexIndexInst t idx inst; - index_mut = alloc_vec_Vec_index_mut t idx inst; -} - -(*** Theorems *) - -let alloc_vec_Vec_index_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) : - Lemma ( - alloc_vec_Vec_index a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i == - alloc_vec_Vec_index_usize v i) - [SMTPat (alloc_vec_Vec_index a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i)] - = - admit() - -let alloc_vec_Vec_index_mut_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) : - Lemma ( - alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i == - alloc_vec_Vec_index_mut_usize v i) - [SMTPat (alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i)] - = - admit() diff --git a/tests/fstar/misc/Issue194RecursiveStructProjector.fst b/tests/fstar/misc/Issue194RecursiveStructProjector.fst new file mode 100644 index 00000000..76368f04 --- /dev/null +++ b/tests/fstar/misc/Issue194RecursiveStructProjector.fst @@ -0,0 +1,24 @@ +(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) +(** [issue_194_recursive_struct_projector] *) +module Issue194RecursiveStructProjector +open Primitives + +#set-options "--z3rlimit 50 --fuel 1 --ifuel 1" + +(** [issue_194_recursive_struct_projector::AVLNode] + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 2:0-2:17 *) +type aVLNode_t (t : Type0) = +{ + value : t; left : option (aVLNode_t t); right : option (aVLNode_t t); +} + +(** [issue_194_recursive_struct_projector::get_val]: + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 10:0-10:33 *) +let get_val (t : Type0) (x : aVLNode_t t) : result t = + Ok x.value + +(** [issue_194_recursive_struct_projector::get_left]: + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 14:0-14:43 *) +let get_left (t : Type0) (x : aVLNode_t t) : result (option (aVLNode_t t)) = + Ok x.left + diff --git a/tests/fstar/misc/Matches.fst b/tests/fstar/misc/Matches.fst new file mode 100644 index 00000000..06a9b6df --- /dev/null +++ b/tests/fstar/misc/Matches.fst @@ -0,0 +1,12 @@ +(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) +(** [matches] *) +module Matches +open Primitives + +#set-options "--z3rlimit 50 --fuel 1 --ifuel 1" + +(** [matches::match_u32]: + Source: 'tests/src/matches.rs', lines 4:0-4:27 *) +let match_u32 (x : u32) : result u32 = + begin match x with | 0 -> Ok 0 | 1 -> Ok 1 | _ -> Ok 2 end + diff --git a/tests/hol4/betree/betreeMain_OpaqueScript.sml b/tests/hol4/betree/betreeMain_OpaqueScript.sml deleted file mode 100644 index 1d16db4c..00000000 --- a/tests/hol4/betree/betreeMain_OpaqueScript.sml +++ /dev/null @@ -1,26 +0,0 @@ -(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: external function declarations *) -open primitivesLib divDefLib -open betreeMain_TypesTheory - -val _ = new_theory "betreeMain_Opaque" - - -(** [betree_main::betree_utils::load_internal_node]: forward function *)val _ = new_constant ("betree_utils_load_internal_node_fwd", - “:u64 -> state -> (state # (u64 # betree_message_t) betree_list_t) - result”) - -(** [betree_main::betree_utils::store_internal_node]: forward function *)val _ = new_constant ("betree_utils_store_internal_node_fwd", - “:u64 -> (u64 # betree_message_t) betree_list_t -> state -> (state # unit) - result”) - -(** [betree_main::betree_utils::load_leaf_node]: forward function *)val _ = new_constant ("betree_utils_load_leaf_node_fwd", - “:u64 -> state -> (state # (u64 # u64) betree_list_t) result”) - -(** [betree_main::betree_utils::store_leaf_node]: forward function *)val _ = new_constant ("betree_utils_store_leaf_node_fwd", - “:u64 -> (u64 # u64) betree_list_t -> state -> (state # unit) result”) - -(** [core::option::Option::{0}::unwrap]: forward function *)val _ = new_constant ("core_option_option_unwrap_fwd", - “:'t option -> state -> (state # 't) result”) - -val _ = export_theory () diff --git a/tests/hol4/betree/betreeMain_OpaqueTheory.sig b/tests/hol4/betree/betreeMain_OpaqueTheory.sig deleted file mode 100644 index da7559a0..00000000 --- a/tests/hol4/betree/betreeMain_OpaqueTheory.sig +++ /dev/null @@ -1,11 +0,0 @@ -signature betreeMain_OpaqueTheory = -sig - type thm = Thm.thm - - val betreeMain_Opaque_grammars : type_grammar.grammar * term_grammar.grammar -(* - [betreeMain_Types] Parent theory of "betreeMain_Opaque" - - -*) -end diff --git a/tests/hol4/betree/betreeMain_FunsScript.sml b/tests/hol4/betree/betree_FunsScript.sml index bd16c16c..49bcb446 100644 --- a/tests/hol4/betree/betreeMain_FunsScript.sml +++ b/tests/hol4/betree/betree_FunsScript.sml @@ -1,13 +1,13 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: function definitions *) +(** [betree]: function definitions *) open primitivesLib divDefLib -open betreeMain_TypesTheory betreeMain_OpaqueTheory +open betree_TypesTheory betree_OpaqueTheory -val _ = new_theory "betreeMain_Funs" +val _ = new_theory "betree_Funs" val betree_load_internal_node_fwd_def = Define ‘ - (** [betree_main::betree::load_internal_node]: forward function *) + (** [betree::betree::load_internal_node]: forward function *) betree_load_internal_node_fwd (id : u64) (st : state) : (state # (u64 # betree_message_t) betree_list_t) result @@ -16,7 +16,7 @@ val betree_load_internal_node_fwd_def = Define ‘ ’ val betree_store_internal_node_fwd_def = Define ‘ - (** [betree_main::betree::store_internal_node]: forward function *) + (** [betree::betree::store_internal_node]: forward function *) betree_store_internal_node_fwd (id : u64) (content : (u64 # betree_message_t) betree_list_t) (st : state) : @@ -29,14 +29,14 @@ val betree_store_internal_node_fwd_def = Define ‘ ’ val betree_load_leaf_node_fwd_def = Define ‘ - (** [betree_main::betree::load_leaf_node]: forward function *) + (** [betree::betree::load_leaf_node]: forward function *) betree_load_leaf_node_fwd (id : u64) (st : state) : (state # (u64 # u64) betree_list_t) result = betree_utils_load_leaf_node_fwd id st ’ val betree_store_leaf_node_fwd_def = Define ‘ - (** [betree_main::betree::store_leaf_node]: forward function *) + (** [betree::betree::store_leaf_node]: forward function *) betree_store_leaf_node_fwd (id : u64) (content : (u64 # u64) betree_list_t) (st : state) : (state # unit) result @@ -48,7 +48,7 @@ val betree_store_leaf_node_fwd_def = Define ‘ ’ val betree_fresh_node_id_fwd_def = Define ‘ - (** [betree_main::betree::fresh_node_id]: forward function *) + (** [betree::betree::fresh_node_id]: forward function *) betree_fresh_node_id_fwd (counter : u64) : u64 result = do _ <- u64_add counter (int_to_u64 1); @@ -57,19 +57,19 @@ val betree_fresh_node_id_fwd_def = Define ‘ ’ val betree_fresh_node_id_back_def = Define ‘ - (** [betree_main::betree::fresh_node_id]: backward function 0 *) + (** [betree::betree::fresh_node_id]: backward function 0 *) betree_fresh_node_id_back (counter : u64) : u64 result = u64_add counter (int_to_u64 1) ’ val betree_node_id_counter_new_fwd_def = Define ‘ - (** [betree_main::betree::NodeIdCounter::{0}::new]: forward function *) + (** [betree::betree::NodeIdCounter::{0}::new]: forward function *) betree_node_id_counter_new_fwd : betree_node_id_counter_t result = Return (<| betree_node_id_counter_next_node_id := (int_to_u64 0) |>) ’ val betree_node_id_counter_fresh_id_fwd_def = Define ‘ - (** [betree_main::betree::NodeIdCounter::{0}::fresh_id]: forward function *) + (** [betree::betree::NodeIdCounter::{0}::fresh_id]: forward function *) betree_node_id_counter_fresh_id_fwd (self : betree_node_id_counter_t) : u64 result = do @@ -79,7 +79,7 @@ val betree_node_id_counter_fresh_id_fwd_def = Define ‘ ’ val betree_node_id_counter_fresh_id_back_def = Define ‘ - (** [betree_main::betree::NodeIdCounter::{0}::fresh_id]: backward function 0 *) + (** [betree::betree::NodeIdCounter::{0}::fresh_id]: backward function 0 *) betree_node_id_counter_fresh_id_back (self : betree_node_id_counter_t) : betree_node_id_counter_t result = do @@ -89,7 +89,7 @@ val betree_node_id_counter_fresh_id_back_def = Define ‘ ’ val betree_upsert_update_fwd_def = Define ‘ - (** [betree_main::betree::upsert_update]: forward function *) + (** [betree::betree::upsert_update]: forward function *) betree_upsert_update_fwd (prev : u64 option) (st : betree_upsert_fun_state_t) : u64 result = (case prev of @@ -109,7 +109,7 @@ val betree_upsert_update_fwd_def = Define ‘ ’ val [betree_list_len_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::List::{1}::len]: forward function *) + (** [betree::betree::List::{1}::len]: forward function *) betree_list_len_fwd (self : 't betree_list_t) : u64 result = (case self of | BetreeListCons t tl => @@ -121,7 +121,7 @@ val [betree_list_len_fwd_def] = DefineDiv ‘ ’ val [betree_list_split_at_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::List::{1}::split_at]: forward function *) + (** [betree::betree::List::{1}::split_at]: forward function *) betree_list_split_at_fwd (self : 't betree_list_t) (n : u64) : ('t betree_list_t # 't betree_list_t) result @@ -140,7 +140,7 @@ val [betree_list_split_at_fwd_def] = DefineDiv ‘ ’ val betree_list_push_front_fwd_back_def = Define ‘ - (** [betree_main::betree::List::{1}::push_front]: merged forward/backward function + (** [betree::betree::List::{1}::push_front]: merged forward/backward function (there is a single backward function, and the forward function returns ()) *) betree_list_push_front_fwd_back (self : 't betree_list_t) (x : 't) : 't betree_list_t result = @@ -150,7 +150,7 @@ val betree_list_push_front_fwd_back_def = Define ‘ ’ val betree_list_pop_front_fwd_def = Define ‘ - (** [betree_main::betree::List::{1}::pop_front]: forward function *) + (** [betree::betree::List::{1}::pop_front]: forward function *) betree_list_pop_front_fwd (self : 't betree_list_t) : 't result = let ls = mem_replace_fwd self BetreeListNil in (case ls of @@ -159,7 +159,7 @@ val betree_list_pop_front_fwd_def = Define ‘ ’ val betree_list_pop_front_back_def = Define ‘ - (** [betree_main::betree::List::{1}::pop_front]: backward function 0 *) + (** [betree::betree::List::{1}::pop_front]: backward function 0 *) betree_list_pop_front_back (self : 't betree_list_t) : 't betree_list_t result = let ls = mem_replace_fwd self BetreeListNil in @@ -169,7 +169,7 @@ val betree_list_pop_front_back_def = Define ‘ ’ val betree_list_hd_fwd_def = Define ‘ - (** [betree_main::betree::List::{1}::hd]: forward function *) + (** [betree::betree::List::{1}::hd]: forward function *) betree_list_hd_fwd (self : 't betree_list_t) : 't result = (case self of | BetreeListCons hd l => Return hd @@ -177,7 +177,7 @@ val betree_list_hd_fwd_def = Define ‘ ’ val betree_list_head_has_key_fwd_def = Define ‘ - (** [betree_main::betree::List::{2}::head_has_key]: forward function *) + (** [betree::betree::List::{2}::head_has_key]: forward function *) betree_list_head_has_key_fwd (self : (u64 # 't) betree_list_t) (key : u64) : bool result = (case self of @@ -186,7 +186,7 @@ val betree_list_head_has_key_fwd_def = Define ‘ ’ val [betree_list_partition_at_pivot_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::List::{2}::partition_at_pivot]: forward function *) + (** [betree::betree::List::{2}::partition_at_pivot]: forward function *) betree_list_partition_at_pivot_fwd (self : (u64 # 't) betree_list_t) (pivot : u64) : ((u64 # 't) betree_list_t # (u64 # 't) betree_list_t) result @@ -207,7 +207,7 @@ val [betree_list_partition_at_pivot_fwd_def] = DefineDiv ‘ ’ val betree_leaf_split_fwd_def = Define ‘ - (** [betree_main::betree::Leaf::{3}::split]: forward function *) + (** [betree::betree::Leaf::{3}::split]: forward function *) betree_leaf_split_fwd (self : betree_leaf_t) (content : (u64 # u64) betree_list_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) @@ -249,7 +249,7 @@ val betree_leaf_split_fwd_def = Define ‘ ’ val betree_leaf_split_back_def = Define ‘ - (** [betree_main::betree::Leaf::{3}::split]: backward function 2 *) + (** [betree::betree::Leaf::{3}::split]: backward function 2 *) betree_leaf_split_back (self : betree_leaf_t) (content : (u64 # u64) betree_list_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) @@ -272,7 +272,7 @@ val betree_leaf_split_back_def = Define ‘ ’ val [betree_node_lookup_first_message_for_key_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::lookup_first_message_for_key]: forward function *) + (** [betree::betree::Node::{5}::lookup_first_message_for_key]: forward function *) betree_node_lookup_first_message_for_key_fwd (key : u64) (msgs : (u64 # betree_message_t) betree_list_t) : (u64 # betree_message_t) betree_list_t result @@ -287,7 +287,7 @@ val [betree_node_lookup_first_message_for_key_fwd_def] = DefineDiv ‘ ’ val [betree_node_lookup_first_message_for_key_back_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::lookup_first_message_for_key]: backward function 0 *) + (** [betree::betree::Node::{5}::lookup_first_message_for_key]: backward function 0 *) betree_node_lookup_first_message_for_key_back (key : u64) (msgs : (u64 # betree_message_t) betree_list_t) (ret : (u64 # betree_message_t) betree_list_t) : @@ -308,7 +308,7 @@ val [betree_node_lookup_first_message_for_key_back_def] = DefineDiv ‘ ’ val [betree_node_apply_upserts_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::apply_upserts]: forward function *) + (** [betree::betree::Node::{5}::apply_upserts]: forward function *) betree_node_apply_upserts_fwd (msgs : (u64 # betree_message_t) betree_list_t) (prev : u64 option) (key : u64) (st : state) : @@ -341,7 +341,7 @@ val [betree_node_apply_upserts_fwd_def] = DefineDiv ‘ ’ val [betree_node_apply_upserts_back_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::apply_upserts]: backward function 0 *) + (** [betree::betree::Node::{5}::apply_upserts]: backward function 0 *) betree_node_apply_upserts_back (msgs : (u64 # betree_message_t) betree_list_t) (prev : u64 option) (key : u64) (st : state) : @@ -373,7 +373,7 @@ val [betree_node_apply_upserts_back_def] = DefineDiv ‘ ’ val [betree_node_lookup_in_bindings_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::lookup_in_bindings]: forward function *) + (** [betree::betree::Node::{5}::lookup_in_bindings]: forward function *) betree_node_lookup_in_bindings_fwd (key : u64) (bindings : (u64 # u64) betree_list_t) : u64 option result = (case bindings of @@ -389,7 +389,7 @@ val [betree_node_lookup_in_bindings_fwd_def] = DefineDiv ‘ ’ val [betree_internal_lookup_in_children_fwd_def, betree_internal_lookup_in_children_back_def, betree_node_lookup_fwd_def, betree_node_lookup_back_def] = DefineDiv ‘ - (** [betree_main::betree::Internal::{4}::lookup_in_children]: forward function *) + (** [betree::betree::Internal::{4}::lookup_in_children]: forward function *) (betree_internal_lookup_in_children_fwd (self : betree_internal_t) (key : u64) (st : state) : (state # u64 option) result @@ -399,7 +399,7 @@ val [betree_internal_lookup_in_children_fwd_def, betree_internal_lookup_in_child else betree_node_lookup_fwd self.betree_internal_right key st) /\ - (** [betree_main::betree::Internal::{4}::lookup_in_children]: backward function 0 *) + (** [betree::betree::Internal::{4}::lookup_in_children]: backward function 0 *) (betree_internal_lookup_in_children_back (self : betree_internal_t) (key : u64) (st : state) : betree_internal_t result @@ -417,7 +417,7 @@ val [betree_internal_lookup_in_children_fwd_def, betree_internal_lookup_in_child od)) /\ - (** [betree_main::betree::Node::{5}::lookup]: forward function *) + (** [betree::betree::Node::{5}::lookup]: forward function *) (betree_node_lookup_fwd (self : betree_node_t) (key : u64) (st : state) : (state # u64 option) result @@ -487,7 +487,7 @@ val [betree_internal_lookup_in_children_fwd_def, betree_internal_lookup_in_child od)) /\ - (** [betree_main::betree::Node::{5}::lookup]: backward function 0 *) + (** [betree::betree::Node::{5}::lookup]: backward function 0 *) betree_node_lookup_back (self : betree_node_t) (key : u64) (st : state) : betree_node_t result = (case self of @@ -556,7 +556,7 @@ val [betree_internal_lookup_in_children_fwd_def, betree_internal_lookup_in_child ’ val [betree_node_filter_messages_for_key_fwd_back_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::filter_messages_for_key]: merged forward/backward function + (** [betree::betree::Node::{5}::filter_messages_for_key]: merged forward/backward function (there is a single backward function, and the forward function returns ()) *) betree_node_filter_messages_for_key_fwd_back (key : u64) (msgs : (u64 # betree_message_t) betree_list_t) : @@ -576,7 +576,7 @@ val [betree_node_filter_messages_for_key_fwd_back_def] = DefineDiv ‘ ’ val [betree_node_lookup_first_message_after_key_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::lookup_first_message_after_key]: forward function *) + (** [betree::betree::Node::{5}::lookup_first_message_after_key]: forward function *) betree_node_lookup_first_message_after_key_fwd (key : u64) (msgs : (u64 # betree_message_t) betree_list_t) : (u64 # betree_message_t) betree_list_t result @@ -591,7 +591,7 @@ val [betree_node_lookup_first_message_after_key_fwd_def] = DefineDiv ‘ ’ val [betree_node_lookup_first_message_after_key_back_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::lookup_first_message_after_key]: backward function 0 *) + (** [betree::betree::Node::{5}::lookup_first_message_after_key]: backward function 0 *) betree_node_lookup_first_message_after_key_back (key : u64) (msgs : (u64 # betree_message_t) betree_list_t) (ret : (u64 # betree_message_t) betree_list_t) : @@ -612,7 +612,7 @@ val [betree_node_lookup_first_message_after_key_back_def] = DefineDiv ‘ ’ val betree_node_apply_to_internal_fwd_back_def = Define ‘ - (** [betree_main::betree::Node::{5}::apply_to_internal]: merged forward/backward function + (** [betree::betree::Node::{5}::apply_to_internal]: merged forward/backward function (there is a single backward function, and the forward function returns ()) *) betree_node_apply_to_internal_fwd_back (msgs : (u64 # betree_message_t) betree_list_t) (key : u64) @@ -679,7 +679,7 @@ val betree_node_apply_to_internal_fwd_back_def = Define ‘ ’ val [betree_node_apply_messages_to_internal_fwd_back_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::apply_messages_to_internal]: merged forward/backward function + (** [betree::betree::Node::{5}::apply_messages_to_internal]: merged forward/backward function (there is a single backward function, and the forward function returns ()) *) betree_node_apply_messages_to_internal_fwd_back (msgs : (u64 # betree_message_t) betree_list_t) @@ -697,7 +697,7 @@ val [betree_node_apply_messages_to_internal_fwd_back_def] = DefineDiv ‘ ’ val [betree_node_lookup_mut_in_bindings_fwd_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::lookup_mut_in_bindings]: forward function *) + (** [betree::betree::Node::{5}::lookup_mut_in_bindings]: forward function *) betree_node_lookup_mut_in_bindings_fwd (key : u64) (bindings : (u64 # u64) betree_list_t) : (u64 # u64) betree_list_t result @@ -712,7 +712,7 @@ val [betree_node_lookup_mut_in_bindings_fwd_def] = DefineDiv ‘ ’ val [betree_node_lookup_mut_in_bindings_back_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::lookup_mut_in_bindings]: backward function 0 *) + (** [betree::betree::Node::{5}::lookup_mut_in_bindings]: backward function 0 *) betree_node_lookup_mut_in_bindings_back (key : u64) (bindings : (u64 # u64) betree_list_t) (ret : (u64 # u64) betree_list_t) : @@ -732,7 +732,7 @@ val [betree_node_lookup_mut_in_bindings_back_def] = DefineDiv ‘ ’ val betree_node_apply_to_leaf_fwd_back_def = Define ‘ - (** [betree_main::betree::Node::{5}::apply_to_leaf]: merged forward/backward function + (** [betree::betree::Node::{5}::apply_to_leaf]: merged forward/backward function (there is a single backward function, and the forward function returns ()) *) betree_node_apply_to_leaf_fwd_back (bindings : (u64 # u64) betree_list_t) (key : u64) @@ -786,7 +786,7 @@ val betree_node_apply_to_leaf_fwd_back_def = Define ‘ ’ val [betree_node_apply_messages_to_leaf_fwd_back_def] = DefineDiv ‘ - (** [betree_main::betree::Node::{5}::apply_messages_to_leaf]: merged forward/backward function + (** [betree::betree::Node::{5}::apply_messages_to_leaf]: merged forward/backward function (there is a single backward function, and the forward function returns ()) *) betree_node_apply_messages_to_leaf_fwd_back (bindings : (u64 # u64) betree_list_t) @@ -804,7 +804,7 @@ val [betree_node_apply_messages_to_leaf_fwd_back_def] = DefineDiv ‘ ’ val [betree_internal_flush_fwd_def, betree_internal_flush_back_def, betree_node_apply_messages_fwd_def, betree_node_apply_messages_back_def] = DefineDiv ‘ - (** [betree_main::betree::Internal::{4}::flush]: forward function *) + (** [betree::betree::Internal::{4}::flush]: forward function *) (betree_internal_flush_fwd (self : betree_internal_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) @@ -853,7 +853,7 @@ val [betree_internal_flush_fwd_def, betree_internal_flush_back_def, betree_node_ od) /\ - (** [betree_main::betree::Internal::{4}::flush]: backward function 0 *) + (** [betree::betree::Internal::{4}::flush]: backward function 0 *) (betree_internal_flush_back (self : betree_internal_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) @@ -901,7 +901,7 @@ val [betree_internal_flush_fwd_def, betree_internal_flush_back_def, betree_node_ od) /\ - (** [betree_main::betree::Node::{5}::apply_messages]: forward function *) + (** [betree::betree::Node::{5}::apply_messages]: forward function *) (betree_node_apply_messages_fwd (self : betree_node_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) @@ -956,7 +956,7 @@ val [betree_internal_flush_fwd_def, betree_internal_flush_back_def, betree_node_ od)) /\ - (** [betree_main::betree::Node::{5}::apply_messages]: backward function 0 *) + (** [betree::betree::Node::{5}::apply_messages]: backward function 0 *) betree_node_apply_messages_back (self : betree_node_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) @@ -1014,7 +1014,7 @@ val [betree_internal_flush_fwd_def, betree_internal_flush_back_def, betree_node_ ’ val betree_node_apply_fwd_def = Define ‘ - (** [betree_main::betree::Node::{5}::apply]: forward function *) + (** [betree::betree::Node::{5}::apply]: forward function *) betree_node_apply_fwd (self : betree_node_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) (key : u64) @@ -1034,7 +1034,7 @@ val betree_node_apply_fwd_def = Define ‘ ’ val betree_node_apply_back_def = Define ‘ - (** [betree_main::betree::Node::{5}::apply]: backward function 0 *) + (** [betree::betree::Node::{5}::apply]: backward function 0 *) betree_node_apply_back (self : betree_node_t) (params : betree_params_t) (node_id_cnt : betree_node_id_counter_t) (key : u64) @@ -1047,7 +1047,7 @@ val betree_node_apply_back_def = Define ‘ ’ val betree_be_tree_new_fwd_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::new]: forward function *) + (** [betree::betree::BeTree::{6}::new]: forward function *) betree_be_tree_new_fwd (min_flush_size : u64) (split_size : u64) (st : state) : (state # betree_be_tree_t) result @@ -1073,7 +1073,7 @@ val betree_be_tree_new_fwd_def = Define ‘ ’ val betree_be_tree_apply_fwd_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::apply]: forward function *) + (** [betree::betree::BeTree::{6}::apply]: forward function *) betree_be_tree_apply_fwd (self : betree_be_tree_t) (key : u64) (msg : betree_message_t) (st : state) : @@ -1091,7 +1091,7 @@ val betree_be_tree_apply_fwd_def = Define ‘ ’ val betree_be_tree_apply_back_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::apply]: backward function 0 *) + (** [betree::betree::BeTree::{6}::apply]: backward function 0 *) betree_be_tree_apply_back (self : betree_be_tree_t) (key : u64) (msg : betree_message_t) (st : state) : @@ -1111,7 +1111,7 @@ val betree_be_tree_apply_back_def = Define ‘ ’ val betree_be_tree_insert_fwd_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::insert]: forward function *) + (** [betree::betree::BeTree::{6}::insert]: forward function *) betree_be_tree_insert_fwd (self : betree_be_tree_t) (key : u64) (value : u64) (st : state) : (state # unit) result @@ -1125,7 +1125,7 @@ val betree_be_tree_insert_fwd_def = Define ‘ ’ val betree_be_tree_insert_back_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::insert]: backward function 0 *) + (** [betree::betree::BeTree::{6}::insert]: backward function 0 *) betree_be_tree_insert_back (self : betree_be_tree_t) (key : u64) (value : u64) (st : state) : betree_be_tree_t result @@ -1134,7 +1134,7 @@ val betree_be_tree_insert_back_def = Define ‘ ’ val betree_be_tree_delete_fwd_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::delete]: forward function *) + (** [betree::betree::BeTree::{6}::delete]: forward function *) betree_be_tree_delete_fwd (self : betree_be_tree_t) (key : u64) (st : state) : (state # unit) result @@ -1147,7 +1147,7 @@ val betree_be_tree_delete_fwd_def = Define ‘ ’ val betree_be_tree_delete_back_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::delete]: backward function 0 *) + (** [betree::betree::BeTree::{6}::delete]: backward function 0 *) betree_be_tree_delete_back (self : betree_be_tree_t) (key : u64) (st : state) : betree_be_tree_t result @@ -1156,7 +1156,7 @@ val betree_be_tree_delete_back_def = Define ‘ ’ val betree_be_tree_upsert_fwd_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::upsert]: forward function *) + (** [betree::betree::BeTree::{6}::upsert]: forward function *) betree_be_tree_upsert_fwd (self : betree_be_tree_t) (key : u64) (upd : betree_upsert_fun_state_t) (st : state) : @@ -1170,7 +1170,7 @@ val betree_be_tree_upsert_fwd_def = Define ‘ ’ val betree_be_tree_upsert_back_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::upsert]: backward function 0 *) + (** [betree::betree::BeTree::{6}::upsert]: backward function 0 *) betree_be_tree_upsert_back (self : betree_be_tree_t) (key : u64) (upd : betree_upsert_fun_state_t) (st : state) : @@ -1180,7 +1180,7 @@ val betree_be_tree_upsert_back_def = Define ‘ ’ val betree_be_tree_lookup_fwd_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::lookup]: forward function *) + (** [betree::betree::BeTree::{6}::lookup]: forward function *) betree_be_tree_lookup_fwd (self : betree_be_tree_t) (key : u64) (st : state) : (state # u64 option) result @@ -1189,7 +1189,7 @@ val betree_be_tree_lookup_fwd_def = Define ‘ ’ val betree_be_tree_lookup_back_def = Define ‘ - (** [betree_main::betree::BeTree::{6}::lookup]: backward function 0 *) + (** [betree::betree::BeTree::{6}::lookup]: backward function 0 *) betree_be_tree_lookup_back (self : betree_be_tree_t) (key : u64) (st : state) : betree_be_tree_t result @@ -1201,12 +1201,12 @@ val betree_be_tree_lookup_back_def = Define ‘ ’ val main_fwd_def = Define ‘ - (** [betree_main::main]: forward function *) + (** [betree::main]: forward function *) main_fwd : unit result = Return () ’ -(** Unit test for [betree_main::main] *) +(** Unit test for [betree::main] *) val _ = assert_return (“main_fwd”) val _ = export_theory () diff --git a/tests/hol4/betree/betreeMain_FunsTheory.sig b/tests/hol4/betree/betree_FunsTheory.sig index c922ca9f..4127cba1 100644 --- a/tests/hol4/betree/betreeMain_FunsTheory.sig +++ b/tests/hol4/betree/betree_FunsTheory.sig @@ -1,4 +1,4 @@ -signature betreeMain_FunsTheory = +signature betree_FunsTheory = sig type thm = Thm.thm @@ -60,9 +60,9 @@ sig val betree_upsert_update_fwd_def : thm val main_fwd_def : thm - val betreeMain_Funs_grammars : type_grammar.grammar * term_grammar.grammar + val betree_Funs_grammars : type_grammar.grammar * term_grammar.grammar (* - [betreeMain_Opaque] Parent theory of "betreeMain_Funs" + [betree_Opaque] Parent theory of "betree_Funs" [betree_be_tree_apply_back_def] Definition diff --git a/tests/hol4/betree/betree_OpaqueScript.sml b/tests/hol4/betree/betree_OpaqueScript.sml new file mode 100644 index 00000000..d8fdf6b5 --- /dev/null +++ b/tests/hol4/betree/betree_OpaqueScript.sml @@ -0,0 +1,26 @@ +(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) +(** [betree]: external function declarations *) +open primitivesLib divDefLib +open betree_TypesTheory + +val _ = new_theory "betree_Opaque" + + +(** [betree::betree_utils::load_internal_node]: forward function *)val _ = new_constant ("betree_utils_load_internal_node_fwd", + “:u64 -> state -> (state # (u64 # betree_message_t) betree_list_t) + result”) + +(** [betree::betree_utils::store_internal_node]: forward function *)val _ = new_constant ("betree_utils_store_internal_node_fwd", + “:u64 -> (u64 # betree_message_t) betree_list_t -> state -> (state # unit) + result”) + +(** [betree::betree_utils::load_leaf_node]: forward function *)val _ = new_constant ("betree_utils_load_leaf_node_fwd", + “:u64 -> state -> (state # (u64 # u64) betree_list_t) result”) + +(** [betree::betree_utils::store_leaf_node]: forward function *)val _ = new_constant ("betree_utils_store_leaf_node_fwd", + “:u64 -> (u64 # u64) betree_list_t -> state -> (state # unit) result”) + +(** [core::option::Option::{0}::unwrap]: forward function *)val _ = new_constant ("core_option_option_unwrap_fwd", + “:'t option -> state -> (state # 't) result”) + +val _ = export_theory () diff --git a/tests/hol4/betree/betree_OpaqueTheory.sig b/tests/hol4/betree/betree_OpaqueTheory.sig new file mode 100644 index 00000000..9452ff0f --- /dev/null +++ b/tests/hol4/betree/betree_OpaqueTheory.sig @@ -0,0 +1,11 @@ +signature betree_OpaqueTheory = +sig + type thm = Thm.thm + + val betree_Opaque_grammars : type_grammar.grammar * term_grammar.grammar +(* + [betree_Types] Parent theory of "betree_Opaque" + + +*) +end diff --git a/tests/hol4/betree/betreeMain_TypesScript.sml b/tests/hol4/betree/betree_TypesScript.sml index 779f6abb..93be2f46 100644 --- a/tests/hol4/betree/betreeMain_TypesScript.sml +++ b/tests/hol4/betree/betree_TypesScript.sml @@ -1,24 +1,24 @@ (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *) -(** [betree_main]: type definitions *) +(** [betree]: type definitions *) open primitivesLib divDefLib -val _ = new_theory "betreeMain_Types" +val _ = new_theory "betree_Types" Datatype: - (** [betree_main::betree::List] *) + (** [betree::betree::List] *) betree_list_t = | BetreeListCons 't betree_list_t | BetreeListNil End Datatype: - (** [betree_main::betree::UpsertFunState] *) + (** [betree::betree::UpsertFunState] *) betree_upsert_fun_state_t = | BetreeUpsertFunStateAdd u64 | BetreeUpsertFunStateSub u64 End Datatype: - (** [betree_main::betree::Message] *) + (** [betree::betree::Message] *) betree_message_t = | BetreeMessageInsert u64 | BetreeMessageDelete @@ -26,12 +26,12 @@ Datatype: End Datatype: - (** [betree_main::betree::Leaf] *) + (** [betree::betree::Leaf] *) betree_leaf_t = <| betree_leaf_id : u64; betree_leaf_size : u64; |> End Datatype: - (** [betree_main::betree::Internal] *) + (** [betree::betree::Internal] *) betree_internal_t = <| betree_internal_id : u64; @@ -41,14 +41,14 @@ Datatype: |> ; - (** [betree_main::betree::Node] *) + (** [betree::betree::Node] *) betree_node_t = | BetreeNodeInternal betree_internal_t | BetreeNodeLeaf betree_leaf_t End Datatype: - (** [betree_main::betree::Params] *) + (** [betree::betree::Params] *) betree_params_t = <| betree_params_min_flush_size : u64; betree_params_split_size : u64; @@ -56,12 +56,12 @@ Datatype: End Datatype: - (** [betree_main::betree::NodeIdCounter] *) + (** [betree::betree::NodeIdCounter] *) betree_node_id_counter_t = <| betree_node_id_counter_next_node_id : u64; |> End Datatype: - (** [betree_main::betree::BeTree] *) + (** [betree::betree::BeTree] *) betree_be_tree_t = <| betree_be_tree_params : betree_params_t; diff --git a/tests/hol4/betree/betreeMain_TypesTheory.sig b/tests/hol4/betree/betree_TypesTheory.sig index cffe6afb..ee2ec4b5 100644 --- a/tests/hol4/betree/betreeMain_TypesTheory.sig +++ b/tests/hol4/betree/betree_TypesTheory.sig @@ -1,4 +1,4 @@ -signature betreeMain_TypesTheory = +signature betree_TypesTheory = sig type thm = Thm.thm @@ -185,9 +185,9 @@ sig val datatype_betree_params_t : thm val datatype_betree_upsert_fun_state_t : thm - val betreeMain_Types_grammars : type_grammar.grammar * term_grammar.grammar + val betree_Types_grammars : type_grammar.grammar * term_grammar.grammar (* - [divDef] Parent theory of "betreeMain_Types" + [divDef] Parent theory of "betree_Types" [betree_be_tree_t_TY_DEF] Definition diff --git a/tests/hol4/hashmap_main/hashmapMain_FunsScript.sml b/tests/hol4/hashmap_main/hashmapMain_FunsScript.sml index c1e30aa6..2a17d185 100644 --- a/tests/hol4/hashmap_main/hashmapMain_FunsScript.sml +++ b/tests/hol4/hashmap_main/hashmapMain_FunsScript.sml @@ -628,9 +628,9 @@ val insert_on_disk_fwd_def = Define ‘ insert_on_disk_fwd (key : usize) (value : u64) (st : state) : (state # unit) result = do - (st0, hm) <- hashmap_utils_deserialize_fwd st; + (st0, hm) <- utils_deserialize_fwd st; hm0 <- hashmap_hash_map_insert_fwd_back hm key value; - (st1, _) <- hashmap_utils_serialize_fwd hm0 st0; + (st1, _) <- utils_serialize_fwd hm0 st0; Return (st1, ()) od ’ diff --git a/tests/hol4/hashmap_main/hashmapMain_FunsTheory.sig b/tests/hol4/hashmap_main/hashmapMain_FunsTheory.sig index d4e43d9a..c19673bb 100644 --- a/tests/hol4/hashmap_main/hashmapMain_FunsTheory.sig +++ b/tests/hol4/hashmap_main/hashmapMain_FunsTheory.sig @@ -583,9 +583,9 @@ sig ⊢ ∀key value st. insert_on_disk_fwd key value st = do - (st0,hm) <- hashmap_utils_deserialize_fwd st; + (st0,hm) <- utils_deserialize_fwd st; hm0 <- hashmap_hash_map_insert_fwd_back hm key value; - (st1,_) <- hashmap_utils_serialize_fwd hm0 st0; + (st1,_) <- utils_serialize_fwd hm0 st0; Return (st1,()) od diff --git a/tests/hol4/hashmap_main/hashmapMain_OpaqueScript.sml b/tests/hol4/hashmap_main/hashmapMain_OpaqueScript.sml index f7221d92..9c29c0e0 100644 --- a/tests/hol4/hashmap_main/hashmapMain_OpaqueScript.sml +++ b/tests/hol4/hashmap_main/hashmapMain_OpaqueScript.sml @@ -6,10 +6,10 @@ open hashmapMain_TypesTheory val _ = new_theory "hashmapMain_Opaque" -(** [hashmap_main::hashmap_utils::deserialize]: forward function *)val _ = new_constant ("hashmap_utils_deserialize_fwd", +(** [hashmap_main::utils::deserialize]: forward function *)val _ = new_constant ("utils_deserialize_fwd", “:state -> (state # u64 hashmap_hash_map_t) result”) -(** [hashmap_main::hashmap_utils::serialize]: forward function *)val _ = new_constant ("hashmap_utils_serialize_fwd", +(** [hashmap_main::utils::serialize]: forward function *)val _ = new_constant ("utils_serialize_fwd", “:u64 hashmap_hash_map_t -> state -> (state # unit) result”) val _ = export_theory () diff --git a/tests/lean/BetreeMain/Funs.lean b/tests/lean/Betree/Funs.lean index f6fda6db..8612ccbc 100644 --- a/tests/lean/BetreeMain/Funs.lean +++ b/tests/lean/Betree/Funs.lean @@ -1,13 +1,13 @@ -- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [betree_main]: function definitions +-- [betree]: function definitions import Base -import BetreeMain.Types -import BetreeMain.FunsExternal +import Betree.Types +import Betree.FunsExternal open Primitives -namespace betree_main +namespace betree -/- [betree_main::betree::load_internal_node]: +/- [betree::betree::load_internal_node]: Source: 'src/betree.rs', lines 36:0-36:52 -/ def betree.load_internal_node (id : U64) (st : State) : @@ -15,7 +15,7 @@ def betree.load_internal_node := betree_utils.load_internal_node id st -/- [betree_main::betree::store_internal_node]: +/- [betree::betree::store_internal_node]: Source: 'src/betree.rs', lines 41:0-41:60 -/ def betree.store_internal_node (id : U64) (content : betree.List (U64 × betree.Message)) (st : State) : @@ -23,13 +23,13 @@ def betree.store_internal_node := betree_utils.store_internal_node id content st -/- [betree_main::betree::load_leaf_node]: +/- [betree::betree::load_leaf_node]: Source: 'src/betree.rs', lines 46:0-46:44 -/ def betree.load_leaf_node (id : U64) (st : State) : Result (State × (betree.List (U64 × U64))) := betree_utils.load_leaf_node id st -/- [betree_main::betree::store_leaf_node]: +/- [betree::betree::store_leaf_node]: Source: 'src/betree.rs', lines 51:0-51:52 -/ def betree.store_leaf_node (id : U64) (content : betree.List (U64 × U64)) (st : State) : @@ -37,19 +37,19 @@ def betree.store_leaf_node := betree_utils.store_leaf_node id content st -/- [betree_main::betree::fresh_node_id]: +/- [betree::betree::fresh_node_id]: Source: 'src/betree.rs', lines 55:0-55:48 -/ def betree.fresh_node_id (counter : U64) : Result (U64 × U64) := do let counter1 ← counter + 1#u64 Result.ok (counter, counter1) -/- [betree_main::betree::{betree_main::betree::NodeIdCounter}::new]: +/- [betree::betree::{betree::betree::NodeIdCounter}::new]: Source: 'src/betree.rs', lines 206:4-206:20 -/ def betree.NodeIdCounter.new : Result betree.NodeIdCounter := Result.ok { next_node_id := 0#u64 } -/- [betree_main::betree::{betree_main::betree::NodeIdCounter}::fresh_id]: +/- [betree::betree::{betree::betree::NodeIdCounter}::fresh_id]: Source: 'src/betree.rs', lines 210:4-210:36 -/ def betree.NodeIdCounter.fresh_id (self : betree.NodeIdCounter) : Result (U64 × betree.NodeIdCounter) := @@ -57,7 +57,7 @@ def betree.NodeIdCounter.fresh_id let i ← self.next_node_id + 1#u64 Result.ok (self.next_node_id, { next_node_id := i }) -/- [betree_main::betree::upsert_update]: +/- [betree::betree::upsert_update]: Source: 'src/betree.rs', lines 234:0-234:70 -/ def betree.upsert_update (prev : Option U64) (st : betree.UpsertFunState) : Result U64 := @@ -79,7 +79,7 @@ def betree.upsert_update then prev1 - v else Result.ok 0#u64 -/- [betree_main::betree::{betree_main::betree::List<T>#1}::len]: +/- [betree::betree::{betree::betree::List<T>#1}::len]: Source: 'src/betree.rs', lines 276:4-276:24 -/ divergent def betree.List.len (T : Type) (self : betree.List T) : Result U64 := match self with @@ -88,7 +88,7 @@ divergent def betree.List.len (T : Type) (self : betree.List T) : Result U64 := 1#u64 + i | betree.List.Nil => Result.ok 0#u64 -/- [betree_main::betree::{betree_main::betree::List<T>#1}::split_at]: +/- [betree::betree::{betree::betree::List<T>#1}::split_at]: Source: 'src/betree.rs', lines 284:4-284:51 -/ divergent def betree.List.split_at (T : Type) (self : betree.List T) (n : U64) : @@ -106,14 +106,14 @@ divergent def betree.List.split_at Result.ok (betree.List.Cons hd ls0, ls1) | betree.List.Nil => Result.fail .panic -/- [betree_main::betree::{betree_main::betree::List<T>#1}::push_front]: +/- [betree::betree::{betree::betree::List<T>#1}::push_front]: Source: 'src/betree.rs', lines 299:4-299:34 -/ def betree.List.push_front (T : Type) (self : betree.List T) (x : T) : Result (betree.List T) := let (tl, _) := core.mem.replace (betree.List T) self betree.List.Nil Result.ok (betree.List.Cons x tl) -/- [betree_main::betree::{betree_main::betree::List<T>#1}::pop_front]: +/- [betree::betree::{betree::betree::List<T>#1}::pop_front]: Source: 'src/betree.rs', lines 306:4-306:32 -/ def betree.List.pop_front (T : Type) (self : betree.List T) : Result (T × (betree.List T)) := @@ -122,14 +122,14 @@ def betree.List.pop_front | betree.List.Cons x tl => Result.ok (x, tl) | betree.List.Nil => Result.fail .panic -/- [betree_main::betree::{betree_main::betree::List<T>#1}::hd]: +/- [betree::betree::{betree::betree::List<T>#1}::hd]: Source: 'src/betree.rs', lines 318:4-318:22 -/ def betree.List.hd (T : Type) (self : betree.List T) : Result T := match self with | betree.List.Cons hd _ => Result.ok hd | betree.List.Nil => Result.fail .panic -/- [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::head_has_key]: +/- [betree::betree::{betree::betree::List<(u64, T)>#2}::head_has_key]: Source: 'src/betree.rs', lines 327:4-327:44 -/ def betree.ListPairU64T.head_has_key (T : Type) (self : betree.List (U64 × T)) (key : U64) : Result Bool := @@ -138,7 +138,7 @@ def betree.ListPairU64T.head_has_key Result.ok (i = key) | betree.List.Nil => Result.ok false -/- [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::partition_at_pivot]: +/- [betree::betree::{betree::betree::List<(u64, T)>#2}::partition_at_pivot]: Source: 'src/betree.rs', lines 339:4-339:73 -/ divergent def betree.ListPairU64T.partition_at_pivot (T : Type) (self : betree.List (U64 × T)) (pivot : U64) : @@ -156,7 +156,7 @@ divergent def betree.ListPairU64T.partition_at_pivot Result.ok (betree.List.Cons (i, t) ls0, ls1) | betree.List.Nil => Result.ok (betree.List.Nil, betree.List.Nil) -/- [betree_main::betree::{betree_main::betree::Leaf#3}::split]: +/- [betree::betree::{betree::betree::Leaf#3}::split]: Source: 'src/betree.rs', lines 359:4-364:17 -/ def betree.Leaf.split (self : betree.Leaf) (content : betree.List (U64 × U64)) @@ -176,7 +176,7 @@ def betree.Leaf.split let n1 := betree.Node.Leaf { id := id1, size := params.split_size } Result.ok (st2, (betree.Internal.mk self.id pivot n n1, node_id_cnt2)) -/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]: +/- [betree::betree::{betree::betree::Node#5}::lookup_first_message_for_key]: Source: 'src/betree.rs', lines 789:4-792:34 -/ divergent def betree.Node.lookup_first_message_for_key (key : U64) (msgs : betree.List (U64 × betree.Message)) : @@ -200,7 +200,7 @@ divergent def betree.Node.lookup_first_message_for_key Result.ok (l, back) | betree.List.Nil => Result.ok (betree.List.Nil, Result.ok) -/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: +/- [betree::betree::{betree::betree::Node#5}::lookup_in_bindings]: Source: 'src/betree.rs', lines 636:4-636:80 -/ divergent def betree.Node.lookup_in_bindings (key : U64) (bindings : betree.List (U64 × U64)) : Result (Option U64) := @@ -215,7 +215,7 @@ divergent def betree.Node.lookup_in_bindings else betree.Node.lookup_in_bindings key tl | betree.List.Nil => Result.ok none -/- [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: +/- [betree::betree::{betree::betree::Node#5}::apply_upserts]: Source: 'src/betree.rs', lines 819:4-819:90 -/ divergent def betree.Node.apply_upserts (msgs : betree.List (U64 × betree.Message)) (prev : Option U64) (key : U64) @@ -244,7 +244,7 @@ divergent def betree.Node.apply_upserts betree.Message.Insert v) Result.ok (v, msgs1) -/- [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: +/- [betree::betree::{betree::betree::Internal#4}::lookup_in_children]: Source: 'src/betree.rs', lines 395:4-395:63 -/ mutual divergent def betree.Internal.lookup_in_children (self : betree.Internal) (key : U64) (st : State) : @@ -260,7 +260,7 @@ mutual divergent def betree.Internal.lookup_in_children let (st1, (o, n)) ← betree.Node.lookup self.right key st Result.ok (st1, (o, betree.Internal.mk self.id self.pivot self.left n)) -/- [betree_main::betree::{betree_main::betree::Node#5}::lookup]: +/- [betree::betree::{betree::betree::Node#5}::lookup]: Source: 'src/betree.rs', lines 709:4-709:58 -/ divergent def betree.Node.lookup (self : betree.Node) (key : U64) (st : State) : @@ -320,7 +320,7 @@ divergent def betree.Node.lookup end -/- [betree_main::betree::{betree_main::betree::Node#5}::filter_messages_for_key]: +/- [betree::betree::{betree::betree::Node#5}::filter_messages_for_key]: Source: 'src/betree.rs', lines 674:4-674:77 -/ divergent def betree.Node.filter_messages_for_key (key : U64) (msgs : betree.List (U64 × betree.Message)) : @@ -339,7 +339,7 @@ divergent def betree.Node.filter_messages_for_key else Result.ok (betree.List.Cons (k, m) l) | betree.List.Nil => Result.ok betree.List.Nil -/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]: +/- [betree::betree::{betree::betree::Node#5}::lookup_first_message_after_key]: Source: 'src/betree.rs', lines 689:4-692:34 -/ divergent def betree.Node.lookup_first_message_after_key (key : U64) (msgs : betree.List (U64 × betree.Message)) : @@ -363,7 +363,7 @@ divergent def betree.Node.lookup_first_message_after_key else Result.ok (betree.List.Cons (k, m) next_msgs, Result.ok) | betree.List.Nil => Result.ok (betree.List.Nil, Result.ok) -/- [betree_main::betree::{betree_main::betree::Node#5}::apply_to_internal]: +/- [betree::betree::{betree::betree::Node#5}::apply_to_internal]: Source: 'src/betree.rs', lines 521:4-521:89 -/ def betree.Node.apply_to_internal (msgs : betree.List (U64 × betree.Message)) (key : U64) @@ -427,7 +427,7 @@ def betree.Node.apply_to_internal betree.List.push_front (U64 × betree.Message) msgs1 (key, new_msg) lookup_first_message_for_key_back msgs2 -/- [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_internal]: +/- [betree::betree::{betree::betree::Node#5}::apply_messages_to_internal]: Source: 'src/betree.rs', lines 502:4-505:5 -/ divergent def betree.Node.apply_messages_to_internal (msgs : betree.List (U64 × betree.Message)) @@ -442,7 +442,7 @@ divergent def betree.Node.apply_messages_to_internal betree.Node.apply_messages_to_internal msgs1 new_msgs_tl | betree.List.Nil => Result.ok msgs -/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]: +/- [betree::betree::{betree::betree::Node#5}::lookup_mut_in_bindings]: Source: 'src/betree.rs', lines 653:4-656:32 -/ divergent def betree.Node.lookup_mut_in_bindings (key : U64) (bindings : betree.List (U64 × U64)) : @@ -466,7 +466,7 @@ divergent def betree.Node.lookup_mut_in_bindings Result.ok (l, back) | betree.List.Nil => Result.ok (betree.List.Nil, Result.ok) -/- [betree_main::betree::{betree_main::betree::Node#5}::apply_to_leaf]: +/- [betree::betree::{betree::betree::Node#5}::apply_to_leaf]: Source: 'src/betree.rs', lines 460:4-460:87 -/ def betree.Node.apply_to_leaf (bindings : betree.List (U64 × U64)) (key : U64) (new_msg : betree.Message) @@ -506,7 +506,7 @@ def betree.Node.apply_to_leaf let bindings2 ← betree.List.push_front (U64 × U64) bindings1 (key, v) lookup_mut_in_bindings_back bindings2 -/- [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_leaf]: +/- [betree::betree::{betree::betree::Node#5}::apply_messages_to_leaf]: Source: 'src/betree.rs', lines 444:4-447:5 -/ divergent def betree.Node.apply_messages_to_leaf (bindings : betree.List (U64 × U64)) @@ -521,7 +521,7 @@ divergent def betree.Node.apply_messages_to_leaf betree.Node.apply_messages_to_leaf bindings1 new_msgs_tl | betree.List.Nil => Result.ok bindings -/- [betree_main::betree::{betree_main::betree::Internal#4}::flush]: +/- [betree::betree::{betree::betree::Internal#4}::flush]: Source: 'src/betree.rs', lines 410:4-415:26 -/ mutual divergent def betree.Internal.flush (self : betree.Internal) (params : betree.Params) @@ -562,7 +562,7 @@ mutual divergent def betree.Internal.flush Result.ok (st1, (msgs_left, (betree.Internal.mk self.id self.pivot self.left n, node_id_cnt1))) -/- [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]: +/- [betree::betree::{betree::betree::Node#5}::apply_messages]: Source: 'src/betree.rs', lines 588:4-593:5 -/ divergent def betree.Node.apply_messages (self : betree.Node) (params : betree.Params) @@ -609,7 +609,7 @@ divergent def betree.Node.apply_messages end -/- [betree_main::betree::{betree_main::betree::Node#5}::apply]: +/- [betree::betree::{betree::betree::Node#5}::apply]: Source: 'src/betree.rs', lines 576:4-582:5 -/ def betree.Node.apply (self : betree.Node) (params : betree.Params) @@ -624,7 +624,7 @@ def betree.Node.apply let (self1, node_id_cnt1) := p Result.ok (st1, (self1, node_id_cnt1)) -/- [betree_main::betree::{betree_main::betree::BeTree#6}::new]: +/- [betree::betree::{betree::betree::BeTree#6}::new]: Source: 'src/betree.rs', lines 849:4-849:60 -/ def betree.BeTree.new (min_flush_size : U64) (split_size : U64) (st : State) : @@ -641,7 +641,7 @@ def betree.BeTree.new root := (betree.Node.Leaf { id := id, size := 0#u64 }) }) -/- [betree_main::betree::{betree_main::betree::BeTree#6}::apply]: +/- [betree::betree::{betree::betree::BeTree#6}::apply]: Source: 'src/betree.rs', lines 868:4-868:47 -/ def betree.BeTree.apply (self : betree.BeTree) (key : U64) (msg : betree.Message) (st : State) : @@ -653,7 +653,7 @@ def betree.BeTree.apply let (n, nic) := p Result.ok (st1, { self with node_id_cnt := nic, root := n }) -/- [betree_main::betree::{betree_main::betree::BeTree#6}::insert]: +/- [betree::betree::{betree::betree::BeTree#6}::insert]: Source: 'src/betree.rs', lines 874:4-874:52 -/ def betree.BeTree.insert (self : betree.BeTree) (key : U64) (value : U64) (st : State) : @@ -661,7 +661,7 @@ def betree.BeTree.insert := betree.BeTree.apply self key (betree.Message.Insert value) st -/- [betree_main::betree::{betree_main::betree::BeTree#6}::delete]: +/- [betree::betree::{betree::betree::BeTree#6}::delete]: Source: 'src/betree.rs', lines 880:4-880:38 -/ def betree.BeTree.delete (self : betree.BeTree) (key : U64) (st : State) : @@ -669,7 +669,7 @@ def betree.BeTree.delete := betree.BeTree.apply self key betree.Message.Delete st -/- [betree_main::betree::{betree_main::betree::BeTree#6}::upsert]: +/- [betree::betree::{betree::betree::BeTree#6}::upsert]: Source: 'src/betree.rs', lines 886:4-886:59 -/ def betree.BeTree.upsert (self : betree.BeTree) (key : U64) (upd : betree.UpsertFunState) (st : State) @@ -678,7 +678,7 @@ def betree.BeTree.upsert := betree.BeTree.apply self key (betree.Message.Upsert upd) st -/- [betree_main::betree::{betree_main::betree::BeTree#6}::lookup]: +/- [betree::betree::{betree::betree::BeTree#6}::lookup]: Source: 'src/betree.rs', lines 895:4-895:62 -/ def betree.BeTree.lookup (self : betree.BeTree) (key : U64) (st : State) : @@ -688,12 +688,12 @@ def betree.BeTree.lookup let (st1, (o, n)) ← betree.Node.lookup self.root key st Result.ok (st1, (o, { self with root := n })) -/- [betree_main::main]: +/- [betree::main]: Source: 'src/main.rs', lines 4:0-4:9 -/ def main : Result Unit := Result.ok () -/- Unit test for [betree_main::main] -/ +/- Unit test for [betree::main] -/ #assert (main == Result.ok ()) -end betree_main +end betree diff --git a/tests/lean/BetreeMain/FunsExternal.lean b/tests/lean/Betree/FunsExternal.lean index d26177fb..859cbd68 100644 --- a/tests/lean/BetreeMain/FunsExternal.lean +++ b/tests/lean/Betree/FunsExternal.lean @@ -1,30 +1,30 @@ --- [betree_main]: external functions. +-- [betree]: external functions. import Base -import BetreeMain.Types +import Betree.Types open Primitives -open betree_main +open betree -- TODO: fill those bodies -/- [betree_main::betree_utils::load_internal_node] -/ +/- [betree::betree_utils::load_internal_node] -/ def betree_utils.load_internal_node : U64 → State → Result (State × (betree.List (U64 × betree.Message))) := fun _ _ => .fail .panic -/- [betree_main::betree_utils::store_internal_node] -/ +/- [betree::betree_utils::store_internal_node] -/ def betree_utils.store_internal_node : U64 → betree.List (U64 × betree.Message) → State → Result (State × Unit) := fun _ _ _ => .fail .panic -/- [betree_main::betree_utils::load_leaf_node] -/ +/- [betree::betree_utils::load_leaf_node] -/ def betree_utils.load_leaf_node : U64 → State → Result (State × (betree.List (U64 × U64))) := fun _ _ => .fail .panic -/- [betree_main::betree_utils::store_leaf_node] -/ +/- [betree::betree_utils::store_leaf_node] -/ def betree_utils.store_leaf_node : U64 → betree.List (U64 × U64) → State → Result (State × Unit) := fun _ _ _ => .fail .panic diff --git a/tests/lean/BetreeMain/FunsExternal_Template.lean b/tests/lean/Betree/FunsExternal_Template.lean index 0dcce5ca..014f0d83 100644 --- a/tests/lean/BetreeMain/FunsExternal_Template.lean +++ b/tests/lean/Betree/FunsExternal_Template.lean @@ -1,29 +1,29 @@ -- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [betree_main]: external functions. +-- [betree]: external functions. -- This is a template file: rename it to "FunsExternal.lean" and fill the holes. import Base -import BetreeMain.Types +import Betree.Types open Primitives -open betree_main +open betree -/- [betree_main::betree_utils::load_internal_node]: +/- [betree::betree_utils::load_internal_node]: Source: 'src/betree_utils.rs', lines 98:0-98:63 -/ axiom betree_utils.load_internal_node : U64 → State → Result (State × (betree.List (U64 × betree.Message))) -/- [betree_main::betree_utils::store_internal_node]: +/- [betree::betree_utils::store_internal_node]: Source: 'src/betree_utils.rs', lines 115:0-115:71 -/ axiom betree_utils.store_internal_node : U64 → betree.List (U64 × betree.Message) → State → Result (State × Unit) -/- [betree_main::betree_utils::load_leaf_node]: +/- [betree::betree_utils::load_leaf_node]: Source: 'src/betree_utils.rs', lines 132:0-132:55 -/ axiom betree_utils.load_leaf_node : U64 → State → Result (State × (betree.List (U64 × U64))) -/- [betree_main::betree_utils::store_leaf_node]: +/- [betree::betree_utils::store_leaf_node]: Source: 'src/betree_utils.rs', lines 145:0-145:63 -/ axiom betree_utils.store_leaf_node : U64 → betree.List (U64 × U64) → State → Result (State × Unit) diff --git a/tests/lean/BetreeMain/Types.lean b/tests/lean/Betree/Types.lean index e79da43f..3b46c00c 100644 --- a/tests/lean/BetreeMain/Types.lean +++ b/tests/lean/Betree/Types.lean @@ -1,31 +1,31 @@ -- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [betree_main]: type definitions +-- [betree]: type definitions import Base -import BetreeMain.TypesExternal +import Betree.TypesExternal open Primitives -namespace betree_main +namespace betree -/- [betree_main::betree::List] +/- [betree::betree::List] Source: 'src/betree.rs', lines 17:0-17:23 -/ inductive betree.List (T : Type) := | Cons : T → betree.List T → betree.List T | Nil : betree.List T -/- [betree_main::betree::UpsertFunState] +/- [betree::betree::UpsertFunState] Source: 'src/betree.rs', lines 63:0-63:23 -/ inductive betree.UpsertFunState := | Add : U64 → betree.UpsertFunState | Sub : U64 → betree.UpsertFunState -/- [betree_main::betree::Message] +/- [betree::betree::Message] Source: 'src/betree.rs', lines 69:0-69:23 -/ inductive betree.Message := | Insert : U64 → betree.Message | Delete : betree.Message | Upsert : betree.UpsertFunState → betree.Message -/- [betree_main::betree::Leaf] +/- [betree::betree::Leaf] Source: 'src/betree.rs', lines 167:0-167:11 -/ structure betree.Leaf where id : U64 @@ -33,12 +33,12 @@ structure betree.Leaf where mutual -/- [betree_main::betree::Internal] +/- [betree::betree::Internal] Source: 'src/betree.rs', lines 156:0-156:15 -/ inductive betree.Internal := | mk : U64 → U64 → betree.Node → betree.Node → betree.Internal -/- [betree_main::betree::Node] +/- [betree::betree::Node] Source: 'src/betree.rs', lines 179:0-179:9 -/ inductive betree.Node := | Internal : betree.Internal → betree.Node @@ -62,22 +62,22 @@ def betree.Internal.left (x : betree.Internal) := def betree.Internal.right (x : betree.Internal) := match x with | betree.Internal.mk _ _ _ x1 => x1 -/- [betree_main::betree::Params] +/- [betree::betree::Params] Source: 'src/betree.rs', lines 187:0-187:13 -/ structure betree.Params where min_flush_size : U64 split_size : U64 -/- [betree_main::betree::NodeIdCounter] +/- [betree::betree::NodeIdCounter] Source: 'src/betree.rs', lines 201:0-201:20 -/ structure betree.NodeIdCounter where next_node_id : U64 -/- [betree_main::betree::BeTree] +/- [betree::betree::BeTree] Source: 'src/betree.rs', lines 218:0-218:17 -/ structure betree.BeTree where params : betree.Params node_id_cnt : betree.NodeIdCounter root : betree.Node -end betree_main +end betree diff --git a/tests/lean/BetreeMain/TypesExternal.lean b/tests/lean/Betree/TypesExternal.lean index 1701eaaf..34170271 100644 --- a/tests/lean/BetreeMain/TypesExternal.lean +++ b/tests/lean/Betree/TypesExternal.lean @@ -1,4 +1,4 @@ --- [betree_main]: external types. +-- [betree]: external types. import Base open Primitives diff --git a/tests/lean/BetreeMain/TypesExternal_Template.lean b/tests/lean/Betree/TypesExternal_Template.lean index bbac7e99..12fce657 100644 --- a/tests/lean/BetreeMain/TypesExternal_Template.lean +++ b/tests/lean/Betree/TypesExternal_Template.lean @@ -1,5 +1,5 @@ -- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [betree_main]: external types. +-- [betree]: external types. -- This is a template file: rename it to "TypesExternal.lean" and fill the holes. import Base open Primitives diff --git a/tests/lean/BetreeMain.lean b/tests/lean/BetreeMain.lean deleted file mode 100644 index 5f307877..00000000 --- a/tests/lean/BetreeMain.lean +++ /dev/null @@ -1 +0,0 @@ -import BetreeMain.Funs diff --git a/tests/lean/Hashmap/Funs.lean b/tests/lean/Hashmap/Funs.lean index 4f05fbc8..d7ac3b05 100644 --- a/tests/lean/Hashmap/Funs.lean +++ b/tests/lean/Hashmap/Funs.lean @@ -2,17 +2,18 @@ -- [hashmap]: function definitions import Base import Hashmap.Types +import Hashmap.FunsExternal open Primitives namespace hashmap /- [hashmap::hash_key]: - Source: 'tests/src/hashmap.rs', lines 35:0-35:32 -/ + Source: 'tests/src/hashmap.rs', lines 37:0-37:32 -/ def hash_key (k : Usize) : Result Usize := Result.ok k /- [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0: - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 -/ + Source: 'tests/src/hashmap.rs', lines 60:4-66:5 -/ divergent def HashMap.allocate_slots_loop (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) : Result (alloc.vec.Vec (List T)) @@ -26,7 +27,7 @@ divergent def HashMap.allocate_slots_loop else Result.ok slots /- [hashmap::{hashmap::HashMap<T>}::allocate_slots]: - Source: 'tests/src/hashmap.rs', lines 58:4-58:76 -/ + Source: 'tests/src/hashmap.rs', lines 60:4-60:76 -/ def HashMap.allocate_slots (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) : Result (alloc.vec.Vec (List T)) @@ -34,7 +35,7 @@ def HashMap.allocate_slots HashMap.allocate_slots_loop T slots n /- [hashmap::{hashmap::HashMap<T>}::new_with_capacity]: - Source: 'tests/src/hashmap.rs', lines 67:4-71:13 -/ + Source: 'tests/src/hashmap.rs', lines 69:4-73:13 -/ def HashMap.new_with_capacity (T : Type) (capacity : Usize) (max_load_dividend : Usize) (max_load_divisor : Usize) : @@ -53,12 +54,12 @@ def HashMap.new_with_capacity } /- [hashmap::{hashmap::HashMap<T>}::new]: - Source: 'tests/src/hashmap.rs', lines 83:4-83:24 -/ + Source: 'tests/src/hashmap.rs', lines 85:4-85:24 -/ def HashMap.new (T : Type) : Result (HashMap T) := HashMap.new_with_capacity T 32#usize 4#usize 5#usize /- [hashmap::{hashmap::HashMap<T>}::clear]: loop 0: - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 -/ + Source: 'tests/src/hashmap.rs', lines 90:4-98:5 -/ divergent def HashMap.clear_loop (T : Type) (slots : alloc.vec.Vec (List T)) (i : Usize) : Result (alloc.vec.Vec (List T)) @@ -76,19 +77,19 @@ divergent def HashMap.clear_loop else Result.ok slots /- [hashmap::{hashmap::HashMap<T>}::clear]: - Source: 'tests/src/hashmap.rs', lines 88:4-88:27 -/ + Source: 'tests/src/hashmap.rs', lines 90:4-90:27 -/ def HashMap.clear (T : Type) (self : HashMap T) : Result (HashMap T) := do let hm ← HashMap.clear_loop T self.slots 0#usize Result.ok { self with num_entries := 0#usize, slots := hm } /- [hashmap::{hashmap::HashMap<T>}::len]: - Source: 'tests/src/hashmap.rs', lines 98:4-98:30 -/ + Source: 'tests/src/hashmap.rs', lines 100:4-100:30 -/ def HashMap.len (T : Type) (self : HashMap T) : Result Usize := Result.ok self.num_entries /- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 -/ + Source: 'tests/src/hashmap.rs', lines 107:4-124:5 -/ divergent def HashMap.insert_in_list_loop (T : Type) (key : Usize) (value : T) (ls : List T) : Result (Bool × (List T)) @@ -104,7 +105,7 @@ divergent def HashMap.insert_in_list_loop | List.Nil => Result.ok (true, List.Cons key value List.Nil) /- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: - Source: 'tests/src/hashmap.rs', lines 105:4-105:71 -/ + Source: 'tests/src/hashmap.rs', lines 107:4-107:71 -/ def HashMap.insert_in_list (T : Type) (key : Usize) (value : T) (ls : List T) : Result (Bool × (List T)) @@ -112,7 +113,7 @@ def HashMap.insert_in_list HashMap.insert_in_list_loop T key value ls /- [hashmap::{hashmap::HashMap<T>}::insert_no_resize]: - Source: 'tests/src/hashmap.rs', lines 125:4-125:54 -/ + Source: 'tests/src/hashmap.rs', lines 127:4-127:54 -/ def HashMap.insert_no_resize (T : Type) (self : HashMap T) (key : Usize) (value : T) : Result (HashMap T) @@ -136,7 +137,7 @@ def HashMap.insert_no_resize Result.ok { self with slots := v } /- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 -/ + Source: 'tests/src/hashmap.rs', lines 193:4-206:5 -/ divergent def HashMap.move_elements_from_list_loop (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) := match ls with @@ -147,13 +148,13 @@ divergent def HashMap.move_elements_from_list_loop | List.Nil => Result.ok ntable /- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: - Source: 'tests/src/hashmap.rs', lines 191:4-191:72 -/ + Source: 'tests/src/hashmap.rs', lines 193:4-193:72 -/ def HashMap.move_elements_from_list (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) := HashMap.move_elements_from_list_loop T ntable ls /- [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0: - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 -/ + Source: 'tests/src/hashmap.rs', lines 181:4-190:5 -/ divergent def HashMap.move_elements_loop (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize) : @@ -174,7 +175,7 @@ divergent def HashMap.move_elements_loop else Result.ok (ntable, slots) /- [hashmap::{hashmap::HashMap<T>}::move_elements]: - Source: 'tests/src/hashmap.rs', lines 179:4-179:95 -/ + Source: 'tests/src/hashmap.rs', lines 181:4-181:95 -/ def HashMap.move_elements (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize) : @@ -183,7 +184,7 @@ def HashMap.move_elements HashMap.move_elements_loop T ntable slots i /- [hashmap::{hashmap::HashMap<T>}::try_resize]: - Source: 'tests/src/hashmap.rs', lines 148:4-148:28 -/ + Source: 'tests/src/hashmap.rs', lines 150:4-150:28 -/ def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) := do let max_usize ← Scalar.cast .Usize core_u32_max @@ -207,7 +208,7 @@ def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) := else Result.ok { self with max_load_factor := (i, i1) } /- [hashmap::{hashmap::HashMap<T>}::insert]: - Source: 'tests/src/hashmap.rs', lines 137:4-137:48 -/ + Source: 'tests/src/hashmap.rs', lines 139:4-139:48 -/ def HashMap.insert (T : Type) (self : HashMap T) (key : Usize) (value : T) : Result (HashMap T) @@ -220,7 +221,7 @@ def HashMap.insert else Result.ok self1 /- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 -/ + Source: 'tests/src/hashmap.rs', lines 216:4-229:5 -/ divergent def HashMap.contains_key_in_list_loop (T : Type) (key : Usize) (ls : List T) : Result Bool := match ls with @@ -231,13 +232,13 @@ divergent def HashMap.contains_key_in_list_loop | List.Nil => Result.ok false /- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: - Source: 'tests/src/hashmap.rs', lines 214:4-214:68 -/ + Source: 'tests/src/hashmap.rs', lines 216:4-216:68 -/ def HashMap.contains_key_in_list (T : Type) (key : Usize) (ls : List T) : Result Bool := HashMap.contains_key_in_list_loop T key ls /- [hashmap::{hashmap::HashMap<T>}::contains_key]: - Source: 'tests/src/hashmap.rs', lines 207:4-207:49 -/ + Source: 'tests/src/hashmap.rs', lines 209:4-209:49 -/ def HashMap.contains_key (T : Type) (self : HashMap T) (key : Usize) : Result Bool := do @@ -250,7 +251,7 @@ def HashMap.contains_key HashMap.contains_key_in_list T key l /- [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 -/ + Source: 'tests/src/hashmap.rs', lines 234:4-247:5 -/ divergent def HashMap.get_in_list_loop (T : Type) (key : Usize) (ls : List T) : Result T := match ls with @@ -261,12 +262,12 @@ divergent def HashMap.get_in_list_loop | List.Nil => Result.fail .panic /- [hashmap::{hashmap::HashMap<T>}::get_in_list]: - Source: 'tests/src/hashmap.rs', lines 232:4-232:70 -/ + Source: 'tests/src/hashmap.rs', lines 234:4-234:70 -/ def HashMap.get_in_list (T : Type) (key : Usize) (ls : List T) : Result T := HashMap.get_in_list_loop T key ls /- [hashmap::{hashmap::HashMap<T>}::get]: - Source: 'tests/src/hashmap.rs', lines 247:4-247:55 -/ + Source: 'tests/src/hashmap.rs', lines 249:4-249:55 -/ def HashMap.get (T : Type) (self : HashMap T) (key : Usize) : Result T := do let hash ← hash_key key @@ -278,7 +279,7 @@ def HashMap.get (T : Type) (self : HashMap T) (key : Usize) : Result T := HashMap.get_in_list T key l /- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 -/ + Source: 'tests/src/hashmap.rs', lines 255:4-264:5 -/ divergent def HashMap.get_mut_in_list_loop (T : Type) (ls : List T) (key : Usize) : Result (T × (T → Result (List T))) @@ -301,7 +302,7 @@ divergent def HashMap.get_mut_in_list_loop | List.Nil => Result.fail .panic /- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: - Source: 'tests/src/hashmap.rs', lines 253:4-253:86 -/ + Source: 'tests/src/hashmap.rs', lines 255:4-255:86 -/ def HashMap.get_mut_in_list (T : Type) (ls : List T) (key : Usize) : Result (T × (T → Result (List T))) @@ -309,7 +310,7 @@ def HashMap.get_mut_in_list HashMap.get_mut_in_list_loop T ls key /- [hashmap::{hashmap::HashMap<T>}::get_mut]: - Source: 'tests/src/hashmap.rs', lines 265:4-265:67 -/ + Source: 'tests/src/hashmap.rs', lines 267:4-267:67 -/ def HashMap.get_mut (T : Type) (self : HashMap T) (key : Usize) : Result (T × (T → Result (HashMap T))) @@ -331,7 +332,7 @@ def HashMap.get_mut Result.ok (t, back) /- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 -/ + Source: 'tests/src/hashmap.rs', lines 275:4-301:5 -/ divergent def HashMap.remove_from_list_loop (T : Type) (key : Usize) (ls : List T) : Result ((Option T) × (List T)) := match ls with @@ -350,13 +351,13 @@ divergent def HashMap.remove_from_list_loop | List.Nil => Result.ok (none, List.Nil) /- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: - Source: 'tests/src/hashmap.rs', lines 273:4-273:69 -/ + Source: 'tests/src/hashmap.rs', lines 275:4-275:69 -/ def HashMap.remove_from_list (T : Type) (key : Usize) (ls : List T) : Result ((Option T) × (List T)) := HashMap.remove_from_list_loop T key ls /- [hashmap::{hashmap::HashMap<T>}::remove]: - Source: 'tests/src/hashmap.rs', lines 302:4-302:52 -/ + Source: 'tests/src/hashmap.rs', lines 304:4-304:52 -/ def HashMap.remove (T : Type) (self : HashMap T) (key : Usize) : Result ((Option T) × (HashMap T)) @@ -380,8 +381,17 @@ def HashMap.remove let v ← index_mut_back l1 Result.ok (some x1, { self with num_entries := i1, slots := v }) +/- [hashmap::insert_on_disk]: + Source: 'tests/src/hashmap.rs', lines 335:0-335:43 -/ +def insert_on_disk + (key : Usize) (value : U64) (st : State) : Result (State × Unit) := + do + let (st1, hm) ← utils.deserialize st + let hm1 ← HashMap.insert U64 hm key value + utils.serialize hm1 st1 + /- [hashmap::test1]: - Source: 'tests/src/hashmap.rs', lines 323:0-323:10 -/ + Source: 'tests/src/hashmap.rs', lines 350:0-350:10 -/ def test1 : Result Unit := do let hm ← HashMap.new U64 diff --git a/tests/lean/Hashmap/FunsExternal.lean b/tests/lean/Hashmap/FunsExternal.lean new file mode 100644 index 00000000..329e5d82 --- /dev/null +++ b/tests/lean/Hashmap/FunsExternal.lean @@ -0,0 +1,19 @@ +-- [hashmap]: external functions. +import Base +import Hashmap.Types +open Primitives +open hashmap + +-- TODO: fill those bodies + +/- [hashmap::utils::deserialize]: + Source: 'tests/src/hashmap.rs', lines 330:4-330:47 -/ +def utils.deserialize + : State → Result (State × (HashMap U64)) := + fun _ => .fail .panic + +/- [hashmap::utils::serialize]: + Source: 'tests/src/hashmap.rs', lines 325:4-325:46 -/ +def utils.serialize + : HashMap U64 → State → Result (State × Unit) := + fun _ _ => .fail .panic diff --git a/tests/lean/Hashmap/FunsExternal_Template.lean b/tests/lean/Hashmap/FunsExternal_Template.lean new file mode 100644 index 00000000..2af57d10 --- /dev/null +++ b/tests/lean/Hashmap/FunsExternal_Template.lean @@ -0,0 +1,16 @@ +-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS +-- [hashmap]: external functions. +-- This is a template file: rename it to "FunsExternal.lean" and fill the holes. +import Base +import Hashmap.Types +open Primitives +open hashmap + +/- [hashmap::utils::deserialize]: + Source: 'tests/src/hashmap.rs', lines 330:4-330:47 -/ +axiom utils.deserialize : State → Result (State × (HashMap U64)) + +/- [hashmap::utils::serialize]: + Source: 'tests/src/hashmap.rs', lines 325:4-325:46 -/ +axiom utils.serialize : HashMap U64 → State → Result (State × Unit) + diff --git a/tests/lean/Hashmap/Types.lean b/tests/lean/Hashmap/Types.lean index a98b972f..b4301106 100644 --- a/tests/lean/Hashmap/Types.lean +++ b/tests/lean/Hashmap/Types.lean @@ -1,18 +1,19 @@ -- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS -- [hashmap]: type definitions import Base +import Hashmap.TypesExternal open Primitives namespace hashmap /- [hashmap::List] - Source: 'tests/src/hashmap.rs', lines 27:0-27:16 -/ + Source: 'tests/src/hashmap.rs', lines 29:0-29:16 -/ inductive List (T : Type) := | Cons : Usize → T → List T → List T | Nil : List T /- [hashmap::HashMap] - Source: 'tests/src/hashmap.rs', lines 43:0-43:21 -/ + Source: 'tests/src/hashmap.rs', lines 45:0-45:21 -/ structure HashMap (T : Type) where num_entries : Usize max_load_factor : (Usize × Usize) diff --git a/tests/lean/HashmapMain/TypesExternal.lean b/tests/lean/Hashmap/TypesExternal.lean index 4e1cdbe9..b32c4c42 100644 --- a/tests/lean/HashmapMain/TypesExternal.lean +++ b/tests/lean/Hashmap/TypesExternal.lean @@ -1,4 +1,4 @@ --- [hashmap_main]: external types. +-- [hashmap]: external types. import Base open Primitives diff --git a/tests/lean/HashmapMain/TypesExternal_Template.lean b/tests/lean/Hashmap/TypesExternal_Template.lean index cfa8bbb1..03c3d157 100644 --- a/tests/lean/HashmapMain/TypesExternal_Template.lean +++ b/tests/lean/Hashmap/TypesExternal_Template.lean @@ -1,5 +1,5 @@ -- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [hashmap_main]: external types. +-- [hashmap]: external types. -- This is a template file: rename it to "TypesExternal.lean" and fill the holes. import Base open Primitives diff --git a/tests/lean/HashmapMain.lean b/tests/lean/HashmapMain.lean deleted file mode 100644 index 1a4e7f82..00000000 --- a/tests/lean/HashmapMain.lean +++ /dev/null @@ -1 +0,0 @@ -import HashmapMain.Funs diff --git a/tests/lean/HashmapMain/Funs.lean b/tests/lean/HashmapMain/Funs.lean deleted file mode 100644 index 45d6b058..00000000 --- a/tests/lean/HashmapMain/Funs.lean +++ /dev/null @@ -1,463 +0,0 @@ --- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [hashmap_main]: function definitions -import Base -import HashmapMain.Types -import HashmapMain.FunsExternal -open Primitives - -namespace hashmap_main - -/- [hashmap_main::hashmap::hash_key]: - Source: 'tests/src/hashmap.rs', lines 35:0-35:32 -/ -def hashmap.hash_key (k : Usize) : Result Usize := - Result.ok k - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: loop 0: - Source: 'tests/src/hashmap.rs', lines 58:4-64:5 -/ -divergent def hashmap.HashMap.allocate_slots_loop - (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (n : Usize) : - Result (alloc.vec.Vec (hashmap.List T)) - := - if n > 0#usize - then - do - let slots1 ← alloc.vec.Vec.push (hashmap.List T) slots hashmap.List.Nil - let n1 ← n - 1#usize - hashmap.HashMap.allocate_slots_loop T slots1 n1 - else Result.ok slots - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: - Source: 'tests/src/hashmap.rs', lines 58:4-58:76 -/ -def hashmap.HashMap.allocate_slots - (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (n : Usize) : - Result (alloc.vec.Vec (hashmap.List T)) - := - hashmap.HashMap.allocate_slots_loop T slots n - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new_with_capacity]: - Source: 'tests/src/hashmap.rs', lines 67:4-71:13 -/ -def hashmap.HashMap.new_with_capacity - (T : Type) (capacity : Usize) (max_load_dividend : Usize) - (max_load_divisor : Usize) : - Result (hashmap.HashMap T) - := - do - let slots ← - hashmap.HashMap.allocate_slots T (alloc.vec.Vec.new (hashmap.List T)) - capacity - let i ← capacity * max_load_dividend - let i1 ← i / max_load_divisor - Result.ok - { - num_entries := 0#usize, - max_load_factor := (max_load_dividend, max_load_divisor), - max_load := i1, - slots := slots - } - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new]: - Source: 'tests/src/hashmap.rs', lines 83:4-83:24 -/ -def hashmap.HashMap.new (T : Type) : Result (hashmap.HashMap T) := - hashmap.HashMap.new_with_capacity T 32#usize 4#usize 5#usize - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: loop 0: - Source: 'tests/src/hashmap.rs', lines 88:4-96:5 -/ -divergent def hashmap.HashMap.clear_loop - (T : Type) (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) : - Result (alloc.vec.Vec (hashmap.List T)) - := - let i1 := alloc.vec.Vec.len (hashmap.List T) slots - if i < i1 - then - do - let (_, index_mut_back) ← - alloc.vec.Vec.index_mut (hashmap.List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) slots i - let i2 ← i + 1#usize - let slots1 ← index_mut_back hashmap.List.Nil - hashmap.HashMap.clear_loop T slots1 i2 - else Result.ok slots - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: - Source: 'tests/src/hashmap.rs', lines 88:4-88:27 -/ -def hashmap.HashMap.clear - (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) := - do - let hm ← hashmap.HashMap.clear_loop T self.slots 0#usize - Result.ok { self with num_entries := 0#usize, slots := hm } - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::len]: - Source: 'tests/src/hashmap.rs', lines 98:4-98:30 -/ -def hashmap.HashMap.len (T : Type) (self : hashmap.HashMap T) : Result Usize := - Result.ok self.num_entries - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 105:4-122:5 -/ -divergent def hashmap.HashMap.insert_in_list_loop - (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) : - Result (Bool × (hashmap.List T)) - := - match ls with - | hashmap.List.Cons ckey cvalue tl => - if ckey = key - then Result.ok (false, hashmap.List.Cons ckey value tl) - else - do - let (b, tl1) ← hashmap.HashMap.insert_in_list_loop T key value tl - Result.ok (b, hashmap.List.Cons ckey cvalue tl1) - | hashmap.List.Nil => - Result.ok (true, hashmap.List.Cons key value hashmap.List.Nil) - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: - Source: 'tests/src/hashmap.rs', lines 105:4-105:71 -/ -def hashmap.HashMap.insert_in_list - (T : Type) (key : Usize) (value : T) (ls : hashmap.List T) : - Result (Bool × (hashmap.List T)) - := - hashmap.HashMap.insert_in_list_loop T key value ls - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_no_resize]: - Source: 'tests/src/hashmap.rs', lines 125:4-125:54 -/ -def hashmap.HashMap.insert_no_resize - (T : Type) (self : hashmap.HashMap T) (key : Usize) (value : T) : - Result (hashmap.HashMap T) - := - do - let hash ← hashmap.hash_key key - let i := alloc.vec.Vec.len (hashmap.List T) self.slots - let hash_mod ← hash % i - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (hashmap.List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots - hash_mod - let (inserted, l1) ← hashmap.HashMap.insert_in_list T key value l - if inserted - then - do - let i1 ← self.num_entries + 1#usize - let v ← index_mut_back l1 - Result.ok { self with num_entries := i1, slots := v } - else do - let v ← index_mut_back l1 - Result.ok { self with slots := v } - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 191:4-204:5 -/ -divergent def hashmap.HashMap.move_elements_from_list_loop - (T : Type) (ntable : hashmap.HashMap T) (ls : hashmap.List T) : - Result (hashmap.HashMap T) - := - match ls with - | hashmap.List.Cons k v tl => - do - let ntable1 ← hashmap.HashMap.insert_no_resize T ntable k v - hashmap.HashMap.move_elements_from_list_loop T ntable1 tl - | hashmap.List.Nil => Result.ok ntable - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: - Source: 'tests/src/hashmap.rs', lines 191:4-191:72 -/ -def hashmap.HashMap.move_elements_from_list - (T : Type) (ntable : hashmap.HashMap T) (ls : hashmap.List T) : - Result (hashmap.HashMap T) - := - hashmap.HashMap.move_elements_from_list_loop T ntable ls - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: loop 0: - Source: 'tests/src/hashmap.rs', lines 179:4-188:5 -/ -divergent def hashmap.HashMap.move_elements_loop - (T : Type) (ntable : hashmap.HashMap T) - (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) : - Result ((hashmap.HashMap T) × (alloc.vec.Vec (hashmap.List T))) - := - let i1 := alloc.vec.Vec.len (hashmap.List T) slots - if i < i1 - then - do - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (hashmap.List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) slots i - let (ls, l1) := core.mem.replace (hashmap.List T) l hashmap.List.Nil - let ntable1 ← hashmap.HashMap.move_elements_from_list T ntable ls - let i2 ← i + 1#usize - let slots1 ← index_mut_back l1 - hashmap.HashMap.move_elements_loop T ntable1 slots1 i2 - else Result.ok (ntable, slots) - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: - Source: 'tests/src/hashmap.rs', lines 179:4-179:95 -/ -def hashmap.HashMap.move_elements - (T : Type) (ntable : hashmap.HashMap T) - (slots : alloc.vec.Vec (hashmap.List T)) (i : Usize) : - Result ((hashmap.HashMap T) × (alloc.vec.Vec (hashmap.List T))) - := - hashmap.HashMap.move_elements_loop T ntable slots i - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::try_resize]: - Source: 'tests/src/hashmap.rs', lines 148:4-148:28 -/ -def hashmap.HashMap.try_resize - (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) := - do - let max_usize ← Scalar.cast .Usize core_u32_max - let capacity := alloc.vec.Vec.len (hashmap.List T) self.slots - let n1 ← max_usize / 2#usize - let (i, i1) := self.max_load_factor - let i2 ← n1 / i - if capacity <= i2 - then - do - let i3 ← capacity * 2#usize - let ntable ← hashmap.HashMap.new_with_capacity T i3 i i1 - let p ← hashmap.HashMap.move_elements T ntable self.slots 0#usize - let (ntable1, _) := p - Result.ok - { - ntable1 - with - num_entries := self.num_entries, max_load_factor := (i, i1) - } - else Result.ok { self with max_load_factor := (i, i1) } - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert]: - Source: 'tests/src/hashmap.rs', lines 137:4-137:48 -/ -def hashmap.HashMap.insert - (T : Type) (self : hashmap.HashMap T) (key : Usize) (value : T) : - Result (hashmap.HashMap T) - := - do - let self1 ← hashmap.HashMap.insert_no_resize T self key value - let i ← hashmap.HashMap.len T self1 - if i > self1.max_load - then hashmap.HashMap.try_resize T self1 - else Result.ok self1 - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 214:4-227:5 -/ -divergent def hashmap.HashMap.contains_key_in_list_loop - (T : Type) (key : Usize) (ls : hashmap.List T) : Result Bool := - match ls with - | hashmap.List.Cons ckey _ tl => - if ckey = key - then Result.ok true - else hashmap.HashMap.contains_key_in_list_loop T key tl - | hashmap.List.Nil => Result.ok false - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: - Source: 'tests/src/hashmap.rs', lines 214:4-214:68 -/ -def hashmap.HashMap.contains_key_in_list - (T : Type) (key : Usize) (ls : hashmap.List T) : Result Bool := - hashmap.HashMap.contains_key_in_list_loop T key ls - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key]: - Source: 'tests/src/hashmap.rs', lines 207:4-207:49 -/ -def hashmap.HashMap.contains_key - (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result Bool := - do - let hash ← hashmap.hash_key key - let i := alloc.vec.Vec.len (hashmap.List T) self.slots - let hash_mod ← hash % i - let l ← - alloc.vec.Vec.index (hashmap.List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots - hash_mod - hashmap.HashMap.contains_key_in_list T key l - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 232:4-245:5 -/ -divergent def hashmap.HashMap.get_in_list_loop - (T : Type) (key : Usize) (ls : hashmap.List T) : Result T := - match ls with - | hashmap.List.Cons ckey cvalue tl => - if ckey = key - then Result.ok cvalue - else hashmap.HashMap.get_in_list_loop T key tl - | hashmap.List.Nil => Result.fail .panic - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: - Source: 'tests/src/hashmap.rs', lines 232:4-232:70 -/ -def hashmap.HashMap.get_in_list - (T : Type) (key : Usize) (ls : hashmap.List T) : Result T := - hashmap.HashMap.get_in_list_loop T key ls - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get]: - Source: 'tests/src/hashmap.rs', lines 247:4-247:55 -/ -def hashmap.HashMap.get - (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result T := - do - let hash ← hashmap.hash_key key - let i := alloc.vec.Vec.len (hashmap.List T) self.slots - let hash_mod ← hash % i - let l ← - alloc.vec.Vec.index (hashmap.List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots - hash_mod - hashmap.HashMap.get_in_list T key l - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 253:4-262:5 -/ -divergent def hashmap.HashMap.get_mut_in_list_loop - (T : Type) (ls : hashmap.List T) (key : Usize) : - Result (T × (T → Result (hashmap.List T))) - := - match ls with - | hashmap.List.Cons ckey cvalue tl => - if ckey = key - then - let back := fun ret => Result.ok (hashmap.List.Cons ckey ret tl) - Result.ok (cvalue, back) - else - do - let (t, back) ← hashmap.HashMap.get_mut_in_list_loop T tl key - let back1 := - fun ret => - do - let tl1 ← back ret - Result.ok (hashmap.List.Cons ckey cvalue tl1) - Result.ok (t, back1) - | hashmap.List.Nil => Result.fail .panic - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: - Source: 'tests/src/hashmap.rs', lines 253:4-253:86 -/ -def hashmap.HashMap.get_mut_in_list - (T : Type) (ls : hashmap.List T) (key : Usize) : - Result (T × (T → Result (hashmap.List T))) - := - hashmap.HashMap.get_mut_in_list_loop T ls key - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]: - Source: 'tests/src/hashmap.rs', lines 265:4-265:67 -/ -def hashmap.HashMap.get_mut - (T : Type) (self : hashmap.HashMap T) (key : Usize) : - Result (T × (T → Result (hashmap.HashMap T))) - := - do - let hash ← hashmap.hash_key key - let i := alloc.vec.Vec.len (hashmap.List T) self.slots - let hash_mod ← hash % i - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (hashmap.List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots - hash_mod - let (t, get_mut_in_list_back) ← hashmap.HashMap.get_mut_in_list T l key - let back := - fun ret => - do - let l1 ← get_mut_in_list_back ret - let v ← index_mut_back l1 - Result.ok { self with slots := v } - Result.ok (t, back) - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 273:4-299:5 -/ -divergent def hashmap.HashMap.remove_from_list_loop - (T : Type) (key : Usize) (ls : hashmap.List T) : - Result ((Option T) × (hashmap.List T)) - := - match ls with - | hashmap.List.Cons ckey t tl => - if ckey = key - then - let (mv_ls, _) := - core.mem.replace (hashmap.List T) (hashmap.List.Cons ckey t tl) - hashmap.List.Nil - match mv_ls with - | hashmap.List.Cons _ cvalue tl1 => Result.ok (some cvalue, tl1) - | hashmap.List.Nil => Result.fail .panic - else - do - let (o, tl1) ← hashmap.HashMap.remove_from_list_loop T key tl - Result.ok (o, hashmap.List.Cons ckey t tl1) - | hashmap.List.Nil => Result.ok (none, hashmap.List.Nil) - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: - Source: 'tests/src/hashmap.rs', lines 273:4-273:69 -/ -def hashmap.HashMap.remove_from_list - (T : Type) (key : Usize) (ls : hashmap.List T) : - Result ((Option T) × (hashmap.List T)) - := - hashmap.HashMap.remove_from_list_loop T key ls - -/- [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove]: - Source: 'tests/src/hashmap.rs', lines 302:4-302:52 -/ -def hashmap.HashMap.remove - (T : Type) (self : hashmap.HashMap T) (key : Usize) : - Result ((Option T) × (hashmap.HashMap T)) - := - do - let hash ← hashmap.hash_key key - let i := alloc.vec.Vec.len (hashmap.List T) self.slots - let hash_mod ← hash % i - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (hashmap.List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (hashmap.List T)) self.slots - hash_mod - let (x, l1) ← hashmap.HashMap.remove_from_list T key l - match x with - | none => - do - let v ← index_mut_back l1 - Result.ok (none, { self with slots := v }) - | some x1 => - do - let i1 ← self.num_entries - 1#usize - let v ← index_mut_back l1 - Result.ok (some x1, { self with num_entries := i1, slots := v }) - -/- [hashmap_main::hashmap::test1]: - Source: 'tests/src/hashmap.rs', lines 323:0-323:10 -/ -def hashmap.test1 : Result Unit := - do - let hm ← hashmap.HashMap.new U64 - let hm1 ← hashmap.HashMap.insert U64 hm 0#usize 42#u64 - let hm2 ← hashmap.HashMap.insert U64 hm1 128#usize 18#u64 - let hm3 ← hashmap.HashMap.insert U64 hm2 1024#usize 138#u64 - let hm4 ← hashmap.HashMap.insert U64 hm3 1056#usize 256#u64 - let i ← hashmap.HashMap.get U64 hm4 128#usize - if ¬ (i = 18#u64) - then Result.fail .panic - else - do - let (_, get_mut_back) ← hashmap.HashMap.get_mut U64 hm4 1024#usize - let hm5 ← get_mut_back 56#u64 - let i1 ← hashmap.HashMap.get U64 hm5 1024#usize - if ¬ (i1 = 56#u64) - then Result.fail .panic - else - do - let (x, hm6) ← hashmap.HashMap.remove U64 hm5 1024#usize - match x with - | none => Result.fail .panic - | some x1 => - if ¬ (x1 = 56#u64) - then Result.fail .panic - else - do - let i2 ← hashmap.HashMap.get U64 hm6 0#usize - if ¬ (i2 = 42#u64) - then Result.fail .panic - else - do - let i3 ← hashmap.HashMap.get U64 hm6 128#usize - if ¬ (i3 = 18#u64) - then Result.fail .panic - else - do - let i4 ← hashmap.HashMap.get U64 hm6 1056#usize - if ¬ (i4 = 256#u64) - then Result.fail .panic - else Result.ok () - -/- [hashmap_main::insert_on_disk]: - Source: 'tests/src/hashmap_main.rs', lines 13:0-13:43 -/ -def insert_on_disk - (key : Usize) (value : U64) (st : State) : Result (State × Unit) := - do - let (st1, hm) ← hashmap_utils.deserialize st - let hm1 ← hashmap.HashMap.insert U64 hm key value - hashmap_utils.serialize hm1 st1 - -/- [hashmap_main::main]: - Source: 'tests/src/hashmap_main.rs', lines 22:0-22:13 -/ -def main : Result Unit := - Result.ok () - -end hashmap_main diff --git a/tests/lean/HashmapMain/FunsExternal.lean b/tests/lean/HashmapMain/FunsExternal.lean deleted file mode 100644 index b394b32b..00000000 --- a/tests/lean/HashmapMain/FunsExternal.lean +++ /dev/null @@ -1,17 +0,0 @@ --- [hashmap_main]: templates for the external functions. -import Base -import HashmapMain.Types -open Primitives -open hashmap_main - --- TODO: fill those bodies - -/- [hashmap_main::hashmap_utils::deserialize] -/ -def hashmap_utils.deserialize - : State → Result (State × (hashmap.HashMap U64)) := - fun _ => .fail .panic - -/- [hashmap_main::hashmap_utils::serialize] -/ -def hashmap_utils.serialize - : hashmap.HashMap U64 → State → Result (State × Unit) := - fun _ _ => .fail .panic diff --git a/tests/lean/HashmapMain/FunsExternal_Template.lean b/tests/lean/HashmapMain/FunsExternal_Template.lean deleted file mode 100644 index 1a6c40d5..00000000 --- a/tests/lean/HashmapMain/FunsExternal_Template.lean +++ /dev/null @@ -1,18 +0,0 @@ --- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [hashmap_main]: external functions. --- This is a template file: rename it to "FunsExternal.lean" and fill the holes. -import Base -import HashmapMain.Types -open Primitives -open hashmap_main - -/- [hashmap_main::hashmap_utils::deserialize]: - Source: 'tests/src/hashmap_utils.rs', lines 11:0-11:43 -/ -axiom hashmap_utils.deserialize - : State → Result (State × (hashmap.HashMap U64)) - -/- [hashmap_main::hashmap_utils::serialize]: - Source: 'tests/src/hashmap_utils.rs', lines 6:0-6:42 -/ -axiom hashmap_utils.serialize - : hashmap.HashMap U64 → State → Result (State × Unit) - diff --git a/tests/lean/HashmapMain/Opaque.lean b/tests/lean/HashmapMain/Opaque.lean deleted file mode 100644 index a410b253..00000000 --- a/tests/lean/HashmapMain/Opaque.lean +++ /dev/null @@ -1,18 +0,0 @@ --- [hashmap_main]: opaque function definitions -import Base -import HashmapMain.Types -open Primitives - -namespace hashmap_main - -structure OpaqueDefs where - - /- [hashmap_main::hashmap_utils::deserialize] -/ - hashmap_utils.deserialize_fwd - : State → Result (State × (hashmap_hash_map_t U64)) - - /- [hashmap_main::hashmap_utils::serialize] -/ - hashmap_utils.serialize_fwd - : hashmap_hash_map_t U64 → State → Result (State × Unit) - -end hashmap_main diff --git a/tests/lean/HashmapMain/Types.lean b/tests/lean/HashmapMain/Types.lean deleted file mode 100644 index 54f11e1e..00000000 --- a/tests/lean/HashmapMain/Types.lean +++ /dev/null @@ -1,23 +0,0 @@ --- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS --- [hashmap_main]: type definitions -import Base -import HashmapMain.TypesExternal -open Primitives - -namespace hashmap_main - -/- [hashmap_main::hashmap::List] - Source: 'tests/src/hashmap.rs', lines 27:0-27:16 -/ -inductive hashmap.List (T : Type) := -| Cons : Usize → T → hashmap.List T → hashmap.List T -| Nil : hashmap.List T - -/- [hashmap_main::hashmap::HashMap] - Source: 'tests/src/hashmap.rs', lines 43:0-43:21 -/ -structure hashmap.HashMap (T : Type) where - num_entries : Usize - max_load_factor : (Usize × Usize) - max_load : Usize - slots : alloc.vec.Vec (hashmap.List T) - -end hashmap_main diff --git a/tests/lean/Issue194RecursiveStructProjector.lean b/tests/lean/Issue194RecursiveStructProjector.lean new file mode 100644 index 00000000..4eb23934 --- /dev/null +++ b/tests/lean/Issue194RecursiveStructProjector.lean @@ -0,0 +1,35 @@ +-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS +-- [issue_194_recursive_struct_projector] +import Base +open Primitives + +namespace issue_194_recursive_struct_projector + +/- [issue_194_recursive_struct_projector::AVLNode] + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 2:0-2:17 -/ +inductive AVLNode (T : Type) := +| mk : T → Option (AVLNode T) → Option (AVLNode T) → AVLNode T + +@[simp, reducible] +def AVLNode.value {T : Type} (x : AVLNode T) := + match x with | AVLNode.mk x1 _ _ => x1 + +@[simp, reducible] +def AVLNode.left {T : Type} (x : AVLNode T) := + match x with | AVLNode.mk _ x1 _ => x1 + +@[simp, reducible] +def AVLNode.right {T : Type} (x : AVLNode T) := + match x with | AVLNode.mk _ _ x1 => x1 + +/- [issue_194_recursive_struct_projector::get_val]: + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 10:0-10:33 -/ +def get_val (T : Type) (x : AVLNode T) : Result T := + Result.ok x.value + +/- [issue_194_recursive_struct_projector::get_left]: + Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 14:0-14:43 -/ +def get_left (T : Type) (x : AVLNode T) : Result (Option (AVLNode T)) := + Result.ok x.left + +end issue_194_recursive_struct_projector diff --git a/tests/lean/Matches.lean b/tests/lean/Matches.lean new file mode 100644 index 00000000..3e3a558b --- /dev/null +++ b/tests/lean/Matches.lean @@ -0,0 +1,16 @@ +-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS +-- [matches] +import Base +open Primitives + +namespace matches + +/- [matches::match_u32]: + Source: 'tests/src/matches.rs', lines 4:0-4:27 -/ +def match_u32 (x : U32) : Result U32 := + match x with + | 0#u32 => Result.ok 0#u32 + | 1#u32 => Result.ok 1#u32 + | _ => Result.ok 2#u32 + +end matches diff --git a/tests/lean/lakefile.lean b/tests/lean/lakefile.lean index 3a777824..ba336a4a 100644 --- a/tests/lean/lakefile.lean +++ b/tests/lean/lakefile.lean @@ -9,11 +9,10 @@ require base from "../../backends/lean" package «tests» {} @[default_target] lean_lib Tutorial -@[default_target] lean_lib BetreeMain +@[default_target] lean_lib Betree @[default_target] lean_lib Constants @[default_target] lean_lib External @[default_target] lean_lib Hashmap -@[default_target] lean_lib HashmapMain @[default_target] lean_lib Loops @[default_target] lean_lib NoNestedBorrows @[default_target] lean_lib Paper diff --git a/tests/src/betree/aeneas-test-options b/tests/src/betree/aeneas-test-options new file mode 100644 index 00000000..c71e01df --- /dev/null +++ b/tests/src/betree/aeneas-test-options @@ -0,0 +1,4 @@ +charon-args=--polonius --opaque=betree_utils +aeneas-args=-backward-no-state-update -test-trans-units -state -split-files +[coq] aeneas-args=-use-fuel +[fstar] aeneas-args=-decreases-clauses -template-clauses diff --git a/tests/src/hashmap.rs b/tests/src/hashmap.rs index 4552e4f2..19832a84 100644 --- a/tests/src/hashmap.rs +++ b/tests/src/hashmap.rs @@ -1,9 +1,11 @@ +//@ charon-args=--opaque=utils +//@ aeneas-args=-state -split-files //@ [coq] aeneas-args=-use-fuel -//@ aeneas-args=-split-files //@ [fstar] aeneas-args=-decreases-clauses -template-clauses //@ [lean] aeneas-args=-no-gen-lib-entry // ^ the `-no-gen-lib-entry` is because we add a custom import in the Hashmap.lean file: we do not // want to overwrite it. +// Possible to add `--no-code-duplication` if we use the optimized MIR // TODO: reactivate -test-trans-units //! A hashmap implementation. @@ -314,6 +316,31 @@ impl<T> HashMap<T> { } } +// This is a module so we can tell charon to leave it opaque +mod utils { + use crate::*; + + /// Serialize a hash map - we don't have traits, so we fix the type of the + /// values (this is not the interesting part anyway) + pub(crate) fn serialize(_hm: HashMap<u64>) { + unimplemented!(); + } + /// Deserialize a hash map - we don't have traits, so we fix the type of the + /// values (this is not the interesting part anyway) + pub(crate) fn deserialize() -> HashMap<u64> { + unimplemented!(); + } +} + +pub fn insert_on_disk(key: Key, value: u64) { + // Deserialize + let mut hm = utils::deserialize(); + // Update + hm.insert(key, value); + // Serialize + utils::serialize(hm); +} + /// I currently can't retrieve functions marked with the attribute #[test], /// while I want to extract the unit tests and use the normalize on them, /// so I have to define the test functions somewhere and call them from diff --git a/tests/src/hashmap_main.rs b/tests/src/hashmap_main.rs deleted file mode 100644 index 0c827844..00000000 --- a/tests/src/hashmap_main.rs +++ /dev/null @@ -1,22 +0,0 @@ -//@ charon-args=--opaque=hashmap_utils -//@ aeneas-args=-state -split-files -//@ [coq] aeneas-args=-use-fuel -//@ [fstar] aeneas-args=-decreases-clauses -template-clauses -// Possible to add `--no-code-duplication` if we use the optimized MIR -// TODO: reactivate -test-trans-units -mod hashmap; -mod hashmap_utils; - -use crate::hashmap::*; -use crate::hashmap_utils::*; - -pub fn insert_on_disk(key: Key, value: u64) { - // Deserialize - let mut hm = deserialize(); - // Update - hm.insert(key, value); - // Serialize - serialize(hm); -} - -pub fn main() {} diff --git a/tests/src/hashmap_utils.rs b/tests/src/hashmap_utils.rs deleted file mode 100644 index 33de49e1..00000000 --- a/tests/src/hashmap_utils.rs +++ /dev/null @@ -1,13 +0,0 @@ -//@ skip -use crate::hashmap::*; - -/// Serialize a hash map - we don't have traits, so we fix the type of the -/// values (this is not the interesting part anyway) -pub(crate) fn serialize(_hm: HashMap<u64>) { - unimplemented!(); -} -/// Deserialize a hash map - we don't have traits, so we fix the type of the -/// values (this is not the interesting part anyway) -pub(crate) fn deserialize() -> HashMap<u64> { - unimplemented!(); -} diff --git a/tests/src/infinite-loop.rs b/tests/src/infinite-loop.rs new file mode 100644 index 00000000..906fc1fa --- /dev/null +++ b/tests/src/infinite-loop.rs @@ -0,0 +1,11 @@ +//@ [coq,fstar,lean] skip +//@ [coq,fstar] aeneas-args=-use-fuel +//@ [coq,fstar] subdir=misc +// FIXME: make it work +fn bar() {} + +fn foo() { + loop { + bar() + } +} diff --git a/tests/src/issue-194-recursive-struct-projector.rs b/tests/src/issue-194-recursive-struct-projector.rs new file mode 100644 index 00000000..9ebdc2bc --- /dev/null +++ b/tests/src/issue-194-recursive-struct-projector.rs @@ -0,0 +1,16 @@ +//@ [coq,fstar] subdir=misc +struct AVLNode<T> { + value: T, + left: AVLTree<T>, + right: AVLTree<T>, +} + +type AVLTree<T> = Option<Box<AVLNode<T>>>; + +fn get_val<T>(x: AVLNode<T>) -> T { + x.value +} + +fn get_left<T>(x: AVLNode<T>) -> AVLTree<T> { + x.left +} diff --git a/tests/src/matches.rs b/tests/src/matches.rs new file mode 100644 index 00000000..5710a604 --- /dev/null +++ b/tests/src/matches.rs @@ -0,0 +1,10 @@ +//@ [coq] skip +//@ [coq,fstar] subdir=misc +//^ note: coq gives "invalid notation for pattern" +fn match_u32(x: u32) -> u32 { + match x { + 0 => 0, + 1 => 1, + _ => 2, + } +} diff --git a/tests/test_runner/run_test.ml b/tests/test_runner/run_test.ml index 1c885d4b..c626b4d1 100644 --- a/tests/test_runner/run_test.ml +++ b/tests/test_runner/run_test.ml @@ -100,32 +100,6 @@ module Command = struct | Failure -> () end -let aeneas_options_for_test backend test_name = - if test_name = "betree" then - let options = - [ - "-backward-no-state-update"; - "-test-trans-units"; - "-state"; - "-split-files"; - ] - in - let extra_options = - match backend with - | Backend.Coq -> [ "-use-fuel" ] - | Backend.FStar -> [ "-decreases-clauses"; "-template-clauses" ] - | _ -> [] - in - List.append extra_options options - else [] - -(* File-specific options *) -let charon_options_for_test test_name = - match test_name with - | "betree" -> - [ "--polonius"; "--opaque=betree_utils"; "--crate"; "betree_main" ] - | _ -> [] - (* The data for a specific test input *) module Input = struct type kind = SingleFile | Crate @@ -219,13 +193,10 @@ module Input = struct else failwith ("`" ^ path ^ "` is not a file or a directory.") in let actions = BackendMap.make (fun _ -> Normal) in - let charon_options = charon_options_for_test name in let subdirs = BackendMap.make (fun backend -> default_subdir backend name) in - let aeneas_options = - BackendMap.make (fun backend -> aeneas_options_for_test backend name) - in + let aeneas_options = BackendMap.make (fun _ -> []) in let check_output = BackendMap.make (fun _ -> true) in let input = { @@ -233,12 +204,14 @@ module Input = struct name; kind; actions; - charon_options; + charon_options = []; subdirs; aeneas_options; check_output; } in + (* For crates, we store the special comments in a separate file. *) + let crate_config_file = Filename.concat path "aeneas-test-options" in match kind with | SingleFile -> let file_lines = Core.In_channel.read_lines path in @@ -252,15 +225,18 @@ module Input = struct List.fold_left (fun input comment -> apply_special_comment comment input) input special_comments + | Crate when Sys.file_exists crate_config_file -> + let special_comments = Core.In_channel.read_lines crate_config_file in + List.fold_left + (fun input comment -> apply_special_comment comment input) + input special_comments | Crate -> input end (* Run Aeneas on a specific input with the given options *) let run_aeneas (env : runner_env) (case : Input.t) (backend : Backend.t) = - (* FIXME: remove this special case *) let backend_str = Backend.to_string backend in - let test_name = if case.name = "betree" then "betree_main" else case.name in - let input_file = concat_path [ env.llbc_dir; test_name ] ^ ".llbc" in + let input_file = concat_path [ env.llbc_dir; case.name ] ^ ".llbc" in let output_file = Filename.remove_extension case.path ^ "." ^ backend_str ^ ".out" in @@ -303,6 +279,7 @@ let run_aeneas (env : runner_env) (case : Input.t) (backend : Backend.t) = let cmd = { cmd with redirect_out = Some out } in Command.run_command_expecting_failure cmd; Unix.close out + (* Run Charon on a specific input with the given options *) let run_charon (env : runner_env) (case : Input.t) = match case.kind with |