Moved functions to parser.c, moved parser to tools

6 files changed, 88 insertions, 83 deletions

diff --git a/Makefile.am b/Makefile.am
index f161b92a..f7c3f825 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,8 +14,8 @@ profanity_SOURCES = \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
 	src/ui/console.c src/ui/notifier.c src/ui/notifier.h \
 	src/command/command.h src/command/command.c src/command/history.c \
-	src/command/history.h src/command/parser.c \
-	src/command/parser.h \
+	src/command/history.h src/tools/parser.c \
+	src/tools/parser.h \
 	src/tools/autocomplete.c src/tools/autocomplete.h \
 	src/tools/history.c src/tools/history.h \
 	src/tools/tinyurl.c src/tools/tinyurl.h \
@@ -40,8 +40,8 @@ tests_testsuite_SOURCES = \
 	src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \
 	src/ui/console.c src/ui/notifier.c src/ui/notifier.h \
 	src/command/command.h src/command/command.c src/command/history.c \
-	src/command/history.h src/command/parser.c \
-	src/command/parser.h \
+	src/command/history.h src/tools/parser.c \
+	src/tools/parser.h \
 	src/tools/autocomplete.c src/tools/autocomplete.h \
 	src/tools/history.c src/tools/history.h \
 	src/tools/tinyurl.c src/tools/tinyurl.h \
diff --git a/src/command/command.c b/src/command/command.c
index 63d003f4..60fe6d6d 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -30,7 +30,6 @@
 #include "chat_session.h"
 #include "command/command.h"
 #include "command/history.h"
-#include "command/parser.h"
 #include "common.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
@@ -41,6 +40,7 @@
 #include "muc.h"
 #include "profanity.h"
 #include "tools/autocomplete.h"
+#include "tools/parser.h"
 #include "tools/tinyurl.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
