1 files changed, 31 insertions, 22 deletions

diff --git a/syntax.y b/syntax.y
index d9d3510..5f33c9a 100644
--- a/syntax.y
+++ b/syntax.y
@@ -8,14 +8,20 @@
     char *str;
     struct Command *cmd;
     CommandType cmdType;
+    int fd;
 }
 
-%token <str> WORD STRING error
-%token NEWLINE PIPE AND OR
+%token <str> WORD STRING error FD_REDIRECT
+%token NEWLINE PIPE AND OR REDIRECT_IN REDIRECT_OUT BACKGROUND
 
 %type <cmd> line command part runcommand
 %type <cmdType> separator
 
+%locations
+%nonassoc WORD
+%nonassoc BACKGROUND
+%nonassoc REDIRECT_IN REDIRECT_OUT
+
 %%
 
 line:
@@ -26,8 +32,8 @@ line:
 runcommand:
     command NEWLINE {
         $$ = $1;
-        printf("running command: \n");
         runcmd($$);
+        showPrompt();
     }
     | NEWLINE { $$ = NULL; }
     ;
@@ -44,18 +50,17 @@ command:
     }
     ;
 
+separator:
+    PIPE { $$ = CMD_PIPE; }
+    | AND { $$ = CMD_AND; }
+    | OR { $$ = CMD_OR; }
+    ;
+
 part:
     part WORD {
         $$ = $1;
         $$->argc++;
-        $$->args = realloc($$->args, ($$->argc) * sizeof(char *));
-        $$->args[$$->argc - 1] = $2;
-        $$->args[$$->argc] = NULL;
-    }
-    | part STRING {
-        $$ = $1;
-        $$->argc++;
-        $$->args = realloc($$->args, ($$->argc) * sizeof(char *));
+        $$->args = realloc($$->args, ($$->argc + 1) * sizeof(char *));
         $$->args[$$->argc - 1] = $2;
         $$->args[$$->argc] = NULL;
     }
@@ -65,18 +70,22 @@ part:
         $$->args[$$->argc++] = $1;
         $$->args[$$->argc] = NULL;
     }
-    | STRING {
-        $$ = newcmd();
-        $$->args = malloc(2 * sizeof(char *));
-        $$->args[$$->argc++] = $1;
-        $$->args[$$->argc] = NULL;
+    | part REDIRECT_IN WORD {
+        $$ = $1;
+        $$->redirectFile[0] = $3;
+    }
+    | part REDIRECT_OUT WORD {
+        $$ = $1;
+        $$->redirectFile[1] = $3;
+    }
+    | part FD_REDIRECT {
+        $$ = $1;
+        $$->redirectFD[$2[0]-'0']=$2[3]-'0';
+    }
+    | part BACKGROUND {
+        $$ = $1;
+        $$->background = true;
     }
-    ;
-
-separator:
-    PIPE { $$ = CMD_TYPE_PIPE; }
-    | AND { $$ = CMD_TYPE_AND; }
-    | OR { $$ = CMD_TYPE_OR; }
     ;
 
 %%