diff options
| author | Jan Maria Matejka <mq@ucw.cz> | 2018-03-13 17:02:49 +0100 |
|---|---|---|
| committer | Jan Maria Matejka <mq@ucw.cz> | 2018-03-13 17:02:49 +0100 |
| commit | e95705f00c9e297cd6dde1e8fa60bee4a4d539f2 (patch) | |
| tree | f6d7d2b495e05b63ac1893727735d5c13851dda9 | |
| parent | d1ba927b369c91ddb2143b686ca4c1be53e46e64 (diff) | |
| parent | 74bfd2f97c0a95b6fb73a67d9334e54a90695c58 (diff) | |
Merge branch 'master' into int-new
| -rw-r--r-- | filter/filter.c | 7 | ||||
| -rw-r--r-- | filter/filter.h | 1 |
2 files changed, 1 insertions, 7 deletions
diff --git a/filter/filter.c b/filter/filter.c index f81f5cfe..28603f27 100644 --- a/filter/filter.c +++ b/filter/filter.c @@ -637,10 +637,6 @@ interpret(struct f_inst *what) for ( ; what; what = what->next) { res.type = T_VOID; switch(what->fi_code) { - case FI_COMMA: - TWOARGS; - break; - /* Binary operators */ case FI_ADD: TWOARGS_C; @@ -1607,8 +1603,7 @@ i_same(struct f_inst *f1, struct f_inst *f2) return 1; switch(f1->fi_code) { - case FI_COMMA: /* fall through */ - case FI_ADD: + case FI_ADD: /* fall through */ case FI_SUBTRACT: case FI_MULTIPLY: case FI_DIVIDE: diff --git a/filter/filter.h b/filter/filter.h index b1fc6c29..47014785 100644 --- a/filter/filter.h +++ b/filter/filter.h @@ -18,7 +18,6 @@ #define FI__TWOCHAR(a,b) ((a<<8) | b) #define FI__LIST \ - F(FI_COMMA, 0, ',') \ F(FI_ADD, 0, '+') \ F(FI_SUBTRACT, 0, '-') \ F(FI_MULTIPLY, 0, '*') \ |