[cleanup] Static calls are already checked.

fusionlanguage · Jun 27, 2024 · 73f302a · 73f302a
1 parent fa5cf71
commit 73f302a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/Sema.fu b/Sema.fu
@@ -1303,7 +1303,6 @@ public class FuSema
 			return PoisonError(symbol, "Expected a method");
 		}
 
-		// TODO: check static
 		if (!method.IsStatic() && method.IsMutator()) {
 			if (symbol.Left == null) {
 				if (!this.CurrentMethod.IsMutator())
@@ -1367,7 +1366,7 @@ public class FuSema
 
 		symbol.Symbol = method;
 
-		if (method.CallType == FuCallType.Static
+		if (method.IsStatic()
 		 && method.Body is FuReturn! ret
 		 && arguments.All(arg => arg is FuLiteral)
 		 && !this.CurrentPureMethods.Contains(method)) {

diff --git a/libfut.cpp b/libfut.cpp
@@ -5870,7 +5870,7 @@ std::shared_ptr<FuExpr> FuSema::resolveCallWithArguments(std::shared_ptr<FuCallE
 	}
 	symbol->symbol = method;
 	FuReturn * ret;
-	if (method->callType == FuCallType::static_ && (ret = dynamic_cast<FuReturn *>(method->body.get())) && std::all_of(arguments->begin(), arguments->end(), [](const std::shared_ptr<FuExpr> &arg) { return dynamic_cast<const FuLiteral *>(arg.get()); }) && !this->currentPureMethods.contains(method)) {
+	if (method->isStatic() && (ret = dynamic_cast<FuReturn *>(method->body.get())) && std::all_of(arguments->begin(), arguments->end(), [](const std::shared_ptr<FuExpr> &arg) { return dynamic_cast<const FuLiteral *>(arg.get()); }) && !this->currentPureMethods.contains(method)) {
 		this->currentPureMethods.insert(method);
 		i = 0;
 		for (const FuVar * param = method->firstParameter(); param != nullptr; param = param->nextVar()) {

diff --git a/libfut.cs b/libfut.cs
@@ -5975,7 +5975,7 @@ FuExpr ResolveCallWithArguments(FuCallExpr expr, List<FuExpr> arguments)
 					ReportError(expr.Method, $"Method marked 'throws {exception.Name}' called from a method without it");
 			}
 			symbol.Symbol = method;
-			if (method.CallType == FuCallType.Static && method.Body is FuReturn ret && arguments.TrueForAll(arg => arg is FuLiteral) && !this.CurrentPureMethods.Contains(method)) {
+			if (method.IsStatic() && method.Body is FuReturn ret && arguments.TrueForAll(arg => arg is FuLiteral) && !this.CurrentPureMethods.Contains(method)) {
 				this.CurrentPureMethods.Add(method);
 				i = 0;
 				for (FuVar param = method.FirstParameter(); param != null; param = param.NextVar()) {

diff --git a/libfut.js b/libfut.js
@@ -6298,7 +6298,7 @@ export class FuSema
 		}
 		symbol.symbol = method;
 		let ret;
-		if (method.callType == FuCallType.STATIC && (ret = method.body) instanceof FuReturn && arguments_.every(arg => arg instanceof FuLiteral) && !this.#currentPureMethods.has(method)) {
+		if (method.isStatic() && (ret = method.body) instanceof FuReturn && arguments_.every(arg => arg instanceof FuLiteral) && !this.#currentPureMethods.has(method)) {
 			this.#currentPureMethods.add(method);
 			i = 0;
 			for (let param = method.firstParameter(); param != null; param = param.nextVar()) {