From cbb8417c9d3565d554d488fe2421cf164d63d73e Mon Sep 17 00:00:00 2001
From: kappa <petarkapris@420blaze.it>
Date: Wed, 11 Dec 2019 22:50:51 +0100
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D1=99?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=83=20"=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BC=D0=B5=D0=BD=D0=B8"=20=D0=BF=D1=80=D0=BE=D1=86?=
 =?UTF-8?q?=D0=B5=D0=B4=D1=83=D1=80=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internals.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/internals.c b/internals.c
index a97d357..8bcf3a4 100644
--- a/internals.c
+++ b/internals.c
@@ -784,11 +784,25 @@ object applyInt(object parameters, env currentEnv)
 	CAR(expression) = copyObject(CAR(parameters));
 	CDR(expression) = copyObject(CAR(CDR(parameters)));
 
-	object *current = &expression;
-	while (TYPE(*current) != nilObject)
+	/* први аргумент се евалуира да би "примени" могао познати да ли се
+	 * заиста ради о функцији, и да ли је она нормална или специјална
+	 * (јер ако је специјална "навођење" аргумената ремети извршавање) */
+	CAR(expression) = Eval(CAR(expression), currentEnv);
+
+	if (TYPE(CAR(expression)) != procedureObject)
 	{
-		CAR(*current) = quoteExpression(CAR(*current));
-		current = &CDR(*current);
+		deleteObject(expression);
+		SIGERR(notApplicableError);
+	}
+
+	if (!PROC_SPECIAL(CAR(expression)))
+	{
+		object *current = &expression;
+		while (TYPE(*current) != nilObject)
+		{
+			CAR(*current) = quoteExpression(CAR(*current));
+			current = &CDR(*current);
+		}
 	}
 
 	return Eval(expression, currentEnv);