clean up a bit

[taskasaur.git] / parser.c

diff --git a/parser.c b/parser.c
index 0bc2d91..a005331 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -83,30 +83,29 @@ begin_parse(char* board_path)
 {
     const char* input_buffer;
     long input_size;
-    State* state;
+    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;
+    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;
+    state.board = new_board;
 
-    md_parse(input_buffer, input_size, &parser, state);
+    md_parse(input_buffer, input_size, &parser, &state);
 
     /* finish calls */
-    exit_todolist(state);
+    exit_todolist(&state);
 
     free((char*)input_buffer);
 
-    return state->board;
+    return state.board;
 }
 
 void
@@ -125,43 +124,60 @@ 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; 
 
-    /* append new todolist to board */
-    board = state->board;
-    todolist_list = board->todolist_list;
+    exit_todoitem(state);
 
-    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
 enter_todoitem(State* state, char* item_name)
 {
+    TodoItem* new_todoitem;
+
+    new_todoitem = malloc(sizeof(TodoItem));
+    new_todoitem->item_name = item_name;
+    new_todoitem->description = NULL;
+    new_todoitem->due = NULL;
+    new_todoitem->subtask_list = malloc(0);
+    new_todoitem->subtask_count = 0;
 
+    state->cur_todoitem = new_todoitem;
+    
 }
 
 void
 exit_todoitem(State* state)
 {
+    #define st state->cur_todolist
+
+    TodoList* todolist;
+    TodoItem** item_list;
+
+    if (state->cur_todoitem == NULL) return; 
+    
+    /* append current item to todo list */
+    todolist = state->cur_todolist;
+    item_list = todolist->item_list;
+
+    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;
 
 }
 
 void
 set_description(State* state, char* description)
 {
-
+    state->cur_todoitem->description = description;
 }
 
 void
@@ -173,6 +189,22 @@ set_due(State* state, char* due)
 void
 add_subtask(State* state, char* subtask_name, SubTaskState subtask_state)
 {
+    SubTask* new_subtask;
+    SubTask** subtask_list;
+    
+    /* create new subtask */
+    new_subtask = malloc(sizeof(SubTask));
+    new_subtask->subtask_name = subtask_name;
+    new_subtask->done = subtask_state;
+
+    /* add it */
+    subtask_list = state->cur_todoitem->subtask_list;
+
+    state->cur_todoitem->subtask_count += 1;
+    subtask_list = realloc(subtask_list, state->cur_todoitem->subtask_count*sizeof(SubTask*));
+    subtask_list[state->cur_todoitem->subtask_count-1] = new_subtask;
+
+    state->cur_todoitem->subtask_list = subtask_list;
 
 }
 
@@ -190,32 +222,44 @@ leave_block(MD_BLOCKTYPE type, void* detail, void* userdata)
 
     switch (type) {
 
-        case MD_BLOCK_H:
+        case MD_BLOCK_H:;
 
-            switch(((MD_BLOCK_H_DETAIL*)detail)->level) {
+            MD_BLOCK_H_DETAIL* h_detail;
+            h_detail = ((MD_BLOCK_H_DETAIL*)detail);
+
+            switch(h_detail->level) {
 
                 case 1:
-                    printf("leave h1, %s\n", state->last_block_text);
-                
+                    break;
+
                 case 2:
                     exit_todolist(state);
                     enter_todolist(state, state->last_block_text);
-                    printf("leave h2, %s\n", state->last_block_text);
                     break;
+
                 case 3:
-                    printf("leave h3, %s\n", state->last_block_text);
+                    exit_todoitem(state);
+                    enter_todoitem(state, state->last_block_text);
                     break;
-
             }
 
             break;
 
         case MD_BLOCK_QUOTE:
-            printf("blockquote, %s\n", state->last_block_text);
+            set_description(state, state->last_block_text);
             break;
 
-        case MD_BLOCK_LI:
-            printf("todo, %s\n", state->last_block_text);
+        case MD_BLOCK_LI:;
+            MD_BLOCK_LI_DETAIL* li_detail;
+            SubTaskState done;
+
+            li_detail = ((MD_BLOCK_LI_DETAIL*)detail);
+
+            assert(li_detail->is_task != 0); // all lists should be task lists
+
+            done = li_detail->task_mark == ' ' ? SubTaskState_todo : SubTaskState_done;
+
+            add_subtask(state, state->last_block_text, done);
             break;
 
         // no need for default case for now :>