From 384bd6c264cd4e4cd0ff6a59244da40835da627f Mon Sep 17 00:00:00 2001 From: w328li <w328li@student.cs.uwaterloo.ca> Date: Thu, 15 Aug 2019 10:47:10 -0400 Subject: [PATCH] remove redundant NULL --- SQLPGrammar_new.tab.c | 2 +- SQLPGrammar_new.y | 2 +- SQLPParser_new | Bin 46272 -> 46272 bytes util_new.c | 5 ++--- util_new.h | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/SQLPGrammar_new.tab.c b/SQLPGrammar_new.tab.c index a9ace2c..16b7fad 100644 --- a/SQLPGrammar_new.tab.c +++ b/SQLPGrammar_new.tab.c @@ -1702,7 +1702,7 @@ yyreduce: printf("BasicPred 1\n"); cons_cell* first_term = create_term((yyvsp[-2])); cons_cell* second_term = create_term((yyvsp[0])); - (yyval) = create_comp_operator((yyvsp[-1]), first_term, second_term, NULL); + (yyval) = create_comp_operator((yyvsp[-1]), first_term, second_term); } #line 1708 "SQLPGrammar_new.tab.c" /* yacc.c:1646 */ break; diff --git a/SQLPGrammar_new.y b/SQLPGrammar_new.y index 9481928..7920588 100644 --- a/SQLPGrammar_new.y +++ b/SQLPGrammar_new.y @@ -261,7 +261,7 @@ BasicPred printf("BasicPred 1\n"); cons_cell* first_term = create_term($1); cons_cell* second_term = create_term($3); - $$ = create_comp_operator($2, first_term, second_term, NULL); + $$ = create_comp_operator($2, first_term, second_term); } | EXIST '(' Body ')' { diff --git a/SQLPParser_new b/SQLPParser_new index c581a6616ebbe3b4b72cefb0d5dc68e8140d12e4..09e61542d0efb79e36c412179ae5d4f4919957ce 100755 GIT binary patch delta 6417 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 O^8~ZKE$GV~n*Rstb0(Vr delta 6472 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 diff --git a/util_new.c b/util_new.c index 841b86e..02c5156 100644 --- a/util_new.c +++ b/util_new.c @@ -84,10 +84,9 @@ cons_cell* create_op(char *op) { } // todo: why need ra -cons_cell* create_comp_operator(cons_cell* op, cons_cell* term1, cons_cell* term2, cons_cell* ra) { +cons_cell* create_comp_operator(cons_cell* op, cons_cell* term1, cons_cell* term2) { - cons_cell* ra_cons = create_cons_cell(ra, NULL); - cons_cell* term2_cons = create_cons_cell(term2, ra_cons); + cons_cell* term2_cons = create_cons_cell(term2, NULL); cons_cell* term1_cons = create_cons_cell(term1, term2_cons); cons_cell* op_cons = create_cons_cell(op, term1_cons); char operator[5] = "COMP\0"; diff --git a/util_new.h b/util_new.h index e4e916d..5eddf72 100644 --- a/util_new.h +++ b/util_new.h @@ -69,7 +69,7 @@ cons_cell* create_col(char *col); cons_cell* create_attr(char *attr); cons_cell* create_var(char *var); cons_cell* create_op(char *op); -cons_cell* create_comp_operator(cons_cell* op, cons_cell* term1, cons_cell* term2, cons_cell* ra); +cons_cell* create_comp_operator(cons_cell* op, cons_cell* term1, cons_cell* term2); cons_cell* create_atom_operator(cons_cell* table, cons_cell* var); cons_cell* create_union_all_operator(cons_cell* ra1, cons_cell* ra2); cons_cell* create_union_operator(cons_cell* ra1, cons_cell* ra2); -- GitLab