Mercurial > vim
diff src/evalfunc.c @ 10722:7598ce51bf2a v8.0.0251
patch 8.0.0251: not easy to select Python 2 or 3
commit https://github.com/vim/vim/commit/f42dd3c3901ea0ba38e67a616aea9953cae81b8d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 28 16:06:38 2017 +0100
patch 8.0.0251: not easy to select Python 2 or 3
Problem: It is not so easy to write a script that works with both Python 2
and Python 3, even when the Python code works with both.
Solution: Add 'pyxversion', :pyx, etc. (Marc Weber, Ken Takata)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 28 Jan 2017 16:15:04 +0100 |
| parents | 056e32b99e93 |
| children | 390ad2cccd3f |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -289,6 +289,9 @@ static void f_py3eval(typval_T *argvars, #ifdef FEAT_PYTHON static void f_pyeval(typval_T *argvars, typval_T *rettv); #endif +#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) +static void f_pyxeval(typval_T *argvars, typval_T *rettv); +#endif static void f_range(typval_T *argvars, typval_T *rettv); static void f_readfile(typval_T *argvars, typval_T *rettv); static void f_reltime(typval_T *argvars, typval_T *rettv); @@ -716,6 +719,9 @@ static struct fst #ifdef FEAT_PYTHON {"pyeval", 1, 1, f_pyeval}, #endif +#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) + {"pyxeval", 1, 1, f_pyxeval}, +#endif {"range", 1, 3, f_range}, {"readfile", 1, 3, f_readfile}, {"reltime", 0, 2, f_reltime}, @@ -5734,15 +5740,13 @@ f_has(typval_T *argvars, typval_T *rettv #ifdef FEAT_PERSISTENT_UNDO "persistent_undo", #endif -#ifdef FEAT_PYTHON -#ifndef DYNAMIC_PYTHON +#if defined(FEAT_PYTHON) && !defined(DYNAMIC_PYTHON) "python", -#endif -#endif -#ifdef FEAT_PYTHON3 -#ifndef DYNAMIC_PYTHON3 + "pythonx", +#endif +#if defined(FEAT_PYTHON3) && !defined(DYNAMIC_PYTHON3) "python3", -#endif + "pythonx", #endif #ifdef FEAT_POSTSCRIPT "postscript", @@ -5972,17 +5976,30 @@ f_has(typval_T *argvars, typval_T *rettv else if (STRICMP(name, "ruby") == 0) n = ruby_enabled(FALSE); #endif -#ifdef FEAT_PYTHON #ifdef DYNAMIC_PYTHON else if (STRICMP(name, "python") == 0) n = python_enabled(FALSE); #endif -#endif -#ifdef FEAT_PYTHON3 #ifdef DYNAMIC_PYTHON3 else if (STRICMP(name, "python3") == 0) n = python3_enabled(FALSE); #endif +#if defined(DYNAMIC_PYTHON) || defined(DYNAMIC_PYTHON3) + else if (STRICMP(name, "pythonx") == 0) + { +# if defined(DYNAMIC_PYTHON) && defined(DYNAMIC_PYTHON3) + if (p_pyx == 0) + n = python3_enabled(FALSE) || python_enabled(FALSE); + else if (p_pyx == 3) + n = python3_enabled(FALSE); + else if (p_pyx == 2) + n = python_enabled(FALSE); +# elif defined(DYNAMIC_PYTHON) + n = python_enabled(FALSE); +# elif defined(DYNAMIC_PYTHON3) + n = python3_enabled(FALSE); +# endif + } #endif #ifdef DYNAMIC_PERL else if (STRICMP(name, "perl") == 0) @@ -8007,6 +8024,9 @@ f_py3eval(typval_T *argvars, typval_T *r char_u *str; char_u buf[NUMBUFLEN]; + if (p_pyx == 0) + p_pyx = 3; + str = get_tv_string_buf(&argvars[0], buf); do_py3eval(str, rettv); } @@ -8022,11 +8042,35 @@ f_pyeval(typval_T *argvars, typval_T *re char_u *str; char_u buf[NUMBUFLEN]; + if (p_pyx == 0) + p_pyx = 2; + str = get_tv_string_buf(&argvars[0], buf); do_pyeval(str, rettv); } #endif +#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) +/* + * "pyxeval()" function + */ + static void +f_pyxeval(typval_T *argvars, typval_T *rettv) +{ +# if defined(FEAT_PYTHON) && defined(FEAT_PYTHON3) + init_pyxversion(); + if (p_pyx == 2) + f_pyeval(argvars, rettv); + else + f_py3eval(argvars, rettv); +# elif defined(FEAT_PYTHON) + f_pyeval(argvars, rettv); +# elif defined(FEAT_PYTHON3) + f_py3eval(argvars, rettv); +# endif +} +#endif + /* * "range()" function */