diff options
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/bc.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/miscutils/bc.c b/miscutils/bc.c index 791275c8c..8426998d0 100644 --- a/miscutils/bc.c +++ b/miscutils/bc.c | |||
| @@ -5793,8 +5793,7 @@ static BC_STATUS zbc_program_logical(char inst) | |||
| 5793 | BcStatus s; | 5793 | BcStatus s; |
| 5794 | BcResult *opd1, *opd2, res; | 5794 | BcResult *opd1, *opd2, res; |
| 5795 | BcNum *n1, *n2; | 5795 | BcNum *n1, *n2; |
| 5796 | bool cond = 0; | 5796 | ssize_t cond; |
| 5797 | ssize_t cmp; | ||
| 5798 | 5797 | ||
| 5799 | s = zbc_program_binOpPrep(&opd1, &n1, &opd2, &n2, false); | 5798 | s = zbc_program_binOpPrep(&opd1, &n1, &opd2, &n2, false); |
| 5800 | if (s) RETURN_STATUS(s); | 5799 | if (s) RETURN_STATUS(s); |
| @@ -5806,25 +5805,25 @@ static BC_STATUS zbc_program_logical(char inst) | |||
| 5806 | else if (inst == BC_INST_BOOL_OR) | 5805 | else if (inst == BC_INST_BOOL_OR) |
| 5807 | cond = bc_num_cmp(n1, &G.prog.zero) || bc_num_cmp(n2, &G.prog.zero); | 5806 | cond = bc_num_cmp(n1, &G.prog.zero) || bc_num_cmp(n2, &G.prog.zero); |
| 5808 | else { | 5807 | else { |
| 5809 | cmp = bc_num_cmp(n1, n2); | 5808 | cond = bc_num_cmp(n1, n2); |
| 5810 | switch (inst) { | 5809 | switch (inst) { |
| 5811 | case BC_INST_REL_EQ: | 5810 | case BC_INST_REL_EQ: |
| 5812 | cond = cmp == 0; | 5811 | cond = (cond == 0); |
| 5813 | break; | 5812 | break; |
| 5814 | case BC_INST_REL_LE: | 5813 | case BC_INST_REL_LE: |
| 5815 | cond = cmp <= 0; | 5814 | cond = (cond <= 0); |
| 5816 | break; | 5815 | break; |
| 5817 | case BC_INST_REL_GE: | 5816 | case BC_INST_REL_GE: |
| 5818 | cond = cmp >= 0; | 5817 | cond = (cond >= 0); |
| 5819 | break; | ||
| 5820 | case BC_INST_REL_NE: | ||
| 5821 | cond = cmp != 0; | ||
| 5822 | break; | 5818 | break; |
| 5823 | case BC_INST_REL_LT: | 5819 | case BC_INST_REL_LT: |
| 5824 | cond = cmp < 0; | 5820 | cond = (cond < 0); |
| 5825 | break; | 5821 | break; |
| 5826 | case BC_INST_REL_GT: | 5822 | case BC_INST_REL_GT: |
| 5827 | cond = cmp > 0; | 5823 | cond = (cond > 0); |
| 5824 | break; | ||
| 5825 | default: // = case BC_INST_REL_NE: | ||
| 5826 | //cond = (cond != 0); - not needed | ||
| 5828 | break; | 5827 | break; |
| 5829 | } | 5828 | } |
| 5830 | } | 5829 | } |
