Experiments/libabacus
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Add a type specifically to operators.

Browse Source
This commit is contained in:
Danila Fedorin 2018-05-16 15:29:14 -07:00
parent 47a57d66ee
commit 325c9b9ef7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/custom.h
View File

@ -67,7 +67,11 @@ struct libab_operator_s {
* Corresponds to token types associated with * Corresponds to token types associated with
* each operator. * each operator.
*/ */
enum libab_operator_variant_e type; enum libab_operator_variant_e variant;
/**
* The type of this operator.
*/
libab_ref type;
/** /**
* The precedence of the operator. * The precedence of the operator.
*/ */

4
src/custom.c
View File

@ -21,13 +21,15 @@ void libab_behavior_free(libab_behavior* behavior) {
void libab_operator_init(libab_operator* op, libab_operator_variant variant, void libab_operator_init(libab_operator* op, libab_operator_variant variant,
int precedence, int associativity, libab_ref* type, int precedence, int associativity, libab_ref* type,
libab_function_ptr func) { libab_function_ptr func) {
op->type = variant; op->variant = variant;
op->precedence = precedence; op->precedence = precedence;
op->associativity = associativity; op->associativity = associativity;
libab_ref_copy(type, &op->type);
libab_behavior_init_internal(&op->behavior, func); libab_behavior_init_internal(&op->behavior, func);
} }
void libab_operator_free(libab_operator* op) { void libab_operator_free(libab_operator* op) {
libab_ref_free(&op->type);
libab_behavior_free(&op->behavior); libab_behavior_free(&op->behavior);
} }

2
src/table.c
View File

@ -30,7 +30,7 @@ libab_table_entry* libab_table_search(libab_table* table, const char* string) {
#define OP_TYPE_COMPARATOR(NAME, TYPE) \ #define OP_TYPE_COMPARATOR(NAME, TYPE) \
int NAME(const void* left, const void* right) { \ int NAME(const void* left, const void* right) { \
const libab_table_entry* entry = right; \ const libab_table_entry* entry = right; \
return entry->variant == ENTRY_OP && entry->data_u.op.type == TYPE; \ return entry->variant == ENTRY_OP && entry->data_u.op.variant == TYPE; \
} }
OP_TYPE_COMPARATOR(libab_table_compare_op_prefix, OPERATOR_PREFIX) OP_TYPE_COMPARATOR(libab_table_compare_op_prefix, OPERATOR_PREFIX)