1 files changed, 54 insertions, 26 deletions

diff --git a/syntax.y b/syntax.y
index aa0df71..1ce2223 100644
--- a/syntax.y
+++ b/syntax.y
@@ -1,50 +1,78 @@
 %{
-#include "lex.yy.c"
 #include "cmd.h"
-
+#include "lex.yy.c"
 %}
 
 %union {
     char *str;
+    struct Command *cmd;
+    CommandType cmdType;
 }
 
 %token <str> WORD STRING
-%token NEWLINE CONTINUATION APPEND_OUT REDIRECT_OUT REDIRECT_IN APPEND_OUTPUT_ERR REDIRECT_OUTPUT_ERR PIPE AND OR BACKGROUND HEREDOC UNKNOWN
+%token NEWLINE PIPE AND OR
+
+%type <cmd> line command part
+%type <cmdType> separator
 
 %%
 
 line:
-    command NEWLINE { printf("Parsed a command.\n"); }
-    | NEWLINE { /* empty line */ }
+    command NEWLINE { $$ = $1; runcmd($$); }
+    | NEWLINE { $$ = NULL; }
     ;
 
 command:
-    part {printf("PART\n"); }
-    | part separator command { printf("COMMAND\n"); }
-    | part REDIRECT_OUT WORD tail { printf("REDIRECT_OUT: %s\n", $3); free($3); }
-    | part REDIRECT_IN WORD tail { printf("REDIRECT_IN: %s\n", $3); free($3); }
-    | part HEREDOC WORD tail { printf("HEREDOC: %s\n", $3); free($3); }
-    | part BACKGROUND { printf("BACKGROUND\n"); }
-    ;
-
-tail:
-    part
-    | part REDIRECT_OUT WORD tail { printf("REDIRECT_OUT: %s\n", $3); free($3); }
-    | part REDIRECT_IN WORD tail { printf("REDIRECT_IN: %s\n", $3); free($3); }
-    | part HEREDOC WORD tail { printf("HEREDOC: %s\n", $3); free($3); }
+    part { $$ = $1; }
+    | part separator command {
+        $$ = malloc(sizeof(Command));
+        $$->type = $2;
+        $$->left = $1;
+        $$->right = $3;
+    }
     ;
 
 part:
-    part WORD { printf("WORD: %s\n", $2); free($2); }
-    | part STRING { printf("STRING: %s\n", $2); free($2); }
-    | WORD { printf("WORD: %s\n", $1); free($1); }
-    | STRING { printf("STRING: %s\n", $1); free($1); }
+    part WORD {
+        $$ = $1;
+        $$->argc++;
+        $$->args = realloc($$->args, ($$->argc) * sizeof(char *));
+        $$->args[$$->argc - 1] = $2;
+        $$->args[$$->argc] = NULL;
+        printf("word[%d] = %s\n", $$->argc-1,$$->args[$$->argc-1]);
+    }
+    | part STRING {
+        $$ = $1;
+        $$->argc++;
+        $$->args = realloc($$->args, ($$->argc) * sizeof(char *));
+        $$->args[$$->argc - 1] = $2;
+        $$->args[$$->argc] = NULL;
+    }
+    | WORD {
+        $$ = malloc(sizeof(Command));
+        $$->type = CMD_TYPE_NORMAL;
+        $$->args = malloc(2 * sizeof(char *));
+        $$->args[0] = $1;
+        $$->args[1] = NULL;
+        $$->argc = 1;
+        printf("word[%d] = %s\n", $$->argc-1,$$->args[$$->argc-1]);
+        $$->left = $$->right = NULL;
+    }
+    | STRING {
+        $$ = malloc(sizeof(Command));
+        $$->type = CMD_TYPE_NORMAL;
+        $$->args = malloc(2 * sizeof(char *));
+        $$->args[0] = $1;
+        $$->args[1] = NULL;
+        $$->argc = 1;
+        $$->left = $$->right = NULL;
+    }
     ;
 
 separator:
-    PIPE { printf("PIPE\n"); }
-    | AND { printf("AND\n"); }
-    | OR { printf("OR\n"); }
+    PIPE { $$ = CMD_TYPE_PIPE; }
+    | AND { $$ = CMD_TYPE_AND; }
+    | OR { $$ = CMD_TYPE_OR; }
     ;
 
-%%
\ No newline at end of file
+%%