fix bugs in lex/parse, add ugly print util

1 files changed, 26 insertions, 22 deletions

diff --git a/parse.c b/parse.c
index 90b904e..5ed08de 100644
--- a/parse.c
+++ b/parse.c
@@ -8,18 +8,21 @@ DECLARE_VEC(char*, StrVec)
 
 
 typedef struct {
-    Token* ptr;
-    size_t len;
+    TokenVec vec;
     size_t pos;
 } TokStream;
 
 
 Connector parse_connector(TokStream* toks) {
-    Token tok = toks->ptr[toks->pos];
+    Token tok = *get_from_TokenVec(&toks->vec, toks->pos);
     if (tok.kind != TOK_SPECIAL) exit(67);
     switch (tok.as.spec) {
-        case PIPE: return CONN_PIPE;
-        case EOL: return CONN_EOL;
+        case PIPE: 
+            toks->pos++;
+            return CONN_PIPE;
+        case EOL: 
+            toks->pos++;
+            return CONN_EOL;
         default: exit(76);
     }
 }
@@ -28,32 +31,31 @@ Connector parse_connector(TokStream* toks) {
 Command parse_command(TokStream* toks) {
     TokenVec args = make_TokenVec(256);
     RedirectVec redirects = make_RedirectVec(256);
-    for (
-        Token curr_tok; 
-        (curr_tok = toks->ptr[toks->pos], !(curr_tok.kind == TOK_SPECIAL && (curr_tok.as.spec == PIPE || curr_tok.as.spec == EOL)));
-        toks->pos++
-    ) {
+    while (true) {
+        Token curr_tok = *get_from_TokenVec(&toks->vec, toks->pos);
+        if (curr_tok.kind == TOK_SPECIAL &&(curr_tok.as.spec == PIPE || curr_tok.as.spec == EOL)) {
+            break;
+        }
+
         switch (curr_tok.kind) {
             case TOK_SPECIAL: 
-                Token tok;
+                toks->pos++;
+                Token name_tok = *get_from_TokenVec(&toks->vec, toks->pos);
                 switch (curr_tok.as.spec) {
                     case WRITE_REDIR_TRUNC:
                         toks->pos++;
-                        tok = toks->ptr[toks->pos];
-                        if(tok.kind != TOK_WORD) exit(1);
-                        push_to_RedirectVec(&redirects, (Redirect){.kind = STDOUT_REDIR_TRUNC, .as.std_redir_filename = tok.as.word});
+                        if(name_tok.kind != TOK_WORD) exit(1);
+                        push_to_RedirectVec(&redirects, (Redirect){.kind = STDOUT_REDIR_TRUNC, .as.std_redir_filename = name_tok.as.word});
                         break;
                     case WRITE_REDIR_APPEND:
                         toks->pos++;
-                        tok = toks->ptr[toks->pos];
-                        if(tok.kind != TOK_WORD) exit(1);
-                        push_to_RedirectVec(&redirects, (Redirect){.kind = STDOUT_REDIR_APPEND, .as.std_redir_filename = tok.as.word});
+                        if(name_tok.kind != TOK_WORD) exit(1);
+                        push_to_RedirectVec(&redirects, (Redirect){.kind = STDOUT_REDIR_APPEND, .as.std_redir_filename = name_tok.as.word});
                         break;
                     case READ_REDIR:
                         toks->pos++;
-                        tok = toks->ptr[toks->pos];
-                        if(tok.kind != TOK_WORD) exit(1);
-                        push_to_RedirectVec(&redirects, (Redirect){.kind = STDOUT_REDIR_APPEND, .as.std_redir_filename = tok.as.word});
+                        if(name_tok.kind != TOK_WORD) exit(1);
+                        push_to_RedirectVec(&redirects, (Redirect){.kind = STDOUT_REDIR_APPEND, .as.std_redir_filename = name_tok.as.word});
                         break;
                     default:
                         exit(69);
@@ -62,13 +64,14 @@ Command parse_command(TokStream* toks) {
             default: 
                 push_to_TokenVec(&args, curr_tok);
         }
+        toks->pos++;
     }
     return (Command){.args = args, .redirects = redirects};
 }
 
 
-Pipeline parse_tokstream(TokenVec toks) {
-    TokStream tokstream = {.ptr = toks.items, .len = toks.count, .pos = 0};
+Pipeline parse_tokstream(TokenVec tok_vec) {
+    TokStream tokstream = {.vec = tok_vec, .pos = 0};
     Pipeline result = make_Pipeline(256);
     while (true) {
         Command cmd = parse_command(&tokstream);
@@ -76,4 +79,5 @@ Pipeline parse_tokstream(TokenVec toks) {
         push_to_Pipeline(&result, (PipelineElement){.cmd = cmd, .conn = conn});
         if (conn == CONN_EOL) break;
     }
+    return result;
 }