Use vector in place of linked list (WIP)

Author: nathom

err

@@ -21,10 +21,11 @@
 #include <wchar.h>
 
 #define NUM_THREADS 1
+#define VERTICAL L"┃"
+#define HORIZONTAL L"━"
 
 // constants
-const wchar_t HORIZONTAL = 0x2501;
-const wchar_t VERTICAL = 0x2503;
+// const wchar_t HORIZONTAL = 0x2501;
 const wchar_t CORNERS[] = { 0x250f, 0x2513, 0x251b, 0x2517 };
 
 void *update_bounds();
@@ -70,24 +71,26 @@ void write_text(char *text, rect_t *r) {
     }
 }
 
-int write_strlist(string *bank, rect_t *r, int start_index, int end_index) {
+int write_strlist(strlist *bank, rect_t *r, int start_index, int end_index) {
     for (int y0 = r->y0 + 1; y0 < r->y1; y0++) {
         move(y0, r->x0 + 1);
         for (int i = r->x0 + 1; i < r->x1 - 1; i++)
             addch(' ');
     }
 
-    string *curr;
     int counter = start_index;
 
     // Write characters
     move(r->y0 + 1, r->x0 + 1);
     int wc = 0, y, x; // word count at first line
-    for (curr = get_string(bank, start_index); curr->next != NULL;
-         curr = curr->next) {
+    string *curr;
+
+    for (int i = 0; i < (int)bank->len; i++) {
+        curr = strlist_get(bank, i);
+        // fprintf(stderr, "%s\n", curr->val);
         getyx(stdscr, y, x);
-        /* printf("%d, %d\n", y, x); */
 
+        // Move to next line if word goes past end of screen
         if (curr->len + 1 >= r->x1 - x) {
             x = r->x0 + 1;
             y++;
@@ -128,7 +131,7 @@ void draw_rect(rect_t *r) {
     // make horizontal lines for top and bottom
     hor_line[0] = CORNERS[0];
     for (int i = 1; i < width - 1; i++)
-        hor_line[i] = HORIZONTAL;
+        hor_line[i] = HORIZONTAL[0];
     hor_line[width - 1] = CORNERS[1];
     hor_line[width] = L'\0';
 
@@ -139,7 +142,7 @@ void draw_rect(rect_t *r) {
     mvaddwstr(r->y1, r->x0, hor_line);
 
     cchar_t vertical_bar;
-    setcchar(&vertical_bar, &VERTICAL, 0, 0, NULL);
+    setcchar(&vertical_bar, L"┃", 0, 0, NULL);
     for (int y = r->y0 + 1; y < r->y1; y++) {
         mvadd_wch(y, r->x0, &vertical_bar);
         mvadd_wch(y, r->x1, &vertical_bar);

frame.c

@@ -1,3 +1,6 @@
+#ifndef FRAME_H
+#define FRAME_H
+
 #include "strlist.h"
 
 typedef struct {
@@ -11,6 +14,8 @@ typedef struct {
 void init_frame();
 void draw_rect(rect_t *);
 void write_text(char *, rect_t *);
-int write_strlist(string *bank, rect_t *r, int start_index, int end_index);
+int write_strlist(strlist *bank, rect_t *r, int start_index, int end_index);
 void refresh_frame();
 void del_frame();
+
+#endif

frame.h

@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <ncurses.h>
 #include <pthread.h>
 #include <stdio.h>
@@ -9,7 +10,7 @@
 
 #include "frame.h"
 
-#define MAX_WORD_LEN 20
+#define MAX_WORD_LEN 100
 #define NUM_THREADS 2
 #define STRLIST_SIZE 200
 
@@ -28,7 +29,7 @@ typedef struct _windowsize {
 } windowsize;
 
 static strlist load_word_bank(FILE *bank_file, char word_delimiter);
-void load_text_from_bank(char *text, string *word_bank, int start_index,
+void load_text_from_bank(char *text, strlist *word_bank, int start_index,
                          int end_index);
 
 // threads
@@ -43,10 +44,10 @@ void update_time_box(rect_t *r, windowsize *size);
 
 void print_rect(rect_t *r);
 
-void calculate_stats(typingtest_results *results, long time, string *word_bank,
+void calculate_stats(typingtest_results *results, long time, strlist *word_bank,
                      string *last_word, int errors);
 void show_results(typingtest_results *results, windowsize *);
-void final_screen(int timediff, string *word_bank, string *curr_word,
+void final_screen(int timediff, strlist *word_bank, string *curr_word,
                   int num_errors, windowsize *curr_size);
 void print_help();
 int is_option(char *str, int pos);
@@ -122,10 +123,11 @@ int main(int argc, char **argv) {
     // update time in the background
     pthread_create(&pids[0], NULL, update_time, &now);
 
-    words_in_first_line = write_strlist(word_bank, &main_box, offset, -1);
+    words_in_first_line = write_strlist(&word_bank, &main_box, offset, -1);
     /* return 1; */
 
-    string *curr_word = word_bank->next;
+    int word_index = 0;
+    string *curr_word = strlist_get(&word_bank, word_index++);
     curr_word->style = A_BOLD;
     // 27 == ESC
     c = getch();
@@ -137,7 +139,7 @@ int main(int argc, char **argv) {
         timef(timestr, &start, &now, TIMER_LEN);
         write_text(timestr, &time_box);
         if (now.tv_sec - start.tv_sec >= TIMER_LEN) {
-            final_screen(now.tv_sec - start.tv_sec, word_bank, curr_word, num_errors,
+            final_screen(now.tv_sec - start.tv_sec, &word_bank, curr_word, num_errors,
                          &curr_size);
             goto EXIT;
         }
@@ -161,7 +163,8 @@ int main(int argc, char **argv) {
                 cp = 0;
                 typed_word[cp] = '\0';
 
-                curr_word = curr_word->next;
+                assert(word_index < word_bank.len);
+                curr_word = strlist_get(&word_bank, word_index++);
                 curr_word->style = A_BOLD;
 
                 word_count++;
@@ -177,7 +180,7 @@ int main(int argc, char **argv) {
         }
 
         write_text(typed_word, &text_box);
-        words_in_first_line = write_strlist(word_bank, &main_box, offset, -1);
+        words_in_first_line = write_strlist(&word_bank, &main_box, offset, -1);
         /* printf("%d\n", words_in_first_line); */
         if (word_count == words_in_first_line) {
             offset += word_count;
@@ -188,7 +191,7 @@ int main(int argc, char **argv) {
 
 EXIT : {
     del_frame();
-    free_strlist(word_bank);
+    strlist_delete(&word_bank);
     for (int i = 0; i < NUM_THREADS; i++)
         pthread_cancel(pids[i]);
 }
@@ -202,41 +205,43 @@ EXIT : {
  * @param start_index The index to start at
  * @param end_index The index to end at. Use -1 for None.
  */
-void load_text_from_bank(char *text, string *word_bank, int start_index,
-                         int end_index) {
-    int i = 0, counter = start_index;
-    string *curr;
-    for (curr = get_string(word_bank, start_index); curr->next != NULL;
-         curr = curr->next) {
-        strcpy(text + i, curr->val);
-        i += curr->len;
-        text[i++] = ' ';
-
-        if (counter++ == end_index)
-            break;
-    }
-    text[i] = '\0';
-}
+// void load_text_from_bank(char *text, strlist *word_bank, int start_index,
+//                          int end_index) {
+//     int i = 0, counter = start_index;
+//     string *curr;
+//     for (curr = get_string(word_bank, start_index); curr->next != NULL;
+//          curr = curr->next) {
+//         strcpy(text + i, curr->val);
+//         i += curr->len;
+//         text[i++] = ' ';
+//
+//         if (counter++ == end_index)
+//             break;
+//     }
+//     text[i] = '\0';
+// }
 
 static strlist load_word_bank(FILE *bank_file, char word_delimiter) {
     // TODO optimize size
     strlist bank = strlist_new(STRLIST_SIZE);
     // int len = lseek(bank_file, 0, SEEK_END);
     // void *data = mmap(0, len, PROT_READ, MAP_PRIVATE, bank_file, 0);
 
+    // TODO Move outside function
     fseek(bank_file, 0, SEEK_END);
     long fsize = ftell(bank_file);
     fseek(bank_file, 0, SEEK_SET); /* same as rewind(f); */
     char *buf = malloc(fsize + 1);
     fread(buf, fsize, 1, bank_file);
-    buf[fsize] = 0;
+    buf[fsize] = '\0';
 
     char *b = buf;
     int len = 0;
     while (*b != '\0') {
         if (*b == word_delimiter) {
             *b = '\0';
-            strlist_append(&bank, (string){ b - len, 0, 0 });
+            // Add 1 because it includes the delimeter
+            strlist_append(&bank, (string){ .val = b - len + 1, .len = len - 1, .style = 0 });
             len = 0;
         }
         len++;
@@ -292,7 +297,7 @@ void print_rect(rect_t *r) {
     printf("Rectangle(%d, %d, %d, %d)\n", r->x0, r->y0, r->x1, r->y1);
 }
 
-void calculate_stats(typingtest_results *results, long time, string *word_bank,
+void calculate_stats(typingtest_results *results, long time, strlist *word_bank,
                      string *last_word, int errors) {
     /*
    * double wpm;
@@ -304,13 +309,14 @@ void calculate_stats(typingtest_results *results, long time, string *word_bank,
 
     int words_typed = 0;
     int chars_typed = 0;
-    for (string *w = word_bank->next;
-         w->next != NULL && strcmp(w->val, last_word->val) != 0; w = w->next) {
+    int i = 0;
+    for (string *s = strlist_get(word_bank, i);
+         i < (int)word_bank->len && strcmp(s->val, last_word->val) != 0; i++) {
         words_typed++;
-        chars_typed += w->len;
+        chars_typed += s->len;
     }
 
-    printf("last: %s\n", get_string(word_bank, words_typed)->val);
+    printf("last: %s\n", strlist_get(word_bank, words_typed)->val);
 
     results->wpm = 60.0 * words_typed / time;
     results->cps = (double)chars_typed / time;
@@ -348,7 +354,7 @@ void show_results(typingtest_results *results, windowsize *size) {
     mvaddstr(result_box.y1 + 2, result_box.x0 + 2, "Press ESC to exit.");
 }
 
-void final_screen(int timediff, string *word_bank, string *curr_word,
+void final_screen(int timediff, strlist *word_bank, string *curr_word,
                   int num_errors, windowsize *curr_size) {
     int c;
     typingtest_results results;

m

@@ -4,7 +4,7 @@ all:    $(PROG)
 
 # Tell make about the file dependencies
 HEAD	= strlist.h frame.h
-OBJ     = strlist.o frame.o strlist_test.o typingtest.o
+OBJ     = strlist.o frame.o main.o
 
 # special libraries This can be blank
 LIB     = -lncurses
@@ -14,7 +14,7 @@ LIB     = -lncurses
 CC      = clang
 DEBUG	= -g -fsanitize=address
 CSTD	=
-WARN	= -Wall -Wextra -Werror
+WARN	= -Wall -Wextra #-Werror
 CDEFS	=
 CFLAGS	= -I. $(DEBUG) $(WARN) $(CSTD) $(CDEFS)
 
@@ -25,7 +25,7 @@ $(PROG):	$(OBJ)
 	$(CC) $(CFLAGS) $(OBJ) $(LIB) -o $@
 
 
-.PHONY: clean test_strlist install
+.PHONY: clean test install
 
 clean:
 	rm -f $(OBJ) $(BIN)
@@ -37,5 +37,8 @@ install: $(PROG)
 	rm -f /usr/local/bin/tterm
 	ln ./typingterm /usr/local/bin/tterm
 
-strlist_test: $(OBJ)
+strlist_test: strlist.o strlist_test.o
 	$(CC) $^ -o $@ $(CFLAGS)
+
+test: strlist_test
+	./strlist_test

typingtest.c main.ctypingtest.c renamed to main.c

@@ -0,0 +1,12 @@
+#define _XOPEN_SOURCE_EXTENDED
+
+#include <ncurses.h>
+#include <wchar.h>
+
+
+const wchar_t VERTICAL = 0x2503;
+
+int main() {
+    int h[2] = L"━";
+    printf("%d, %d\n%x, %x\n%c, %c\n", h[0], h[1], h[0], h[1], h[0], h[1]);
+}

makefile

@@ -26,15 +26,14 @@ strlist strlist_new(uintptr_t size) {
 
 void strlist_delete(strlist *s) {
     free(s->vec);
-    free(s);
 }
 
-string strlist_get(strlist *s, uintptr_t index) {
+string *strlist_get(strlist *s, uintptr_t index) {
     if (index >= s->len) {
         fprintf(stderr, "index out of bounds: %lu >= len %lu\n", index, s->len);
         exit(EXIT_FAILURE);
     }
-    return s->vec[index];
+    return &s->vec[index];
 }
 
 uintptr_t strlist_append(strlist *l, string s) {
@@ -76,10 +75,11 @@ static void strlist_resize(strlist *s, uintptr_t size) {
 
 void strlist_shuffle(strlist *s) {
     srand(getpid());
-    for (int i = 0; i < s->len; i++) {
+    const int len = s->len;
+    for (int i = 0; i < len; i++) {
         int rand_pos = (double)s->len * rand() / RAND_MAX;
-        string curr = strlist_get(s, i);
-        string r = strlist_get(s, rand_pos);
+        string curr = *strlist_get(s, i);
+        string r = *strlist_get(s, rand_pos);
         // swap
         string tmp = curr;
         strlist_set(s, i, r);

misc_test.c

@@ -1,3 +1,6 @@
+#ifndef STRLIST_H
+#define STRLIST_H
+
 #include <stdint.h>
 
 typedef struct _string {
@@ -16,7 +19,7 @@ typedef struct _strlist {
 strlist strlist_new(uintptr_t size);
 void strlist_delete(strlist *);
 
-string strlist_get(strlist *s, uintptr_t index);
+string *strlist_get(strlist *s, uintptr_t index);
 uintptr_t strlist_set(strlist *l, uintptr_t index, string s);
 uintptr_t strlist_append(strlist *l, string s);
 void strlist_shuffle(strlist *s);
@@ -34,3 +37,4 @@ void strlist_shuffle(strlist *s);
 // void free_string(string *);
 // void free_strlist(string *);
 // void free_string(string *str);
+#endif