挺大的改动。增加 as运算符，转换不了抛出 TypeError。import语法更新。修复try一点错误。现在表达式运算返回ExprResult。通过3个宏实现简便错误传播与解包 unwrap

2026-02-04 18:14:30 +08:00
parent 27cf09cad0
commit b98c1b7dd8
26 changed files with 693 additions and 206 deletions
--- a/src/Evaluator/Core/ExprResult.hpp
+++ b/src/Evaluator/Core/ExprResult.hpp
@@ -0,0 +1,72 @@
+#pragma once
+
+#include <Core/fig_string.hpp>
+#include <Evaluator/Value/value_forward.hpp>
+#include <Evaluator/Value/LvObject.hpp>
+
+#include <variant>
+#include <cassert>
+
+namespace Fig
+{
+    struct StatementResult;
+    struct ExprResult
+    {
+        std::variant<LvObject, RvObject> result;
+        enum class Flow
+        {
+            Normal,
+            Error,
+        } flow;
+
+        ExprResult(ObjectPtr _result, Flow _flow = Flow::Normal) : result(_result), flow(_flow) {}
+        ExprResult(const LvObject &_result, Flow _flow = Flow::Normal) : result(_result), flow(_flow) {}
+
+        static ExprResult normal(ObjectPtr _result) { return ExprResult(_result); }
+        static ExprResult normal(const LvObject &_result) { return ExprResult(_result); }
+
+        static ExprResult error(ObjectPtr _result) { return ExprResult(_result, Flow::Error); }
+        static ExprResult error(const LvObject &_result) { return ExprResult(_result, Flow::Error); }
+
+        bool isNormal() const { return flow == Flow::Normal; }
+
+        bool isError() const { return flow == Flow::Error; }
+
+        bool isResultLv() const { return std::holds_alternative<LvObject>(result); }
+
+        ObjectPtr &unwrap()
+        {
+            if (!isNormal()) { assert(false && "unwrap abnormal ExprResult!"); }
+            return std::get<RvObject>(result);
+        }
+
+        const ObjectPtr &unwrap() const
+        {
+            if (!isNormal()) { assert(false && "unwrap abnormal ExprResult!"); }
+            return std::get<RvObject>(result);
+        }
+
+        const LvObject &unwrap_lv() const { return std::get<LvObject>(result); }
+
+        StatementResult toStatementResult() const;
+    };
+#define check_unwrap(expr)                                                                                             \
+    ({                                                                                                                 \
+        auto _r = (expr);                                                                                              \
+        if (_r.isError()) return _r;                                                                                   \
+        _r.unwrap();                                                                                                   \
+    })
+#define check_unwrap_lv(expr)                                                                                          \
+    ({                                                                                                                 \
+        auto _r = (expr);                                                                                              \
+        if (_r.isError()) return _r;                                                                                   \
+        _r.unwrap_lv();                                                                                                \
+    })
+#define check_unwrap_stres(expr)                                                                                       \
+    ({                                                                                                                 \
+        auto _r = (expr);                                                                                              \
+        if (_r.isError()) return _r.toStatementResult();                                                               \
+        _r.unwrap();                                                                                                   \
+    })
+
+}; // namespace Fig