mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-22 09:41:54 +00:00
Merge branch 'master' into int-new
This commit is contained in:
commit
e95705f00c
@ -637,10 +637,6 @@ interpret(struct f_inst *what)
|
|||||||
for ( ; what; what = what->next) {
|
for ( ; what; what = what->next) {
|
||||||
res.type = T_VOID;
|
res.type = T_VOID;
|
||||||
switch(what->fi_code) {
|
switch(what->fi_code) {
|
||||||
case FI_COMMA:
|
|
||||||
TWOARGS;
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* Binary operators */
|
/* Binary operators */
|
||||||
case FI_ADD:
|
case FI_ADD:
|
||||||
TWOARGS_C;
|
TWOARGS_C;
|
||||||
@ -1607,8 +1603,7 @@ i_same(struct f_inst *f1, struct f_inst *f2)
|
|||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
switch(f1->fi_code) {
|
switch(f1->fi_code) {
|
||||||
case FI_COMMA: /* fall through */
|
case FI_ADD: /* fall through */
|
||||||
case FI_ADD:
|
|
||||||
case FI_SUBTRACT:
|
case FI_SUBTRACT:
|
||||||
case FI_MULTIPLY:
|
case FI_MULTIPLY:
|
||||||
case FI_DIVIDE:
|
case FI_DIVIDE:
|
||||||
|
@ -18,7 +18,6 @@
|
|||||||
|
|
||||||
#define FI__TWOCHAR(a,b) ((a<<8) | b)
|
#define FI__TWOCHAR(a,b) ((a<<8) | b)
|
||||||
#define FI__LIST \
|
#define FI__LIST \
|
||||||
F(FI_COMMA, 0, ',') \
|
|
||||||
F(FI_ADD, 0, '+') \
|
F(FI_ADD, 0, '+') \
|
||||||
F(FI_SUBTRACT, 0, '-') \
|
F(FI_SUBTRACT, 0, '-') \
|
||||||
F(FI_MULTIPLY, 0, '*') \
|
F(FI_MULTIPLY, 0, '*') \
|
||||||
|
Loading…
Reference in New Issue
Block a user