Update to remove other_type references

Update to remove remaining references to the 'other_type' derived type.

Author: chuckyvt

example/hashmaps/CMakeLists.txt

@@ -1,12 +1,10 @@
 ADD_EXAMPLE(hashmaps_calls)
 ADD_EXAMPLE(hashmaps_copy_key)
-ADD_EXAMPLE(hashmaps_copy_other)
 ADD_EXAMPLE(hashmaps_entries)
 ADD_EXAMPLE(hashmaps_equal_keys)
 ADD_EXAMPLE(hashmaps_fnv_1a_hasher)
 ADD_EXAMPLE(hashmaps_fnv_1_hasher)
 ADD_EXAMPLE(hashmaps_free_key)
-ADD_EXAMPLE(hashmaps_free_other)
 ADD_EXAMPLE(hashmaps_get)
 ADD_EXAMPLE(hashmaps_get_all_keys)
 ADD_EXAMPLE(hashmaps_get_other_data)
@@ -26,3 +24,5 @@ ADD_EXAMPLE(hashmaps_set)
 ADD_EXAMPLE(hashmaps_set_other_data)
 ADD_EXAMPLE(hashmaps_slots_bits)
 ADD_EXAMPLE(hashmaps_total_depth)
+
+

example/hashmaps/example_hashmaps_copy_other.f90

@@ -2,7 +2,7 @@ program example_hashmaps_get_all_keys
   use stdlib_kinds, only: int32
   use stdlib_hashmaps, only: chaining_hashmap_type
   use stdlib_hashmap_wrappers, only: fnv_1_hasher, get, &
-                                     key_type, other_type, set
+                                     key_type, set
   implicit none
   type(chaining_hashmap_type) :: map
   type(key_type)   :: key

example/hashmaps/example_hashmaps_free_other.f90

@@ -1,7 +1,7 @@
 program example_get_other_data
   use stdlib_kinds, only: int8, int64
-  use stdlib_hashmaps, only: chaining_hashmap_type
-  use stdlib_hashmap_wrappers, only: fnv_1_hasher, key_type, other_type, set, get
+  use stdlib_hashmaps, only: chaining_hashmap_type, int_index
+  use stdlib_hashmap_wrappers, only: fnv_1_hasher, key_type, set, get
   implicit none
   logical                     :: conflict
   type(key_type)              :: key

example/hashmaps/example_hashmaps_get_all_keys.f90

@@ -1,24 +1,28 @@
 program example_set_other_data
   use stdlib_kinds, only: int8
   use stdlib_hashmaps, only: open_hashmap_type, chaining_hashmap_type
-  use stdlib_hashmap_wrappers, only: fnv_1_hasher, &
-                                     fnv_1a_hasher
+  use stdlib_hashmap_wrappers, only: key_type, set, fnv_1_hasher
+  
   implicit none
   logical :: exists
   type(chaining_hashmap_type) :: map
   class(*), allocatable   :: data
+  
+  type(key_type) :: key
 
   ! Initialize hashmap with 2^10 slots.
   ! Hashmap will dynamically increase size if needed.
   call map%init(fnv_1_hasher, slots_bits=10)
 
-  call map%map_entry([5, 7, 4, 13], 'A value')
+  call set(key, [5, 7, 4, 13])
+  
+  call map%map_entry(key, 'A value')
 
-  call map%set_other_data([5, 7, 4, 13], 'Another value', exists)
+  call map%set_other_data(key, 'Another value', exists)
 
   print *, 'The entry to have its other data replaced exists = ', exists
 
-  call map%get_other_data( [5, 7, 4, 13], data, exists)
+  call map%get_other_data(key, data, exists)
 
   print *, 'Get_other_data was successful = ', exists
 

example/hashmaps/example_hashmaps_get_other_data.f90

@@ -24,12 +24,10 @@ module stdlib_hashmap_wrappers
 !! Public procedures
     public ::                    &
         copy_key,                &
-        copy_other,              &
         fibonacci_hash,          &
         fnv_1_hasher,            &
         fnv_1a_hasher,           &
         free_key,                &
