Commit fde7b02
committed
Fix wantarray in eval STRING: pass outer context to apply()
EvalStringHandler.evalString() was hardcoding RuntimeContextType.SCALAR
when executing the eval body, so wantarray() inside eval STRING always
returned false (scalar) regardless of the actual call site context.
Fix: read registers[2] (the outer wantarray set by BytecodeInterpreter)
and pass it as callContext to evalString() and apply(), so wantarray()
inside the eval body correctly returns undef (void), false (scalar), or
true (list) matching the outer call site.
Result: op/eval.t passes 153/153 in both JVM and interpreter modes.1 parent 326c11e commit fde7b02
2 files changed
Lines changed: 13 additions & 3 deletions
Lines changed: 6 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
43 | 43 | | |
44 | 44 | | |
45 | 45 | | |
| 46 | + | |
46 | 47 | | |
47 | 48 | | |
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
51 | 52 | | |
52 | | - | |
| 53 | + | |
| 54 | + | |
53 | 55 | | |
54 | 56 | | |
55 | 57 | | |
| |||
196 | 198 | | |
197 | 199 | | |
198 | 200 | | |
| 201 | + | |
| 202 | + | |
199 | 203 | | |
200 | | - | |
| 204 | + | |
201 | 205 | | |
202 | 206 | | |
203 | 207 | | |
| |||
Lines changed: 7 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
252 | 252 | | |
253 | 253 | | |
254 | 254 | | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
255 | 260 | | |
256 | 261 | | |
257 | 262 | | |
258 | 263 | | |
259 | 264 | | |
260 | 265 | | |
261 | | - | |
| 266 | + | |
| 267 | + | |
262 | 268 | | |
263 | 269 | | |
264 | 270 | | |
| |||
0 commit comments