Fix indexer finishing too soon

fist/dstring.c

@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "utils.h"
+
 int dequals(dstring s1, dstring s2) {
     return !strcmp(dtext(s1), dtext(s2));
 }
@@ -296,3 +298,14 @@ int dfree(dstring string) {
         free(string.text);
     return string.length;
 }
+
+static int cmpdstringp(const void *pa, const void *pb) {
+    const dstring a = *(const dstring *) pa;
+    const dstring b = *(const dstring *) pb;
+    return strncmp(dtext(a), dtext(b), MIN(a.length, b.length));
+}
+
+dstringa dsorta(dstringa array) {
+    qsort(array.values, array.length, sizeof(dstring), cmpdstringp);
+    return array;
+}

fist/dstring.h

@@ -40,6 +40,7 @@ dstringa dcreatea(); // Create empty array of dstrings
 dstringa dpush(dstringa array, dstring input); // Push dstring to list of dstrings
 dstringa dremove(dstringa array, dstring input); // Remove item from dstring array
 dstringa dpop(dstringa array); // Pop from stack
+dstringa dsorta(dstringa array); // sort an array of dstrings
 int dindexofa(dstringa array, dstring input); // Find index of dstring
 dstringa dset(dstringa array, unsigned int index, dstring with); // Replace index in dstring array with another dstring
 dstringa drange(dstringa array, int start, int end); // Return new array between two ranges

fist/indexer.c

@@ -9,24 +9,20 @@ dstringa indexer(dstring text, int max_phrase_length) {
     dstringa words = dsplit(text, ' ');
     dstringa index = dcreatea();
 
-    int max_length = MIN(max_phrase_length, words.length);
+    max_phrase_length = MIN(max_phrase_length, words.length);
 
-    for(int text_size = 0; text_size < words.length; text_size += max_phrase_length) {
-        for(int ahead = 0; ahead < max_length; ahead++) {
-            for(int i = text_size; i < max_length + text_size; i++) {
-                int check_len = max_length + text_size;
-                if(check_len > words.length)
-                    check_len = words.length;
-                if(i + ahead < check_len) {
-                    dstringa range = drange(words, i, i + ahead);
-                    dstring joined = djoin(range, ' ');
-                    index = dpush(index, joined);
-                    dfreea(range);
-                    dfree(joined);
-                }
+    for (int i = 0; i < words.length; i += max_phrase_length) {
+        for (int j = i; j < i + max_phrase_length; j++) {
+            for (int k = 0; k < MIN(words.length - j, max_phrase_length); k++) {
+                dstringa range = drange(words, j, j + k);
+                dstring joined = djoin(range, ' ');
+                index = dpush(index, joined);
+                dfreea(range);
+                dfree(joined);
             }
         }
     }
+
     dfreea(words);
 
     return index;

fist/tests.c

@@ -275,6 +275,9 @@ static char *test_indexer() {
     // indexer(t2, 10);
     dstringa index = indexer(test, 10);
 
+    answers = dsorta(answers);
+    index = dsorta(index);
+
     for(int i = 0; i < answers.length; i++) {
         char *buffer = malloc(sizeof(char) * 1024);
         sprintf(buffer, "indexer: Expecting '%s' got '%s' at %d", dtext(answers.values[i]),