Merge branch 'debugger'

Now the debug info can look at tables in the `foo.baz.bar` fashion along
with the basic global functions. Next will be for ordered tables like
`foo[0]`.

Author: sourrust

src/commands.c

@@ -38,7 +38,7 @@ void laco_handle_command(struct LacoState* laco, char* line) {
     char* command_line   = strdup(line + 1);
     char** command_words = laco_line_to_words(command_line);
 
-    /* Alias for  */
+    /* Alias for parsed out words within the line */
     const char* command    = command_words[0];
     const char** arguments = (const char**) command_words + 1;
 

src/commands/debugger.c

@@ -1,16 +1,30 @@
 #include "debugger.h"
 
-#include <stdio.h>
 #include <lua.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "laco.h"
+#include "util.h"
 
 void laco_print_debug_info(struct LacoState* laco,
                            const char* function_name) {
-  lua_State* L = laco_get_laco_lua_state(laco);
+  int i;
+  char* namespace;
+  lua_State* L         = laco_get_laco_lua_state(laco);
+  size_t index         = LUA_GLOBALSINDEX;
   lua_Debug debug_info = {0};
 
-  lua_getfield(L, LUA_GLOBALSINDEX, function_name);
+  char* name        = strdup(function_name);
+  char** namespaces = laco_split_by(".", name, 0);
+
+  /* Walk down the namespace if there is something to go down */
+  for(i = 0; (namespace = namespaces[i]); i++) {
+    lua_getfield(L, index, namespace);
+    index = lua_gettop(L);
+  }
 
   lua_getinfo(L, ">Sl", &debug_info);
 
@@ -21,4 +35,12 @@ void laco_print_debug_info(struct LacoState* laco,
     "Current line:    \t%d\n",
     debug_info.what, debug_info.source,
     debug_info.linedefined, debug_info.currentline);
+
+  /* Pop off the extra fields from the top of the stack */
+  if(i > 1) {
+    lua_pop(L, i - 1);
+  }
+
+  free(name);
+  free(namespaces);
 }

src/util.c

@@ -100,10 +100,10 @@ static bool pushline(LacoState* laco, bool isFirstLine) {
   return result;
 }
 
-static inline void ignore_extra_spaces(char** string_ptr) {
+static inline void ignore_extra(const char chr, char** string_ptr) {
   if(*string_ptr == NULL) return;
 
-  while(**string_ptr == ' ') {
+  while(**string_ptr == chr) {
     *string_ptr += 1;
   }
 }
@@ -179,18 +179,19 @@ int laco_is_match(const char** matches, const char* test_string) {
   return false;
 }
 
-char** laco_line_to_words(char* line) {
-  if(line == NULL) return NULL;
+char** laco_split_by(const char* split_with, char* string,
+                     int ignore_repeats) {
+  if(string == NULL) return NULL;
 
   char** result = calloc(16, sizeof(char*));
   size_t i = 0;
 
   while(1) {
-    result[i] = strsep(&line, " ");
+    result[i] = strsep(&string, split_with);
 
     if(result[i] == NULL) break;
 
-    ignore_extra_spaces(&line);
+    if(ignore_repeats) ignore_extra(split_with[0], &string);
 
     i += 1;
   }

src/util.h

@@ -39,9 +39,14 @@ void laco_report_error(struct LacoState* laco, int status);
 int laco_is_match(const char** matches, const char* test_string);
 
 /**
- * Takes a line, seperated by spaces, and changes it into an array of the
- * words that make up the line. The last value of this array will be NULL.
+ * Break the provided string into an array of strings that are between the
+ * split_with value. The last value of this array will be NULL.
  */
-char** laco_line_to_words(char* line);
+char** laco_split_by(const char* split_with, char* string,
+                     int ignore_repeats);
+
+/* Macro for splitting with spaces */
+#define laco_line_to_words(line) \
+  laco_split_by(" ", line, 1)
 
 #endif /* LACO_UTIL_H */