aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-07-24 10:25:42 -04:00
Code

eval.c: replace sequence of ifs with switch

Browse Source 
Replace a sequence of "if" statements with a switch.
This commit is contained in:
H. Peter Anvin 2007-09-24 10:51:07 -07:00
parent 0c3e395cc1
commit 5f77c031fa
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eval.c
View File

@ -609,16 +609,20 @@ static expr *expr6(int critical)
expr *e; expr *e;
int32_t label_seg, label_ofs; int32_t label_seg, label_ofs;
if (i == '-') { switch (i) {
case '-':
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
e = expr6(critical); e = expr6(critical);
if (!e) if (!e)
return NULL; return NULL;
return scalar_mult(e, -1L, FALSE); return scalar_mult(e, -1L, FALSE);
} else if (i == '+') {
case '+':
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
return expr6(critical); return expr6(critical);
} else if (i == '~') {
case '~':
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
e = expr6(critical); e = expr6(critical);
if (!e) if (!e)
@ -631,7 +635,8 @@ static expr *expr6(int critical)
return NULL; return NULL;
} }
return scalarvect(~reloc_value(e)); return scalarvect(~reloc_value(e));
} else if (i == '!') {
case '!':
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
e = expr6(critical); e = expr6(critical);
if (!e) if (!e)
@ -644,7 +649,8 @@ static expr *expr6(int critical)
return NULL; return NULL;
} }
return scalarvect(!reloc_value(e)); return scalarvect(!reloc_value(e));
} else if (i == TOKEN_SEG) {
case TOKEN_SEG:
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
e = expr6(critical); e = expr6(critical);
if (!e) if (!e)
@ -657,7 +663,8 @@ static expr *expr6(int critical)
return NULL; return NULL;
} }
return e; return e;
} else if (i == '(') {
case '(':
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
e = bexpr(critical); e = bexpr(critical);
if (!e) if (!e)
@ -668,8 +675,12 @@ static expr *expr6(int critical)
} }
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
return e; return e;
} else if (i == TOKEN_NUM || i == TOKEN_REG || i == TOKEN_ID ||
i == TOKEN_HERE || i == TOKEN_BASE) { case TOKEN_NUM:
case TOKEN_REG:
case TOKEN_ID:
case TOKEN_HERE:
case TOKEN_BASE:
begintemp(); begintemp();
switch (i) { switch (i) {
case TOKEN_NUM: case TOKEN_NUM:
@ -733,7 +744,8 @@ static expr *expr6(int critical)
} }
i = scan(scpriv, tokval); i = scan(scpriv, tokval);
return finishtemp(); return finishtemp();
} else {
default:
error(ERR_NONFATAL, "expression syntax error"); error(ERR_NONFATAL, "expression syntax error");
return NULL; return NULL;
} }