Merge branch 'move-dispatch'

Author: sourrust

src/commands.c

@@ -39,20 +39,6 @@ static const struct LacoCommand line_commands[] = {
 
 /* External API */
 
-void laco_dispatch(const struct LacoCommand* commands,
-                   struct LacoState* laco, const char* command_keyword,
-                   const char** arguments) {
-  int i;
-  const char** matches;
-
-  for(i = 0; (matches = commands[i].matches); i++) {
-    if(laco_is_match(matches, command_keyword)) {
-      commands[i].handler(laco, arguments);
-      break;
-    }
-  }
-}
-
 void laco_handle_command(struct LacoState* laco, char* line) {
   if(laco != NULL && line != NULL) {
     char* command_line   = strdup(line + 1);

src/commands.h

@@ -3,24 +3,6 @@
 
 struct LacoState;
 
-typedef void (*LacoHandler)(struct LacoState* laco, const char** arguments);
-
-struct LacoCommand {
-  const char** matches;
-  LacoHandler handler;
-};
-
-/**
- * Goes through each instance from the list of commands and see if there is
- * a match with for command_keyword. When there is a match, the defined
- * handler inside the LacoCommand gets called -- passing in LacoState and
- * the arguments. The list of commands expects the last entry of the array
- * to be `{ NULL, NULL }` for ease of iteration.
- */
-void laco_dispatch(const struct LacoCommand* commands,
-                   struct LacoState* laco, const char* command_keyword,
-                   const char** arguments);
-
 /**
  * Gets passed ever line to see if it matches one of the REPL command. If it
  * does, that command will be executed.

src/flags.c

@@ -2,7 +2,6 @@
 
 #include <stdio.h>
 
-#include "commands.h"
 #include "laco.h"
 #include "util.h"
 

src/util.c

@@ -58,3 +58,17 @@ char** laco_split_by(const char split_with, char* string,
 
   return result;
 }
+
+void laco_dispatch(const struct LacoCommand* commands,
+                   struct LacoState* laco, const char* command_keyword,
+                   const char** arguments) {
+  int i;
+  const char** matches;
+
+  for(i = 0; (matches = commands[i].matches); i++) {
+    if(laco_is_match(matches, command_keyword)) {
+      commands[i].handler(laco, arguments);
+      break;
+    }
+  }
+}

src/util.h

@@ -5,6 +5,23 @@
 
 struct LacoState;
 
+/**
+ * Generalized function pointer for handling commands from from either a
+ * command line flag or a command inside of laco itself.
+ */
+typedef void (*LacoHandler)(struct LacoState* laco, const char** arguments);
+
+/**
+ * A representation of each command with a list of string matches and a
+ * function pointer to the behavior of said command. When there is a match
+ * to one of the string, this function will be called and passed in the
+ * appropriate arguments.
+ */
+struct LacoCommand {
+  const char** matches;
+  LacoHandler handler;
+};
+
 /**
  * Load a line into the lua stack to evaluated later. This function will
  * return false if there is no line input to load.
@@ -51,4 +68,15 @@ char** laco_split_by(const char split_with, char* string,
 #define laco_line_to_words(line) \
   laco_split_by(' ', line, 1)
 
+/**
+ * Goes through each instance from the list of commands and see if there is
+ * a match with for command_keyword. When there is a match, the defined
+ * handler inside the LacoCommand gets called -- passing in LacoState and
+ * the arguments. The list of commands expects the last entry of the array
+ * to be `{ NULL, NULL }` for ease of iteration.
+ */
+void laco_dispatch(const struct LacoCommand* commands,
+                   struct LacoState* laco, const char* command_keyword,
+                   const char** arguments);
+
 #endif /* LACO_UTIL_H */