Add more grammar stuff

SQLPGrammer2.y

@@ -49,18 +49,14 @@ Identifier
 Query
 	: Union_Query
 		{ printf("Union Query\n");
-		  $$ = new_node(1, Query);
-		  $$->children[0] = $1;
+		  $$ = $1;
 		}
 	;
 
 Select_Query
 	: SELECT Select_List Body
 		{ printf("SQLP Query\n");
-		  $$ = new_node(3, Select_Query);
-		  $$->children[0] = new_node(0, SELECT);
-		  $$->children[1] = $2;
-		  $$->children[2] = $3;
+		  $$ = create_proj_operator($1, $2);
 		}
 	;
 
@@ -108,15 +104,11 @@ TablePath
 Union_Query
    : Select_Query
         { printf("union query 1\n");
-          $$ = new_node(1, Union_Query);
-          $$->children[0] = $1;
+          $$ = $1;
       	}
    | Union_Query UNION Select_Query
    		{ printf("union query 2\n");
-   		  $$ = new_node(3, Union_Query);
-          $$->children[0] = $1;
-          $$->children[1] = new_node(0, UNION);
-          $$->children[2] = $3;
+   		  $$ = create_union_all_operator($1, $3)
         }
    ;
 
@@ -128,30 +120,22 @@ Select_List
 		}
 	| AttrPath
 		{ printf("select list attr path\n");
-		  $$ = new_node(1, Select_List);
-          $$->children[0] = $1;
+		  $$ = create_assign_operator($1, $1, NULL);
       	}
 	| AttrPath ',' Select_List
 		{ printf("Select list\n"); 
-		  $$ = new_node(3, Select_List);
-		  $$->children[0] = $1;
-		  $$->children[1] = new_node(0, COMMA);
-		  $$->children[2] = $3;
+		  $$ = create_assign_operator($1, $1, $2);
 		}
 	;
 
 AttrPath 
 	: Identifier
 		{ printf("path id\n");
-		  $$ = new_node(1, AttrPath);
-		  $$->children[0] = $1;
+		  $$ = create_pf($1, NULL);
 		}
 	| Identifier '.' AttrPath
 		{ printf("Path Function\n");
-		  $$ = new_node(3, AttrPath);
-		  $$->children[0] = $1;
-		  $$->children[1] = new_node(0, DOT);
-		  $$->children[2] = $3;
+		  $$ = create_pf($1, $2);
 		}
 	;
 Operator

util.c

@@ -51,7 +51,7 @@ cons_cell* create_atom_operator(char* tab_name, char* var) {
 }
 
 
-cons_cell* create_union_operator(cons_cell* ra1, cons_cell* ra2) {
+cons_cell* create_union_all_operator(cons_cell* ra1, cons_cell* ra2) {
 	cons_cell* ra2_cons = create_cons_cell(ra2, NULL);
 	cons_cell* ra1_cons = create_cons_cell(ra1, ra2_cons);
 	char operator[9] = "UNION_ALL";
@@ -68,19 +68,17 @@ cons_cell* create_cross_operator(cons_cell* ra1, cons_cell* ra2) {
 }
 
 // For when you want to assign column names to another name
-cons_cell* create_assign_operator(char* col1, char* col2) {
-	cons_cell* col2_cons = create_cons_cell_w_atom(col2, NULL);
-	cons_cell* col1_cons = create_cons_cell_w_atom(col1, col2_cons);
+cons_cell* create_assign_operator(char* original, char* new_name, cons_cell* next) {
+	cons_cell* new_name_cons = create_cons_cell_w_atom(new_name, next);
+	cons_cell* original_cons = create_cons_cell_w_atom(original, new_name_cons);
 	char operator[2] = "AS";
-	cons_cell* operator_cons = create_cons_cell_w_atom(operator, col1_cons);
+	cons_cell* operator_cons = create_cons_cell_w_atom(operator, original_cons);
 	return operator_cons;
 }
 
-cons_cell* create_proj_operator(cons_cell* assign1, cons_cell* assign2, cons_cell* ra) {
+cons_cell* create_proj_operator(cons_cell* assign, cons_cell* ra) {
 	cons_cell* ra_cons = create_cons_cell(ra, NULL);
-	cons_cell* assign2_cons = create_cons_cell(assign2, NULL);
-	cons_cell* assign1_cons = create_cons_cell(assign1, assign2_cons);
-	cons_cell* assign_cons = create_cons_cell(assign1_cons, ra_cons);
+	cons_cell* assign_cons = create_cons_cell(assign, ra_cons);
 	char operator[4] = "PROJ";
 	cons_cell* operator_cons = create_cons_cell_w_atom(operator, assign_cons);
 	return operator_cons;