From 7a533b883b789f0e4a1e2d6379b2735e41ad4ed5 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 13 Jan 2013 19:44:00 +1000
Subject: Fixed some of the bit rot in LuaSL, it compiles now, but not working
still.
---
LuaSL/build.sh | 3 ++-
LuaSL/src/LuaSL_compile.c | 12 ++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/LuaSL/build.sh b/LuaSL/build.sh
index 7d95965..5e60691 100755
--- a/LuaSL/build.sh
+++ b/LuaSL/build.sh
@@ -21,6 +21,7 @@ CFLAGS="-g -Wall -Wunreachable-code -I include -I $LOCALDIR/src"
CFLAGS="$CFLAGS -I ../../libraries"
CFLAGS="$CFLAGS -I ../../libraries/luajit-2.0/src"
#CFLAGS="$CFLAGS -I /usr/include/lua5.1"
+CFLAGS="$CFLAGS -I $E17DIR/include/eo-1"
CFLAGS="$CFLAGS -I $E17DIR/include/eina-1"
CFLAGS="$CFLAGS -I $E17DIR/include/eina-1/eina"
CFLAGS="$CFLAGS -I $E17DIR/include/eet-1"
@@ -32,7 +33,7 @@ CFLAGS="$CFLAGS -I $E17DIR/include"
CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS"
LDFLAGS="-L ../../libraries/luajit-2.0/src -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
-libs="-lecore -levas -ledje -lembryo -leet -leina -lluajit -lpthread -lm"
+libs="-leo -lecore -levas -ledje -lembryo -leet -leina -lluajit -lpthread -lm"
#LDFLAGS="-L /usr/lib/lua/5.1 -L lib -L /usr/lib -L /lib -L $E17DIR/lib"
#libs="-lecore -levas -ledje -lembryo -leet -leina -llua5.1 -lpthread -lm"
# These need to be added to libs if linking staticaly, though some parts of EFL don't like that.
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index de103b7..2a4c503 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -673,7 +673,7 @@ LSL_Leaf *collectParameters(LuaSL_compiler *compiler, LSL_Leaf *list, LSL_Leaf *
if (func)
{
list->value.functionValue = func;
- eina_inarray_setup(&(func->vars), sizeof(LSL_Leaf), 3);
+ eina_inarray_step_set(&(func->vars), sizeof(Eina_Inarray), sizeof(LSL_Leaf), 3);
}
}
@@ -685,9 +685,9 @@ LSL_Leaf *collectParameters(LuaSL_compiler *compiler, LSL_Leaf *list, LSL_Leaf *
{
// Stash the comma for diff later.
if (comma)
- eina_inarray_append(&(func->vars), comma);
+ eina_inarray_push(&(func->vars), comma);
}
- eina_inarray_append(&(func->vars), newParam);
+ eina_inarray_push(&(func->vars), newParam);
// At this point, pointers to newParams are not pointing to the one in func->vars, AND newParam is no longer needed.
}
}
@@ -770,7 +770,7 @@ LSL_Leaf *collectArguments(LuaSL_compiler *compiler, LSL_Leaf *list, LSL_Leaf *c
if (call)
{
list->value.functionCallValue = call;
- eina_inarray_setup(&(call->params), sizeof(LSL_Leaf), 3);
+ eina_inarray_step_set(&(call->params), sizeof(Eina_Inarray), sizeof(LSL_Leaf), 3);
}
}
@@ -782,9 +782,9 @@ LSL_Leaf *collectArguments(LuaSL_compiler *compiler, LSL_Leaf *list, LSL_Leaf *c
{
// Stash the comma for diff later.
if (comma)
- eina_inarray_append(&(call->params), comma);
+ eina_inarray_push(&(call->params), comma);
}
- eina_inarray_append(&(call->params), arg);
+ eina_inarray_push(&(call->params), arg);
// At this point, pointers to arg are not pointing to the one in call->params, AND arg is no longer needed.
}
}
--
cgit v1.1