1 files changed, 23 insertions, 19 deletions

diff --git a/syntax.y b/syntax.y
index 1ce2223..d9d3510 100644
--- a/syntax.y
+++ b/syntax.y
@@ -1,6 +1,7 @@
 %{
 #include "cmd.h"
 #include "lex.yy.c"
+#include <stdio.h>
 %}
 
 %union {
@@ -9,23 +10,34 @@
     CommandType cmdType;
 }
 
-%token <str> WORD STRING
+%token <str> WORD STRING error
 %token NEWLINE PIPE AND OR
 
-%type <cmd> line command part
+%type <cmd> line command part runcommand
 %type <cmdType> separator
 
 %%
 
 line:
-    command NEWLINE { $$ = $1; runcmd($$); }
+    runcommand line { /* empty */ }
+    | /* empty */ { $$ = NULL; }
+    ;
+
+runcommand:
+    command NEWLINE {
+        $$ = $1;
+        printf("running command: \n");
+        runcmd($$);
+    }
     | NEWLINE { $$ = NULL; }
     ;
 
 command:
-    part { $$ = $1; }
+    part {
+        $$ = $1;
+    }
     | part separator command {
-        $$ = malloc(sizeof(Command));
+        $$ = newcmd();
         $$->type = $2;
         $$->left = $1;
         $$->right = $3;
@@ -39,7 +51,6 @@ part:
         $$->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;
@@ -49,23 +60,16 @@ part:
         $$->args[$$->argc] = NULL;
     }
     | WORD {
-        $$ = malloc(sizeof(Command));
-        $$->type = CMD_TYPE_NORMAL;
+        $$ = newcmd();
         $$->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;
+        $$->args[$$->argc++] = $1;
+        $$->args[$$->argc] = NULL;
     }
     | STRING {
-        $$ = malloc(sizeof(Command));
-        $$->type = CMD_TYPE_NORMAL;
+        $$ = newcmd();
         $$->args = malloc(2 * sizeof(char *));
-        $$->args[0] = $1;
-        $$->args[1] = NULL;
-        $$->argc = 1;
-        $$->left = $$->right = NULL;
+        $$->args[$$->argc++] = $1;
+        $$->args[$$->argc] = NULL;
     }
     ;