Use short names for the structure fields in Lean

1 files changed, 40 insertions, 76 deletions

diff --git a/tests/lean/HashmapMain/Funs.lean b/tests/lean/HashmapMain/Funs.lean
index b1afcd44..e82cc9b2 100644
--- a/tests/lean/HashmapMain/Funs.lean
+++ b/tests/lean/HashmapMain/Funs.lean
@@ -43,11 +43,10 @@ def hashmap.HashMap.new_with_capacity
     let i0 ← i / max_load_divisor
     Result.ret
       {
-        hashmap_hash_map_num_entries := (Usize.ofInt 0 (by intlit)),
-        hashmap_hash_map_max_load_factor :=
-          (max_load_dividend, max_load_divisor),
-        hashmap_hash_map_max_load := i0,
-        hashmap_hash_map_slots := slots
+        num_entries := (Usize.ofInt 0 (by intlit)),
+        max_load_factor := (max_load_dividend, max_load_divisor),
+        max_load := i0,
+        slots := slots
       }
 
 /- [hashmap_main::hashmap::HashMap::{0}::new]: forward function -/
@@ -77,19 +76,13 @@ def hashmap.HashMap.clear
   (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) :=
   do
     let v ←
-      hashmap.HashMap.clear_loop T self.hashmap_hash_map_slots
-        (Usize.ofInt 0 (by intlit))
+      hashmap.HashMap.clear_loop T self.slots (Usize.ofInt 0 (by intlit))
     Result.ret
-      {
-        self
-          with
-          hashmap_hash_map_num_entries := (Usize.ofInt 0 (by intlit)),
-          hashmap_hash_map_slots := v
-      }
+      { self with num_entries := (Usize.ofInt 0 (by intlit)), slots := v }
 
 /- [hashmap_main::hashmap::HashMap::{0}::len]: forward function -/
 def hashmap.HashMap.len (T : Type) (self : hashmap.HashMap T) : Result Usize :=
-  Result.ret self.hashmap_hash_map_num_entries
+  Result.ret self.num_entries
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert_in_list]: loop 0: forward function -/
 divergent def hashmap.HashMap.insert_in_list_loop
@@ -138,33 +131,22 @@ def hashmap.HashMap.insert_no_resize
   :=
   do
     let hash ← hashmap.hash_key key
-    let i := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ←
-      Vec.index_mut (hashmap.List T) self.hashmap_hash_map_slots hash_mod
+    let l ← Vec.index_mut (hashmap.List T) self.slots hash_mod
     let inserted ← hashmap.HashMap.insert_in_list T key value l
     if inserted
     then
       do
-        let i0 ← self.hashmap_hash_map_num_entries +
-          (Usize.ofInt 1 (by intlit))
+        let i0 ← self.num_entries + (Usize.ofInt 1 (by intlit))
         let l0 ← hashmap.HashMap.insert_in_list_back T key value l
-        let v ←
-          Vec.index_mut_back (hashmap.List T) self.hashmap_hash_map_slots
-            hash_mod l0
-        Result.ret
-          {
-            self
-              with
-              hashmap_hash_map_num_entries := i0, hashmap_hash_map_slots := v
-          }
+        let v ← Vec.index_mut_back (hashmap.List T) self.slots hash_mod l0
+        Result.ret { self with num_entries := i0, slots := v }
     else
       do
         let l0 ← hashmap.HashMap.insert_in_list_back T key value l
-        let v ←
-          Vec.index_mut_back (hashmap.List T) self.hashmap_hash_map_slots
-            hash_mod l0
-        Result.ret { self with hashmap_hash_map_slots := v }
+        let v ← Vec.index_mut_back (hashmap.List T) self.slots hash_mod l0
+        Result.ret { self with slots := v }
 
 /- [core::num::u32::{9}::MAX] -/
 def core_num_u32_max_body : Result U32 :=
@@ -227,9 +209,9 @@ def hashmap.HashMap.try_resize
   (T : Type) (self : hashmap.HashMap T) : Result (hashmap.HashMap T) :=
   do
     let max_usize ← Scalar.cast .Usize core_num_u32_max_c
-    let capacity := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let capacity := Vec.len (hashmap.List T) self.slots
     let n1 ← max_usize / (Usize.ofInt 2 (by intlit))
-    let (i, i0) := self.hashmap_hash_map_max_load_factor
+    let (i, i0) := self.max_load_factor
     let i1 ← n1 / i
     if capacity <= i1
     then
@@ -237,16 +219,15 @@ def hashmap.HashMap.try_resize
         let i2 ← capacity * (Usize.ofInt 2 (by intlit))
         let ntable ← hashmap.HashMap.new_with_capacity T i2 i i0
         let (ntable0, _) ←
-          hashmap.HashMap.move_elements T ntable self.hashmap_hash_map_slots
+          hashmap.HashMap.move_elements T ntable self.slots
             (Usize.ofInt 0 (by intlit))
         Result.ret
           {
             ntable0
               with
-              hashmap_hash_map_num_entries := self.hashmap_hash_map_num_entries,
-              hashmap_hash_map_max_load_factor := (i, i0)
+              num_entries := self.num_entries, max_load_factor := (i, i0)
           }
-    else Result.ret { self with hashmap_hash_map_max_load_factor := (i, i0) }
+    else Result.ret { self with max_load_factor := (i, i0) }
 
 /- [hashmap_main::hashmap::HashMap::{0}::insert]: merged forward/backward function
    (there is a single backward function, and the forward function returns ()) -/
