Mercurial > hg > dmlib
changeset 747:faf43d8aa841
Rename some constants.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sat, 04 May 2013 05:32:52 +0300 |
| parents | fe5910d6df82 |
| children | 136d4ddc7438 |
| files | dmeval.c dmeval.h |
| diffstat | 2 files changed, 27 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/dmeval.c Sat May 04 03:25:57 2013 +0300 +++ b/dmeval.c Sat May 04 05:32:52 2013 +0300 @@ -536,7 +536,7 @@ switch (*c) { case '-': op = OP_SUB_UNARY; c++; break; - case '~': op = OP_COMPLEMENT; c++; break; + case '~': op = OP_BIT_COMPLEMENT; c++; break; } if (op != OP_NONE) @@ -563,15 +563,15 @@ case '*': op = OP_MUL; c++; break; case '/': op = OP_DIV; c++; break; case '%': op = OP_MOD; c++; break; - case '&': op = OP_AND; c++; break; - case '^': op = OP_XOR; c++; break; - case '|': op = OP_OR; c++; break; + case '&': op = OP_BIT_AND; c++; break; + case '^': op = OP_BIT_XOR; c++; break; + case '|': op = OP_BIT_OR; c++; break; case '>': if (c[1] == '>') { c += 2; - op = OP_RSHIFT; + op = OP_BIT_RSHIFT; } else { @@ -584,7 +584,7 @@ if (c[1] == '<') { c += 2; - op = OP_LSHIFT; + op = OP_BIT_LSHIFT; } else { @@ -843,7 +843,7 @@ RO_DEBUG("PASS0: ", tmp1); // Pass 1 - if ((res = dm_eval_reorder_pass1(ev, tmp1, &tmp2, OP_COMPLEMENT, -1, -1)) != 0) + if ((res = dm_eval_reorder_pass1(ev, tmp1, &tmp2, OP_BIT_COMPLEMENT, -1, -1)) != 0) goto out; RO_DEBUG("PASS1: ", tmp2); @@ -862,7 +862,7 @@ goto out; RO_DEBUG("PASS4: ", tmp3); - res = dm_eval_reorder_passN(ev, tmp5, result, OP_LSHIFT, OP_RSHIFT, -1); + res = dm_eval_reorder_passN(ev, tmp5, result, OP_BIT_LSHIFT, OP_BIT_RSHIFT, -1); RO_DEBUG("PASS5: ", *result); out: @@ -930,12 +930,12 @@ switch (node->op) { - case OP_LSHIFT: - case OP_RSHIFT: + case OP_BIT_LSHIFT: + case OP_BIT_RSHIFT: - case OP_AND: - case OP_XOR: - case OP_OR: + case OP_BIT_AND: + case OP_BIT_XOR: + case OP_BIT_OR: case OP_MUL: case OP_DIV: @@ -965,19 +965,19 @@ result = DMCONVTYPE result % DMCONVTYPE tmp; break; - case OP_LSHIFT: + case OP_BIT_LSHIFT: if (tmp > 31) dm_eval_err(ev, "Left shift count >= width of type"); result = DMCONVTYPE result << DMCONVTYPE tmp; break; - case OP_RSHIFT: + case OP_BIT_RSHIFT: if (tmp > 31) dm_eval_err(ev, "Right shift count >= width of type"); result = DMCONVTYPE result >> DMCONVTYPE tmp; break; - case OP_AND: result = DMCONVTYPE result & DMCONVTYPE tmp; break; - case OP_OR: result = DMCONVTYPE result | DMCONVTYPE tmp; break; - case OP_XOR: result = DMCONVTYPE result ^ DMCONVTYPE tmp; break; + case OP_BIT_AND: result = DMCONVTYPE result & DMCONVTYPE tmp; break; + case OP_BIT_OR: result = DMCONVTYPE result | DMCONVTYPE tmp; break; + case OP_BIT_XOR: result = DMCONVTYPE result ^ DMCONVTYPE tmp; break; } node = node->next; @@ -986,7 +986,7 @@ case OP_ADD: case OP_SUB: case OP_SUB_UNARY: - case OP_COMPLEMENT: + case OP_BIT_COMPLEMENT: if (dm_eval_get(ev, node->next, &tmp) != 0) return -6; @@ -995,7 +995,7 @@ case OP_ADD: result += tmp; break; case OP_SUB: result -= tmp; break; case OP_SUB_UNARY: result -= tmp; break; - case OP_COMPLEMENT: result = DMCONVTYPE ~(DMCONVTYPE tmp); break; + case OP_BIT_COMPLEMENT: result = DMCONVTYPE ~(DMCONVTYPE tmp); break; } node = node->next;
--- a/dmeval.h Sat May 04 03:25:57 2013 +0300 +++ b/dmeval.h Sat May 04 05:32:52 2013 +0300 @@ -8,6 +8,7 @@ #define DMCONVTYPE (int) #define DM_MAX_ARGS 8 + enum { // No-op @@ -20,14 +21,14 @@ OP_MOD, OP_SUB_UNARY, - OP_COMPLEMENT, + OP_BIT_COMPLEMENT, - OP_LSHIFT, - OP_RSHIFT, + OP_BIT_LSHIFT, + OP_BIT_RSHIFT, - OP_AND, - OP_OR, - OP_XOR, + OP_BIT_AND, + OP_BIT_OR, + OP_BIT_XOR, OP_GT, OP_LT,