4b72aebe80
It is misplaced: caller knows better what can or cannot follow the expression.
Sometimes even caller's caller: "if (1) return a+b else..." -
parser of "return" does not know that "else" after it is valid,
parser of stmt does not know it either, - only parser of
"if" knows it!
The removed code balked on e.g. "{ print 1 }" statement.
This does not break any valid programs, but starts accepting some
invalid ones, e.g. "print 1 print 2" would work.
function old new delta
zcommon_parse_expr 40 32 -8
zbc_parse_name 509 494 -15
zbc_parse_stmt_possibly_auto 1678 1638 -40
bc_parse_expr_empty_ok 2025 1977 -48
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/4 up/down: 0/-111) Total: -111 bytes
text data bss dec hex filename
981599 485 7296 989380 f18c4 busybox_old
981488 485 7296 989269 f1855 busybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
172 lines
2.3 KiB
Bash
Executable File
172 lines
2.3 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright 2018 by Denys Vlasenko
|
|
# Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
|
|
. ./testing.sh
|
|
|
|
# testing "test name" "command" "expected result" "file input" "stdin"
|
|
|
|
testing "bc comment 1" \
|
|
"bc" \
|
|
"3\n" \
|
|
"" "1 /* comment */ + 2"
|
|
|
|
testing "bc comment 2: /*/ is not a closed comment" \
|
|
"bc" \
|
|
"4\n" \
|
|
"" "1 /*/ + 2 */ + 3"
|
|
|
|
testing "bc backslash 1" \
|
|
"bc" \
|
|
"3\n" \
|
|
"" "1 \\\\\n + 2"
|
|
|
|
testing "bc string 1" \
|
|
"bc" \
|
|
"STR\n" \
|
|
"" "\"STR\n\""
|
|
|
|
testing "bc if 0 else" \
|
|
"bc" \
|
|
"2\n9\n" \
|
|
"" "if (0) 1 else 2; 9"
|
|
|
|
testing "bc if 1 else" \
|
|
"bc" \
|
|
"1\n9\n" \
|
|
"" "if (1) 1 else 2; 9"
|
|
|
|
testing "bc if 1 if 1 else else" \
|
|
"bc" \
|
|
"1\n9\n" \
|
|
"" "if (1) if (1) 1 else 2 else 3; 9"
|
|
|
|
testing "bc if 0 else if 1" \
|
|
"bc" \
|
|
"2\n9\n" \
|
|
"" "if (0) 1 else if (1) 2; 9"
|
|
|
|
testing "bc define auto" \
|
|
"bc" \
|
|
"8\n9\n" \
|
|
"" "define w() { auto z; return 8; }; w(); 9"
|
|
|
|
testing "bc define with body on next line" \
|
|
"bc" \
|
|
"8\n9\n" \
|
|
"" "define w()\n{ auto z; return 8; }\nw()\n9"
|
|
|
|
testing "bc if(cond)<NL>" \
|
|
"bc" \
|
|
"9\n" \
|
|
"" "if(0)\n3\n9"
|
|
|
|
testing "bc if(cond) stmt else<NL>" \
|
|
"bc" \
|
|
"4\n9\n" \
|
|
"" "if(0)3 else\n4\n9"
|
|
|
|
testing "bc while(cond)<NL>" \
|
|
"bc" \
|
|
"8\n7\n6\n5\n4\n3\n2\n1\n9\n" \
|
|
"" "i=9;while(--i)\ni\n9"
|
|
|
|
testing "bc print 1,2,3" \
|
|
"bc" \
|
|
"123" \
|
|
"" "print 1,2,3"
|
|
|
|
testing "bc { print 1 }" \
|
|
"bc" \
|
|
"1" \
|
|
"" "{ print 1 }"
|
|
|
|
testing "bc nested loops and breaks" \
|
|
"bc" \
|
|
"\
|
|
11
|
|
21
|
|
31
|
|
22
|
|
12
|
|
99
|
|
" \
|
|
"" "\
|
|
if(1) {
|
|
11
|
|
while(1) {
|
|
21
|
|
while(1) {
|
|
31
|
|
break
|
|
32
|
|
}
|
|
22
|
|
break
|
|
23
|
|
}
|
|
12
|
|
} else {
|
|
88
|
|
}
|
|
99
|
|
"
|
|
|
|
testing "bc continue in if" \
|
|
"bc" \
|
|
"\
|
|
11
|
|
21
|
|
11
|
|
31
|
|
99
|
|
" \
|
|
"" "\
|
|
i=2
|
|
while(i--) {
|
|
11
|
|
if(i) {
|
|
21
|
|
continue
|
|
22
|
|
} else {
|
|
31
|
|
continue
|
|
32
|
|
}
|
|
12
|
|
}
|
|
99
|
|
"
|
|
|
|
testing "bc continue in for" \
|
|
"bc" \
|
|
"\
|
|
1
|
|
77
|
|
2
|
|
99
|
|
" \
|
|
"" "\
|
|
for(i=1; i<3; i++) {
|
|
i
|
|
if(i==2) continue
|
|
77
|
|
}
|
|
99
|
|
"
|
|
|
|
tar xJf bc_large.tar.xz
|
|
|
|
for f in bc*.bc; do
|
|
r="`basename "$f" .bc`_results.txt"
|
|
test -f "$r" || continue
|
|
# testing "test name" "command" "expected result" "file input" "stdin"
|
|
testing "bc -lq $f" \
|
|
"{ { bc -lq $f 2>&1; echo E:\$? >&2; } | diff -u - $r; echo E:\$?; } 2>&1" \
|
|
"E:0\nE:0\n" \
|
|
"" ""
|
|
done
|
|
|
|
exit $FAILCOUNT
|