Skip to content

Commit 4cf102e

Browse files
committed
removed pad_char_char function
1 parent f8f4a0b commit 4cf102e

File tree

1 file changed

+29
-45
lines changed

1 file changed

+29
-45
lines changed

src/stdlib_strings.f90

Lines changed: 29 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ module stdlib_strings
1212

1313
public :: strip, chomp
1414
public :: starts_with, ends_with
15-
public :: slice, find, replace_all
15+
public :: slice, find, replace_all, padl, padr
1616

1717

1818
!> Remove leading and trailing whitespace characters.
@@ -584,18 +584,19 @@ pure function replace_all_char_char_char(string, pattern, replacement, replace_o
584584

585585
end function replace_all_char_char_char
586586

587-
!> Left pad the input string with the 'pad_with' string
587+
!> Left pad the input string with " " (1 whitespace)
588588
!>
589589
!> Returns a new string
590590
pure function padl_string_default(string, output_length) result(res)
591591
type(string_type), intent(in) :: string
592592
integer, intent(in) :: output_length
593593
type(string_type) :: res
594594

595-
res = string_type(padl_char_char(char(string), output_length, " "))
595+
res = string_type(padl(char(string), output_length, " "))
596+
596597
end function padl_string_default
597598

598-
!> Left pad the input string with the 'pad_with' string
599+
!> Left pad the input string with the 'pad_with' character
599600
!>
600601
!> Returns a new string
601602
pure function padl_string_pad_with(string, output_length, pad_with) result(res)
@@ -604,65 +605,58 @@ pure function padl_string_pad_with(string, output_length, pad_with) result(res)
604605
character(len=1), intent(in) :: pad_with
605606
type(string_type) :: res
606607

607-
res = string_type(padl_char_char(char(string), output_length, pad_with))
608+
res = string_type(padl(char(string), output_length, pad_with))
609+
608610
end function padl_string_pad_with
609611

610-
!> Left pad the input string with the 'pad_with' string
612+
!> Left pad the input string with " " (1 whitespace)
611613
!>
612614
!> Returns a new string
613615
pure function padl_char_default(string, output_length) result(res)
614616
character(len=*), intent(in) :: string
615617
integer, intent(in) :: output_length
616618
character(len=max(len(string), output_length)) :: res
617619

618-
res = padl_char_char(string, output_length, " ")
620+
res = padl(string, output_length, " ")
621+
619622
end function padl_char_default
620623

621-
!> Left pad the input string with the 'pad_with' string
624+
!> Left pad the input string with the 'pad_with' character
622625
!>
623626
!> Returns a new string
624627
pure function padl_char_pad_with(string, output_length, pad_with) result(res)
625628
character(len=*), intent(in) :: string
626629
integer, intent(in) :: output_length
627630
character(len=1), intent(in) :: pad_with
628631
character(len=max(len(string), output_length)) :: res
629-
630-
res = padl_char_char(string, output_length, pad_with)
631-
end function padl_char_pad_with
632-
633-
!> Left pad the input string with the 'pad_with' string
634-
!>
635-
!> Returns a new string
636-
pure function padl_char_char(string, output_length, pad_with) result(res)
637-
character(len=*), intent(in) :: string
638-
integer, intent(in) :: output_length
639-
character(len=1), intent(in) :: pad_with
640-
character(len=max(len(string), output_length)) :: res
641632
integer :: string_length
642-
633+
643634
string_length = len(string)
644-
635+
645636
if (string_length < output_length) then
646637
res = repeat(pad_with, output_length - string_length)
647638
res(output_length - string_length + 1 : output_length) = string
648639
else
649640
res = string
650641
end if
651-
652-
end function padl_char_char
653642

654-
!> Right pad the input string with the 'pad_with' string
643+
end function padl_char_pad_with
644+
645+
!> Right pad the input string with " " (1 whitespace)
655646
!>
656647
!> Returns a new string
657648
pure function padr_string_default(string, output_length) result(res)
658649
type(string_type), intent(in) :: string
659650
integer, intent(in) :: output_length
651+
character(len=max(len(string), output_length)) :: char_output
660652
type(string_type) :: res
661653

662-
res = string_type(padr_char_char(char(string), output_length, " "))
654+
char_output = char(string)
655+
res = string_type(char_output)
656+
663657
end function padr_string_default
664658

665-
!> Right pad the input string with the 'pad_with' string
659+
!> Right pad the input string with the 'pad_with' character
666660
!>
667661
!> Returns a new string
668662
pure function padr_string_pad_with(string, output_length, pad_with) result(res)
@@ -671,10 +665,11 @@ pure function padr_string_pad_with(string, output_length, pad_with) result(res)
671665
character(len=1), intent(in) :: pad_with
672666
type(string_type) :: res
673667

674-
res = string_type(padr_char_char(char(string), output_length, pad_with))
668+
res = string_type(padr(char(string), output_length, pad_with))
669+
675670
end function padr_string_pad_with
676671

677-
!> Right pad the input string with the 'pad_with' string
672+
!> Right pad the input string with " " (1 whitespace)
678673
!>
679674
!> Returns a new string
680675
pure function padr_char_default(string, output_length) result(res)
@@ -683,39 +678,28 @@ pure function padr_char_default(string, output_length) result(res)
683678
character(len=max(len(string), output_length)) :: res
684679

685680
res = string
686-
end function padr_char_default
687681

688-
!> Right pad the input string with the 'pad_with' string
689-
!>
690-
!> Returns a new string
691-
pure function padr_char_pad_with(string, output_length, pad_with) result(res)
692-
character(len=*), intent(in) :: string
693-
integer, intent(in) :: output_length
694-
character(len=1), intent(in) :: pad_with
695-
character(len=max(len(string), output_length)) :: res
696-
697-
res = padr_char_char(string, output_length, pad_with)
698-
end function padr_char_pad_with
682+
end function padr_char_default
699683

700684
!> Right pad the input string with the 'pad_with' character
701685
!>
702686
!> Returns a new string
703-
pure function padr_char_char(string, output_length, pad_with) result(res)
687+
pure function padr_char_pad_with(string, output_length, pad_with) result(res)
704688
character(len=*), intent(in) :: string
705689
integer, intent(in) :: output_length
706690
character(len=1), intent(in) :: pad_with
707691
character(len=max(len(string), output_length)) :: res
708692
integer :: string_length
709693

710694
string_length = len(string)
711-
695+
712696
res = string
713697
if (string_length < output_length) then
714698
res(string_length + 1 : output_length) = repeat(pad_with, &
715699
& output_length - string_length)
716700
end if
717-
718-
end function padr_char_char
701+
702+
end function padr_char_pad_with
719703

720704

721705
end module stdlib_strings

0 commit comments

Comments
 (0)