Fixed chained functions, resolved #52

source/toy_interpreter.c

@@ -1229,12 +1229,8 @@ static bool execFnCall(Toy_Interpreter* interpreter, bool looseFirstArgument) {
 
 	//get the function literal
 	Toy_Literal func = identifier;
-
-	if (!Toy_parseIdentifierToValue(interpreter, &func)) {
-		Toy_freeLiteralArray(&arguments);
-		Toy_freeLiteral(stackSize);
+	if (!TOY_IS_FUNCTION(func) && Toy_parseIdentifierToValue(interpreter, &func)) {
 		Toy_freeLiteral(identifier);
-		return false;
 	}
 
 	if (!TOY_IS_FUNCTION(func) && !TOY_IS_FUNCTION_NATIVE(func)) {
@@ -1271,7 +1267,6 @@ static bool execFnCall(Toy_Interpreter* interpreter, bool looseFirstArgument) {
 	Toy_freeLiteralArray(&arguments);
 	Toy_freeLiteral(func);
 	Toy_freeLiteral(stackSize);
-	Toy_freeLiteral(identifier);
 
 	return ret;
 }

test/scripts/function-within-function-bugfix.toy

@@ -0,0 +1,30 @@
+{
+	fn a() {
+		fn b() {
+			return 42;
+		}
+
+		return b;
+	}
+
+	assert a()() == 42, "function within function failed";
+}
+
+{
+	fn a() {
+		fn b() {
+			fn c() {
+				return 42;
+			}
+
+			return c;
+		}
+
+		return b;
+	}
+
+	assert a()()() == 42, "function within function within function failed";
+}
+
+
+print "All good";

test/test_interpreter.c

@@ -117,6 +117,7 @@ int main() {
 			"dot-chaining.toy",
 			"dot-modulo-bugfix.toy",
 			"dottify-bugfix.toy",
+			"function-within-function-bugfix.toy",
 			"functions.toy",
 			"index-arrays.toy",
 			"index-assignment-both-bugfix.toy",