Skip to content

Commit 4299e5a

Browse files
committed
Merge branch 'add_disp' of https://github.com/zoziha/stdlib into add_disp
2 parents 761dacf + fd00762 commit 4299e5a

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

doc/specs/stdlib_io.md

+15-15
Original file line numberDiff line numberDiff line change
@@ -214,40 +214,40 @@ end program test_io_disp
214214
```
215215
**Results:**
216216
```fortran
217-
disp(string):
217+
disp(string):
218218
string
219219
It is a note.
220220
221-
disp(r):
222-
[matrix size: 2×3]
221+
disp(r):
222+
[matrix size: 2×3]
223223
1.000 1.000 1.000
224224
1.000 1.000 1.000
225-
disp(r(1,:))
226-
[vector size: 3]
225+
disp(r(1,:))
226+
[vector size: 3]
227227
1.00 1.00 1.00
228-
disp(c):
229-
[matrix size: 2×3]
228+
disp(c):
229+
[matrix size: 2×3]
230230
(1.000,0.000) (1.000,0.000) (1.000,0.000)
231231
(1.000,0.000) (1.000,0.000) (1.000,0.000)
232-
disp(i):
233-
[matrix size: 2×3]
232+
disp(i):
233+
[matrix size: 2×3]
234234
1, 1, 1,
235235
1, 1, 1,
236-
disp(l):
237-
[matrix size: 10×10]
236+
disp(l):
237+
[matrix size: 10×10]
238238
T T T .. T
239239
T T T .. T
240240
T T T .. T
241241
: : : : :
242242
T T T .. T
243-
disp(c_3d(:,:,3)):
244-
[matrix size: 2×10]
243+
disp(c_3d(:,3,1:10)):
244+
[matrix size: 2×10]
245245
(1000.,0.1000E-2) (2.000,0.000) (2.000,0.000) (2.000,0.000) (2.000,0.000) &
246246
(2.000,0.000) (2.000,0.000) (2.000,0.000) (2.000,0.000) (2.000,0.000)
247247
(2.000,0.000) (2.000,0.000) (2.000,0.000) (2.000,0.000) (2.000,0.000) &
248248
(2.000,0.000) (2.000,0.000) (2.000,0.000) (2.000,0.000) (2.000,0.000)
249-
disp(c_3d(2,:,:)):
250-
[matrix size: 100×20]
249+
disp(c_3d(2,:,:)):
250+
[matrix size: 100×20]
251251
(2.000,0.000) (2.000,0.000) (2.000,0.000) .. (2.000,0.000)
252252
(2.000,0.000) (2.000,0.000) (2.000,0.000) .. (2.000,0.000)
253253
(2.000,0.000) (2.000,0.000) (2.000,0.000) .. (2.000,0.000)

src/stdlib_io_disp.fypp

+6-6
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ contains
5151

5252
#! Prints header
5353
if (present(header)) then
54-
write(unit_, *) format_output_string([string_type(header)], width_, brief_, "", len(header))
54+
write(unit_, "(A)") format_output_string([string_type(header)], width_, brief_, "", len(header))
5555
end if
5656

5757
#:if k1 != "string_type"
@@ -63,7 +63,7 @@ contains
6363

6464
#:elif r1 == 1
6565
array_info = array_info_maker(size(x, 1))
66-
write(unit_, *) format_output_string([array_info], width_, brief_, "", len(array_info))
66+
write(unit_, "(A)") format_output_string([array_info], width_, brief_, "", len(array_info))
6767

6868
allocate(x_str(size(x, 1)))
6969
do i = 1, size(x, 1)
@@ -74,7 +74,7 @@ contains
7474
#:elif r1 == 2
7575

7676
array_info = array_info_maker(size(x, 1), size(x, 2))
77-
write(unit_, *) format_output_string([array_info], width_, brief_, "", len(array_info))
77+
write(unit_, "(A)") format_output_string([array_info], width_, brief_, "", len(array_info))
7878

7979
allocate(x_str(size(x, 1), size(x, 2)))
8080
do i = 1, size(x, 1)
@@ -110,14 +110,14 @@ contains
110110

111111
#:elif r1 == 1
112112
array_info = array_info_maker(size(x, 1))
113-
write(unit_, *) format_output_string([array_info], width_, brief_, "", len(array_info))
113+
write(unit_, "(A)") format_output_string([array_info], width_, brief_, "", len(array_info))
114114

115115
write(unit_, "(*(A))") format_output_string(x, width_, brief_, sep_, maxval(len(x)))
116116

117117
#:elif r1 == 2
118118

119119
array_info = array_info_maker(size(x, 1), size(x, 2))
120-
write(unit_, *) format_output_string([array_info], width_, brief_, "", len(array_info))
120+
write(unit_, "(A)") format_output_string([array_info], width_, brief_, "", len(array_info))
121121

122122
max_elem_len = maxval(len(x))
123123

@@ -299,7 +299,7 @@ contains
299299
sep_ = optval(sep, " ")
300300

301301
if (present(header)) then
302-
write(unit_, *) format_output_string([string_type(header)], width_, brief_, "", len(header))
302+
write(unit_, "(A)") format_output_string([string_type(header)], width_, brief_, "", len(header))
303303
end if
304304

305305
coloum(1) = string_type(x_)

0 commit comments

Comments
 (0)