@@ -257,7 +238,7 @@ def hashmap.HashMap.insert
   do
     let self0 ← hashmap.HashMap.insert_no_resize T self key value
     let i ← hashmap.HashMap.len T self0
-    if i > self0.hashmap_hash_map_max_load
+    if i > self0.max_load
     then hashmap.HashMap.try_resize T self0
     else Result.ret self0
 
@@ -281,9 +262,9 @@ def hashmap.HashMap.contains_key
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result Bool :=
   do
     let hash ← hashmap.hash_key key
-    let i := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ← Vec.index (hashmap.List T) self.hashmap_hash_map_slots hash_mod
+    let l ← Vec.index (hashmap.List T) self.slots hash_mod
     hashmap.HashMap.contains_key_in_list T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: loop 0: forward function -/
@@ -306,9 +287,9 @@ def hashmap.HashMap.get
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result T :=
   do
     let hash ← hashmap.hash_key key
-    let i := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ← Vec.index (hashmap.List T) self.hashmap_hash_map_slots hash_mod
+    let l ← Vec.index (hashmap.List T) self.slots hash_mod
     hashmap.HashMap.get_in_list T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: loop 0: forward function -/
@@ -353,10 +334,9 @@ def hashmap.HashMap.get_mut
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result T :=
   do
     let hash ← hashmap.hash_key key
-    let i := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ←
-      Vec.index_mut (hashmap.List T) self.hashmap_hash_map_slots hash_mod
+    let l ← Vec.index_mut (hashmap.List T) self.slots hash_mod
     hashmap.HashMap.get_mut_in_list T l key
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut]: backward function 0 -/
@@ -366,15 +346,12 @@ def hashmap.HashMap.get_mut_back
   :=
   do
     let hash ← hashmap.hash_key key
-    let i := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ←
-      Vec.index_mut (hashmap.List T) self.hashmap_hash_map_slots hash_mod
+    let l ← Vec.index_mut (hashmap.List T) self.slots hash_mod
     let l0 ← hashmap.HashMap.get_mut_in_list_back T l key ret0
-    let v ←
-      Vec.index_mut_back (hashmap.List T) self.hashmap_hash_map_slots hash_mod
-        l0
-    Result.ret { self with hashmap_hash_map_slots := v }
+    let v ← Vec.index_mut_back (hashmap.List T) self.slots hash_mod l0
+    Result.ret { self with slots := v }
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove_from_list]: loop 0: forward function -/
 divergent def hashmap.HashMap.remove_from_list_loop
@@ -426,17 +403,15 @@ def hashmap.HashMap.remove
   (T : Type) (self : hashmap.HashMap T) (key : Usize) : Result (Option T) :=
   do
     let hash ← hashmap.hash_key key
-    let i := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ←
-      Vec.index_mut (hashmap.List T) self.hashmap_hash_map_slots hash_mod
+    let l ← Vec.index_mut (hashmap.List T) self.slots hash_mod
     let x ← hashmap.HashMap.remove_from_list T key l
     match x with
     | Option.none => Result.ret Option.none
     | Option.some x0 =>
       do
-        let _ ← self.hashmap_hash_map_num_entries -
-          (Usize.ofInt 1 (by intlit))
+        let _ ← self.num_entries - (Usize.ofInt 1 (by intlit))
         Result.ret (Option.some x0)
 
 /- [hashmap_main::hashmap::HashMap::{0}::remove]: backward function 0 -/
@@ -446,33 +421,22 @@ def hashmap.HashMap.remove_back
   :=
   do
     let hash ← hashmap.hash_key key
-    let i := Vec.len (hashmap.List T) self.hashmap_hash_map_slots
+    let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ←
-      Vec.index_mut (hashmap.List T) self.hashmap_hash_map_slots hash_mod
+    let l ← Vec.index_mut (hashmap.List T) self.slots hash_mod
     let x ← hashmap.HashMap.remove_from_list T key l
     match x with
     | Option.none =>
       do
         let l0 ← hashmap.HashMap.remove_from_list_back T key l
-        let v ←
-          Vec.index_mut_back (hashmap.List T) self.hashmap_hash_map_slots
-            hash_mod l0
-        Result.ret { self with hashmap_hash_map_slots := v }
+        let v ← Vec.index_mut_back (hashmap.List T) self.slots hash_mod l0
+        Result.ret { self with slots := v }
     | Option.some x0 =>
       do
-        let i0 ← self.hashmap_hash_map_num_entries -
-          (Usize.ofInt 1 (by intlit))
+        let i0 ← self.num_entries - (Usize.ofInt 1 (by intlit))
         let l0 ← hashmap.HashMap.remove_from_list_back T key l
-        let v ←
-          Vec.index_mut_back (hashmap.List T) self.hashmap_hash_map_slots
-            hash_mod l0
-        Result.ret
-          {
-            self
-              with
-              hashmap_hash_map_num_entries := i0, hashmap_hash_map_slots := v
-          }
+        let v ← Vec.index_mut_back (hashmap.List T) self.slots hash_mod l0
+        Result.ret { self with num_entries := i0, slots := v }
 
 /- [hashmap_main::hashmap::test1]: forward function -/
 def hashmap.test1 : Result Unit :=