Merge branch 'utility/function-definitions'

Author: sourrust

src/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(DEPS_DIR "${laco_SOURCE_DIR}/deps")
 
-include_directories("${DEPS_DIR}/linenoise")
+include_directories("${laco_SOURCE_DIR}/src" "${DEPS_DIR}/linenoise")
 
 set(SOURCE ${DEPS_DIR}/linenoise/linenoise.c
            main.c util.c util/print.c

src/util.c

@@ -10,7 +10,6 @@
 #include "linenoise.h"
 #include "commands.h"
 #include "laco.h"
-#include "util/print.h"
 
 /* Check if line is incomplete */
 static bool incomplete(lua_State* L, int status) {
@@ -138,12 +137,12 @@ void laco_handle_line(LacoState* laco) {
     status = lua_pcall(L, 0, LUA_MULTRET, 0);
   }
 
-  laco_report_error(L, status);
+  laco_report_error(laco, status);
 
   if(status == 0 && lua_gettop(L) > 0) {
-    status = laco_print_type(L);
+    status = laco_print_type(laco);
 
-    laco_report_error(L, status);
+    laco_report_error(laco, status);
   }
 
   laco_set_laco_status(laco, status);

src/util.h

@@ -29,6 +29,24 @@ void laco_handle_line(struct LacoState* laco);
  */
 void laco_kill(struct LacoState* laco, int status, const char* message);
 
+/**
+ * When there is a value on the lua stack, it will print out depending on
+ * the type it is
+ *
+ * param          pointer to LacoState
+ *
+ * return LUA_ERRSYNTAX if the value has some error
+ */
+int laco_print_type(struct LacoState* laco);
+
+/**
+ * Prints out and pops off errors pushed into the lua stack
+ *
+ * param          pointer to LacoState
+ * param          incoming lua stack status
+ */
+void laco_report_error(struct LacoState* laco, int status);
+
 int laco_is_match(const char** matches, const char* test_string);
 
 #endif /* LACO_UTIL_H */

src/util/print.c

@@ -1,10 +1,12 @@
-#include "print.h"
+#include "util.h"
 
 #include <stdio.h>
 #include <stdbool.h>
 
 #include <lua.h>
 
+#include "laco.h"
+
 /* C Wrapper for lua's tostring function  */
 inline static const char* to_lua_string(lua_State* L) {
   const char* result = NULL;
@@ -78,9 +80,10 @@ static void print_table(lua_State* L) {
 
 /* External API*/
 
-int laco_print_type(lua_State* L) {
-  int status  = 0;
-  int luatype = lua_type(L, -1);
+int laco_print_type(LacoState* laco) {
+  lua_State* L = laco_get_laco_lua_state(laco);
+  int status   = laco_get_laco_status(laco);
+  int luatype  = lua_type(L, -1);
 
   if(luatype != LUA_TTABLE) {
     lua_getglobal(L, "print");
@@ -91,10 +94,14 @@ int laco_print_type(lua_State* L) {
     print_table(L);
   }
 
+  laco_set_laco_status(laco, status);
+
   return status;
 }
 
-void laco_report_error(lua_State* L, int status) {
+void laco_report_error(LacoState* laco, int status) {
+  lua_State* L = laco_get_laco_lua_state(laco);
+
   if(status != 0 && lua_isstring(L, -1)) {
     fprintf(stderr, "%s\n", lua_tostring(L, -1));
     fflush(stderr);