Skip to content

Commit f3c17a0

Browse files
committed
Fix test_string_to_string.f90: merge -> optval
1 parent bdc33f5 commit f3c17a0

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ set(fppFiles
3434
stdlib_math_logspace.fypp
3535
stdlib_string_type.fypp
3636
stdlib_string_type_constructor.fypp
37-
stdlib_string_to_string.fypp
37+
stdlib_strings_to_string.fypp
3838
stdlib_strings.fypp
3939
)
4040

src/Makefile.manual

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SRCFYPP =\
3232
stdlib_string_type.fypp \
3333
stdlib_string_type_constructor.fypp \
3434
stdlib_strings.fypp \
35-
stdlib_string_to_string.fypp
35+
stdlib_strings_to_string.fypp
3636

3737
SRC = f18estop.f90 \
3838
stdlib_error.f90 \
@@ -150,14 +150,14 @@ stdlib_stats_distribution_PRNG.o: \
150150
stdlib_string_type.o: stdlib_ascii.o \
151151
stdlib_kinds.o
152152
stdlib_string_type_constructor.o: stdlib_string_type.o \
153-
stdlib_string_to_string.o \
153+
stdlib_strings_to_string.o \
154154
stdlib_strings.o
155155
stdlib_strings.o: stdlib_ascii.o \
156156
stdlib_string_type.o \
157157
stdlib_optval.o \
158158
stdlib_kinds.o
159159
stdlib_math.o: stdlib_kinds.o
160-
stdlib_string_to_string.o: stdlib_strings.o
160+
stdlib_strings_to_string.o: stdlib_strings.o
161161
stdlib_math_linspace.o: \
162162
stdlib_math.o
163163
stdlib_math_logspace.o: \
File renamed without changes.

src/tests/string/test_string_to_string.f90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module test_string_to_string
33

44
use stdlib_strings, only: to_string, starts_with
55
use stdlib_error, only: check
6+
use stdlib_optval, only: optval
67
implicit none
78

89
contains
@@ -13,7 +14,7 @@ subroutine check_formatter(actual, expected, description, partial)
1314
logical :: stat
1415
character(len=:), allocatable :: msg
1516

16-
if (merge(partial, .false., present(partial))) then
17+
if (optval(partial, .false.)) then
1718
stat = starts_with(actual, expected)
1819
else
1920
stat = actual == expected

0 commit comments

Comments
 (0)