[ctfe] Fix forward-referenced methods.

fusionlanguage · Mar 25, 2024 · c83b061 · c83b061
1 parent d615551
commit c83b061
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 6 deletions.
diff --git a/AST.fu b/AST.fu
@@ -1198,7 +1198,7 @@ public class FuMethodBase : FuMember
 {
 	internal FuParameters() Parameters;
 	internal List<FuThrowsDeclaration#>() Throws;
-	internal FuStatement#? Body;
+	internal FuScope#? Body;
 	internal bool IsLive = false;
 	internal HashSet<FuMethod!>() Calls;
 	public override bool IsStatic() => false; // constructor

diff --git a/Sema.fu b/Sema.fu
@@ -1357,7 +1357,7 @@ public class FuSema
 		symbol.Symbol = method;
 
 		if (method.CallType == FuCallType.Static
-		 && method.Body is FuReturn ret
+		 && method.Body is FuReturn! ret
 		 && arguments.All(arg => arg is FuLiteral)
 		 && !this.CurrentPureMethods.Contains(method)) {
 			this.CurrentPureMethods.Add(method);
@@ -1368,7 +1368,11 @@ public class FuSema
 				else
 					this.CurrentPureArguments[param] = param.Value;
 			}
+			FuScope! callSite = this.CurrentScope;
+			ret.Parent = method.Parameters;
+			this.CurrentScope = ret;
 			FuExpr# result = VisitExpr(ret.Value);
+			this.CurrentScope = callSite;
 			for (FuVar? param = method.FirstParameter(); param != null; param = param.NextVar())
 				this.CurrentPureArguments.Remove(param);
 			this.CurrentPureMethods.Remove(method);

diff --git a/libfut.cpp b/libfut.cpp
@@ -5730,8 +5730,8 @@ std::shared_ptr<FuExpr> FuSema::resolveCallWithArguments(std::shared_ptr<FuCallE
 			reportError(expr.get(), std::format("Method marked 'throws {}' called from a method without it", exception->name));
 	}
 	symbol->symbol = method;
-	const FuReturn * ret;
-	if (method->callType == FuCallType::static_ && (ret = dynamic_cast<const 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)) {
+	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)) {
 		this->currentPureMethods.insert(method);
 		i = 0;
 		for (const FuVar * param = method->firstParameter(); param != nullptr; param = param->nextVar()) {
@@ -5740,7 +5740,11 @@ std::shared_ptr<FuExpr> FuSema::resolveCallWithArguments(std::shared_ptr<FuCallE
 			else
 				this->currentPureArguments[param] = param->value;
 		}
+		FuScope * callSite = this->currentScope;
+		ret->parent = &method->parameters;
+		this->currentScope = ret;
 		std::shared_ptr<FuExpr> result = visitExpr(ret->value);
+		this->currentScope = callSite;
 		for (const FuVar * param = method->firstParameter(); param != nullptr; param = param->nextVar())
 			this->currentPureArguments.erase(param);
 		this->currentPureMethods.erase(method);

diff --git a/libfut.cs b/libfut.cs
@@ -2738,7 +2738,7 @@ public class FuMethodBase : FuMember
 
 		internal readonly List<FuThrowsDeclaration> Throws = new List<FuThrowsDeclaration>();
 
-		internal FuStatement Body;
+		internal FuScope Body;
 
 		internal bool IsLive = false;
 
@@ -5852,7 +5852,11 @@ FuExpr ResolveCallWithArguments(FuCallExpr expr, List<FuExpr> arguments)
 					else
 						this.CurrentPureArguments[param] = param.Value;
 				}
+				FuScope callSite = this.CurrentScope;
+				ret.Parent = method.Parameters;
+				this.CurrentScope = ret;
 				FuExpr result = VisitExpr(ret.Value);
+				this.CurrentScope = callSite;
 				for (FuVar param = method.FirstParameter(); param != null; param = param.NextVar())
 					this.CurrentPureArguments.Remove(param);
 				this.CurrentPureMethods.Remove(method);

diff --git a/libfut.hpp b/libfut.hpp
@@ -1301,7 +1301,7 @@ class FuMethodBase : public FuMember
 public:
 	FuParameters parameters;
 	std::vector<std::shared_ptr<FuThrowsDeclaration>> throws;
-	std::shared_ptr<FuStatement> body;
+	std::shared_ptr<FuScope> body;
 	bool isLive = false;
 	std::unordered_set<FuMethod *> calls;
 };

diff --git a/libfut.js b/libfut.js
@@ -6153,7 +6153,11 @@ export class FuSema
 				else
 					this.#currentPureArguments[param] = param.value;
 			}
+			let callSite = this.#currentScope;
+			ret.parent = method.parameters;
+			this.#currentScope = ret;
 			let result = this.#visitExpr(ret.value);
+			this.#currentScope = callSite;
 			for (let param = method.firstParameter(); param != null; param = param.nextVar())
 				delete this.#currentPureArguments[param];
 			this.#currentPureMethods.delete(method);

diff --git a/test/ConstForwardMethod.fu b/test/ConstForwardMethod.fu
@@ -0,0 +1,9 @@
+public static class Test
+{
+	public static bool Run()
+	{
+		return Foo(42);
+	}
+
+	static bool Foo(int answer) => answer == 42;
+}