Skip to content

Commit 7a7bbe8

Browse files
committed
add many-arg printf tests
1 parent 86da880 commit 7a7bbe8

3 files changed

Lines changed: 13 additions & 21 deletions

File tree

jnc/params/jlib.jn

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,19 @@ pub fn print_seven_longs(int a, int b, int c, int d, int e, int f, int g) {
55
}
66

77
pub fn print_eight_longs(int a, int b, int c, int d, int e, int f, int g, int h) {
8-
# once printf is implemented in Johann
9-
# printf("J: %d, %d, %d, %d, %d, %d, %d, and %d\n",
10-
# a, b, c, d, e, f, g, h);
11-
printf("J: %d, %d, %d, %d, %d, %d, %d",
12-
a, b, c, d, e, f, g);
13-
printf(", and %d\n",
14-
h);
8+
printf("J: %d, %d, %d, %d, %d, %d, %d, and %d\n",
9+
a, b, c, d, e, f, g, h);
1510
flush_stdout__();
1611
}
1712

1813
pub fn print_nine_longs(int a, int b, int c, int d, int e, int f, int g, int h, int i) {
19-
# once printf is implemented in Johann
20-
# printf("J: %d, %d, %d, %d, %d, %d, %d, %d, and %d\n",
21-
# a, b, c, d, e, f, g, h, i);
22-
printf("J: %d, %d, %d, %d, %d, %d, %d",
23-
a, b, c, d, e, f, g);
24-
printf(", %d, and %d\n",
25-
h, i);
14+
printf("J: %d, %d, %d, %d, %d, %d, %d, %d, and %d\n",
15+
a, b, c, d, e, f, g, h, i);
2616
flush_stdout__();
2717
}
2818

2919
pub fn print_ten_longs(int a, int b, int c, int d, int e, int f, int g, int h, int i, int j) {
30-
# once printf is implemented in Johann
31-
# printf("J: %d, %d, %d, %d, %d, %d, %d, %d, %d, and %d\n",
32-
# a, b, c, d, e, f, g, h, i, j);
33-
printf("J: %d, %d, %d, %d, %d, %d, %d",
34-
a, b, c, d, e, f, g);
35-
printf(", %d, %d, and %d\n",
36-
h, i, j);
20+
printf("J: %d, %d, %d, %d, %d, %d, %d, %d, %d, and %d\n",
21+
a, b, c, d, e, f, g, h, i, j);
3722
flush_stdout__();
3823
}

jstdlib/tests/printf.expected.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,5 @@ pointer: [[0x00000007b:0x000000929:0x000000008707]]
3434
written: 52
3535
everything: %, Z, Hello, this most beautiful world!, 456, 0x400, 0x0000003ff
3636
written: 77
37+
Ten: 1, 2, 3, 4, 5, 6, 7, 8, 9, and 10
38+
written: 39

jstdlib/tests/printf.jn

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,9 @@ pub fn main() {
6060
0x400,
6161
0x3ff);
6262
printf(count, n);
63+
64+
int e = 8;
65+
n = printf("Ten: %d, %d, %d, %d, %d, %d, %d, %d, %c, and %s\n",
66+
1, 2, 3, 4, 5, 6, 7, e, '9', "10");
67+
printf(count, n);
6368
}

0 commit comments

Comments
 (0)