From c2fafb76bd22dad7cc443171513284c7647a944a Mon Sep 17 00:00:00 2001
From: ZhuangYumin <zhuangyumin@sjtu.edu.cn>
Date: Thu, 9 Nov 2023 20:26:39 +0800
Subject: [PATCH] upd: delete FatalError in Dequate

---
 src/Evalvisitor.cpp | 2 +-
 src/utils.cpp       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Evalvisitor.cpp b/src/Evalvisitor.cpp
index 81ed01d..7d0d3a8 100644
--- a/src/Evalvisitor.cpp
+++ b/src/Evalvisitor.cpp
@@ -184,7 +184,7 @@ std::any EvalVisitor::visitContinue_stmt(
 std::any EvalVisitor::visitReturn_stmt(Python3Parser::Return_stmtContext *ctx) {
   if (!ctx->testlist()) return FlowType(RETURN, std::vector<std::any>());
   std::any val = visitTestlist(ctx->testlist());
-  // val = DeQuate(val, Variables);
+  val = DeQuate(val, Variables);
   std::vector<std::any> *val_ptr = std::any_cast<std::vector<std::any>>(&val);
   if (val_ptr) return FlowType(RETURN, *val_ptr);
   std::vector<std::any> tmp;
diff --git a/src/utils.cpp b/src/utils.cpp
index 3fc600b..0b28898 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -98,7 +98,8 @@ std::any DeQuate(std::any val, VariableContainer &Variables) {
              std::any_cast<NoneType>(&val))
     return val;
   else
-    throw FatalError("DeQuate: unknown type");
+    return NoneType();
+  // throw FatalError("DeQuate: unknown type");
 }
 
 int ConverToSameArithType(std::any &a, std::any &b,