Make minor fixes, improve formatting for Lean and generate code for all the test suite

8 files changed, 1418 insertions, 129 deletions

diff --git a/tests/lean/hashmap/Base/Primitives.lean b/tests/lean/hashmap/Base/Primitives.lean
new file mode 100644
index 00000000..79958d94
--- /dev/null
+++ b/tests/lean/hashmap/Base/Primitives.lean
@@ -0,0 +1,373 @@
+import Lean
+import Lean.Meta.Tactic.Simp
+import Init.Data.List.Basic
+import Mathlib.Tactic.RunCmd
+
+-------------
+-- PRELUDE --
+-------------
+
+-- Results & monadic combinators
+
+-- TODO: use syntactic conventions and capitalize error, result, etc.
+
+inductive error where
+   | assertionFailure: error
+   | integerOverflow: error
+   | arrayOutOfBounds: error
+   | maximumSizeExceeded: error
+   | panic: error
+deriving Repr, BEq
+
+open error
+
+inductive result (α : Type u) where
+  | ret (v: α): result α
+  | fail (e: error): result α 
+deriving Repr, BEq
+
+open result
+
+/- HELPERS -/
+
+-- TODO: is there automated syntax for these discriminators?
+def is_ret {α: Type} (r: result α): Bool :=
+  match r with
+  | result.ret _ => true
+  | result.fail _ => false
+
+def massert (b:Bool) : result Unit :=
+  if b then .ret () else fail assertionFailure
+
+def eval_global {α: Type} (x: result α) (_: is_ret x): α :=
+  match x with
+  | result.fail _ => by contradiction
+  | result.ret x => x
+
+/- DO-DSL SUPPORT -/
+
+def bind (x: result α) (f: α -> result β) : result β :=
+  match x with
+  | ret v  => f v 
+  | fail v => fail v
+
+-- Allows using result in do-blocks
+instance : Bind result where
+  bind := bind
+
+-- Allows using return x in do-blocks
+instance : Pure result where
+  pure := fun x => ret x
+
+/- CUSTOM-DSL SUPPORT -/
+
+-- Let-binding the result of a monadic operation is oftentimes not sufficient,
+-- because we may need a hypothesis for equational reasoning in the scope. We
+-- rely on subtype, and a custom let-binding operator, in effect recreating our
+-- own variant of the do-dsl
+
+def result.attach : (o : result α) → result { x : α // o = ret x }
+  | .ret x => .ret ⟨x, rfl⟩
+  | .fail e   => .fail e
+
+macro "let" h:ident " : " e:term " <-- " f:term : doElem =>
+  `(doElem| let ⟨$e, $h⟩ ← result.attach $f)
+
+-- Silly example of the kind of reasoning that this notation enables
+#eval do
+  let h: y <-- .ret (0: Nat)
+  let _: y = 0 := by cases h; decide
+  let r: { x: Nat // x = 0 } := ⟨ y, by assumption ⟩
+  .ret r
+
+----------------------
+-- MACHINE INTEGERS --
+----------------------
+
+-- NOTE: we reuse the USize type from prelude.lean, because at least we know
+-- it's defined in an idiomatic style that is going to make proofs easy (and
+-- indeed, several proofs here are much shortened compared to Aymeric's earlier
+-- attempt.) This is not stricto sensu the *correct* thing to do, because one
+-- can query at run-time the value of USize, which we do *not* want to do (we
+-- don't know what target we'll run on!), but when the day comes, we'll just
+-- define our own USize.
+-- ANOTHER NOTE: there is USize.sub but it has wraparound semantics, which is
+-- not something we want to define (I think), so we use our own monadic sub (but
+-- is it in line with the Rust behavior?)
+
+-- TODO: I am somewhat under the impression that subtraction is defined as a
+-- total function over nats...? the hypothesis in the if condition is not used
+-- in the then-branch which confuses me quite a bit
+
+-- TODO: add a refinement for the result (just like vec_push_back below) that
+-- explains that the toNat of the result (in the case of success) is the sub of
+-- the toNat of the arguments (i.e. intrinsic specification)
+-- ... do we want intrinsic specifications for the builtins? that might require
+-- some careful type annotations in the monadic notation for clients, but may
+-- give us more "for free"
+
+-- Note from Chris Bailey: "If there's more than one salient property of your
+-- definition then the subtyping strategy might get messy, and the property part
+-- of a subtype is less discoverable by the simplifier or tactics like
+-- library_search." Try to settle this with a Lean expert on what is the most
+-- productive way to go about this?
+
+-- One needs to perform a little bit of reasoning in order to successfully
+-- inject constants into USize, so we provide a general-purpose macro
+
+syntax "intlit" : tactic
+
+macro_rules
+  | `(tactic| intlit) => `(tactic|
+    match USize.size, usize_size_eq with
+    | _, Or.inl rfl => decide
+    | _, Or.inr rfl => decide)
+
+-- This is how the macro is expected to be used
+#eval USize.ofNatCore 0 (by intlit)
+
+-- Also works for other integer types (at the expense of a needless disjunction)
+#eval UInt32.ofNatCore 0 (by intlit)
+
+-- Further thoughts: look at what has been done here:
+-- https://github.com/leanprover-community/mathlib4/blob/master/Mathlib/Data/Fin/Basic.lean
+-- and
+-- https://github.com/leanprover-community/mathlib4/blob/master/Mathlib/Data/UInt.lean
+-- which both contain a fair amount of reasoning already!
+def USize.checked_sub (n: USize) (m: USize): result USize :=
+  -- NOTE: the test USize.toNat n - m >= 0 seems to always succeed?
+  if n >= m then
+    let n' := USize.toNat n
+    let m' := USize.toNat n
+    let r := USize.ofNatCore (n' - m') (by
+      have h: n' - m' <= n' := by
+        apply Nat.sub_le_of_le_add
+        case h => rewrite [ Nat.add_comm ]; apply Nat.le_add_left
+      apply Nat.lt_of_le_of_lt h
+      apply n.val.isLt
+    )
+    return r
+  else
+    fail integerOverflow
+
+def USize.checked_add (n: USize) (m: USize): result USize :=
+  if h: n.val.val + m.val.val <= 4294967295 then
+    .ret ⟨ n.val.val + m.val.val, by
+      have h': 4294967295 < USize.size := by intlit
+      apply Nat.lt_of_le_of_lt h h'
+    ⟩
+  else if h: n.val + m.val < USize.size then
+    .ret ⟨ n.val + m.val, h ⟩
+  else
+    .fail integerOverflow
+
+def USize.checked_rem (n: USize) (m: USize): result USize :=
+  if h: m > 0 then
+    .ret ⟨ n.val % m.val, by
+      have h1: ↑m.val < USize.size := m.val.isLt
+      have h2: n.val.val % m.val.val < m.val.val := @Nat.mod_lt n.val m.val h
+      apply Nat.lt_trans h2 h1
+    ⟩
+  else
+    .fail integerOverflow
+
+def USize.checked_mul (n: USize) (m: USize): result USize :=
+    if h: n.val.val * m.val.val <= 4294967295 then
+    .ret ⟨ n.val.val * m.val.val, by
+      have h': 4294967295 < USize.size := by intlit
+      apply Nat.lt_of_le_of_lt h h'
+    ⟩
+  else if h: n.val * m.val < USize.size then
+    .ret ⟨ n.val * m.val, h ⟩
+  else
+    .fail integerOverflow
+
+def USize.checked_div (n: USize) (m: USize): result USize :=
+  if m > 0 then
+    .ret ⟨ n.val / m.val, by
+      have h1: ↑n.val < USize.size := n.val.isLt
+      have h2: n.val.val / m.val.val <= n.val.val := @Nat.div_le_self n.val m.val
+      apply Nat.lt_of_le_of_lt h2 h1
+    ⟩
+  else
+    .fail integerOverflow
+
+class MachineInteger (t: Type) where
+  size: Nat
+  val: t -> Fin size
+  ofNatCore: (n:Nat) -> LT.lt n size -> t
+
+set_option hygiene false in
+run_cmd
+  for typeName in [`UInt8, `UInt16, `UInt32, `UInt64, `USize].map Lean.mkIdent do
+  Lean.Elab.Command.elabCommand (← `(
+    namespace $typeName
+    instance: MachineInteger $typeName where
+      size := size
+      val := val
+      ofNatCore := ofNatCore
+    end $typeName
+  ))
+
+def scalar_cast { src: Type } (dst: Type) [ MachineInteger src ] [ MachineInteger dst ] (x: src): result dst :=
+  if h: MachineInteger.val x < MachineInteger.size dst then
+    .ret (MachineInteger.ofNatCore (MachineInteger.val x).val h)
+  else
+    .fail integerOverflow
+
+
+-- Test behavior...
+#eval assert! USize.checked_sub 10 20 == fail integerOverflow; 0
+
+#eval USize.checked_sub 20 10
+-- NOTE: compare with concrete behavior here, which I do not think we want
+#eval USize.sub 0 1
+#eval UInt8.add 255 255
+
+-------------
+-- VECTORS --
+-------------
+
+-- Note: unlike F*, Lean seems to use strict upper bounds (e.g. USize.size)
+-- rather than maximum values (usize_max).
+def vec (α : Type u) := { l : List α // List.length l < USize.size }
+
+def vec_new (α : Type u): vec α := ⟨ [], by {
+  match USize.size, usize_size_eq with
+  | _, Or.inl rfl => simp
+  | _, Or.inr rfl => simp
+  } ⟩
+
+#check vec_new
+
+def vec_len (α : Type u) (v : vec α) : USize :=
+  let ⟨ v, l ⟩ := v
+  USize.ofNatCore (List.length v) l
+
+#eval vec_len Nat (vec_new Nat)
+ 
+def vec_push_fwd (α : Type u) (_ : vec α) (_ : α) : Unit := ()
+
+-- NOTE: old version trying to use a subtype notation, but probably better to
+-- leave result elimination to auxiliary lemmas with suitable preconditions
+-- TODO: I originally wrote `List.length v.val < USize.size - 1`; how can one
+-- make the proof work in that case? Probably need to import tactics from
+-- mathlib to deal with inequalities... would love to see an example.
+def vec_push_back_old (α : Type u) (v : vec α) (x : α) : { res: result (vec α) //
+  match res with | fail _ => True | ret v' => List.length v'.val = List.length v.val + 1}
+  :=
+  if h : List.length v.val + 1 < USize.size then
+    ⟨ return ⟨List.concat v.val x,
+      by
+        rw [List.length_concat]
+        assumption
+     ⟩, by simp ⟩
+  else
+    ⟨ fail maximumSizeExceeded, by simp ⟩
+
+#eval do
+  -- NOTE: the // notation is syntactic sugar for Subtype, a refinement with
+  -- fields val and property. However, Lean's elaborator can automatically
+  -- select the `val` field if the context provides a type annotation. We
+  -- annotate `x`, which relieves us of having to write `.val` on the right-hand
+  -- side of the monadic let.
+  let v := vec_new Nat
+  let x: vec Nat ← (vec_push_back_old Nat v 1: result (vec Nat)) -- WHY do we need the type annotation here?
+  -- TODO: strengthen post-condition above and do a demo to show that we can
+  -- safely eliminate the `fail` case
+  return (vec_len Nat x)
+
+def vec_push_back (α : Type u) (v : vec α) (x : α) : result (vec α)
+  :=
+  if h : List.length v.val + 1 <= 4294967295 then
+    return ⟨ List.concat v.val x,
+      by
+        rw [List.length_concat]
+        have h': 4294967295 < USize.size := by intlit
+        apply Nat.lt_of_le_of_lt h h'
+    ⟩
+  else if h: List.length v.val + 1 < USize.size then
+    return ⟨List.concat v.val x,
+      by
+        rw [List.length_concat]
+        assumption
+     ⟩
+  else
+    fail maximumSizeExceeded
+
+def vec_insert_fwd (α : Type u) (v: vec α) (i: USize) (_: α): result Unit :=
+  if i.val < List.length v.val then
+    .ret ()
+  else
+    .fail arrayOutOfBounds
+
+def vec_insert_back (α : Type u) (v: vec α) (i: USize) (x: α): result (vec α) :=
+  if i.val < List.length v.val then
+    .ret ⟨ List.set v.val i.val x, by
+      have h: List.length v.val < USize.size := v.property
+      rewrite [ List.length_set v.val i.val x ]
+      assumption
+    ⟩
+  else
+    .fail arrayOutOfBounds
+
+def vec_index_fwd (α : Type u) (v: vec α) (i: USize): result α :=
+  if h: i.val < List.length v.val then
+    .ret (List.get v.val ⟨i.val, h⟩)
+  else
+    .fail arrayOutOfBounds
+
+def vec_index_back (α : Type u) (v: vec α) (i: USize) (_: α): result Unit :=
+  if i.val < List.length v.val then
+    .ret ()
+  else
+    .fail arrayOutOfBounds
+
+def vec_index_mut_fwd (α : Type u) (v: vec α) (i: USize): result α :=
+  if h: i.val < List.length v.val then
+    .ret (List.get v.val ⟨i.val, h⟩)
+  else
+    .fail arrayOutOfBounds
+
+def vec_index_mut_back (α : Type u) (v: vec α) (i: USize) (x: α): result (vec α) :=
+  if i.val < List.length v.val then
+    .ret ⟨ List.set v.val i.val x, by
+      have h: List.length v.val < USize.size := v.property
+      rewrite [ List.length_set v.val i.val x ]
+      assumption
+    ⟩
+  else
+    .fail arrayOutOfBounds
+
+----------
+-- MISC --
+----------
+
+def mem_replace_fwd (a : Type) (x : a) (_ : a) : a :=
+  x
+
+def mem_replace_back (a : Type) (_ : a) (y : a) : a :=
+  y
+
+--------------------
+-- ASSERT COMMAND --
+--------------------
+
+open Lean Elab Command Term Meta
+
+syntax (name := assert) "#assert" term: command
+
+@[command_elab assert]
+def assertImpl : CommandElab := fun (_stx: Syntax) => do
+  logInfo "Reducing and asserting: "
+  logInfo _stx[1]
+  runTermElabM (fun _ => do
+    let e ← Term.elabTerm _stx[1] none
+    logInfo (Expr.dbgToString e)
+    -- How to evaluate the term and compare the result to true?
+    pure ())
+  -- logInfo (Expr.dbgToString (``true))
+  -- throwError "TODO: assert"
+
+#eval 2 == 2
+#assert (2 == 2)
diff --git a/tests/lean/hashmap/Hashmap/Clauses/Clauses.lean b/tests/lean/hashmap/Hashmap/Clauses/Clauses.lean
new file mode 100644
index 00000000..eec8ef96
--- /dev/null
+++ b/tests/lean/hashmap/Hashmap/Clauses/Clauses.lean
@@ -0,0 +1,107 @@
+-- [hashmap]: the decreases clauses
+import Base.Primitives
+import Hashmap.Types
+
+/- [hashmap::HashMap::{0}::allocate_slots]: termination measure -/
+@[simp]
+def hash_map_allocate_slots_loop_terminates (T : Type) (slots : vec (list_t T))
+  (n : USize) :=
+  (slots, n)
+
+syntax "hash_map_allocate_slots_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_allocate_slots_loop_decreases $slots $n) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::clear]: termination measure -/
+@[simp]
+def hash_map_clear_loop_terminates (T : Type) (slots : vec (list_t T))
+  (i : USize) :=
+  (slots, i)
+
+syntax "hash_map_clear_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_clear_loop_decreases $slots $i) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::insert_in_list]: termination measure -/
+@[simp]
+def hash_map_insert_in_list_loop_terminates (T : Type) (key : USize)
+  (value : T) (ls : list_t T) :=
+  (key, value, ls)
+
+syntax "hash_map_insert_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_insert_in_list_loop_decreases $key $value $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::move_elements_from_list]: termination measure -/
+@[simp]
+def hash_map_move_elements_from_list_loop_terminates (T : Type)
+  (ntable : hash_map_t T) (ls : list_t T) :=
+  (ntable, ls)
+
+syntax "hash_map_move_elements_from_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_move_elements_from_list_loop_decreases $ntable $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::move_elements]: termination measure -/
+@[simp]
+def hash_map_move_elements_loop_terminates (T : Type) (ntable : hash_map_t T)
+  (slots : vec (list_t T)) (i : USize) :=
+  (ntable, slots, i)
+
+syntax "hash_map_move_elements_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_move_elements_loop_decreases $ntable $slots $i) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::contains_key_in_list]: termination measure -/
+@[simp]
+def hash_map_contains_key_in_list_loop_terminates (T : Type) (key : USize)
+  (ls : list_t T) :=
+  (key, ls)
+
+syntax "hash_map_contains_key_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_contains_key_in_list_loop_decreases $key $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::get_in_list]: termination measure -/
+@[simp]
+def hash_map_get_in_list_loop_terminates (T : Type) (key : USize)
+  (ls : list_t T) :=
+  (key, ls)
+
+syntax "hash_map_get_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_get_in_list_loop_decreases $key $ls) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::get_mut_in_list]: termination measure -/
+@[simp]
+def hash_map_get_mut_in_list_loop_terminates (T : Type) (ls : list_t T)
+  (key : USize) :=
+  (ls, key)
+
+syntax "hash_map_get_mut_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_get_mut_in_list_loop_decreases $ls $key) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::remove_from_list]: termination measure -/
+@[simp]
+def hash_map_remove_from_list_loop_terminates (T : Type) (key : USize)
+  (ls : list_t T) :=
+  (key, ls)
+
+syntax "hash_map_remove_from_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_remove_from_list_loop_decreases $key $ls) =>`(tactic| sorry)
+
diff --git a/tests/lean/hashmap/Hashmap/Clauses/Template.lean b/tests/lean/hashmap/Hashmap/Clauses/Template.lean
new file mode 100644
index 00000000..2bc92153
--- /dev/null
+++ b/tests/lean/hashmap/Hashmap/Clauses/Template.lean
@@ -0,0 +1,108 @@
+-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
+-- [hashmap]: templates for the decreases clauses
+import Base.Primitives
+import Hashmap.Types
+
+/- [hashmap::HashMap::{0}::allocate_slots]: termination measure -/
+@[simp]
+def hash_map_allocate_slots_loop_terminates (T : Type) (slots : vec (list_t T))
+  (n : USize) :=
+  (slots, n)
+
+syntax "hash_map_allocate_slots_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_allocate_slots_loop_decreases $slots $n) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::clear]: termination measure -/
+@[simp]
+def hash_map_clear_loop_terminates (T : Type) (slots : vec (list_t T))
+  (i : USize) :=
+  (slots, i)
+
+syntax "hash_map_clear_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_clear_loop_decreases $slots $i) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::insert_in_list]: termination measure -/
+@[simp]
+def hash_map_insert_in_list_loop_terminates (T : Type) (key : USize)
+  (value : T) (ls : list_t T) :=
+  (key, value, ls)
+
+syntax "hash_map_insert_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_insert_in_list_loop_decreases $key $value $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::move_elements_from_list]: termination measure -/
+@[simp]
+def hash_map_move_elements_from_list_loop_terminates (T : Type)
+  (ntable : hash_map_t T) (ls : list_t T) :=
+  (ntable, ls)
+
+syntax "hash_map_move_elements_from_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_move_elements_from_list_loop_decreases $ntable $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::move_elements]: termination measure -/
+@[simp]
+def hash_map_move_elements_loop_terminates (T : Type) (ntable : hash_map_t T)
+  (slots : vec (list_t T)) (i : USize) :=
+  (ntable, slots, i)
+
+syntax "hash_map_move_elements_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_move_elements_loop_decreases $ntable $slots $i) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::contains_key_in_list]: termination measure -/
+@[simp]
+def hash_map_contains_key_in_list_loop_terminates (T : Type) (key : USize)
+  (ls : list_t T) :=
+  (key, ls)
+
+syntax "hash_map_contains_key_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_contains_key_in_list_loop_decreases $key $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::get_in_list]: termination measure -/
+@[simp]
+def hash_map_get_in_list_loop_terminates (T : Type) (key : USize)
+  (ls : list_t T) :=
+  (key, ls)
+
+syntax "hash_map_get_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_get_in_list_loop_decreases $key $ls) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::get_mut_in_list]: termination measure -/
+@[simp]
+def hash_map_get_mut_in_list_loop_terminates (T : Type) (ls : list_t T)
+  (key : USize) :=
+  (ls, key)
+
+syntax "hash_map_get_mut_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_get_mut_in_list_loop_decreases $ls $key) =>`(tactic| sorry)
+
+/- [hashmap::HashMap::{0}::remove_from_list]: termination measure -/
+@[simp]
+def hash_map_remove_from_list_loop_terminates (T : Type) (key : USize)
+  (ls : list_t T) :=
+  (key, ls)
+
+syntax "hash_map_remove_from_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hash_map_remove_from_list_loop_decreases $key $ls) =>`(tactic| sorry)
+
diff --git a/tests/lean/hashmap/Hashmap/Funs.lean b/tests/lean/hashmap/Hashmap/Funs.lean
new file mode 100644
index 00000000..030b335a
--- /dev/null
+++ b/tests/lean/hashmap/Hashmap/Funs.lean
@@ -0,0 +1,580 @@
+-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
+-- [hashmap]: function definitions
+import Base.Primitives
+import Hashmap.Types
+import Hashmap.Clauses.Clauses
+
+/- [hashmap::hash_key] -/
+def hash_key_fwd (k : USize) : result USize := result.ret k
+
+/- [hashmap::HashMap::{0}::allocate_slots] -/
+def hash_map_allocate_slots_loop_fwd
+  (T : Type) (slots : vec (list_t T)) (n : USize) :
+  (result (vec (list_t T)))
+  :=
+  if n > (USize.ofNatCore 0 (by intlit))
+  then
+    do
+      let slots0 <- vec_push_back (list_t T) slots list_t.ListNil
+      let n0 <- USize.checked_sub n (USize.ofNatCore 1 (by intlit))
+      hash_map_allocate_slots_loop_fwd T slots0 n0
+  else result.ret slots
+termination_by hash_map_allocate_slots_loop_fwd slots n =>
+                                                          hash_map_allocate_slots_loop_terminates
+                                                          T slots n
+decreasing_by hash_map_allocate_slots_loop_decreases slots n
+
+/- [hashmap::HashMap::{0}::allocate_slots] -/
+def hash_map_allocate_slots_fwd
+  (T : Type) (slots : vec (list_t T)) (n : USize) : result (vec (list_t T)) :=
+  hash_map_allocate_slots_loop_fwd T slots n
+
+/- [hashmap::HashMap::{0}::new_with_capacity] -/
+def hash_map_new_with_capacity_fwd
+  (T : Type) (capacity : USize) (max_load_dividend : USize)
+  (max_load_divisor : USize) :
+  result (hash_map_t T)
+  :=
+  do
+    let v := vec_new (list_t T)
+    let slots <- hash_map_allocate_slots_fwd T v capacity
+    let i <- USize.checked_mul capacity max_load_dividend
+    let i0 <- USize.checked_div i max_load_divisor
+    result.ret
+      {
+        hash_map_num_entries := (USize.ofNatCore 0 (by intlit)),
+        hash_map_max_load_factor := (max_load_dividend, max_load_divisor),
+        hash_map_max_load := i0,
+        hash_map_slots := slots
+      }
+
+/- [hashmap::HashMap::{0}::new] -/
+def hash_map_new_fwd (T : Type) : result (hash_map_t T) :=
+  hash_map_new_with_capacity_fwd T (USize.ofNatCore 32 (by intlit))
+    (USize.ofNatCore 4 (by intlit)) (USize.ofNatCore 5 (by intlit))
+
+/- [hashmap::HashMap::{0}::clear] -/
+def hash_map_clear_loop_fwd_back
+  (T : Type) (slots : vec (list_t T)) (i : USize) :
+  (result (vec (list_t T)))
+  :=
+  let i0 := vec_len (list_t T) slots
+  if i < i0
+  then
+    do
+      let i1 <- USize.checked_add i (USize.ofNatCore 1 (by intlit))
+      let slots0 <- vec_index_mut_back (list_t T) slots i list_t.ListNil
+      hash_map_clear_loop_fwd_back T slots0 i1
+  else result.ret slots
+termination_by hash_map_clear_loop_fwd_back slots i =>
+                                                      hash_map_clear_loop_terminates
+                                                      T slots i
+decreasing_by hash_map_clear_loop_decreases slots i
+
+/- [hashmap::HashMap::{0}::clear] -/
+def hash_map_clear_fwd_back
+  (T : Type) (self : hash_map_t T) : result (hash_map_t T) :=
+  do
+    let v <-
+      hash_map_clear_loop_fwd_back T self.hash_map_slots
+        (USize.ofNatCore 0 (by intlit))
+    result.ret
+      {
+        hash_map_num_entries := (USize.ofNatCore 0 (by intlit)),
+        hash_map_max_load_factor := self.hash_map_max_load_factor,
+        hash_map_max_load := self.hash_map_max_load,
+        hash_map_slots := v
+      }
+
+/- [hashmap::HashMap::{0}::len] -/
+def hash_map_len_fwd (T : Type) (self : hash_map_t T) : result USize :=
+  result.ret self.hash_map_num_entries
+
+/- [hashmap::HashMap::{0}::insert_in_list] -/
+def hash_map_insert_in_list_loop_fwd
+  (T : Type) (key : USize) (value : T) (ls : list_t T) : (result Bool) :=
+  match ls with
+  | list_t.ListCons ckey cvalue tl =>
+    if ckey = key
+    then result.ret false
+    else hash_map_insert_in_list_loop_fwd T key value tl
+  | list_t.ListNil => result.ret true
+  
+termination_by hash_map_insert_in_list_loop_fwd key value ls =>
+                                                               hash_map_insert_in_list_loop_terminates
+                                                               T key value ls
+decreasing_by hash_map_insert_in_list_loop_decreases key value ls
+
+/- [hashmap::HashMap::{0}::insert_in_list] -/
+def hash_map_insert_in_list_fwd
+  (T : Type) (key : USize) (value : T) (ls : list_t T) : result Bool :=
+  hash_map_insert_in_list_loop_fwd T key value ls
+
+/- [hashmap::HashMap::{0}::insert_in_list] -/
+def hash_map_insert_in_list_loop_back
+  (T : Type) (key : USize) (value : T) (ls : list_t T) : (result (list_t T)) :=
+  match ls with
+  | list_t.ListCons ckey cvalue tl =>
+    if ckey = key
+    then result.ret (list_t.ListCons ckey value tl)
+    else
+      do
+        let tl0 <- hash_map_insert_in_list_loop_back T key value tl
+        result.ret (list_t.ListCons ckey cvalue tl0)
+  | list_t.ListNil =>
+    let l := list_t.ListNil result.ret (list_t.ListCons key value l)
+  
+termination_by hash_map_insert_in_list_loop_back key value ls =>
+                                                                hash_map_insert_in_list_loop_terminates
+                                                                T key value ls
+decreasing_by hash_map_insert_in_list_loop_decreases key value ls
+
+/- [hashmap::HashMap::{0}::insert_in_list] -/
+def hash_map_insert_in_list_back
+  (T : Type) (key : USize) (value : T) (ls : list_t T) : result (list_t T) :=
+  hash_map_insert_in_list_loop_back T key value ls
+
+/- [hashmap::HashMap::{0}::insert_no_resize] -/
+def hash_map_insert_no_resize_fwd_back
+  (T : Type) (self : hash_map_t T) (key : USize) (value : T) :
+  result (hash_map_t T)
+  :=
+  do
+    let hash <- hash_key_fwd key
+    let i := vec_len (list_t T) self.hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
+    let l <- vec_index_mut_fwd (list_t T) self.hash_map_slots hash_mod
+    let inserted <- hash_map_insert_in_list_fwd T key value l
+    if inserted
+    then
+      do
+        let i0 <- USize.checked_add self.hash_map_num_entries
+          (USize.ofNatCore 1 (by intlit))
+        let l0 <- hash_map_insert_in_list_back T key value l
+        let v <- vec_index_mut_back (list_t T) self.hash_map_slots hash_mod l0
+        result.ret
+          {
+            hash_map_num_entries := i0,
+            hash_map_max_load_factor := self.hash_map_max_load_factor,
+            hash_map_max_load := self.hash_map_max_load,
+            hash_map_slots := v
+          }
+    else
+      do
+        let l0 <- hash_map_insert_in_list_back T key value l
+        let v <- vec_index_mut_back (list_t T) self.hash_map_slots hash_mod l0
+        result.ret
+          {
+            hash_map_num_entries := self.hash_map_num_entries,
+            hash_map_max_load_factor := self.hash_map_max_load_factor,
+            hash_map_max_load := self.hash_map_max_load,
+            hash_map_slots := v
+          }
+
+/- [core::num::u32::{9}::MAX] -/
+def core_num_u32_max_body : result UInt32 :=
+  result.ret (UInt32.ofNatCore 4294967295 (by intlit))
+def core_num_u32_max_c : UInt32 := eval_global core_num_u32_max_body (by simp)
+
+/- [hashmap::HashMap::{0}::move_elements_from_list] -/
+def hash_map_move_elements_from_list_loop_fwd_back
+  (T : Type) (ntable : hash_map_t T) (ls : list_t T) :
+  (result (hash_map_t T))
+  :=
+  match ls with
+  | list_t.ListCons k v tl =>
+    do
+      let ntable0 <- hash_map_insert_no_resize_fwd_back T ntable k v
+      hash_map_move_elements_from_list_loop_fwd_back T ntable0 tl
+  | list_t.ListNil => result.ret ntable
+  
+termination_by hash_map_move_elements_from_list_loop_fwd_back ntable ls =>
+   hash_map_move_elements_from_list_loop_terminates T ntable ls
+decreasing_by hash_map_move_elements_from_list_loop_decreases ntable ls
+
+/- [hashmap::HashMap::{0}::move_elements_from_list] -/
+def hash_map_move_elements_from_list_fwd_back
+  (T : Type) (ntable : hash_map_t T) (ls : list_t T) : result (hash_map_t T) :=
+  hash_map_move_elements_from_list_loop_fwd_back T ntable ls
+
+/- [hashmap::HashMap::{0}::move_elements] -/
+def hash_map_move_elements_loop_fwd_back
+  (T : Type) (ntable : hash_map_t T) (slots : vec (list_t T)) (i : USize) :
+  (result ((hash_map_t T) × (vec (list_t T))))
+  :=
+  let i0 := vec_len (list_t T) slots
+  if i < i0
+  then
+    do
+      let l <- vec_index_mut_fwd (list_t T) slots i
+      let ls := mem_replace_fwd (list_t T) l list_t.ListNil
+      let ntable0 <- hash_map_move_elements_from_list_fwd_back T ntable ls
+      let i1 <- USize.checked_add i (USize.ofNatCore 1 (by intlit))
+      let l0 := mem_replace_back (list_t T) l list_t.ListNil
+      let slots0 <- vec_index_mut_back (list_t T) slots i l0
+      hash_map_move_elements_loop_fwd_back T ntable0 slots0 i1
+  else result.ret (ntable, slots)
+termination_by hash_map_move_elements_loop_fwd_back ntable slots i =>
+   hash_map_move_elements_loop_terminates T ntable slots i
+decreasing_by hash_map_move_elements_loop_decreases ntable slots i
+
+/- [hashmap::HashMap::{0}::move_elements] -/
+def hash_map_move_elements_fwd_back
+  (T : Type) (ntable : hash_map_t T) (slots : vec (list_t T)) (i : USize) :
+  result ((hash_map_t T) × (vec (list_t T)))
+  :=
+  hash_map_move_elements_loop_fwd_back T ntable slots i
+
+/- [hashmap::HashMap::{0}::try_resize] -/
+def hash_map_try_resize_fwd_back
+  (T : Type) (self : hash_map_t T) : result (hash_map_t T) :=
+  do
+    let max_usize <- scalar_cast USize core_num_u32_max_c
+    let capacity := vec_len (list_t T) self.hash_map_slots
+    let n1 <- USize.checked_div max_usize (USize.ofNatCore 2 (by intlit))
+    let (i, i0) := self.hash_map_max_load_factor
+    let i1 <- USize.checked_div n1 i
+    if capacity <= i1
+    then
+      do
+        let i2 <- USize.checked_mul capacity (USize.ofNatCore 2 (by intlit))
+        let ntable <- hash_map_new_with_capacity_fwd T i2 i i0
+        let (ntable0, _) <-
+          hash_map_move_elements_fwd_back T ntable self.hash_map_slots
+            (USize.ofNatCore 0 (by intlit))
+        result.ret
+          {
+            hash_map_num_entries := self.hash_map_num_entries,
+            hash_map_max_load_factor := (i, i0),
+            hash_map_max_load := ntable0.hash_map_max_load,
+            hash_map_slots := ntable0.hash_map_slots
+          }
+    else
+      result.ret
+        {
+          hash_map_num_entries := self.hash_map_num_entries,
+          hash_map_max_load_factor := (i, i0),
+          hash_map_max_load := self.hash_map_max_load,
+          hash_map_slots := self.hash_map_slots
+        }
+
+/- [hashmap::HashMap::{0}::insert] -/
+def hash_map_insert_fwd_back
+  (T : Type) (self : hash_map_t T) (key : USize) (value : T) :
+  result (hash_map_t T)
+  :=
+  do
+    let self0 <- hash_map_insert_no_resize_fwd_back T self key value
+    let i <- hash_map_len_fwd T self0
+    if i > self0.hash_map_max_load
+    then hash_map_try_resize_fwd_back T self0
+    else result.ret self0
+
+/- [hashmap::HashMap::{0}::contains_key_in_list] -/
+def hash_map_contains_key_in_list_loop_fwd
+  (T : Type) (key : USize) (ls : list_t T) : (result Bool) :=
+  match ls with
+  | list_t.ListCons ckey t tl =>
+    if ckey = key
+    then result.ret true
+    else hash_map_contains_key_in_list_loop_fwd T key tl
+  | list_t.ListNil => result.ret false
+  
+termination_by hash_map_contains_key_in_list_loop_fwd key ls =>
+                                                               hash_map_contains_key_in_list_loop_terminates
+                                                               T key ls
+decreasing_by hash_map_contains_key_in_list_loop_decreases key ls
+
+/- [hashmap::HashMap::{0}::contains_key_in_list] -/
+def hash_map_contains_key_in_list_fwd
+  (T : Type) (key : USize) (ls : list_t T) : result Bool :=
+  hash_map_contains_key_in_list_loop_fwd T key ls
+
+/- [hashmap::HashMap::{0}::contains_key] -/
+def hash_map_contains_key_fwd
+  (T : Type) (self : hash_map_t T) (key : USize) : result Bool :=
+  do
+    let hash <- hash_key_fwd key
+    let i := vec_len (list_t T) self.hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
+    let l <- vec_index_fwd (list_t T) self.hash_map_slots hash_mod
+    hash_map_contains_key_in_list_fwd T key l
+
+/- [hashmap::HashMap::{0}::get_in_list] -/
+def hash_map_get_in_list_loop_fwd
+  (T : Type) (key : USize) (ls : list_t T) : (result T) :=
+  match ls with
+  | list_t.ListCons ckey cvalue tl =>
+    if ckey = key
+    then result.ret cvalue
+    else hash_map_get_in_list_loop_fwd T key tl
+  | list_t.ListNil => result.fail error.panic
+  
+termination_by hash_map_get_in_list_loop_fwd key ls =>
+                                                      hash_map_get_in_list_loop_terminates
+                                                      T key ls
+decreasing_by hash_map_get_in_list_loop_decreases key ls
+
+/- [hashmap::HashMap::{0}::get_in_list] -/
+def hash_map_get_in_list_fwd
+  (T : Type) (key : USize) (ls : list_t T) : result T :=
+  hash_map_get_in_list_loop_fwd T key ls
+
+/- [hashmap::HashMap::{0}::get] -/
+def hash_map_get_fwd
+  (T : Type) (self : hash_map_t T) (key : USize) : result T :=
+  do
+    let hash <- hash_key_fwd key
+    let i := vec_len (list_t T) self.hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
+    let l <- vec_index_fwd (list_t T) self.hash_map_slots hash_mod
+    hash_map_get_in_list_fwd T key l
+
+/- [hashmap::HashMap::{0}::get_mut_in_list] -/
+def hash_map_get_mut_in_list_loop_fwd
+  (T : Type) (ls : list_t T) (key : USize) : (result T) :=
+  match ls with
+  | list_t.ListCons ckey cvalue tl =>
+    if ckey = key
+    then result.ret cvalue
+    else hash_map_get_mut_in_list_loop_fwd T tl key
+  | list_t.ListNil => result.fail error.panic
+  
+termination_by hash_map_get_mut_in_list_loop_fwd ls key =>
+                                                          hash_map_get_mut_in_list_loop_terminates
+                                                          T ls key
+decreasing_by hash_map_get_mut_in_list_loop_decreases ls key
+
+/- [hashmap::HashMap::{0}::get_mut_in_list] -/
+def hash_map_get_mut_in_list_fwd
+  (T : Type) (ls : list_t T) (key : USize) : result T :=
+  hash_map_get_mut_in_list_loop_fwd T ls key
+
+/- [hashmap::HashMap::{0}::get_mut_in_list] -/
+def hash_map_get_mut_in_list_loop_back
+  (T : Type) (ls : list_t T) (key : USize) (ret0 : T) : (result (list_t T)) :=
+  match ls with
+  | list_t.ListCons ckey cvalue tl =>
+    if ckey = key
+    then result.ret (list_t.ListCons ckey ret0 tl)
+    else
+      do
+        let tl0 <- hash_map_get_mut_in_list_loop_back T tl key ret0
+        result.ret (list_t.ListCons ckey cvalue tl0)
+  | list_t.ListNil => result.fail error.panic
+  
+termination_by hash_map_get_mut_in_list_loop_back ls key ret0 =>
+                                                                hash_map_get_mut_in_list_loop_terminates
+                                                                T ls key
+decreasing_by hash_map_get_mut_in_list_loop_decreases ls key
+
+/- [hashmap::HashMap::{0}::get_mut_in_list] -/
+def hash_map_get_mut_in_list_back
+  (T : Type) (ls : list_t T) (key : USize) (ret0 : T) : result (list_t T) :=
+  hash_map_get_mut_in_list_loop_back T ls key ret0
+
+/- [hashmap::HashMap::{0}::get_mut] -/
+def hash_map_get_mut_fwd
+  (T : Type) (self : hash_map_t T) (key : USize) : result T :=
+  do
+    let hash <- hash_key_fwd key
+    let i := vec_len (list_t T) self.hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
+    let l <- vec_index_mut_fwd (list_t T) self.hash_map_slots hash_mod
+    hash_map_get_mut_in_list_fwd T l key
+
+/- [hashmap::HashMap::{0}::get_mut] -/
+def hash_map_get_mut_back
+  (T : Type) (self : hash_map_t T) (key : USize) (ret0 : T) :
+  result (hash_map_t T)
+  :=
+  do
+    let hash <- hash_key_fwd key
+    let i := vec_len (list_t T) self.hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
+    let l <- vec_index_mut_fwd (list_t T) self.hash_map_slots hash_mod
+    let l0 <- hash_map_get_mut_in_list_back T l key ret0
+    let v <- vec_index_mut_back (list_t T) self.hash_map_slots hash_mod l0
+    result.ret
+      {
+        hash_map_num_entries := self.hash_map_num_entries,
+        hash_map_max_load_factor := self.hash_map_max_load_factor,
+        hash_map_max_load := self.hash_map_max_load,
+        hash_map_slots := v
+      }
+
+/- [hashmap::HashMap::{0}::remove_from_list] -/
+def hash_map_remove_from_list_loop_fwd
+  (T : Type) (key : USize) (ls : list_t T) : (result (Option T)) :=
+  match ls with
+  | list_t.ListCons ckey t tl =>
+    if ckey = key
+    then
+      let mv_ls :=
+        mem_replace_fwd (list_t T) (list_t.ListCons ckey t tl) list_t.ListNil
+      match mv_ls with
+      | list_t.ListCons i cvalue tl0 => result.ret (Option.some cvalue)
+      | list_t.ListNil => result.fail error.panic
+      
+    else hash_map_remove_from_list_loop_fwd T key tl
+  | list_t.ListNil => result.ret Option.none
+  
+termination_by hash_map_remove_from_list_loop_fwd key ls =>
+                                                           hash_map_remove_from_list_loop_terminates
+                                                           T key ls
+decreasing_by hash_map_remove_from_list_loop_decreases key ls
+
+/- [hashmap::HashMap::{0}::remove_from_list] -/
+def hash_map_remove_from_list_fwd
+  (T : Type) (key : USize) (ls : list_t T) : result (Option T) :=
+  hash_map_remove_from_list_loop_fwd T key ls
+
+/- [hashmap::HashMap::{0}::remove_from_list] -/
+def hash_map_remove_from_list_loop_back
+  (T : Type) (key : USize) (ls : list_t T) : (result (list_t T)) :=
+  match ls with
+  | list_t.ListCons ckey t tl =>
+    if ckey = key
+    then
+      let mv_ls :=
+        mem_replace_fwd (list_t T) (list_t.ListCons ckey t tl) list_t.ListNil
+      match mv_ls with
+      | list_t.ListCons i cvalue tl0 => result.ret tl0
+      | list_t.ListNil => result.fail error.panic
+      
+    else
+      do
+        let tl0 <- hash_map_remove_from_list_loop_back T key tl
+        result.ret (list_t.ListCons ckey t tl0)
+  | list_t.ListNil => result.ret list_t.ListNil
+  
+termination_by hash_map_remove_from_list_loop_back key ls =>
+                                                            hash_map_remove_from_list_loop_terminates
+                                                            T key ls
+decreasing_by hash_map_remove_from_list_loop_decreases key ls
+
+/- [hashmap::HashMap::{0}::remove_from_list] -/
+def hash_map_remove_from_list_back
+  (T : Type) (key : USize) (ls : list_t T) : result (list_t T) :=
+  hash_map_remove_from_list_loop_back T key ls
+
+/- [hashmap::HashMap::{0}::remove] -/
+def hash_map_remove_fwd
+  (T : Type) (self : hash_map_t T) (key : USize) : result (Option T) :=
+  do
+    let hash <- hash_key_fwd key
+    let i := vec_len (list_t T) self.hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
+    let l <- vec_index_mut_fwd (list_t T) self.hash_map_slots hash_mod
+    let x <- hash_map_remove_from_list_fwd T key l
+    match x with
+    | Option.none => result.ret Option.none
+    | Option.some x0 =>
+      do
+        let _ <- USize.checked_sub self.hash_map_num_entries
+          (USize.ofNatCore 1 (by intlit))
+        result.ret (Option.some x0)
+    
+
+/- [hashmap::HashMap::{0}::remove] -/
+def hash_map_remove_back
+  (T : Type) (self : hash_map_t T) (key : USize) : result (hash_map_t T) :=
+  do
+    let hash <- hash_key_fwd key
+    let i := vec_len (list_t T) self.hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
+    let l <- vec_index_mut_fwd (list_t T) self.hash_map_slots hash_mod
+    let x <- hash_map_remove_from_list_fwd T key l
+    match x with
+    | Option.none =>
+      do
+        let l0 <- hash_map_remove_from_list_back T key l
+        let v <- vec_index_mut_back (list_t T) self.hash_map_slots hash_mod l0
+        result.ret
+          {
+            hash_map_num_entries := self.hash_map_num_entries,
+            hash_map_max_load_factor := self.hash_map_max_load_factor,
+            hash_map_max_load := self.hash_map_max_load,
+            hash_map_slots := v
+          }
+    | Option.some x0 =>
+      do
+        let i0 <- USize.checked_sub self.hash_map_num_entries
+          (USize.ofNatCore 1 (by intlit))
+        let l0 <- hash_map_remove_from_list_back T key l
+        let v <- vec_index_mut_back (list_t T) self.hash_map_slots hash_mod l0
+        result.ret
+          {
+            hash_map_num_entries := i0,
+            hash_map_max_load_factor := self.hash_map_max_load_factor,
+            hash_map_max_load := self.hash_map_max_load,
+            hash_map_slots := v
+          }
+    
+
+/- [hashmap::test1] -/
+def test1_fwd : result Unit :=
+  do
+    let hm <- hash_map_new_fwd UInt64
+    let hm0 <-
+      hash_map_insert_fwd_back UInt64 hm (USize.ofNatCore 0 (by intlit))
+        (UInt64.ofNatCore 42 (by intlit))
+    let hm1 <-
+      hash_map_insert_fwd_back UInt64 hm0 (USize.ofNatCore 128 (by intlit))
+        (UInt64.ofNatCore 18 (by intlit))
+    let hm2 <-
+      hash_map_insert_fwd_back UInt64 hm1 (USize.ofNatCore 1024 (by intlit))
+        (UInt64.ofNatCore 138 (by intlit))
+    let hm3 <-
+      hash_map_insert_fwd_back UInt64 hm2 (USize.ofNatCore 1056 (by intlit))
+        (UInt64.ofNatCore 256 (by intlit))
+    let i <- hash_map_get_fwd UInt64 hm3 (USize.ofNatCore 128 (by intlit))
+    if not (i = (UInt64.ofNatCore 18 (by intlit)))
+    then result.fail error.panic
+    else
+      do
+        let hm4 <-
+          hash_map_get_mut_back UInt64 hm3 (USize.ofNatCore 1024 (by intlit))
+            (UInt64.ofNatCore 56 (by intlit))
+        let i0 <-
+          hash_map_get_fwd UInt64 hm4 (USize.ofNatCore 1024 (by intlit))
+        if not (i0 = (UInt64.ofNatCore 56 (by intlit)))
+        then result.fail error.panic
+        else
+          do
+            let x <-
+              hash_map_remove_fwd UInt64 hm4 (USize.ofNatCore 1024 (by intlit))
+            match x with
+            | Option.none => result.fail error.panic
+            | Option.some x0 =>
+              if not (x0 = (UInt64.ofNatCore 56 (by intlit)))
+              then result.fail error.panic
+              else
+                do
+                  let hm5 <-
+                    hash_map_remove_back UInt64 hm4
+                      (USize.ofNatCore 1024 (by intlit))
+                  let i1 <-
+                    hash_map_get_fwd UInt64 hm5 (USize.ofNatCore 0 (by intlit))
+                  if not (i1 = (UInt64.ofNatCore 42 (by intlit)))
+                  then result.fail error.panic
+                  else
+                    do
+                      let i2 <-
+                        hash_map_get_fwd UInt64 hm5
+                          (USize.ofNatCore 128 (by intlit))
+                      if not (i2 = (UInt64.ofNatCore 18 (by intlit)))
+                      then result.fail error.panic
+                      else
+                        do
+                          let i3 <-
+                            hash_map_get_fwd UInt64 hm5
+                              (USize.ofNatCore 1056 (by intlit))
+                          if not (i3 = (UInt64.ofNatCore 256 (by intlit)))
+                          then result.fail error.panic
+                          else result.ret ()
+            
+
+/- Unit test for [hashmap::test1] -/
+#assert (test1_fwd = .ret ())
+
diff --git a/tests/lean/hashmap/Hashmap/Types.lean b/tests/lean/hashmap/Hashmap/Types.lean
new file mode 100644
index 00000000..9f08bd60
--- /dev/null
+++ b/tests/lean/hashmap/Hashmap/Types.lean
@@ -0,0 +1,18 @@
+-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
+-- [hashmap]: type definitions
+import Base.Primitives
+
+/- [hashmap::List] -/
+inductive list_t (T : Type) :=
+| ListCons : USize -> T -> list_t T -> list_t T
+| ListNil : list_t T
+
+/- [hashmap::HashMap] -/
+structure hash_map_t (T : Type) where
+
+  hash_map_num_entries : USize
+  hash_map_max_load_factor : (USize × USize)
+  hash_map_max_load : USize
+  hash_map_slots : vec (list_t T)
+
+
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Clauses.lean b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Clauses.lean
new file mode 100644
index 00000000..16a4ea4c
--- /dev/null
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Clauses.lean
@@ -0,0 +1,111 @@
+-- [hashmap_main]: decreases clauses
+import Base.Primitives
+import HashmapMain.Types
+
+/- [hashmap_main::hashmap::HashMap::{0}::allocate_slots]: termination measure -/
+@[simp]
+def hashmap_hash_map_allocate_slots_loop_terminates (T : Type)
+  (slots : vec (hashmap_list_t T)) (n : USize) :=
+  (slots, n)
+
+syntax "hashmap_hash_map_allocate_slots_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_allocate_slots_loop_decreases $slots $n) =>
+  `(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::clear]: termination measure -/
+@[simp]
+def hashmap_hash_map_clear_loop_terminates (T : Type)
+  (slots : vec (hashmap_list_t T)) (i : USize) :=
+  (slots, i)
+
+syntax "hashmap_hash_map_clear_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_clear_loop_decreases $slots $i) =>`(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: termination measure -/
+@[simp]
+def hashmap_hash_map_insert_in_list_loop_terminates (T : Type) (key : USize)
+  (value : T) (ls : hashmap_list_t T) :=
+  (key, value, ls)
+
+syntax "hashmap_hash_map_insert_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_insert_in_list_loop_decreases $key $value $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list]: termination measure -/
+@[simp]
+def hashmap_hash_map_move_elements_from_list_loop_terminates (T : Type)
+  (ntable : hashmap_hash_map_t T) (ls : hashmap_list_t T) :=
+  (ntable, ls)
+
+syntax "hashmap_hash_map_move_elements_from_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_move_elements_from_list_loop_decreases $ntable
+$ls) =>`(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::move_elements]: termination measure -/
+@[simp]
+def hashmap_hash_map_move_elements_loop_terminates (T : Type)
+  (ntable : hashmap_hash_map_t T) (slots : vec (hashmap_list_t T)) (i : USize)
+  :=
+  (ntable, slots, i)
+
+syntax "hashmap_hash_map_move_elements_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_move_elements_loop_decreases $ntable $slots $i) =>
+  `(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list]: termination measure -/
+@[simp]
+def hashmap_hash_map_contains_key_in_list_loop_terminates (T : Type)
+  (key : USize) (ls : hashmap_list_t T) :=
+  (key, ls)
+
+syntax "hashmap_hash_map_contains_key_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_contains_key_in_list_loop_decreases $key $ls) =>
+  `(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: termination measure -/
+@[simp]
+def hashmap_hash_map_get_in_list_loop_terminates (T : Type) (key : USize)
+  (ls : hashmap_list_t T) :=
+  (key, ls)
+
+syntax "hashmap_hash_map_get_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_get_in_list_loop_decreases $key $ls) =>`(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: termination measure -/
+@[simp]
+def hashmap_hash_map_get_mut_in_list_loop_terminates (T : Type)
+  (ls : hashmap_list_t T) (key : USize) :=
+  (ls, key)
+
+syntax "hashmap_hash_map_get_mut_in_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_get_mut_in_list_loop_decreases $ls $key) =>
+  `(tactic| sorry)
+
+/- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: termination measure -/
+@[simp]
+def hashmap_hash_map_remove_from_list_loop_terminates (T : Type) (key : USize)
+  (ls : hashmap_list_t T) :=
+  (key, ls)
+
+syntax "hashmap_hash_map_remove_from_list_loop_decreases" term+ : tactic
+
+macro_rules
+| `(tactic| hashmap_hash_map_remove_from_list_loop_decreases $key $ls) =>
+  `(tactic| sorry)
+
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean
index bf331d6e..3466e7e0 100644
--- a/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Clauses/Template.lean
@@ -15,17 +15,16 @@ macro_rules
 | `(tactic| hashmap_hash_map_allocate_slots_loop_decreases $slots $n) =>
   `(tactic| sorry)
 
-/- [hashmap_main::hashmap::HashMap::{0}::clear_slots]: termination measure -/
+/- [hashmap_main::hashmap::HashMap::{0}::clear]: termination measure -/
 @[simp]
-def hashmap_hash_map_clear_slots_loop_terminates (T : Type)
+def hashmap_hash_map_clear_loop_terminates (T : Type)
   (slots : vec (hashmap_list_t T)) (i : USize) :=
   (slots, i)
 
-syntax "hashmap_hash_map_clear_slots_loop_decreases" term+ : tactic
+syntax "hashmap_hash_map_clear_loop_decreases" term+ : tactic
 
 macro_rules
-| `(tactic| hashmap_hash_map_clear_slots_loop_decreases $slots $i) =>
-  `(tactic| sorry)
+| `(tactic| hashmap_hash_map_clear_loop_decreases $slots $i) =>`(tactic| sorry)
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: termination measure -/
 @[simp]
diff --git a/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean b/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean
index b0c4d683..5134f483 100644
--- a/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean
+++ b/tests/lean/hashmap_on_disk/HashmapMain/Funs.lean
@@ -3,7 +3,7 @@
 import Base.Primitives
 import HashmapMain.Types
 import HashmapMain.Opaque
-import HashmapMain.Clauses.Template
+import HashmapMain.Clauses.Clauses
 
 section variable (opaque_defs: OpaqueDefs)
 
@@ -19,13 +19,13 @@ def hashmap_hash_map_allocate_slots_loop_fwd
   then
     do
       let slots0 <-
-        vec_push_back (hashmap_list_t T) slots hashmap_list_t.HashmapListNil 
-      let n0 <- USize.checked_sub n (USize.ofNatCore 1 (by intlit)) 
+        vec_push_back (hashmap_list_t T) slots hashmap_list_t.HashmapListNil
+      let n0 <- USize.checked_sub n (USize.ofNatCore 1 (by intlit))
       hashmap_hash_map_allocate_slots_loop_fwd T slots0 n0
   else result.ret slots
 termination_by hashmap_hash_map_allocate_slots_loop_fwd slots n =>
                                                                   hashmap_hash_map_allocate_slots_loop_terminates
-                                                                  T slots n 
+                                                                  T slots n
 decreasing_by hashmap_hash_map_allocate_slots_loop_decreases slots n
 
 /- [hashmap_main::hashmap::HashMap::{0}::allocate_slots] -/
@@ -42,10 +42,10 @@ def hashmap_hash_map_new_with_capacity_fwd
   result (hashmap_hash_map_t T)
   :=
   do
-    let v := vec_new (hashmap_list_t T) 
-    let slots <- hashmap_hash_map_allocate_slots_fwd T v capacity 
-    let i <- USize.checked_mul capacity max_load_dividend 
-    let i0 <- USize.checked_div i max_load_divisor 
+    let v := vec_new (hashmap_list_t T)
+    let slots <- hashmap_hash_map_allocate_slots_fwd T v capacity
+    let i <- USize.checked_mul capacity max_load_dividend
+    let i0 <- USize.checked_div i max_load_divisor
     result.ret
       {
         hashmap_hash_map_num_entries := (USize.ofNatCore 0 (by intlit)),
@@ -60,40 +60,33 @@ def hashmap_hash_map_new_fwd (T : Type) : result (hashmap_hash_map_t T) :=
   hashmap_hash_map_new_with_capacity_fwd T (USize.ofNatCore 32 (by intlit))
     (USize.ofNatCore 4 (by intlit)) (USize.ofNatCore 5 (by intlit))
 
-/- [hashmap_main::hashmap::HashMap::{0}::clear_slots] -/
-def hashmap_hash_map_clear_slots_loop_fwd_back
+/- [hashmap_main::hashmap::HashMap::{0}::clear] -/
+def hashmap_hash_map_clear_loop_fwd_back
   (T : Type) (slots : vec (hashmap_list_t T)) (i : USize) :
   (result (vec (hashmap_list_t T)))
   :=
-  let i0 := vec_len (hashmap_list_t T) slots 
+  let i0 := vec_len (hashmap_list_t T) slots
   if i < i0
   then
     do
-      let i1 <- USize.checked_add i (USize.ofNatCore 1 (by intlit)) 
+      let i1 <- USize.checked_add i (USize.ofNatCore 1 (by intlit))
       let slots0 <-
         vec_index_mut_back (hashmap_list_t T) slots i
-          hashmap_list_t.HashmapListNil 
-      hashmap_hash_map_clear_slots_loop_fwd_back T slots0 i1
+          hashmap_list_t.HashmapListNil
+      hashmap_hash_map_clear_loop_fwd_back T slots0 i1
   else result.ret slots
-termination_by hashmap_hash_map_clear_slots_loop_fwd_back slots i =>
-                                                                    hashmap_hash_map_clear_slots_loop_terminates
-                                                                    T slots i 
-decreasing_by hashmap_hash_map_clear_slots_loop_decreases slots i
-
-/- [hashmap_main::hashmap::HashMap::{0}::clear_slots] -/
-def hashmap_hash_map_clear_slots_fwd_back
-  (T : Type) (slots : vec (hashmap_list_t T)) :
-  result (vec (hashmap_list_t T))
-  :=
-  hashmap_hash_map_clear_slots_loop_fwd_back T slots
-    (USize.ofNatCore 0 (by intlit))
+termination_by hashmap_hash_map_clear_loop_fwd_back slots i =>
+                                                              hashmap_hash_map_clear_loop_terminates
+                                                              T slots i
+decreasing_by hashmap_hash_map_clear_loop_decreases slots i
 
 /- [hashmap_main::hashmap::HashMap::{0}::clear] -/
 def hashmap_hash_map_clear_fwd_back
   (T : Type) (self : hashmap_hash_map_t T) : result (hashmap_hash_map_t T) :=
   do
     let v <-
-      hashmap_hash_map_clear_slots_fwd_back T self.hashmap_hash_map_slots 
+      hashmap_hash_map_clear_loop_fwd_back T self.hashmap_hash_map_slots
+        (USize.ofNatCore 0 (by intlit))
     result.ret
       {
         hashmap_hash_map_num_entries := (USize.ofNatCore 0 (by intlit)),
@@ -120,7 +113,7 @@ def hashmap_hash_map_insert_in_list_loop_fwd
   | hashmap_list_t.HashmapListNil => result.ret true
   
 termination_by hashmap_hash_map_insert_in_list_loop_fwd key value ls =>
-   hashmap_hash_map_insert_in_list_loop_terminates T key value ls 
+   hashmap_hash_map_insert_in_list_loop_terminates T key value ls
 decreasing_by hashmap_hash_map_insert_in_list_loop_decreases key value ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list] -/
@@ -139,14 +132,14 @@ def hashmap_hash_map_insert_in_list_loop_back
     then result.ret (hashmap_list_t.HashmapListCons ckey value tl)
     else
       do
-        let l <- hashmap_hash_map_insert_in_list_loop_back T key value tl 
-        result.ret (hashmap_list_t.HashmapListCons ckey cvalue l)
+        let tl0 <- hashmap_hash_map_insert_in_list_loop_back T key value tl
+        result.ret (hashmap_list_t.HashmapListCons ckey cvalue tl0)
   | hashmap_list_t.HashmapListNil =>
-    let l := hashmap_list_t.HashmapListNil 
+    let l := hashmap_list_t.HashmapListNil
     result.ret (hashmap_list_t.HashmapListCons key value l)
   
 termination_by hashmap_hash_map_insert_in_list_loop_back key value ls =>
-   hashmap_hash_map_insert_in_list_loop_terminates T key value ls 
+   hashmap_hash_map_insert_in_list_loop_terminates T key value ls
 decreasing_by hashmap_hash_map_insert_in_list_loop_decreases key value ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list] -/
@@ -162,21 +155,21 @@ def hashmap_hash_map_insert_no_resize_fwd_back
   result (hashmap_hash_map_t T)
   :=
   do
-    let hash <- hashmap_hash_key_fwd key 
-    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let hash_mod <- USize.checked_rem hash i 
+    let hash <- hashmap_hash_key_fwd key
+    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
     let l <-
-      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod 
-    let inserted <- hashmap_hash_map_insert_in_list_fwd T key value l 
+      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
+    let inserted <- hashmap_hash_map_insert_in_list_fwd T key value l
     if inserted
     then
       do
         let i0 <- USize.checked_add self.hashmap_hash_map_num_entries
-          (USize.ofNatCore 1 (by intlit)) 
-        let l0 <- hashmap_hash_map_insert_in_list_back T key value l 
+          (USize.ofNatCore 1 (by intlit))
+        let l0 <- hashmap_hash_map_insert_in_list_back T key value l
         let v <-
           vec_index_mut_back (hashmap_list_t T) self.hashmap_hash_map_slots
-            hash_mod l0 
+            hash_mod l0
         result.ret
           {
             hashmap_hash_map_num_entries := i0,
@@ -186,10 +179,10 @@ def hashmap_hash_map_insert_no_resize_fwd_back
           }
     else
       do
-        let l0 <- hashmap_hash_map_insert_in_list_back T key value l 
+        let l0 <- hashmap_hash_map_insert_in_list_back T key value l
         let v <-
           vec_index_mut_back (hashmap_list_t T) self.hashmap_hash_map_slots
-            hash_mod l0 
+            hash_mod l0
         result.ret
           {
             hashmap_hash_map_num_entries := self.hashmap_hash_map_num_entries,
@@ -211,13 +204,13 @@ def hashmap_hash_map_move_elements_from_list_loop_fwd_back
   match ls with
   | hashmap_list_t.HashmapListCons k v tl =>
     do
-      let ntable0 <- hashmap_hash_map_insert_no_resize_fwd_back T ntable k v 
+      let ntable0 <- hashmap_hash_map_insert_no_resize_fwd_back T ntable k v
       hashmap_hash_map_move_elements_from_list_loop_fwd_back T ntable0 tl
   | hashmap_list_t.HashmapListNil => result.ret ntable
   
 termination_by hashmap_hash_map_move_elements_from_list_loop_fwd_back ntable ls
               => hashmap_hash_map_move_elements_from_list_loop_terminates T
-                ntable ls 
+                ntable ls
 decreasing_by hashmap_hash_map_move_elements_from_list_loop_decreases ntable ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::move_elements_from_list] -/
@@ -233,23 +226,23 @@ def hashmap_hash_map_move_elements_loop_fwd_back
   (i : USize) :
   (result ((hashmap_hash_map_t T) × (vec (hashmap_list_t T))))
   :=
-  let i0 := vec_len (hashmap_list_t T) slots 
+  let i0 := vec_len (hashmap_list_t T) slots
   if i < i0
   then
     do
-      let l <- vec_index_mut_fwd (hashmap_list_t T) slots i 
+      let l <- vec_index_mut_fwd (hashmap_list_t T) slots i
       let ls :=
-        mem_replace_fwd (hashmap_list_t T) l hashmap_list_t.HashmapListNil 
+        mem_replace_fwd (hashmap_list_t T) l hashmap_list_t.HashmapListNil
       let ntable0 <-
-        hashmap_hash_map_move_elements_from_list_fwd_back T ntable ls 
-      let i1 <- USize.checked_add i (USize.ofNatCore 1 (by intlit)) 
+        hashmap_hash_map_move_elements_from_list_fwd_back T ntable ls
+      let i1 <- USize.checked_add i (USize.ofNatCore 1 (by intlit))
       let l0 :=
-        mem_replace_back (hashmap_list_t T) l hashmap_list_t.HashmapListNil 
-      let slots0 <- vec_index_mut_back (hashmap_list_t T) slots i l0 
+        mem_replace_back (hashmap_list_t T) l hashmap_list_t.HashmapListNil
+      let slots0 <- vec_index_mut_back (hashmap_list_t T) slots i l0
       hashmap_hash_map_move_elements_loop_fwd_back T ntable0 slots0 i1
   else result.ret (ntable, slots)
 termination_by hashmap_hash_map_move_elements_loop_fwd_back ntable slots i =>
-   hashmap_hash_map_move_elements_loop_terminates T ntable slots i 
+   hashmap_hash_map_move_elements_loop_terminates T ntable slots i
 decreasing_by hashmap_hash_map_move_elements_loop_decreases ntable slots i
 
 /- [hashmap_main::hashmap::HashMap::{0}::move_elements] -/
@@ -264,19 +257,19 @@ def hashmap_hash_map_move_elements_fwd_back
 def hashmap_hash_map_try_resize_fwd_back
   (T : Type) (self : hashmap_hash_map_t T) : result (hashmap_hash_map_t T) :=
   do
-    let max_usize <- scalar_cast USize core_num_u32_max_c 
-    let capacity := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let n1 <- USize.checked_div max_usize (USize.ofNatCore 2 (by intlit)) 
-    let (i, i0) := self.hashmap_hash_map_max_load_factor 
-    let i1 <- USize.checked_div n1 i 
+    let max_usize <- scalar_cast USize core_num_u32_max_c
+    let capacity := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let n1 <- USize.checked_div max_usize (USize.ofNatCore 2 (by intlit))
+    let (i, i0) := self.hashmap_hash_map_max_load_factor
+    let i1 <- USize.checked_div n1 i
     if capacity <= i1
     then
       do
-        let i2 <- USize.checked_mul capacity (USize.ofNatCore 2 (by intlit)) 
-        let ntable <- hashmap_hash_map_new_with_capacity_fwd T i2 i i0 
+        let i2 <- USize.checked_mul capacity (USize.ofNatCore 2 (by intlit))
+        let ntable <- hashmap_hash_map_new_with_capacity_fwd T i2 i i0
         let (ntable0, _) <-
           hashmap_hash_map_move_elements_fwd_back T ntable
-            self.hashmap_hash_map_slots (USize.ofNatCore 0 (by intlit)) 
+            self.hashmap_hash_map_slots (USize.ofNatCore 0 (by intlit))
         result.ret
           {
             hashmap_hash_map_num_entries := self.hashmap_hash_map_num_entries,
@@ -299,8 +292,8 @@ def hashmap_hash_map_insert_fwd_back
   result (hashmap_hash_map_t T)
   :=
   do
-    let self0 <- hashmap_hash_map_insert_no_resize_fwd_back T self key value 
-    let i <- hashmap_hash_map_len_fwd T self0 
+    let self0 <- hashmap_hash_map_insert_no_resize_fwd_back T self key value
+    let i <- hashmap_hash_map_len_fwd T self0
     if i > self0.hashmap_hash_map_max_load
     then hashmap_hash_map_try_resize_fwd_back T self0
     else result.ret self0
@@ -316,7 +309,7 @@ def hashmap_hash_map_contains_key_in_list_loop_fwd
   | hashmap_list_t.HashmapListNil => result.ret false
   
 termination_by hashmap_hash_map_contains_key_in_list_loop_fwd key ls =>
-   hashmap_hash_map_contains_key_in_list_loop_terminates T key ls 
+   hashmap_hash_map_contains_key_in_list_loop_terminates T key ls
 decreasing_by hashmap_hash_map_contains_key_in_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::contains_key_in_list] -/
@@ -328,11 +321,11 @@ def hashmap_hash_map_contains_key_in_list_fwd
 def hashmap_hash_map_contains_key_fwd
   (T : Type) (self : hashmap_hash_map_t T) (key : USize) : result Bool :=
   do
-    let hash <- hashmap_hash_key_fwd key 
-    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let hash_mod <- USize.checked_rem hash i 
+    let hash <- hashmap_hash_key_fwd key
+    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
     let l <-
-      vec_index_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod 
+      vec_index_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     hashmap_hash_map_contains_key_in_list_fwd T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list] -/
@@ -347,7 +340,7 @@ def hashmap_hash_map_get_in_list_loop_fwd
   
 termination_by hashmap_hash_map_get_in_list_loop_fwd key ls =>
                                                               hashmap_hash_map_get_in_list_loop_terminates
-                                                              T key ls 
+                                                              T key ls
 decreasing_by hashmap_hash_map_get_in_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list] -/
@@ -359,11 +352,11 @@ def hashmap_hash_map_get_in_list_fwd
 def hashmap_hash_map_get_fwd
   (T : Type) (self : hashmap_hash_map_t T) (key : USize) : result T :=
   do
-    let hash <- hashmap_hash_key_fwd key 
-    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let hash_mod <- USize.checked_rem hash i 
+    let hash <- hashmap_hash_key_fwd key
+    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
     let l <-
-      vec_index_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod 
+      vec_index_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     hashmap_hash_map_get_in_list_fwd T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] -/
@@ -378,7 +371,7 @@ def hashmap_hash_map_get_mut_in_list_loop_fwd
   
 termination_by hashmap_hash_map_get_mut_in_list_loop_fwd ls key =>
                                                                   hashmap_hash_map_get_mut_in_list_loop_terminates
-                                                                  T ls key 
+                                                                  T ls key
 decreasing_by hashmap_hash_map_get_mut_in_list_loop_decreases ls key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] -/
@@ -397,12 +390,12 @@ def hashmap_hash_map_get_mut_in_list_loop_back
     then result.ret (hashmap_list_t.HashmapListCons ckey ret0 tl)
     else
       do
-        let l <- hashmap_hash_map_get_mut_in_list_loop_back T tl key ret0 
-        result.ret (hashmap_list_t.HashmapListCons ckey cvalue l)
+        let tl0 <- hashmap_hash_map_get_mut_in_list_loop_back T tl key ret0
+        result.ret (hashmap_list_t.HashmapListCons ckey cvalue tl0)
   | hashmap_list_t.HashmapListNil => result.fail error.panic
   
 termination_by hashmap_hash_map_get_mut_in_list_loop_back ls key ret0 =>
-   hashmap_hash_map_get_mut_in_list_loop_terminates T ls key 
+   hashmap_hash_map_get_mut_in_list_loop_terminates T ls key
 decreasing_by hashmap_hash_map_get_mut_in_list_loop_decreases ls key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list] -/
@@ -416,11 +409,11 @@ def hashmap_hash_map_get_mut_in_list_back
 def hashmap_hash_map_get_mut_fwd
   (T : Type) (self : hashmap_hash_map_t T) (key : USize) : result T :=
   do
-    let hash <- hashmap_hash_key_fwd key 
-    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let hash_mod <- USize.checked_rem hash i 
+    let hash <- hashmap_hash_key_fwd key
+    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
     let l <-
-      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod 
+      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
     hashmap_hash_map_get_mut_in_list_fwd T l key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut] -/
@@ -429,15 +422,15 @@ def hashmap_hash_map_get_mut_back
   result (hashmap_hash_map_t T)
   :=
   do
-    let hash <- hashmap_hash_key_fwd key 
-    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let hash_mod <- USize.checked_rem hash i 
+    let hash <- hashmap_hash_key_fwd key
+    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
     let l <-
-      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod 
-    let l0 <- hashmap_hash_map_get_mut_in_list_back T l key ret0 
+      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
+    let l0 <- hashmap_hash_map_get_mut_in_list_back T l key ret0
     let v <-
       vec_index_mut_back (hashmap_list_t T) self.hashmap_hash_map_slots
-        hash_mod l0 
+        hash_mod l0
     result.ret
       {
         hashmap_hash_map_num_entries := self.hashmap_hash_map_num_entries,
@@ -455,7 +448,7 @@ def hashmap_hash_map_remove_from_list_loop_fwd
     then
       let mv_ls :=
         mem_replace_fwd (hashmap_list_t T) (hashmap_list_t.HashmapListCons ckey
-          t tl) hashmap_list_t.HashmapListNil 
+          t tl) hashmap_list_t.HashmapListNil
       match mv_ls with
       | hashmap_list_t.HashmapListCons i cvalue tl0 =>
         result.ret (Option.some cvalue)
@@ -466,7 +459,7 @@ def hashmap_hash_map_remove_from_list_loop_fwd
   
 termination_by hashmap_hash_map_remove_from_list_loop_fwd key ls =>
                                                                    hashmap_hash_map_remove_from_list_loop_terminates
-                                                                   T key ls 
+                                                                   T key ls
 decreasing_by hashmap_hash_map_remove_from_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list] -/
@@ -485,20 +478,20 @@ def hashmap_hash_map_remove_from_list_loop_back
     then
       let mv_ls :=
         mem_replace_fwd (hashmap_list_t T) (hashmap_list_t.HashmapListCons ckey
-          t tl) hashmap_list_t.HashmapListNil 
+          t tl) hashmap_list_t.HashmapListNil
       match mv_ls with
       | hashmap_list_t.HashmapListCons i cvalue tl0 => result.ret tl0
       | hashmap_list_t.HashmapListNil => result.fail error.panic
       
     else
       do
-        let l <- hashmap_hash_map_remove_from_list_loop_back T key tl 
-        result.ret (hashmap_list_t.HashmapListCons ckey t l)
+        let tl0 <- hashmap_hash_map_remove_from_list_loop_back T key tl
+        result.ret (hashmap_list_t.HashmapListCons ckey t tl0)
   | hashmap_list_t.HashmapListNil => result.ret hashmap_list_t.HashmapListNil
   
 termination_by hashmap_hash_map_remove_from_list_loop_back key ls =>
                                                                     hashmap_hash_map_remove_from_list_loop_terminates
-                                                                    T key ls 
+                                                                    T key ls
 decreasing_by hashmap_hash_map_remove_from_list_loop_decreases key ls
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list] -/
@@ -512,18 +505,18 @@ def hashmap_hash_map_remove_from_list_back
 def hashmap_hash_map_remove_fwd
   (T : Type) (self : hashmap_hash_map_t T) (key : USize) : result (Option T) :=
   do
-    let hash <- hashmap_hash_key_fwd key 
-    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let hash_mod <- USize.checked_rem hash i 
+    let hash <- hashmap_hash_key_fwd key
+    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
     let l <-
-      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod 
-    let x <- hashmap_hash_map_remove_from_list_fwd T key l 
+      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
+    let x <- hashmap_hash_map_remove_from_list_fwd T key l
     match x with
     | Option.none => result.ret Option.none
     | Option.some x0 =>
       do
         let _ <- USize.checked_sub self.hashmap_hash_map_num_entries
-          (USize.ofNatCore 1 (by intlit)) 
+          (USize.ofNatCore 1 (by intlit))
         result.ret (Option.some x0)
     
 
@@ -533,19 +526,19 @@ def hashmap_hash_map_remove_back
   result (hashmap_hash_map_t T)
   :=
   do
-    let hash <- hashmap_hash_key_fwd key 
-    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots 
-    let hash_mod <- USize.checked_rem hash i 
+    let hash <- hashmap_hash_key_fwd key
+    let i := vec_len (hashmap_list_t T) self.hashmap_hash_map_slots
+    let hash_mod <- USize.checked_rem hash i
     let l <-
-      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod 
-    let x <- hashmap_hash_map_remove_from_list_fwd T key l 
+      vec_index_mut_fwd (hashmap_list_t T) self.hashmap_hash_map_slots hash_mod
+    let x <- hashmap_hash_map_remove_from_list_fwd T key l
     match x with
     | Option.none =>
       do
-        let l0 <- hashmap_hash_map_remove_from_list_back T key l 
+        let l0 <- hashmap_hash_map_remove_from_list_back T key l
         let v <-
           vec_index_mut_back (hashmap_list_t T) self.hashmap_hash_map_slots
-            hash_mod l0 
+            hash_mod l0
         result.ret
           {
             hashmap_hash_map_num_entries := self.hashmap_hash_map_num_entries,
@@ -556,11 +549,11 @@ def hashmap_hash_map_remove_back
     | Option.some x0 =>
       do
         let i0 <- USize.checked_sub self.hashmap_hash_map_num_entries
-          (USize.ofNatCore 1 (by intlit)) 
-        let l0 <- hashmap_hash_map_remove_from_list_back T key l 
+          (USize.ofNatCore 1 (by intlit))
+        let l0 <- hashmap_hash_map_remove_from_list_back T key l
         let v <-
           vec_index_mut_back (hashmap_list_t T) self.hashmap_hash_map_slots
-            hash_mod l0 
+            hash_mod l0
         result.ret
           {
             hashmap_hash_map_num_entries := i0,
@@ -573,21 +566,21 @@ def hashmap_hash_map_remove_back
 /- [hashmap_main::hashmap::test1] -/
 def hashmap_test1_fwd : result Unit :=
   do
-    let hm <- hashmap_hash_map_new_fwd UInt64 
+    let hm <- hashmap_hash_map_new_fwd UInt64
     let hm0 <-
       hashmap_hash_map_insert_fwd_back UInt64 hm
-        (USize.ofNatCore 0 (by intlit)) (UInt64.ofNatCore 42 (by intlit)) 
+        (USize.ofNatCore 0 (by intlit)) (UInt64.ofNatCore 42 (by intlit))
     let hm1 <-
       hashmap_hash_map_insert_fwd_back UInt64 hm0
-        (USize.ofNatCore 128 (by intlit)) (UInt64.ofNatCore 18 (by intlit)) 
+        (USize.ofNatCore 128 (by intlit)) (UInt64.ofNatCore 18 (by intlit))
     let hm2 <-
       hashmap_hash_map_insert_fwd_back UInt64 hm1
-        (USize.ofNatCore 1024 (by intlit)) (UInt64.ofNatCore 138 (by intlit)) 
+        (USize.ofNatCore 1024 (by intlit)) (UInt64.ofNatCore 138 (by intlit))
     let hm3 <-
       hashmap_hash_map_insert_fwd_back UInt64 hm2
-        (USize.ofNatCore 1056 (by intlit)) (UInt64.ofNatCore 256 (by intlit)) 
+        (USize.ofNatCore 1056 (by intlit)) (UInt64.ofNatCore 256 (by intlit))
     let i <-
-      hashmap_hash_map_get_fwd UInt64 hm3 (USize.ofNatCore 128 (by intlit)) 
+      hashmap_hash_map_get_fwd UInt64 hm3 (USize.ofNatCore 128 (by intlit))
     if not (i = (UInt64.ofNatCore 18 (by intlit)))
     then result.fail error.panic
     else
@@ -595,17 +588,17 @@ def hashmap_test1_fwd : result Unit :=
         let hm4 <-
           hashmap_hash_map_get_mut_back UInt64 hm3
             (USize.ofNatCore 1024 (by intlit))
-            (UInt64.ofNatCore 56 (by intlit)) 
+            (UInt64.ofNatCore 56 (by intlit))
         let i0 <-
           hashmap_hash_map_get_fwd UInt64 hm4
-            (USize.ofNatCore 1024 (by intlit)) 
+            (USize.ofNatCore 1024 (by intlit))
         if not (i0 = (UInt64.ofNatCore 56 (by intlit)))
         then result.fail error.panic
         else
           do
             let x <-
               hashmap_hash_map_remove_fwd UInt64 hm4
-                (USize.ofNatCore 1024 (by intlit)) 
+                (USize.ofNatCore 1024 (by intlit))
             match x with
             | Option.none => result.fail error.panic
             | Option.some x0 =>
@@ -615,24 +608,24 @@ def hashmap_test1_fwd : result Unit :=
                 do
                   let hm5 <-
                     hashmap_hash_map_remove_back UInt64 hm4
-                      (USize.ofNatCore 1024 (by intlit)) 
+                      (USize.ofNatCore 1024 (by intlit))
                   let i1 <-
                     hashmap_hash_map_get_fwd UInt64 hm5
-                      (USize.ofNatCore 0 (by intlit)) 
+                      (USize.ofNatCore 0 (by intlit))
                   if not (i1 = (UInt64.ofNatCore 42 (by intlit)))
                   then result.fail error.panic
                   else
                     do
                       let i2 <-
                         hashmap_hash_map_get_fwd UInt64 hm5
-                          (USize.ofNatCore 128 (by intlit)) 
+                          (USize.ofNatCore 128 (by intlit))
                       if not (i2 = (UInt64.ofNatCore 18 (by intlit)))
                       then result.fail error.panic
                       else
                         do
                           let i3 <-
                             hashmap_hash_map_get_fwd UInt64 hm5
-                              (USize.ofNatCore 1056 (by intlit)) 
+                              (USize.ofNatCore 1056 (by intlit))
                           if not (i3 = (UInt64.ofNatCore 256 (by intlit)))
                           then result.fail error.panic
                           else result.ret ()
@@ -645,9 +638,9 @@ def hashmap_test1_fwd : result Unit :=
 def insert_on_disk_fwd
   (key : USize) (value : UInt64) (st : state) : result (state × Unit) :=
   do
-    let (st0, hm) <- opaque_defs.hashmap_utils_deserialize_fwd st 
-    let hm0 <- hashmap_hash_map_insert_fwd_back UInt64 hm key value 
-    let (st1, _) <- opaque_defs.hashmap_utils_serialize_fwd hm0 st0 
+    let (st0, hm) <- opaque_defs.hashmap_utils_deserialize_fwd st
+    let hm0 <- hashmap_hash_map_insert_fwd_back UInt64 hm key value
+    let (st1, _) <- opaque_defs.hashmap_utils_serialize_fwd hm0 st0
     result.ret (st1, ())
 
 /- [hashmap_main::main] -/