PuqiAR/Fig
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Fix] 修复类成员可见性问题

Browse Source
This commit is contained in:
PuqiAR
2025-12-23 11:45:50 +08:00
parent 660cca2579
commit 3227230aa2
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/evaluator.cpp
View File

@@ -76,6 +76,15 @@ namespace Fig
std::format("Struct `{}` has no attribute '{}'", structTypeName.toBasicString(), member.toBasicString())), std::format("Struct `{}` has no attribute '{}'", structTypeName.toBasicString(), member.toBasicString())),
binExp->rexp->getAAI()); binExp->rexp->getAAI());
} }
if (!st.localContext->isVariablePublic(member))
{
static constexpr char AttributeIsPrivateError[] = "AttributeIsPrivateError";
throw EvaluatorError<AttributeIsPrivateError>(FStringView(
std::format("Attribute '{}' of class `{}` is private",
structTypeName.toBasicString(),
member.toBasicString())),
binExp->rexp->getAAI());
}
return *st.localContext->get(member); // safe return *st.localContext->get(member); // safe
} }
else if ((fnCall = std::dynamic_pointer_cast<Ast::FunctionCallExpr>(binExp->rexp))) else if ((fnCall = std::dynamic_pointer_cast<Ast::FunctionCallExpr>(binExp->rexp)))
@@ -84,7 +93,6 @@ namespace Fig
if (!structTypeNameOpt) throw RuntimeError(FStringView("Can't get struct type name")); if (!structTypeNameOpt) throw RuntimeError(FStringView("Can't get struct type name"));
FString structTypeName = *structTypeNameOpt; FString structTypeName = *structTypeNameOpt;
FString fnName = u8"<anonymous>"; FString fnName = u8"<anonymous>";
if (auto var = std::dynamic_pointer_cast<Ast::VarExprAst>(fnCall->callee)) if (auto var = std::dynamic_pointer_cast<Ast::VarExprAst>(fnCall->callee))
fnName = var->name; // function in struct has its name, so we can get the name fnName = var->name; // function in struct has its name, so we can get the name
@@ -95,6 +103,15 @@ namespace Fig
std::format("Struct `{}` has no attribute '{}'", structTypeName.toBasicString(), fnName.toBasicString())), std::format("Struct `{}` has no attribute '{}'", structTypeName.toBasicString(), fnName.toBasicString())),
binExp->rexp->getAAI()); binExp->rexp->getAAI());
} }
if (!st.localContext->isVariablePublic(fnName))
{
static constexpr char AttributeIsPrivateError[] = "AttributeIsPrivateError";
throw EvaluatorError<AttributeIsPrivateError>(FStringView(
std::format("Attribute '{}' of class `{}` is private",
structTypeName.toBasicString(),
fnName.toBasicString())),
binExp->rexp->getAAI());
}
auto calleeValOpt = st.localContext->get(fnName); auto calleeValOpt = st.localContext->get(fnName);
ObjectPtr calleeVal = *calleeValOpt; ObjectPtr calleeVal = *calleeValOpt;
@@ -119,7 +136,6 @@ namespace Fig
std::format("{} is not a field", binExp->rexp->toString().toBasicString())), std::format("{} is not a field", binExp->rexp->toString().toBasicString())),
binExp->rexp->getAAI()); binExp->rexp->getAAI());
} }
} }
return __evalOp(binExp->op, eval(binExp->lexp), eval(binExp->rexp)); return __evalOp(binExp->op, eval(binExp->lexp), eval(binExp->rexp));
} }
@@ -459,8 +475,8 @@ namespace Fig
for (auto &[id, fn] : instanceCtx->getFunctions()) for (auto &[id, fn] : instanceCtx->getFunctions())
{ {
instanceCtx->_update(*instanceCtx->getFunctionName(id), Object( instanceCtx->_update(*instanceCtx->getFunctionName(id), Object(
Function(fn.paras, fn.retType, fn.body, instanceCtx) // change its closureContext to struct instance's context 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)); return std::make_shared<Object>(StructInstance(structT.id, instanceCtx));
} }