Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed bug in stringlist #552

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft

fixed bug in stringlist #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
933a367
resolved inserting 0 lengthed slist in list bug
aman-godara Oct 10, 2021
ea46f19
changed name
aman-godara Oct 10, 2021
875def4
added test cases for inserting a list in itself
aman-godara Oct 15, 2021
a9a6288
added length check
aman-godara Oct 17, 2021
0bd66e1
a temp commit to test
aman-godara Nov 21, 2021
d946a35
again a temp commit
aman-godara Nov 21, 2021
bb30a55
another temp commit
aman-godara Nov 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions src/stdlib_stringlist_type.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,23 +642,29 @@ subroutine insert_before_stringlist_int_impl( list, idxn, slist )
type(stringlist_type), intent(in) :: slist

integer :: i
integer :: work_idxn, idxnew
integer :: pre_length, post_length
integer :: work_idxn, inew
integer :: pre_length, post_length, temp

work_idxn = idxn
pre_length = slist%len()
call insert_before_empty_positions( list, work_idxn, pre_length )
post_length = slist%len()
if (pre_length > 0) then
work_idxn = idxn

do i = 1, min( work_idxn - 1, pre_length )
idxnew = work_idxn + i - 1
list%stringarray(idxnew) = slist%stringarray(i)
end do
call insert_before_empty_positions( list, work_idxn, pre_length )
post_length = slist%len()

do i = work_idxn + post_length - pre_length, post_length
idxnew = work_idxn + i - post_length + pre_length - 1
list%stringarray(idxnew) = slist%stringarray(i)
end do
inew = work_idxn
temp = min( work_idxn - 1, pre_length )
do i = 1, temp
list%stringarray(inew) = slist%stringarray(i)
inew = inew + 1
end do

temp = work_idxn + post_length - pre_length
do i = temp, post_length
list%stringarray(inew) = slist%stringarray(i)
inew = inew + 1
end do
end if

end subroutine insert_before_stringlist_int_impl

Expand Down
81 changes: 72 additions & 9 deletions src/tests/stringlist/test_insert_at.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
! SPDX-Identifier: MIT
module test_insert_at
use stdlib_error, only: check
use stdlib_string_type, only: string_type, operator(//), operator(==)
use stdlib_string_type, only: string_type, operator(//), operator(==), char, operator(/=)
use stdlib_stringlist_type, only: stringlist_type, fidx, bidx, list_head, list_tail, operator(==)
use stdlib_strings, only: to_string
use stdlib_optval, only: optval
implicit none

contains
Expand Down Expand Up @@ -351,24 +352,85 @@ subroutine test_constructor

end subroutine test_constructor

subroutine test_insert_at_same_list
type(stringlist_type) :: work_list
type(stringlist_type) :: temp_list
integer :: i
integer, parameter :: first = -100
integer, parameter :: last = 100

write (*,*) "test_insert_at_same_list: Starting work_list!"

call work_list%insert_at( list_head, work_list )
call work_list%insert_at( list_tail, work_list )

do i = -10, 10
call work_list%insert_at( fidx(i), work_list )
call work_list%insert_at( bidx(i), work_list )

end do

call compare_list( work_list, 0, 0, 13 )
call check( work_list%len() == 0, "test_insert_at_same_list: empty list insertion")

do i = first, last
call work_list%insert_at( list_tail, string_type( to_string(i) ) )
call check(string_type( to_string(i) ) /= "", "There is something wrong with this")
end do
temp_list = work_list

call work_list%insert_at( list_head, work_list )
! call compare_list( work_list, first, last + 1, 14, to=last - first + 1 )
call compare_list( work_list, first, last + 1, 15, from=last - first + 2 )

work_list = temp_list
call work_list%insert_at( list_tail, work_list )
call compare_list( work_list, first, last + 1, 16, to=last - first + 1 )
call compare_list( work_list, first, last + 1, 17, from=last - first + 2 )

work_list = temp_list
call compare_list( work_list, first, last + 1, 18 )

write (*,*) "test_insert_at_same_list: Starting temp_list!"

do i = 1, last - first + 2
temp_list = work_list
call temp_list%insert_at( fidx(i), temp_list )

call compare_list( temp_list, first, first + i - 1, 19, to=i - 1 )
call compare_list( temp_list, first, last + 1, 20, from=i, to=i + last - first )
call compare_list( temp_list, first + i - 1, last + 1, 21, from=i + last - first + 1 )

end do

end subroutine test_insert_at_same_list

! compares input stringlist 'list' with an array of consecutive integers
! array is 'first' inclusive and 'last' exclusive
subroutine compare_list(list, first, last, call_number)
subroutine compare_list(list, first, last, call_number, from, to)
type(stringlist_type), intent(in) :: list
integer, intent(in) :: first, last, call_number
integer :: i, j
integer, intent(in), optional :: from, to
integer :: i, j, k, work_from, work_to, length

length = list%len()
work_from = optval( from, 1 )
work_to = optval( to, length )

call check( abs( last - first ) == list%len(), "compare_list: length mis-match&
call check( abs( last - first ) == max( 0, work_to - work_from + 1 ), "compare_list: length mis-match&
& call_number " // to_string( call_number ) )

j = merge(-1, 1, last < first)
do i = 1, list%len()
call check( list%get( fidx(i) ) == to_string( first + ( ( i - 1 ) * j ) ), &
do i = work_from, work_to
call check( list%get( fidx(i) ) == to_string( first + ( ( i - work_from ) * j ) ), &
& "compare_list: call_number " // to_string( call_number ) &
& // " fidx( " // to_string( i ) // " )")
call check( list%get( bidx(i) ) == to_string( last - ( i * j ) ), &
& // " fidx( " // to_string( i ) // " )" )

k = length - ( work_to - ( i - work_from ) ) + 1
call check( list%get( bidx(k) ) == &
& to_string( last - ( ( i - work_from + 1 ) * j ) ), &
& "compare_list: call_number " // to_string( call_number ) &
& // " bidx( " // to_string( i ) // " )")
& // " bidx( " // to_string( k ) // " )" )
end do

end subroutine compare_list
Expand All @@ -385,6 +447,7 @@ program tester
call test_insert_at_string_3
call test_insert_at_array
call test_insert_at_list
call test_insert_at_same_list
call test_constructor

end program tester