Fixed some bugs and tried to maintain the bootstrap

App/lib/core/Handles/HandlesAnnAssign.py

@@ -4,6 +4,7 @@ import ast
 import llvmlite
 import memhub
 import string
+import stdio
 import lib.core.Handles.HandlesBase as HandlesBase
 import lib.core.Handles.HandlesTranslator as HT
 import lib.core.Handles.HandlesVar as HandlesVar
@@ -49,18 +50,72 @@ def is_cdefine_annotation(annot: ast.AST | t.CPtr) -> int:
 # ============================================================
 # extract_cdefine_int_value - 从 AnnAssign.value 提取整数常量（模块级函数）
 #
-# 仅支持 ast.Constant(INT)，其他形式返回 0
+# 支持的表达式形式:
+#   1. Constant(INT)         — 如 0x0002, 42
+#   2. BinOp(BitOr/BitAnd)   — 如 FOREGROUND_RED | FOREGROUND_GREEN
+#   3. Name                  — 引用已注册的 CDefine 常量
+#   4. Call                  — 如 t.CUnsignedLong(-11) → 取第一个参数
+#   5. UnaryOp(USub/UAdd/Invert) — 如 -11
 # ============================================================
 def extract_cdefine_int_value(val_node: ast.AST | t.CPtr) -> int:
-    """从值节点提取整数常量（仅支持 Constant INT）"""
+    """从值节点提取整数常量（支持 Constant/BinOp/Name/Call/UnaryOp）"""
     if val_node is None:
         return 0
-    if val_node.kind() != ast.ASTKind.Constant:
+    k: int = val_node.kind()
+
+    # Case 1: Constant(INT) — 如 0x0002
+    if k == ast.ASTKind.Constant:
+        cn: ast.Constant | t.CPtr = (ast.Constant | t.CPtr)(val_node)
+        if cn.const_kind != ast.CONST_INT:
+            return 0
+        return cn.int_val
+
+    # Case 2: BinOp — 如 FOREGROUND_RED | FOREGROUND_GREEN
+    if k == ast.ASTKind.BinOp:
+        bop: ast.BinOp | t.CPtr = (ast.BinOp | t.CPtr)(val_node)
+        left_val: int = extract_cdefine_int_value(bop.left)
+        right_val: int = extract_cdefine_int_value(bop.right)
+        if bop.op == ast.OpKind.BitOr:
+            return left_val | right_val
+        if bop.op == ast.OpKind.BitAnd:
+            return left_val & right_val
+        if bop.op == ast.OpKind.Add:
+            return left_val + right_val
+        if bop.op == ast.OpKind.Sub:
+            return left_val - right_val
         return 0
-    cn: ast.Constant | t.CPtr = (ast.Constant | t.CPtr)(val_node)
-    if cn.const_kind != ast.CONST_INT:
+
+    # Case 3: Name — 引用已注册的 CDefine 常量
+    if k == ast.ASTKind.Name:
+        nm: ast.Name | t.CPtr = (ast.Name | t.CPtr)(val_node)
+        if nm.id is not None:
+            looked_up: int = HandlesType.lookup_cdefine_constant(nm.id)
+            if HandlesType.is_cdefine_found() != 0:
+                return looked_up
         return 0
-    return cn.int_val
+
+    # Case 4: Call — 如 t.CUnsignedLong(-11)
+    if k == ast.ASTKind.Call:
+        cl: ast.Call | t.CPtr = (ast.Call | t.CPtr)(val_node)
+        if cl.args is not None and cl.args.__len__() > 0:
+            first_arg: ast.AST | t.CPtr = cl.args.get(0)
+            arg_val: int = extract_cdefine_int_value(first_arg)
+            return arg_val
+        return 0
+
+    # Case 5: UnaryOp — 如 -11
+    if k == ast.ASTKind.UnaryOp:
+        uop: ast.UnaryOp | t.CPtr = (ast.UnaryOp | t.CPtr)(val_node)
+        operand_val: int = extract_cdefine_int_value(uop.operand)
+        if uop.op == ast.OpKind.USub:
+            return -operand_val
+        if uop.op == ast.OpKind.UAdd:
+            return operand_val
+        if uop.op == ast.OpKind.Invert:
+            return ~operand_val
+        return 0
+
+    return 0
 
 
 # ============================================================