resolved a bug in destroy, added test cases

Author: aman-godara

src/Makefile.manual

@@ -156,6 +156,6 @@ stdlib_math_linspace.o: \
 stdlib_math_logspace.o: \
 	stdlib_math_linspace.o
 stdlib_linalg_outer_product.o: stdlib_linalg.o
-stdlib_stringlist.o: stdlib_stringtype.o \
+stdlib_stringlist.o: stdlib_string_type.o \
     stdlib_math.o \
 	stdlib_optval.o

src/stdlib_stringlist.f90

@@ -232,7 +232,9 @@ subroutine destroy_list( list )
         class(stringlist_type), intent(out) :: list
 
         list%size = 0
-        deallocate( list%stringarray )
+        if ( allocated( list%stringarray ) ) then
+            deallocate( list%stringarray )
+        end if
 
     end subroutine destroy_list
 

src/tests/CMakeLists.txt

@@ -18,6 +18,7 @@ add_subdirectory(string)
 add_subdirectory(system)
 add_subdirectory(quadrature)
 add_subdirectory(math)
+add_subdirectory(stringlist)
 
 ADDTEST(always_skip)
 set_tests_properties(always_skip PROPERTIES SKIP_RETURN_CODE 77)

src/tests/Makefile.manual

@@ -11,3 +11,4 @@ all test clean:
 	$(MAKE) -f Makefile.manual --directory=stats $@
 	$(MAKE) -f Makefile.manual --directory=string $@
 	$(MAKE) -f Makefile.manual --directory=math $@
+	$(MAKE) -f Makefile.manual --directory=stringlist $@

src/tests/stringlist/CMakeLists.txt

@@ -1,4 +1 @@
-ADDTEST(insert)
-ADDTEST(delete)
-ADDTEST(find)
-ADDTEST(replace_append)
+ADDTEST(insert_at)

src/tests/stringlist/test_insert.f90 renamed to src/tests/stringlist/test_insert_at.f90

@@ -2,35 +2,37 @@
 !     Test the insertion routine
 !
 program test_insertion
-    use stdlib_stringlist
+    use stdlib_stringlist, only: stringlist_type, fidx, bidx, stringlist_index_type, &
+    & list_head, list_tail
+    use stdlib_string_type, only: string_type, char
 
     type(stringlist_type)           :: list, second_list
     character(len=10), dimension(3) :: sarray
 
 
-    call list%insert( 1, "C" )
-    call list%insert( 1, "B" )
-    call list%insert( 1, "A" )
+    call list%insert_at( fidx(1), "C" )
+    call list%insert_at( fidx(1), "B" )
+    call list%insert_at( fidx(1), "A" )
 
     write(*,*) 'Expected: A, B, C (3)'
     call print_list( list )
 
-    call list%insert( 6, "D" )
+    call list%insert_at( fidx(1), "D" )
 
     write(*,*) 'Expected: A, B, C, D (4)'
     call print_list( list )
 
-    call list%insert( -1, "X" )
+    call list%insert_at( bidx(1), "X" )
 
     write(*,*) 'Expected: X, A, B, C, D (5)'
     call print_list( list )
 
-    call list%insert( list_end-1, "Y" )
+    call list%insert_at( bidx(2), "Y" )
 
     write(*,*) 'Expected: X, A, B, Y, C, D (6)'
     call print_list( list )
 
-    call list%insert( list_end+1, "Z" )
+    call list%insert_at( list_tail, "Z" )
 
     write(*,*) 'Expected: X, A, B, Y, C, D, Z (7)'
     call print_list( list )
@@ -40,15 +42,15 @@ program test_insertion
     !
     call renew_list( list )
 
-    call second_list%insert( 1, "SecondA" )
-    call second_list%insert( 2, "SecondB" )
+    call second_list%insert_at( fidx(1), "SecondA" )
+    call second_list%insert_at( fidx(2), "SecondB" )
 
-    call list%insert( 2, second_list )
+    call list%insert_at( fidx(2), second_list )
     call print_list( list )
 
     call renew_list( list )
 
-    call list%insert( list_after_end, second_list )
+    call list%insert_at( list_tail, second_list )
     call print_list( list )
 
     !
@@ -60,31 +62,32 @@ program test_insertion
     sarray(2) = "ThirdB"
     sarray(3) = "ThirdC"
 
-    call list%insert( list_head, sarray )
+    call list%insert_at( list_head, sarray )
     call print_list( list )
 
     call renew_list( list )
 
-    call list%insert( 2, sarray )
+    call list%insert_at( fidx(2), sarray )
     call print_list( list )
 
 contains
 subroutine renew_list( list )
     type(stringlist_type), intent(inout) :: list
 
-    call list%destroy
-    call list%insert( 1, "A" )
-    call list%insert( 2, "B" )
-    call list%insert( 3, "C" )
+    call list%destroy()
+    call list%insert_at( fidx(1), "A" )
+    call list%insert_at( fidx(2), "B" )
+    call list%insert_at( fidx(3), "C" )
 end subroutine renew_list
 
 subroutine print_list( list )
     type(stringlist_type), intent(in) :: list
+    integer                           :: i
 
-    write(*,*) list%length()
+    write(*,*) list%len()
 
-    do i = 1,list%length()
-        write(*,*) '>', list%get(i), '<'
+    do i = 1, list%len()
+        write(*,*) '>', char( list%get( fidx(i) ) ), '<'
     enddo
 end subroutine print_list