forked from aniani/vim
patch 8.2.3573: cannot decide whether to skip test that fails with 64 bit
Problem: Cannot decide whether to skip test that fails with 64 bit ints. (closes #9072) Solution: Add v:sizeofint, v:sizeoflong and v:sizeofpointer. Improve the check for multiply overflow.
This commit is contained in:
parent
7a33ebfc5b
commit
69b3072d98
@ -150,6 +150,9 @@ static struct vimvar
|
|||||||
{VV_NAME("collate", VAR_STRING), VV_RO},
|
{VV_NAME("collate", VAR_STRING), VV_RO},
|
||||||
{VV_NAME("exiting", VAR_SPECIAL), VV_RO},
|
{VV_NAME("exiting", VAR_SPECIAL), VV_RO},
|
||||||
{VV_NAME("colornames", VAR_DICT), VV_RO},
|
{VV_NAME("colornames", VAR_DICT), VV_RO},
|
||||||
|
{VV_NAME("sizeofint", VAR_NUMBER), VV_RO},
|
||||||
|
{VV_NAME("sizeoflong", VAR_NUMBER), VV_RO},
|
||||||
|
{VV_NAME("sizeofpointer", VAR_NUMBER), VV_RO},
|
||||||
};
|
};
|
||||||
|
|
||||||
// shorthand
|
// shorthand
|
||||||
@ -234,6 +237,9 @@ evalvars_init(void)
|
|||||||
set_vim_var_nr(VV_NUMBERMAX, VARNUM_MAX);
|
set_vim_var_nr(VV_NUMBERMAX, VARNUM_MAX);
|
||||||
set_vim_var_nr(VV_NUMBERMIN, VARNUM_MIN);
|
set_vim_var_nr(VV_NUMBERMIN, VARNUM_MIN);
|
||||||
set_vim_var_nr(VV_NUMBERSIZE, sizeof(varnumber_T) * 8);
|
set_vim_var_nr(VV_NUMBERSIZE, sizeof(varnumber_T) * 8);
|
||||||
|
set_vim_var_nr(VV_SIZEOFINT, sizeof(int));
|
||||||
|
set_vim_var_nr(VV_SIZEOFLONG, sizeof(long));
|
||||||
|
set_vim_var_nr(VV_SIZEOFPOINTER, sizeof(char *));
|
||||||
|
|
||||||
set_vim_var_nr(VV_TYPE_NUMBER, VAR_TYPE_NUMBER);
|
set_vim_var_nr(VV_TYPE_NUMBER, VAR_TYPE_NUMBER);
|
||||||
set_vim_var_nr(VV_TYPE_STRING, VAR_TYPE_STRING);
|
set_vim_var_nr(VV_TYPE_STRING, VAR_TYPE_STRING);
|
||||||
|
@ -2014,7 +2014,8 @@ do_put(
|
|||||||
long multlen = count * yanklen;
|
long multlen = count * yanklen;
|
||||||
|
|
||||||
totlen = multlen;
|
totlen = multlen;
|
||||||
if (totlen != multlen)
|
if (totlen != multlen || totlen / count != yanklen
|
||||||
|
|| totlen / yanklen != count)
|
||||||
{
|
{
|
||||||
emsg(_(e_resulting_text_too_long));
|
emsg(_(e_resulting_text_too_long));
|
||||||
break;
|
break;
|
||||||
|
@ -149,13 +149,6 @@ func Test_p_with_count_leaves_mark_at_end()
|
|||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
func Test_very_large_count()
|
func Test_very_large_count()
|
||||||
" FIXME: should actually check if sizeof(int) == sizeof(long)
|
|
||||||
CheckNotMSWindows
|
|
||||||
|
|
||||||
if v:numbersize != 64
|
|
||||||
throw 'Skipped: only works with 64 bit numbers'
|
|
||||||
endif
|
|
||||||
|
|
||||||
new
|
new
|
||||||
let @" = 'x'
|
let @" = 'x'
|
||||||
call assert_fails('norm 44444444444444p', 'E1240:')
|
call assert_fails('norm 44444444444444p', 'E1240:')
|
||||||
|
@ -757,6 +757,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
3573,
|
||||||
/**/
|
/**/
|
||||||
3572,
|
3572,
|
||||||
/**/
|
/**/
|
||||||
|
@ -2060,7 +2060,10 @@ typedef int sock_T;
|
|||||||
#define VV_COLLATE 97
|
#define VV_COLLATE 97
|
||||||
#define VV_EXITING 98
|
#define VV_EXITING 98
|
||||||
#define VV_COLORNAMES 99
|
#define VV_COLORNAMES 99
|
||||||
#define VV_LEN 100 // number of v: vars
|
#define VV_SIZEOFINT 100
|
||||||
|
#define VV_SIZEOFLONG 101
|
||||||
|
#define VV_SIZEOFPOINTER 102
|
||||||
|
#define VV_LEN 103 // number of v: vars
|
||||||
|
|
||||||
// used for v_number in VAR_BOOL and VAR_SPECIAL
|
// used for v_number in VAR_BOOL and VAR_SPECIAL
|
||||||
#define VVAL_FALSE 0L // VAR_BOOL
|
#define VVAL_FALSE 0L // VAR_BOOL
|
||||||
|
Loading…
x
Reference in New Issue
Block a user