From f2b6fdc902da8ce71778e4f8245bc2cfbb732599 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 30 Jan 2012 18:46:40 +1000
Subject: Clean up dangling function calls.

---
 LuaSL/src/LuaSL_LSL_tree.h | 2 +-
 LuaSL/src/LuaSL_compile.c  | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'LuaSL/src')

diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h
index 26e7ee8..561a2ff 100644
--- a/LuaSL/src/LuaSL_LSL_tree.h
+++ b/LuaSL/src/LuaSL_LSL_tree.h
@@ -270,7 +270,7 @@ struct _LSL_FunctionCall
     LSL_Function	*function;
     Eina_Inarray	params;		// Eina Inarray has not been released yet (Eina 1.2).
     Eina_Clist		dangler;	// Entry for function calls used before the function is defined.
-    LSL_Leaf		*call;
+    LSL_Leaf		*call;		// This is to stash the details for dangling ones, to search later.  The line and column details are needed for bitching, so we need the leaf.
 };
 
 struct _LSL_State
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index 21f876c..7745f93 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -582,7 +582,6 @@ LSL_Leaf *addFunctionCall(LuaSL_compiler *compiler, LSL_Leaf *identifier, LSL_Le
 	{
 	    call->function = func->value.functionValue;
 	    eina_clist_element_init(&(call->dangler));
-	    call->call = identifier;
 	}
 	identifier->value.functionCallValue = call;
 	// TODO - Put the params in call.
@@ -1257,7 +1256,6 @@ static void outputFunctionCallToken(FILE *file, outputMode mode, LSL_Leaf *conte
 	LSL_FunctionCall *call = content->value.functionCallValue;
 	LSL_Function *func = call->function;
 	outputText(file, &(func->name), !(LSL_NOIGNORE & content->toKen->flags));
-//	fprintf(file, "%s(", func->name);
 	fprintf(file, "(");
 	// TODO - print params here.
 	fprintf(file, ")");
@@ -1608,12 +1606,7 @@ boolean compileLSL(gameGlobals *game, char *script, boolean doConstants)
 		LSL_Leaf *func = findFunction(&(compiler), call->call->value.stringValue);
 
 		if (func)
-		{
 		    call->function = func->value.functionValue;
-		    call->call->value.functionCallValue = call;
-		    call->call->toKen = tokens[LSL_FUNCTION_CALL - lowestToken];
-		    call->call->basicType = func->basicType;
-		}
 		else
 		    PE("Undeclared function %s called @ line %d, column %d!", call->call->value.stringValue, call->call->line, call->call->column);
 	    }
-- 
cgit v1.1