diff --git a/src/tools/autocomplete.c b/src/tools/autocomplete.c
index 849aaf1d..4b25edd6 100644
--- a/src/tools/autocomplete.c
+++ b/src/tools/autocomplete.c
@@ -24,7 +24,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "autocomplete.h"
+#include "tools/autocomplete.h"
+#include "tools/parser.h"
 
 struct autocomplete_t {
     GSList *items;
@@ -260,80 +261,6 @@ autocomplete_param_with_ac(char *input, int *size, char *command,
     return auto_msg;
 }
 
-int
-_count_tokens(char *string)
-{
-    int num_tokens = 0;
-
-    // if no quotes, use glib
-    if (g_strrstr(string, "\"") == NULL) {
-        gchar **tokens = g_strsplit(string, " ", 0);
-        num_tokens = g_strv_length(tokens);
-        g_strfreev(tokens);
-
-    // else count tokens including quoted
-    } else {
-        int length = strlen(string);
-        int i = 0;
-        gboolean in_quotes = FALSE;
-
-        // include first token
-        num_tokens++;
-
-        for (i = 0; i < length; i++) {
-            if (string[i] == ' ') {
-                if (!in_quotes) {
-                    num_tokens++;
-                }
-            } else if (string[i] == '"') {
-                if (in_quotes) {
-                    in_quotes = FALSE;
-                } else {
-                    in_quotes = TRUE;
-                }
-            }
-        }
-    }
-
-    return num_tokens;
-}
-
-char *
-_get_start(char *string, int tokens)
-{
-    char *result_str = NULL;
-    int num_tokens = 0;
-    int length = strlen(string);
-    int i = 0;
-    gboolean in_quotes = FALSE;
-    GString *result = g_string_new("");
-
-    // include first token
-    num_tokens++;
-
-    for (i = 0; i < length; i++) {
-        if (num_tokens < tokens) {
-            g_string_append_c(result, string[i]);
-        }
-        if (string[i] == ' ') {
-            if (!in_quotes) {
-                num_tokens++;
-            }
-        } else if (string[i] == '"') {
-            if (in_quotes) {
-                in_quotes = FALSE;
-            } else {
-                in_quotes = TRUE;
-            }
-        }
-    }
-
-    result_str = result->str;
-    g_string_free(result, FALSE);
-
-    return result_str;
-}
-
 char *
 autocomplete_param_no_with_func(char *input, int *size, char *command,
     int arg_number, autocomplete_func func)
@@ -353,11 +280,11 @@ autocomplete_param_no_with_func(char *input, int *size, char *command,
         g_strstrip(inp_cpy);
 
         // count tokens properly
-        int num_tokens = _count_tokens(inp_cpy);
+        int num_tokens = count_tokens(inp_cpy);
 
         // if correct number of tokens, then candidate for autocompletion of last param
         if (num_tokens == arg_number) {
-            gchar *start_str = _get_start(inp_cpy, arg_number);
+            gchar *start_str = get_start(inp_cpy, arg_number);
             gchar *comp_str = g_strdup(&inp_cpy[strlen(start_str)]);
 
             // autocomplete param
diff --git a/src/command/parser.c b/src/tools/parser.c
index d7dfebab..c3190a96 100644
--- a/src/command/parser.c
+++ b/src/tools/parser.c
@@ -271,3 +271,79 @@ parse_args_with_freetext(const char * const inp, int min, int max)
         return args;
     }
 }
+
+int
+count_tokens(char *string)
+{
+    int num_tokens = 0;
+
+    // if no quotes, use glib
+    if (g_strrstr(string, "\"") == NULL) {
+        gchar **tokens = g_strsplit(string, " ", 0);
+        num_tokens = g_strv_length(tokens);
+        g_strfreev(tokens);
+
+    // else count tokens including quoted
+    } else {
+        int length = strlen(string);
+        int i = 0;
+        gboolean in_quotes = FALSE;
+
+        // include first token
+        num_tokens++;
+
+        for (i = 0; i < length; i++) {
+            if (string[i] == ' ') {
+                if (!in_quotes) {
+                    num_tokens++;
+                }
+            } else if (string[i] == '"') {
+                if (in_quotes) {
+                    in_quotes = FALSE;
+                } else {
+                    in_quotes = TRUE;
+                }
+            }
+        }
+    }
+
+    return num_tokens;
+}
+
+char *
+get_start(char *string, int tokens)
+{
+    char *result_str = NULL;
+    int num_tokens = 0;
+    int length = strlen(string);
+    int i = 0;
+    gboolean in_quotes = FALSE;
+    GString *result = g_string_new("");
+
+    // include first token
+    num_tokens++;
+
+    for (i = 0; i < length; i++) {
+        if (num_tokens < tokens) {
+            g_string_append_c(result, string[i]);
+        }
+        if (string[i] == ' ') {
+            if (!in_quotes) {
+                num_tokens++;
+            }
+        } else if (string[i] == '"') {
+            if (in_quotes) {
+                in_quotes = FALSE;
+            } else {
+                in_quotes = TRUE;
+            }
+        }
+    }
+
+    result_str = result->str;
+    g_string_free(result, FALSE);
+
+    return result_str;
+}
+
+
diff --git a/src/command/parser.h b/src/tools/parser.h
index f191ed15..6f00cc90 100644
--- a/src/command/parser.h
+++ b/src/tools/parser.h
@@ -27,5 +27,7 @@
 
 gchar** parse_args(const char * const inp, int min, int max);
 gchar** parse_args_with_freetext(const char * const inp, int min, int max);
+int count_tokens(char *string);
+char* get_start(char *string, int tokens);
 
 #endif
diff --git a/tests/test_parser.c b/tests/test_parser.c
index fd1b1e1c..58e3f3e7 100644
--- a/tests/test_parser.c
+++ b/tests/test_parser.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <head-unit.h>
-#include "command/parser.h"
+#include "tools/parser.h"
 
 void
 parse_null_returns_null(void)