Mercurial > vim
comparison src/vim9execute.c @ 19193:9f98957582d6 v8.2.0155
patch 8.2.0155: warnings from MinGW compiler; tests fail without +float
Commit: https://github.com/vim/vim/commit/a5d5953d59730d9bf9c00a727c4aeb56f6ffc944
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 26 21:42:03 2020 +0100
patch 8.2.0155: warnings from MinGW compiler; tests fail without +float
Problem: Warnings from MinGW compiler. (John Marriott) Json test fails when
building without +float feature.
Solution: Init variables. Fix Json parsing. Skip a few tests that require
the +float feature.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 26 Jan 2020 21:45:03 +0100 |
parents | 133ef7ba4e4e |
children | 45c062fa2156 |
comparison
equal
deleted
inserted
replaced
19192:68049eeb2e00 | 19193:9f98957582d6 |
---|---|
1093 break; | 1093 break; |
1094 | 1094 |
1095 // Computation with two float arguments | 1095 // Computation with two float arguments |
1096 case ISN_OPFLOAT: | 1096 case ISN_OPFLOAT: |
1097 case ISN_COMPAREFLOAT: | 1097 case ISN_COMPAREFLOAT: |
1098 #ifdef FEAT_FLOAT | |
1098 { | 1099 { |
1099 typval_T *tv1 = STACK_TV_BOT(-2); | 1100 typval_T *tv1 = STACK_TV_BOT(-2); |
1100 typval_T *tv2 = STACK_TV_BOT(-1); | 1101 typval_T *tv2 = STACK_TV_BOT(-1); |
1101 float_T arg1 = tv1->vval.v_float; | 1102 float_T arg1 = tv1->vval.v_float; |
1102 float_T arg2 = tv2->vval.v_float; | 1103 float_T arg2 = tv2->vval.v_float; |
1125 tv1->vval.v_number = cmp ? VVAL_TRUE : VVAL_FALSE; | 1126 tv1->vval.v_number = cmp ? VVAL_TRUE : VVAL_FALSE; |
1126 } | 1127 } |
1127 else | 1128 else |
1128 tv1->vval.v_float = res; | 1129 tv1->vval.v_float = res; |
1129 } | 1130 } |
1131 #endif | |
1130 break; | 1132 break; |
1131 | 1133 |
1132 case ISN_COMPARELIST: | 1134 case ISN_COMPARELIST: |
1133 { | 1135 { |
1134 typval_T *tv1 = STACK_TV_BOT(-2); | 1136 typval_T *tv1 = STACK_TV_BOT(-2); |
1616 case ISN_PUSHSPEC: | 1618 case ISN_PUSHSPEC: |
1617 smsg("%4d PUSH %s", current, | 1619 smsg("%4d PUSH %s", current, |
1618 get_var_special_name(iptr->isn_arg.number)); | 1620 get_var_special_name(iptr->isn_arg.number)); |
1619 break; | 1621 break; |
1620 case ISN_PUSHF: | 1622 case ISN_PUSHF: |
1623 #ifdef FEAT_FLOAT | |
1621 smsg("%4d PUSHF %g", current, iptr->isn_arg.fnumber); | 1624 smsg("%4d PUSHF %g", current, iptr->isn_arg.fnumber); |
1625 #endif | |
1622 break; | 1626 break; |
1623 case ISN_PUSHS: | 1627 case ISN_PUSHS: |
1624 smsg("%4d PUSHS \"%s\"", current, iptr->isn_arg.string); | 1628 smsg("%4d PUSHS \"%s\"", current, iptr->isn_arg.string); |
1625 break; | 1629 break; |
1626 case ISN_PUSHBLOB: | 1630 case ISN_PUSHBLOB: |