Skip to content

Commit bc9eda7

Browse files
aman-godaraaman-godara
committed
resolved 2 bugs, improved aesthetics of code
1 parent e7604bd commit bc9eda7

File tree

1 file changed

+46
-46
lines changed

1 file changed

+46
-46
lines changed

‎src/stdlib_stringlist.f90

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ pure integer function capacity( list )
280280
type(stringlist_type), intent(in) :: list
281281

282282
capacity = 0
283-
if ( allocated(list%stringarray) ) then
284-
capacity = size(list%stringarray)
283+
if ( allocated( list%stringarray ) ) then
284+
capacity = size( list%stringarray )
285285
end if
286286

287287
end function capacity
@@ -304,38 +304,38 @@ end function to_idxn
304304
! string The string in question
305305
!
306306
subroutine insert_char_idx_wrap( list, idx, string )
307-
type(stringlist_type), intent(inout) :: list
308-
type(stringlist_index_type), intent(in) :: idx
309-
character(len=*), intent(in) :: string
307+
type(stringlist_type), intent(inout) :: list
308+
type(stringlist_index_type), intent(in) :: idx
309+
character(len=*), intent(in) :: string
310310

311311
call list%insert( idx, string_type( string ) )
312312

313313
end subroutine insert_char_idx_wrap
314314

315315
subroutine insert_string_idx_wrap( list, idx, string )
316-
type(stringlist_type), intent(inout) :: list
317-
type(stringlist_index_type), intent(in) :: idx
318-
type(type_string), intent(in) :: string
316+
type(stringlist_type), intent(inout) :: list
317+
type(stringlist_index_type), intent(in) :: idx
318+
type(string_type), intent(in) :: string
319319

320-
call list%insert( to_idxn(idx), string )
320+
call list%insert( to_idxn( idx ), string )
321321

322322
end subroutine insert_string_idx_wrap
323323

324324
subroutine insert_stringlist_idx_wrap( list, idx, slist )
325-
type(stringlist_type), intent(inout) :: list
326-
type(stringlist_index_type), intent(in) :: idx
327-
type(stringlist_type), intent(in) :: slist
325+
type(stringlist_type), intent(inout) :: list
326+
type(stringlist_index_type), intent(in) :: idx
327+
type(stringlist_type), intent(in) :: slist
328328

329-
call list%insert( to_idxn(idx), slist )
329+
call list%insert( to_idxn( idx ), slist )
330330

331331
end subroutine insert_stringlist_idx_wrap
332332

333333
subroutine insert_stringarray_idx_wrap( list, idx, sarray )
334-
type(stringlist_type), intent(inout) :: list
335-
type(stringlist_index_type), intent(in) :: idx
336-
character(len=*), dimension(:), intent(in) :: sarray
334+
type(stringlist_type), intent(inout) :: list
335+
type(stringlist_index_type), intent(in) :: idx
336+
character(len=*), dimension(:), intent(in) :: sarray
337337

338-
call list%insert( to_idxn(idx), sarray )
338+
call list%insert( to_idxn( idx ), sarray )
339339

340340
end subroutine insert_stringarray_idx_wrap
341341

@@ -348,13 +348,13 @@ end subroutine insert_stringarray_idx_wrap
348348
! number Number of positions
349349
!
350350
subroutine insert_empty_positions( list, idxn, number )
351-
type(stringlist_type), intent(inout) :: list
352-
integer, intent(inout) :: idxn
353-
integer, intent(inout) :: number
351+
type(stringlist_type), intent(inout) :: list
352+
integer, intent(inout) :: idxn
353+
integer, intent(inout) :: number
354354

355-
integer :: i, inew
356-
integer :: new_size, old_size
357-
type(string_type), dimension(:), allocatable :: new_stringarray
355+
integer :: i, inew
356+
integer :: new_size, old_size
357+
type(string_type), dimension(:), allocatable :: new_stringarray
358358

359359
if (number > 0) then
360360

