fix(sizeof,parse): 尺寸链去静默兜底，解析报错可定位，补 C 解析器缺口
StructGen: _get_struct_size/_get_align 去 opaque→8/ptr_size、未知→4 兜底并补 VectorType；LiteralStructType.fields→.elements（llvmlite 无 fields，必然 AttributeError） HandlesClassDef: union 载荷尺寸经不存在的 ir.DataLayout 静默退化成 8 字节；HandlesExprCall/ExprBuiltin: sizeof 各静默 0 分支改 fail-fast，数组元素 sizeof 统一走 _get_struct_size HandlesFor: nonlocal struct/array 堆分配不再退化成 malloc(8) vast/vast_c: 补一元 * / & 解析，装饰器后 extern/export 分派修复，C 侧报错带 token 与行号；StubGen.Converter: 宏展开丢尾随空行修 .pyi 缩进非法 其余为 rawptr 迁移 / fail-fast 口径等历史改动一并入库
This commit is contained in:
TermiNexus committed
1 parent
53a345a59a
commit
c83fc752c6
53 files changed
+6238
-887
No files matched your search
@@ -303,9 +303,14 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
if not any(isinstance(n, ast.Await) for n in ast.walk(stmt)):
|
||||
continue # 无 await：委托 ForHandler，不需额外槽
|
||||
if not self._IsRangeFor(stmt):
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(stmt, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M3] 协程内 For 仅支持 range 迭代（含 await）"
|
||||
f"(line {getattr(stmt, 'lineno', 0)})"
|
||||
f"(line {_lineno})"
|
||||
)
|
||||
slots.append(f'__f_idx_{for_counter}')
|
||||
slots.append(f'__f_len_{for_counter}')
|
||||
@@ -551,9 +556,14 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
if isinstance(stmt, ast.Expr):
|
||||
self.Trans.ExprHandler.HandleExprLlvm(stmt.value)
|
||||
return
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(stmt, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M2] async 函数体暂不支持语句: {type(stmt).__name__} "
|
||||
f"(line {getattr(stmt, 'lineno', 0)})"
|
||||
f"(line {_lineno})"
|
||||
)
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
@@ -640,9 +650,14 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
return
|
||||
async_name: str | None = self._GetAsyncCallName(call) if isinstance(call, ast.Call) else None
|
||||
if not async_name:
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(await_node, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M3] await 目标必须是 async 函数调用或 coro_sleep(ms) "
|
||||
f"(line {getattr(await_node, 'lineno', 0)})"
|
||||
f"(line {_lineno})"
|
||||
)
|
||||
self.Trans.ExprHandler.HandleExprLlvm(await_node) # → _HandleAwaitLlvm
|
||||
|
||||
@@ -1002,8 +1017,13 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
|
||||
def _HandleCoroIf(self, Node: ast.If, Gen: LlvmCodeGenerator) -> None:
|
||||
if any(isinstance(n, ast.Await) for n in ast.walk(Node.test)):
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(Node, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M2] if 条件中不支持 await (line {getattr(Node, 'lineno', 0)})"
|
||||
f"[coro-M2] if 条件中不支持 await (line {_lineno})"
|
||||
)
|
||||
Cond: ir.Value | None = self.Trans.ExprHandler.HandleExprLlvm(Node.test)
|
||||
if not Cond:
|
||||
@@ -1034,8 +1054,13 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
|
||||
def _HandleCoroWhile(self, Node: ast.While, Gen: LlvmCodeGenerator) -> None:
|
||||
if any(isinstance(n, ast.Await) for n in ast.walk(Node.test)):
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(Node, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M2] while 条件中不支持 await (line {getattr(Node, 'lineno', 0)})"
|
||||
f"[coro-M2] while 条件中不支持 await (line {_lineno})"
|
||||
)
|
||||
CondBB: ir.Block = Gen.func.append_basic_block(name='coro_wcond')
|
||||
BodyBB: ir.Block = Gen.func.append_basic_block(name='coro_wbody')
|
||||
@@ -1076,12 +1101,22 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
def _HandleCoroTry(self, Node: ast.Try, Gen: LlvmCodeGenerator) -> None:
|
||||
"""协程内 try/except：捕获 raise 与 await 传播异常（M6：多 except 类型匹配；Exception/裸 except 捕获所有）。"""
|
||||
if not Node.handlers:
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(Node, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M6] 协程内 try 需要 except 子句 (line {getattr(Node, 'lineno', 0)})"
|
||||
f"[coro-M6] 协程内 try 需要 except 子句 (line {_lineno})"
|
||||
)
|
||||
if Node.finalbody:
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno = int(getattr(Node, 'lineno', 0) or 0)
|
||||
_line_offset = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M6] 协程内暂不支持 try/finally (line {getattr(Node, 'lineno', 0)})"
|
||||
f"[coro-M6] 协程内暂不支持 try/finally (line {_lineno})"
|
||||
)
|
||||
except_bb: ir.Block = Gen.func.append_basic_block('coro_try_except')
|
||||
merge_bb: ir.Block = Gen.func.append_basic_block('coro_try_merge')
|
||||
@@ -1159,8 +1194,13 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
"""协程内 try/finally（无 except）：正常/异常路径都执行 fbody；
|
||||
异常时 finally 后重新传播（done=1 + br exit）；finally 内暂不支持 await。"""
|
||||
if any(isinstance(n, ast.Await) for s in Node.finalbody for n in ast.walk(s)):
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(Node, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M7] finally 内暂不支持 await (line {getattr(Node, 'lineno', 0)})"
|
||||
f"[coro-M7] finally 内暂不支持 await (line {_lineno})"
|
||||
)
|
||||
fin_bb: ir.Block = Gen.func.append_basic_block('coro_fin')
|
||||
fin_exc_bb: ir.Block = Gen.func.append_basic_block('coro_fin_exc')
|
||||
@@ -1201,15 +1241,25 @@ class AsyncFunctionHandle(BaseHandle):
|
||||
def _HandleCoroFor(self, Node: ast.For, Gen: LlvmCodeGenerator) -> None:
|
||||
if any(isinstance(n, ast.Await) for n in ast.walk(Node)):
|
||||
if not self._IsRangeFor(Node):
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(Node, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M3] 协程内 For 仅支持 range 迭代（含 await）"
|
||||
f"(line {getattr(Node, 'lineno', 0)})"
|
||||
f"(line {_lineno})"
|
||||
)
|
||||
self._HandleCoroForRange(Node, Gen)
|
||||
return
|
||||
if any(isinstance(n, ast.Return) for st in Node.body for n in ast.walk(st)):
|
||||
# 注入行偏移还原：AST 行号含 _inject_auto_imports 注入的 N 行
|
||||
_lineno: int = int(getattr(Node, 'lineno', 0) or 0)
|
||||
_line_offset: int = int(getattr(self.Trans, '_line_offset', 0) or 0)
|
||||
if _line_offset > 0 and _lineno > _line_offset:
|
||||
_lineno -= _line_offset
|
||||
raise SyntaxError(
|
||||
f"[coro-M2] For 循环体内暂不支持 return（M3 实现）(line {getattr(Node, 'lineno', 0)})"
|
||||
f"[coro-M2] For 循环体内暂不支持 return（M3 实现）(line {_lineno})"
|
||||
)
|
||||
# 无 await/return：委托现有 ForHandler（迭代索引等 alloca 不跨挂起，安全）
|
||||
self.Trans.ForHandler._HandleForLlvm(Node)
|
||||
|
||||
Reference in new issue
Block a user