hook up read from file

[taskasaur.git] / parser.c

diff --git a/parser.c b/parser.c
index e0564c1..9b129d4 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -43,6 +43,66 @@ const MD_PARSER parser = {
     &syntax
 };
 
+
+void
+log_todo(Board* board)
+{
+    for (int i = 0; i < board->todolist_count; i++) {
+        TodoList* todolist;
+        printf("List =-=-=-=-=-==-=-=-=-=-=-\n");
+        todolist = board->todolist_list[i];
+        printf("List name: %s\n", todolist->list_name);
+        printf("Num of items: %d\n", todolist->item_count);
+
+        for (int j = 0; j < todolist->item_count; j++) {
+            TodoItem* todoitem;
+            printf("Item =-=-=-=-=-\n");
+            todoitem = todolist->item_list[j];
+            printf("Item name: %s\n", todoitem->item_name);
+            printf("Description: %s\n", todoitem->description);
+            printf("Num of subtasks: %d\n", todoitem->subtask_count);
+
+            for (int k = 0; k < todoitem->subtask_count; k++) {
+                SubTask* subtask;
+                int done;
+
+                subtask = todoitem->subtask_list[k];
+                printf("Subtask: %s, %d\n", subtask->subtask_name, subtask->done);
+            }
+        }
+    }
+}
+
+Board*
+begin_parse(char* board_path)
+{
+    const char* input_buffer;
+    long input_size;
+    State state;
+    Board* new_board;
+
+    /* read entire file */
+    input_buffer = read_file(board_path, &input_size);
+
+    /* setup state */
+    state.cur_todolist = NULL;
+    state.cur_todoitem = NULL;
+
+    new_board = malloc(sizeof(Board));
+    new_board->todolist_list = malloc(0);
+    new_board->todolist_count = 0;
+    state.board = new_board;
+
+    md_parse(input_buffer, input_size, &parser, &state);
+
+    /* finish calls */
+    exit_todolist(&state);
+
+    free((char*)input_buffer);
+
+    return state.board;
+}
+
 char*
 read_file(char* file_name, long* size) 
 { // apparently using seek isnt the greatest, may change to chunk reading later
@@ -78,37 +138,6 @@ read_file(char* file_name, long* size)
     return output;
 }
 
-Board*
-begin_parse(char* board_path)
-{
-    const char* input_buffer;
-    long input_size;
-    State* state;
-    Board* new_board;
-
-    /* read entire file */
-    input_buffer = read_file(board_path, &input_size);
-
-    /* setup state */
-    state = malloc(sizeof(State));
-    state->cur_todolist = NULL;
-    state->cur_todoitem = NULL;
-
-    new_board = malloc(sizeof(Board));
-    new_board->todolist_list = malloc(0);
-    new_board->todolist_count = 0;
-    state->board = new_board;
-
-    md_parse(input_buffer, input_size, &parser, state);
-
-    /* finish calls */
-    exit_todolist(state);
-
-    free((char*)input_buffer);
-
-    return state->board;
-}
-
 void
 enter_todolist(State* state, char* list_name)
 {
@@ -125,27 +154,17 @@ enter_todolist(State* state, char* list_name)
 void
 exit_todolist(State* state)
 {
-    Board* board;
-    TodoList** todolist_list;
+    #define sb state->board
 
-    if (state->cur_todolist == NULL) { 
-        return;
-    }
+    if (state->cur_todolist == NULL) return; 
 
     exit_todoitem(state);
 
-    /* append new todolist to board */
-    board = state->board;
-    todolist_list = board->todolist_list;
-
-    board->todolist_count += 1;
-    todolist_list = realloc(todolist_list, board->todolist_count*sizeof(TodoList*));
-    todolist_list[board->todolist_count-1] = state->cur_todolist;
+    sb->todolist_count += 1;
+    sb->todolist_list = realloc(sb->todolist_list, sb->todolist_count*sizeof(TodoList*));
+    sb->todolist_list[sb->todolist_count-1] = state->cur_todolist;
     state->cur_todolist = NULL;
 
-    /* save */
-    board->todolist_list = todolist_list;
-
 }
 
 void
@@ -167,25 +186,22 @@ enter_todoitem(State* state, char* item_name)
 void
 exit_todoitem(State* state)
 {
+    #define st state->cur_todolist
+
     TodoList* todolist;
     TodoItem** item_list;
 
-    if (state->cur_todoitem == NULL) {
-        return;
-    }
+    if (state->cur_todoitem == NULL) return; 
     
     /* append current item to todo list */
     todolist = state->cur_todolist;
     item_list = todolist->item_list;
 
-    todolist->item_count += 1;
-    item_list = realloc(item_list, todolist->item_count*sizeof(TodoItem*));
-    item_list[todolist->item_count-1] = state->cur_todoitem;
+    st->item_count += 1;
+    st->item_list = realloc(st->item_list, st->item_count*sizeof(TodoItem*));
+    st->item_list[st->item_count-1] = state->cur_todoitem;
     state->cur_todoitem = NULL;
 
-    /* save */
-    todolist->item_list = item_list;
-
 }
 
 void