-        free_other,              &
         get,                     &
         hasher_fun,              &
         operator(==),            &
@@ -40,8 +38,7 @@ module stdlib_hashmap_wrappers
 
 !! Public types
     public ::      &
-        key_type,  &
-        other_type
+        key_type
 
 !! Public integers
     public ::   &
@@ -76,20 +73,12 @@ pure function hasher_fun( key )  result(hash_value)
         end function hasher_fun
     end interface
 
-    type :: other_type
-!! Version: Experimental
-!!
-!! A wrapper type for the other data's true type
-!        private
-        class(*), allocatable :: value
-    end type other_type
-
+    
     interface get
 
         module procedure get_char_key,   &
                          get_int8_key,   &
-                         get_int32_key,   &
-                         get_other
+                         get_int32_key
 
     end interface get
 
@@ -102,8 +91,7 @@ end function hasher_fun
 
         module procedure set_char_key,   &
                          set_int8_key,   &
-                         set_int32_key, &
-                         set_other
+                         set_int32_key
 
     end interface set
 
@@ -127,23 +115,6 @@ pure subroutine copy_key( old_key, new_key )
     end subroutine copy_key
 
 
-    subroutine copy_other( other_in, other_out )
-!! Version: Experimental
-!!
-!! Copies the other data, other_in, to the variable, other_out
-!! ([Specifications](../page/specs/stdlib_hashmaps.html#copy_other-returns-a-copy-of-the-other-data))
-!!
-!! Arguments:
-!!     other_in  - the input data
-!!     other_out - the output data
-        type(other_type), intent(in)  :: other_in
-        type(other_type), intent(out) :: other_out
-
-        allocate(other_out % value, source = other_in % value )
-
-    end subroutine copy_other
-
-
     function equal_keys( key1, key2 ) result(test) ! Chase's tester
 !! Version: Experimental
 !!
@@ -187,21 +158,6 @@ subroutine free_key( key )
     end subroutine free_key
 
 
-    subroutine free_other( other )
-!! Version: Experimental
-!!
-!! Frees the memory in the other data
-!! ([Specifications](../page/specs/stdlib_hashmaps.html#free_other-frees-the-memory-associated-with-other-data))
-!!
-!! Arguments:
-!!     other  - the other data
-        type(other_type), intent(inout) :: other
-
-        if ( allocated( other % value) ) deallocate( other % value )
-
-    end subroutine free_other
-
-
     subroutine get_char_key( key, value )
 !! Version: Experimental
 !!
@@ -249,20 +205,6 @@ subroutine get_char_key( key, value )
 
     end subroutine get_char_key
 
-    subroutine get_other( other, value )
-!! Version: Experimental
-!!
-!! Gets the contents of the other as a CLASS(*) string
-!! Arguments:
-!!     other - the input other data
-!!     value - the contents of other mapped to a CLASS(*) variable
-        type(other_type), intent(in)       :: other
-        class(*), allocatable, intent(out) :: value
-
-        allocate(value, source=other % value)
-
-    end subroutine get_other
-
 
     subroutine get_int8_key( key, value )
 !! Version: Experimental
@@ -310,21 +252,6 @@ subroutine set_char_key( key, value )
     end subroutine set_char_key
 
 
-    subroutine set_other( other, value )
-!! Version: Experimental
-!!
-!! Sets the contents of the other data from a CLASS(*) variable
-!! Arguments:
-!!     other - the output other data
-!!     value - the input CLASS(*) variable
-        type(other_type), intent(out) :: other
-        class(*), intent(in)          :: value
-
-        allocate(other % value, source=value)
-
-    end subroutine set_other
-
-
     subroutine set_int8_key( key, value )
 !! Version: Experimental
 !!

example/hashmaps/example_hashmaps_set_other_data.f90

@@ -18,12 +18,10 @@ module stdlib_hashmaps
 
     use stdlib_hashmap_wrappers, only: &
         copy_key,                &
-        copy_other,              &
         fibonacci_hash,          &
         fnv_1_hasher,            &
         fnv_1a_hasher,           &
         free_key,                &
-        free_other,              &
         get,                     &
         hasher_fun,              &
         operator(==),            &