diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-09-15 13:33:02 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-09-15 13:33:02 +0200 |
commit | 063847d6bd23e184c409f37645ba90fa4d039ada (patch) | |
tree | 63e360e3e0a2f46d187ef2e21487753a52697efa /shell/ash_test | |
parent | 197a6b3c14a8be7101903118516e0e16ec843eb5 (diff) | |
download | busybox-w32-063847d6bd23e184c409f37645ba90fa4d039ada.tar.gz busybox-w32-063847d6bd23e184c409f37645ba90fa4d039ada.tar.bz2 busybox-w32-063847d6bd23e184c409f37645ba90fa4d039ada.zip |
shell/math: return string error indicator, not integer
function old new delta
expand_and_evaluate_arith 87 106 +19
expand_one_var 1563 1570 +7
arith 12 18 +6
evaluate_string 678 680 +2
arith_apply 1269 1271 +2
builtin_umask 133 132 -1
ash_arith 118 75 -43
expand_vars_to_list 1094 1038 -56
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/3 up/down: 36/-100) Total: -64 bytes
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'shell/ash_test')
-rw-r--r-- | shell/ash_test/ash-arith/arith.right | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/shell/ash_test/ash-arith/arith.right b/shell/ash_test/ash-arith/arith.right index 3ea7ce680..7257cc566 100644 --- a/shell/ash_test/ash-arith/arith.right +++ b/shell/ash_test/ash-arith/arith.right | |||
@@ -55,28 +55,28 @@ Format: 'expected actual' | |||
55 | 30 30 | 55 | 30 30 |
56 | 20 20 | 56 | 20 20 |
57 | 30 30 | 57 | 30 30 |
58 | ./arith.tests: line 117: syntax error: 1 ? 20 : x+=2 | 58 | ./arith.tests: line 117: arithmetic syntax error |
59 | 6 6 | 59 | 6 6 |
60 | 6,5,3 6,5,3 | 60 | 6,5,3 6,5,3 |
61 | 263 263 | 61 | 263 263 |
62 | 255 255 | 62 | 255 255 |
63 | 40 40 | 63 | 40 40 |
64 | ./arith.tests: line 163: syntax error: 7 = 43 | 64 | ./arith.tests: line 163: arithmetic syntax error |
65 | ./arith.tests: line 165: divide by zero | 65 | ./arith.tests: line 165: divide by zero |
66 | ./arith.tests: let: line 166: syntax error: jv += $iv | 66 | ./arith.tests: let: line 166: arithmetic syntax error |
67 | ./arith.tests: line 167: syntax error: jv += $iv | 67 | ./arith.tests: line 167: arithmetic syntax error |
68 | ./arith.tests: let: line 168: syntax error: rv = 7 + (43 * 6 | 68 | ./arith.tests: let: line 168: arithmetic syntax error |
69 | abc | 69 | abc |
70 | def | 70 | def |
71 | ghi | 71 | ghi |
72 | ./arith.tests: line 191: syntax error: ( 4 + A ) + 4 | 72 | ./arith.tests: line 191: arithmetic syntax error |
73 | 16 16 | 73 | 16 16 |
74 | ./arith.tests: line 196: syntax error: 4 ? : 3 + 5 | 74 | ./arith.tests: line 196: arithmetic syntax error |
75 | ./arith.tests: line 197: syntax error: 1 ? 20 | 75 | ./arith.tests: line 197: arithmetic syntax error |
76 | ./arith.tests: line 198: syntax error: 4 ? 20 : | 76 | ./arith.tests: line 198: arithmetic syntax error |
77 | 9 9 | 77 | 9 9 |
78 | ./arith.tests: line 205: syntax error: 0 && B=42 | 78 | ./arith.tests: line 205: arithmetic syntax error |
79 | ./arith.tests: line 208: syntax error: 1 || B=88 | 79 | ./arith.tests: line 208: arithmetic syntax error |
80 | 9 9 | 80 | 9 9 |
81 | 9 9 | 81 | 9 9 |
82 | 9 9 | 82 | 9 9 |
@@ -97,18 +97,18 @@ ghi | |||
97 | 3 3 | 97 | 3 3 |
98 | 4 4 | 98 | 4 4 |
99 | 4 4 | 99 | 4 4 |
100 | ./arith.tests: line 257: syntax error: 7-- | 100 | ./arith.tests: line 257: arithmetic syntax error |
101 | ./arith.tests: line 259: syntax error: --x=7 | 101 | ./arith.tests: line 259: arithmetic syntax error |
102 | ./arith.tests: line 260: syntax error: ++x=7 | 102 | ./arith.tests: line 260: arithmetic syntax error |
103 | ./arith.tests: line 262: syntax error: x++=7 | 103 | ./arith.tests: line 262: arithmetic syntax error |
104 | ./arith.tests: line 263: syntax error: x--=7 | 104 | ./arith.tests: line 263: arithmetic syntax error |
105 | 4 4 | 105 | 4 4 |
106 | 7 7 | 106 | 7 7 |
107 | -7 -7 | 107 | -7 -7 |
108 | ./arith1.sub: line 2: syntax error: 4-- | 108 | ./arith1.sub: line 2: arithmetic syntax error |
109 | ./arith1.sub: line 3: syntax error: 4++ | 109 | ./arith1.sub: line 3: arithmetic syntax error |
110 | ./arith1.sub: line 4: syntax error: 4 -- | 110 | ./arith1.sub: line 4: arithmetic syntax error |
111 | ./arith1.sub: line 5: syntax error: 4 ++ | 111 | ./arith1.sub: line 5: arithmetic syntax error |
112 | 6 6 | 112 | 6 6 |
113 | 3 3 | 113 | 3 3 |
114 | 7 7 | 114 | 7 7 |
@@ -119,19 +119,19 @@ ghi | |||
119 | 2 2 | 119 | 2 2 |
120 | -2 -2 | 120 | -2 -2 |
121 | 1 1 | 121 | 1 1 |
122 | ./arith1.sub: line 37: syntax error: +++7 | 122 | ./arith1.sub: line 37: arithmetic syntax error |
123 | ./arith2.sub: line 2: syntax error: --7 | 123 | ./arith2.sub: line 2: arithmetic syntax error |
124 | ./arith2.sub: line 3: syntax error: ++7 | 124 | ./arith2.sub: line 3: arithmetic syntax error |
125 | ./arith2.sub: line 4: syntax error: -- 7 | 125 | ./arith2.sub: line 4: arithmetic syntax error |
126 | ./arith2.sub: line 5: syntax error: ++ 7 | 126 | ./arith2.sub: line 5: arithmetic syntax error |
127 | 5 5 | 127 | 5 5 |
128 | 1 1 | 128 | 1 1 |
129 | 4 4 | 129 | 4 4 |
130 | 0 0 | 130 | 0 0 |
131 | ./arith2.sub: line 42: syntax error: -- - 7 | 131 | ./arith2.sub: line 42: arithmetic syntax error |
132 | ./arith2.sub: line 47: syntax error: ++ + 7 | 132 | ./arith2.sub: line 47: arithmetic syntax error |
133 | 8 12 | 133 | 8 12 |
134 | ./arith.tests: line 290: syntax error: a b | 134 | ./arith.tests: line 290: arithmetic syntax error |
135 | 42 | 135 | 42 |
136 | 42 | 136 | 42 |
137 | 42 | 137 | 42 |