diff options
Diffstat (limited to 'parts/table.h')
| -rw-r--r-- | parts/table.h | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/parts/table.h b/parts/table.h index 01a6bbf..efd19bb 100644 --- a/parts/table.h +++ b/parts/table.h @@ -62,6 +62,8 @@ void table_print_cstyle() } #include "grammar.h" +#include "precedence.h" + int table_insert(size_t state, symbol sym, struct action a) { struct action *tbl_a = &table[state][sym]; @@ -75,7 +77,7 @@ int table_insert(size_t state, symbol sym, struct action a) int r = 0, report = 0, set_tbl_a = 0, reduce_reduce = 0, shift_reduce = 0, - shift_p, reduce_p, tbl_is_reduce; + tbl_is_reduce, shift_p, reduce_p; if((tbl_a->type == ACTION_REDUCE && new_a->type == ACTION_REDUCE)) reduce_reduce = 1; else if((tbl_a->type == ACTION_REDUCE && new_a->type == ACTION_SHIFT)) { shift_reduce = 1; @@ -84,45 +86,36 @@ int table_insert(size_t state, symbol sym, struct action a) tbl_is_reduce = 0; } - // bad hack to get precedence of the symbol if(shift_reduce) { - for(size_t i = 0; i < total_productions; i++) - for(size_t j = 0; j < grammar[i].nRHS; j++) - if(grammar[i].RHS[j] == sym) { - shift_p = grammar[i].precedence; - goto out; - } - out: - if(tbl_is_reduce) reduce_p = grammar[tbl_a->arg].precedence; - else reduce_p = grammar[new_a->arg].precedence; + report = 1; + shift_p = precedence_symbol[sym]; + reduce_p = (tbl_is_reduce) + ? precedence_production[tbl_a->arg] + : precedence_production[new_a->arg]; } -#define prec_num(a) PRECEDENCE_NUM(grammar[(a)->arg].precedence) -#define prec_flag(a) PRECEDENCE_FLAG(grammar[(a)->arg].precedence) +#define prec_num(a) PRECEDENCE_NUM(precedence_production[(a)->arg]) +#define prec_flag(a) PRECEDENCE_FLAG(precedence_production[(a)->arg]) if(reduce_reduce) { if(prec_num(tbl_a) == 0 || prec_num(new_a) == 0) report = 1; if(prec_num(tbl_a) > prec_num(new_a)) set_tbl_a = 0; else if(prec_num(tbl_a) < prec_num(new_a)) set_tbl_a = 1; - else { - report = 1; + else { report = 1; if(new_a->arg > tbl_a->arg) set_tbl_a = 1; } } else if(shift_reduce) { int favor_shift = 0; + if(shift_p == 0 || reduce_p == 0) { favor_shift = 1; report = 1; } else if(PRECEDENCE_NUM(shift_p) > PRECEDENCE_NUM(reduce_p)) favor_shift = 1; - else if(PRECEDENCE_NUM(reduce_p) > PRECEDENCE_NUM(shift_p)) favor_shift = 1; - else { - if(PRECEDENCE_FLAG(shift_p) == PRECEDENCE_LEFT_ASSOC) favor_shift = 1; - else if(PRECEDENCE_FLAG(shift_p) == PRECEDENCE_RIGHT_ASSOC) favor_shift = 0; - // else if(PRECEDENCE_FLAG(shift_p) == PRECEDENCE_NO_ASSOC && - // PRECEDENCE_FLAG(reduce_p) == PRECEDENCE_NO_ASSOC) { set_tbl_a = 1; a.type = ACTION_ERROR; a.arg = 0; } - else { favor_shift = 1, report = 1; } - } + else if(PRECEDENCE_NUM(reduce_p) > PRECEDENCE_NUM(shift_p)) favor_shift = 0; + else if(PRECEDENCE_FLAG(shift_p) == PRECEDENCE_LEFT_ASSOC) favor_shift = 1; + else if(PRECEDENCE_FLAG(shift_p) == PRECEDENCE_RIGHT_ASSOC) favor_shift = 0; + else { favor_shift = 1, report = 1; } - if(favor_shift && tbl_is_reduce || !favor_shift && !tbl_is_reduce) set_tbl_a = 1; + if((favor_shift && tbl_is_reduce) || (!favor_shift && !tbl_is_reduce)) set_tbl_a = 1; } else { r = 1; report = 1; } |