From 3227230aa2a2bad8849063b6020b3a0fda58eec1 Mon Sep 17 00:00:00 2001
From: PuqiAR <PuqiAR@qq.com>
Date: Tue, 23 Dec 2025 11:45:50 +0800
Subject: [PATCH] =?UTF-8?q?[Fix]=20=E4=BF=AE=E5=A4=8D=E7=B1=BB=E6=88=90?=
 =?UTF-8?q?=E5=91=98=E5=8F=AF=E8=A7=81=E6=80=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/evaluator.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/evaluator.cpp b/src/evaluator.cpp
index bddc364..bfc8ede 100644
--- a/src/evaluator.cpp
+++ b/src/evaluator.cpp
@@ -76,6 +76,15 @@ namespace Fig
                                                                std::format("Struct `{}` has no attribute '{}'", structTypeName.toBasicString(), member.toBasicString())),
                                                            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
             }
             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"));
                 FString structTypeName = *structTypeNameOpt;
 
-
                 FString fnName = u8"<anonymous>";
                 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
@@ -95,6 +103,15 @@ namespace Fig
                                                                std::format("Struct `{}` has no attribute '{}'", structTypeName.toBasicString(), fnName.toBasicString())),
                                                            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);
                 ObjectPtr calleeVal = *calleeValOpt;
 
@@ -119,7 +136,6 @@ namespace Fig
                                                                      std::format("{} is not a field", binExp->rexp->toString().toBasicString())),
                                                                  binExp->rexp->getAAI());
             }
-                
         }
         return __evalOp(binExp->op, eval(binExp->lexp), eval(binExp->rexp));
     }
@@ -459,8 +475,8 @@ namespace Fig
                 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
-                    ));
+                                                                                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));
             }