PuqiAR/Fig-TreeWalker
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

修复了函数调用时求值类型使用的作用域错误的问题。结构体中现在可以使用自己

Browse Source
This commit is contained in:
PuqiAR
2026-02-03 18:49:40 +08:00
parent 01c16dee3f
commit 4535f75058
9 changed files with 169 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/Evaluator/Core/EvalLvObject.cpp
View File

@@ -8,6 +8,35 @@ namespace Fig
LvObject Evaluator::evalVarExpr(Ast::VarExpr var, ContextPtr ctx)
{
const FString &name = var->name;
// 调试信息
// std::cerr << "=== DEBUG evalVarExpr ===" << std::endl;
// std::cerr << "Looking for: " << name.toBasicString() << std::endl;
// std::cerr << "Context: " << ctx->getScopeName().toBasicString() << std::endl;
// // 打印上下文
// ContextPtr current = ctx;
// int depth = 0;
// while (current)
// {
// std::cerr << " [" << depth << "] " << current->getScopeName().toBasicString();
// if (current->containsInThisScope(name))
// {
// std::cerr << " -> FOUND HERE!" << std::endl;
// auto slot = current->get(name);
// std::cerr << " Type: " << slot->declaredType.toString().toBasicString() << std::endl;
// std::cerr << " Value: " << (slot->value ? slot->value->toString().toBasicString() : "null")
// << std::endl;
// }
// else
// {
// std::cerr << " -> not found" << std::endl;
// }
// current = current->parent;
// depth++;
// }
// end
if (!ctx->contains(name)) { throw EvaluatorError(u8"UndeclaredIdentifierError", name, var); }
return LvObject(ctx->get(name), ctx);
}
@@ -18,7 +47,26 @@ namespace Fig
const FString &member = me->member;
if (baseVal->getTypeInfo() == ValueType::Module)
{
// std::cerr << "=== DEBUG evalMemberExpr (Module) ===" << std::endl;
// std::cerr << "Module object: " << baseVal->toString().toBasicString() << std::endl;
const Module &mod = baseVal->as<Module>();
// std::cerr << "Module context: " << mod.ctx->getScopeName().toBasicString() << std::endl;
// std::cerr << "Looking for member: " << member.toBasicString() << std::endl;
// if (mod.ctx->contains(member))
// {
// std::cerr << "Found in module context!" << std::endl;
// if (mod.ctx->isVariablePublic(member)) { std::cerr << "And it's public!" << std::endl; }
// else
// {
// std::cerr << "But it's NOT public!" << std::endl;
// }
// }
// else
// {
// std::cerr << "NOT found in module context!" << std::endl;
// }
if (mod.ctx->contains(member) && mod.ctx->isVariablePublic(member))
{
return LvObject(mod.ctx->get(member), ctx);