zi2ven/Fig
1
0
Fork 0
forked from PuqiAR/Fig-TreeWalker
Code Pull Requests Activity

[Fix] 修复struct内部函数无法访问内部成员的问题

Browse Source 
[Feat] 拓展构建
This commit is contained in:
PuqiAR
2025-12-23 01:37:46 +08:00
parent 6226059adc
commit 660cca2579
6 changed files with 83 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/evaluator.cpp
View File

@@ -456,6 +456,12 @@ namespace Fig
}
}
instanceCtx->merge(*structT.defContext);
for (auto &[id, fn] : instanceCtx->getFunctions())
{
instanceCtx->_update(*instanceCtx->getFunctionName(id), Object(
Function(fn.paras, fn.retType, fn.body, instanceCtx) // change its closureContext to struct instance's context
));
}
return std::make_shared<Object>(StructInstance(structT.id, instanceCtx));
}
default:
@@ -542,7 +548,7 @@ namespace Fig
};
case AstType::FunctionDefSt: {
auto fnDef = std::dynamic_pointer_cast<Ast::FunctionDefSt>(stmt);
if (currentContext->contains(fnDef->name))
if (currentContext->containsInThisScope(fnDef->name))
{
static constexpr char RedeclarationErrorName[] = "RedeclarationError";
throw EvaluatorError<RedeclarationErrorName>(FStringView(std::format("Function '{}' already defined in this scope", fnDef->name.toBasicString())), currentAddressInfo);