- 实现逻辑运算符短路求值功能，支持 && 和 || 操作符的惰性求值 - 添加 parseShortCircuitLogicalOp 方法处理逻辑运算符的特殊解析逻辑 - 新增 parseExprWithCapturedStmts 方法捕获表达式解析过程中的语句 - 实现 appendCapturedStmtLines 和 genConditionWithCapturedStmts 辅助方法 - 重构 for 循环条件和循环体表达式的解析逻辑 - 修改三元运算符解析以支持条件表达式的语句捕获 - 重构 if 语句解析使用递归函数处理 if-elseif-else 链 - 更新 while 和 do-while 循环处理条件表达式中的副作用 - 重构 switch 语句解析逻辑，改进 case 条件的匹配机制 - 添加多个测试用例验证条件表达式副作用的执行时机pull/5/head
parent
4ad8c0a6fa
commit
cff27c7c79
8 changed files with 483 additions and 57 deletions
@ -0,0 +1,62 @@ |
||||
--TEST-- |
||||
If and while conditions evaluate side effects at the correct time |
||||
--FILE-- |
||||
<?php |
||||
function makeArgs(string $name): array |
||||
{ |
||||
echo "args:$name\n"; |
||||
return [$name]; |
||||
} |
||||
|
||||
function makeValue(string $name): string |
||||
{ |
||||
echo "value:$name\n"; |
||||
return $name; |
||||
} |
||||
|
||||
function probe(string $id, string $value): bool |
||||
{ |
||||
echo "probe:$id:$value\n"; |
||||
return $id !== 'elseif-false'; |
||||
} |
||||
|
||||
function loopProbe(int $i): bool |
||||
{ |
||||
echo "loop:$i\n"; |
||||
return $i < 3; |
||||
} |
||||
|
||||
function main(): void |
||||
{ |
||||
if (false && probe(...makeArgs('if-skip'), value: makeValue('if-skip'))) { |
||||
echo "if\n"; |
||||
} elseif (probe(...makeArgs('elseif-false'), value: makeValue('elseif-false'))) { |
||||
echo "elseif false\n"; |
||||
} elseif (probe(...makeArgs('elseif-true'), value: makeValue('elseif-true'))) { |
||||
echo "elseif true\n"; |
||||
} else { |
||||
echo "else\n"; |
||||
} |
||||
|
||||
$i = 0; |
||||
while (loopProbe($i)) { |
||||
echo "body:$i\n"; |
||||
$i++; |
||||
} |
||||
} |
||||
?> |
||||
--EXPECT-- |
||||
args:elseif-false |
||||
value:elseif-false |
||||
probe:elseif-false:elseif-false |
||||
args:elseif-true |
||||
value:elseif-true |
||||
probe:elseif-true:elseif-true |
||||
elseif true |
||||
loop:0 |
||||
body:0 |
||||
loop:1 |
||||
body:1 |
||||
loop:2 |
||||
body:2 |
||||
loop:3 |
||||
@ -0,0 +1,29 @@ |
||||
--TEST-- |
||||
Do-while condition evaluates side effects after continue |
||||
--FILE-- |
||||
<?php |
||||
function keepGoing(int $i): bool |
||||
{ |
||||
echo "cond:$i\n"; |
||||
return $i < 3; |
||||
} |
||||
|
||||
function main(): void |
||||
{ |
||||
$i = 0; |
||||
do { |
||||
echo "body:$i\n"; |
||||
$i++; |
||||
if ($i < 2) { |
||||
continue; |
||||
} |
||||
} while (keepGoing($i)); |
||||
} |
||||
?> |
||||
--EXPECT-- |
||||
body:0 |
||||
cond:1 |
||||
body:1 |
||||
cond:2 |
||||
body:2 |
||||
cond:3 |
||||
@ -0,0 +1,56 @@ |
||||
--TEST-- |
||||
For condition and loop expressions evaluate side effects at the correct time |
||||
--FILE-- |
||||
<?php |
||||
function makeArgs(string $name): array |
||||
{ |
||||
echo "args:$name\n"; |
||||
return [$name]; |
||||
} |
||||
|
||||
function keepGoing(string $id, int $value): bool |
||||
{ |
||||
echo "cond:$id:$value\n"; |
||||
return $value < 3; |
||||
} |
||||
|
||||
function step(string $id, int $value): void |
||||
{ |
||||
global $i; |
||||
echo "step:$id:$value\n"; |
||||
$i++; |
||||
} |
||||
|
||||
function main(): void |
||||
{ |
||||
global $i; |
||||
for ( |
||||
$i = 0; |
||||
keepGoing(...makeArgs('cond-' . $i), value: $i); |
||||
step(...makeArgs('step-' . $i), value: $i) |
||||
) { |
||||
echo "body:$i\n"; |
||||
if ($i === 1) { |
||||
continue; |
||||
} |
||||
} |
||||
} |
||||
?> |
||||
--EXPECT-- |
||||
args:cond-0 |
||||
cond:cond-0:0 |
||||
body:0 |
||||
args:step-0 |
||||
step:step-0:0 |
||||
args:cond-1 |
||||
cond:cond-1:1 |
||||
body:1 |
||||
args:step-1 |
||||
step:step-1:1 |
||||
args:cond-2 |
||||
cond:cond-2:2 |
||||
body:2 |
||||
args:step-2 |
||||
step:step-2:2 |
||||
args:cond-3 |
||||
cond:cond-3:3 |
||||
@ -0,0 +1,41 @@ |
||||
--TEST-- |
||||
Logical && and || evaluate right side lazily |
||||
--FILE-- |
||||
<?php |
||||
function makeArgs(string $name): array |
||||
{ |
||||
echo "args:$name\n"; |
||||
return [$name]; |
||||
} |
||||
|
||||
function makeValue(string $name): string |
||||
{ |
||||
echo "value:$name\n"; |
||||
return $name; |
||||
} |
||||
|
||||
function check(string $id, string $value): bool |
||||
{ |
||||
echo "check:$id:$value\n"; |
||||
return true; |
||||
} |
||||
|
||||
function main(): void |
||||
{ |
||||
var_dump(false && check(...makeArgs('and-skip'), value: makeValue('and-skip'))); |
||||
var_dump(true && check(...makeArgs('and-run'), value: makeValue('and-run'))); |
||||
var_dump(true || check(...makeArgs('or-skip'), value: makeValue('or-skip'))); |
||||
var_dump(false || check(...makeArgs('or-run'), value: makeValue('or-run'))); |
||||
} |
||||
?> |
||||
--EXPECT-- |
||||
bool(false) |
||||
args:and-run |
||||
value:and-run |
||||
check:and-run:and-run |
||||
bool(true) |
||||
bool(true) |
||||
args:or-run |
||||
value:or-run |
||||
check:or-run:or-run |
||||
bool(true) |
||||
@ -0,0 +1,55 @@ |
||||
--TEST-- |
||||
Switch condition and case expressions evaluate side effects in order |
||||
--FILE-- |
||||
<?php |
||||
function makeArgs(string $name): array |
||||
{ |
||||
echo "args:$name\n"; |
||||
return [$name]; |
||||
} |
||||
|
||||
function makeValue(string $name): string |
||||
{ |
||||
echo "value:$name\n"; |
||||
return $name; |
||||
} |
||||
|
||||
function subject(string $id, string $value): string |
||||
{ |
||||
echo "subject:$id:$value\n"; |
||||
return $value; |
||||
} |
||||
|
||||
function marker(string $id, string $value): string |
||||
{ |
||||
echo "case:$id:$value\n"; |
||||
return $value; |
||||
} |
||||
|
||||
function main(): void |
||||
{ |
||||
switch (subject(...makeArgs('subject'), value: makeValue('b'))) { |
||||
case marker(...makeArgs('a'), value: makeValue('a')): |
||||
echo "A\n"; |
||||
break; |
||||
case marker(...makeArgs('b'), value: makeValue('b')): |
||||
case marker(...makeArgs('skip'), value: makeValue('skip')): |
||||
echo "B\n"; |
||||
break; |
||||
default: |
||||
echo "default\n"; |
||||
break; |
||||
} |
||||
} |
||||
?> |
||||
--EXPECT-- |
||||
args:subject |
||||
value:b |
||||
subject:subject:b |
||||
args:a |
||||
value:a |
||||
case:a:a |
||||
args:b |
||||
value:b |
||||
case:b:b |
||||
B |
||||
Loading…
Reference in new issue