@@ -395,23 +395,23 @@ end subroutine insert_empty_positions
395395
! Insert a new string into the list - specific implementation
396396
!
397397
subroutine insert_char_int_impl( list, idx, string )
398-
type(stringlist_type), intent(inout) :: list
399-
integer, intent(in) :: idx
400-
character(len=*), intent(in) :: string
398+
type(stringlist_type), intent(inout) :: list
399+
integer, intent(in) :: idx
400+
character(len=*), intent(in) :: string
401401

402-
call insert( list, idx, string_type(string) )
402+
call insert( list, idx, string_type( string ) )
403403

404404
end subroutine insert_char_int_impl
405405

406406
! insert_string_int_impl --
407407
! Insert a new string into the list - specific implementation
408408
!
409409
subroutine insert_string_int_impl( list, idx, string )
410-
type(stringlist_type), intent(inout) :: list
411-
integer, intent(in) :: idx
412-
type(string_type), intent(in) :: string
410+
type(stringlist_type), intent(inout) :: list
411+
integer, intent(in) :: idx
412+
type(string_type), intent(in) :: string
413413

414-
integer :: idxn
414+
integer :: idxn
415415

416416
idxn = idx
417417
call insert_empty_positions( list, idxn, 1 )
@@ -424,17 +424,17 @@ end subroutine insert_string_int_impl
424424
! Insert a list of strings into the list - specific implementation
425425
!
426426
subroutine insert_stringlist_int_impl( list, idx, slist )
427-
type(stringlist_type), intent(inout) :: list
428-
integer, intent(in) :: idx
429-
type(stringlist_type), intent(in) :: slist
427+
type(stringlist_type), intent(inout) :: list
428+
integer, intent(in) :: idx
429+
type(stringlist_type), intent(in) :: slist
430430

431-
integer :: i
432-
integer :: idxn, idxnew
431+
integer :: i
432+
integer :: idxn, idxnew
433433

434434
idxn = idx
435-
call insert_empty_positions( list, idxn, len(list) )
435+
call insert_empty_positions( list, idxn, len( slist ) )
436436

437-
do i = 1, len(list)
437+
do i = 1, len( slist )
438438
idxnew = idxn + i - 1
439439
list%stringarray(idxnew) = slist%stringarray(i)
440440
end do
@@ -453,11 +453,11 @@ subroutine insert_chararray_int_impl( list, idx, sarray )
453453
integer :: idxn, idxnew
454454

455455
idxn = idx
456-
call insert_empty_positions( list, idxn, size(sarray) )
456+
call insert_empty_positions( list, idxn, size( sarray ) )
457457

458-
do i = 1, size(sarray)
458+
do i = 1, size( sarray )
459459
idxnew = idxn + i - 1
460-
list%stringarray(idxnew) = string_type(sarray(i))
460+
list%stringarray(idxnew) = string_type( sarray(i) )
461461
end do
462462

463463
end subroutine insert_chararray_int_impl
@@ -474,9 +474,9 @@ subroutine insert_stringarray_int_impl( list, idx, sarray )
474474
integer :: idxn, idxnew
475475

476476
idxn = idx
477-
call insert_empty_positions( list, idxn, size(sarray) )
477+
call insert_empty_positions( list, idxn, size( sarray ) )
478478

479-
do i = 1, size(sarray)
479+
do i = 1, size( sarray )
480480
idxnew = idxn + i - 1
481481
list%stringarray(idxnew) = sarray(i)
482482
end do
@@ -499,9 +499,9 @@ pure function get_string_idx_wrap( list, idx )
499499

500500
end function get_string_idx_wrap
501501

502-
pure function get_string_int_impl( list, idx )
502+
pure function get_string_int_impl( list, idxn )
503503
type(stringlist_type), intent(in) :: list
504-
integer, intent(in) :: idx
504+
integer, intent(in) :: idxn
505505
type(string_type) :: get_string_int_impl
506506

507507
integer :: idxnew
@@ -510,7 +510,7 @@ pure function get_string_int_impl( list, idx )
510510
! Examine the actual index:
511511
! - if the index is out of bounds, return a string_type equivalent to empty string
512512
!
513-
if ( 1 <= idx .or. idx <= len(list) ) then
513+
if ( 1 <= idxn .and. idxn <= len( list ) ) then
514514
get_string_int_impl = list%stringarray(idx)
515515
end if
516516

0 commit comments

Comments
 (0)