diff --git a/EqTest/App/main.vp b/EqTest/App/main.vp index 865cf91..8758e4a 100644 --- a/EqTest/App/main.vp +++ b/EqTest/App/main.vp @@ -54,4 +54,36 @@ def main() -> CInt | CExport: testcheck.check(null_ptr == None, "ptr == None OK", "ptr == None FAILED") testcheck.check(not (s1 == None), "str != None OK", "str != None FAILED") + # === Test 7: 整型 vs None(整数上的 None 隐式为 0)=== + # 语义(TPC / TPV 统一):x is None ≡ x == None ≡ x == 0;x is not None ≡ x != None ≡ x != 0 + testcheck.section("Test 7: int vs None") + nz: int = 7 + zr: int = 0 + # 非零整数 ⇒ 不等于 None + testcheck.check(not (nz is None), "int(7) is None -> false OK", "int(7) is None FAILED") + testcheck.check(nz is not None, "int(7) is not None -> true OK", "int(7) is not None FAILED") + testcheck.check(not (nz == None), "int(7) == None -> false OK", "int(7) == None FAILED") + testcheck.check(nz != None, "int(7) != None -> true OK", "int(7) != None FAILED") + # 零值 ⇒ 等价于 None + testcheck.check(zr is None, "int(0) is None -> true OK", "int(0) is None FAILED") + testcheck.check(not (zr is not None), "int(0) is not None -> false OK", "int(0) is not None FAILED") + testcheck.check(zr == None, "int(0) == None -> true OK", "int(0) == None FAILED") + testcheck.check(not (zr != None), "int(0) != None -> false OK", "int(0) != None FAILED") + # None 在左侧的镜像方向(TPV 此前该方向分支有误,恒判相等) + testcheck.check(not (None is nz), "None is int(7) -> false OK", "None is int(7) FAILED") + testcheck.check(None is zr, "None is int(0) -> true OK", "None is int(0) FAILED") + + # === Test 8: 其它整型位宽 vs None(i8 / i64,防"从空指针 load"回归)=== + testcheck.section("Test 8: char / sizet vs None") + c8: char = 0 + c8nz: char = 65 + testcheck.check(c8 is None, "char(0) is None -> true OK", "char(0) is None FAILED") + testcheck.check(c8nz is not None, "char(65) is not None -> true OK", "char(65) is not None FAILED") + testcheck.check(c8 == None, "char(0) == None -> true OK", "char(0) == None FAILED") + s64: sizet = 0 + s64nz: sizet = 4096 + testcheck.check(s64 is None, "sizet(0) is None -> true OK", "sizet(0) is None FAILED") + testcheck.check(s64nz is not None, "sizet(4096) is not None -> true OK", "sizet(4096) is not None FAILED") + testcheck.check(s64nz != None, "sizet(4096) != None -> true OK", "sizet(4096) != None FAILED") + return testcheck.end() diff --git a/ForAndLoopTest/App/main.vp b/ForAndLoopTest/App/main.vp index 76d119b..31d935b 100644 --- a/ForAndLoopTest/App/main.vp +++ b/ForAndLoopTest/App/main.vp @@ -148,6 +148,93 @@ def test_enumerate_range(): testcheck.check(last_val == 4, "enumerate range last_val OK (4)", "enumerate range last_val FAILED expect 4") +def test_for_else_no_break(): + testcheck.section("Test 11: for-else (迭代耗尽 → 执行 else)") + total: t.CInt = 0 + for i in range(3): + total += i + else: + total += 100 + testcheck.check(total == 103, "for-else no-break OK (103)", "for-else no-break FAILED expect 103") + + +def test_for_else_break(): + testcheck.section("Test 12: for-else (break → 跳过 else)") + found: t.CInt = 0 + for i in range(10): + if i == 4: + found = 1 + break + else: + found = 2 + testcheck.check(found == 1, "for-else break OK (1)", "for-else break FAILED expect 1") + + +def test_for_else_empty_range(): + testcheck.section("Test 13: for-else (range(0) 空迭代 → 执行 else)") + v: t.CInt = 0 + for i in range(0): + v = 1 + else: + v = 7 + testcheck.check(v == 7, "for-else empty range OK (7)", "for-else empty range FAILED expect 7") + + +def test_for_else_list(): + testcheck.section("Test 14: for-else (list[str] 迭代耗尽 → 执行 else)") + arena: bytes = stdlib.malloc(65536) + bd: memhub.MemBuddy | t.CPtr = memhub.MemBuddy(arena, 65536) + lst: list[str] = list[str](bd) + lst.append("a") + lst.append("b") + lst.append("c") + cnt: t.CInt = 0 + ran_else: t.CInt = 0 + for v in lst: + cnt += 1 + else: + ran_else = 1 + testcheck.check(cnt == 3, "for-else list count OK (3)", "for-else list count FAILED expect 3") + testcheck.check(ran_else == 1, "for-else list else OK (1)", "for-else list else FAILED expect 1") + stdlib.free(arena) + + +def test_while_else_cond_false(): + testcheck.section("Test 15: while-else (条件变假 → 执行 else)") + i: t.CInt = 0 + acc: t.CInt = 0 + while i < 3: + acc += i + i += 1 + else: + acc += 100 + testcheck.check(acc == 103, "while-else cond-false OK (103)", "while-else cond-false FAILED expect 103") + + +def test_while_else_zero_iter(): + testcheck.section("Test 16: while-else (一次都不进循环 → 执行 else)") + n: t.CInt = 0 + while n < 0: + n = 99 + else: + n = 7 + testcheck.check(n == 7, "while-else zero-iter OK (7)", "while-else zero-iter FAILED expect 7") + + +def test_while_else_break(): + testcheck.section("Test 17: while-else (break → 跳过 else)") + i: t.CInt = 0 + flag: t.CInt = 0 + while i < 10: + if i == 2: + flag = 1 + break + i += 1 + else: + flag = 2 + testcheck.check(flag == 1, "while-else break OK (1)", "while-else break FAILED expect 1") + + def main() -> t.CInt: testcheck.begin("ForAndLoopTest: 迭代器与循环测试") @@ -161,5 +248,12 @@ def main() -> t.CInt: test_enumerate_list() test_enumerate_str() test_enumerate_range() + test_for_else_no_break() + test_for_else_break() + test_for_else_empty_range() + test_for_else_list() + test_while_else_cond_false() + test_while_else_zero_iter() + test_while_else_break() return testcheck.end()