To: vim_dev@googlegroups.com

Subject: Patch 7.3.569

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.569

Problem:    Evaluating Vim expression in Python is insufficient.

Solution:   Add vim.bindeval().  Also add pyeval() and py3eval(). (ZyX)

Files:	    runtime/doc/eval.txt, runtime/doc/if_pyth.txt, src/eval.c,

	    src/if_lua.c, src/if_py_both.h, src/if_python.c, src/if_python3.c,

	    src/proto/eval.pro, src/proto/if_python.pro,

	    src/proto/if_python3.pro, src/testdir/Make_amiga.mak,

	    src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,

	    src/testdir/Make_os2.mak, src/testdir/Makefile,

	    src/testdir/test86.in, src/testdir/test86.ok,

	    src/testdir/test87.in, src/testdir/test87.ok

*** ../vim-7.3.568/runtime/doc/eval.txt	2012-03-07 19:16:49.000000000 +0100

--- runtime/doc/eval.txt	2012-06-20 18:01:02.000000000 +0200

***************

*** 1836,1844 ****

  localtime()			Number	current time

  log( {expr})			Float	natural logarithm (base e) of {expr}

  log10( {expr})			Float	logarithm of Float {expr} to base 10

  map( {expr}, {string})		List/Dict  change each item in {expr} to {expr}

  maparg( {name}[, {mode} [, {abbr} [, {dict}]]])

! 				String	rhs of mapping {name} in mode {mode}

  mapcheck( {name}[, {mode} [, {abbr}]])

  				String	check for mappings matching {name}

  match( {expr}, {pat}[, {start}[, {count}]])

--- 1847,1857 ----

  localtime()			Number	current time

  log( {expr})			Float	natural logarithm (base e) of {expr}

  log10( {expr})			Float	logarithm of Float {expr} to base 10

+ luaeval( {expr}[, {expr}])	any	evaluate |Lua| expression

  map( {expr}, {string})		List/Dict  change each item in {expr} to {expr}

  maparg( {name}[, {mode} [, {abbr} [, {dict}]]])

! 				String or Dict

! 					rhs of mapping {name} in mode {mode}

  mapcheck( {name}[, {mode} [, {abbr}]])

  				String	check for mappings matching {name}

  match( {expr}, {pat}[, {start}[, {count}]])

***************

*** 1867,1872 ****

--- 1880,1887 ----

  prevnonblank( {lnum})		Number	line nr of non-blank line <= {lnum}

  printf( {fmt}, {expr1}...)	String	format text

  pumvisible()			Number	whether popup menu is visible

+ pyeval( {expr})			any	evaluate |Python| expression

+ py3eval( {expr})		any	evaluate |python3| expression

  range( {expr} [, {max} [, {stride}]])

  				List	items from {expr} to {max}

  readfile( {fname} [, {binary} [, {max}]])

***************

*** 3980,3985 ****

--- 4003,4022 ----

  <			-2.0

  		{only available when compiled with the |+float| feature}

+ luaeval({expr}[, {expr}])					*luaeval()*

+ 		Evaluate Lua expression {expr} and return its result converted 

+ 		to Vim data structures. Second {expr} may hold additional 

+ 		argument accessible as _A inside first {expr}.

+ 		Strings are returned as they are.

+ 		Boolean objects are converted to numbers.

+ 		Numbers are converted to |Float| values if vim was compiled 

+ 		with |+float| and to numbers otherwise.

+ 		Dictionaries and lists obtained by vim.eval() are returned 

+ 		as-is.

+ 		Other objects are returned as zero without any errors.

+ 		See |lua-luaeval| for more details.

+ 		{only available when compiled with the |+lua| feature}

+ 

  map({expr}, {string})					*map()*

  		{expr} must be a |List| or a |Dictionary|.

  		Replace each item in {expr} with the result of evaluating

***************

*** 4574,4579 ****

--- 4612,4640 ----

  		This can be used to avoid some things that would remove the

  		popup menu.

+ 							*E860* *E861*

+ py3eval({expr})						*py3eval()*

+ 		Evaluate Python expression {expr} and return its result

+ 		converted to Vim data structures.

+ 		Numbers and strings are returned as they are (strings are 

+ 		copied though, unicode strings are additionally converted to 

+ 		'encoding').

+ 		Lists are represented as Vim |List| type.

+ 		Dictionaries are represented as Vim |Dictionary| type with 

+ 		keys converted to strings.

+ 		{only available when compiled with the |+python3| feature}

+ 

+ 							*E858* *E859*

+ pyeval({expr})						*pyeval()*

+ 		Evaluate Python expression {expr} and return its result

+ 		converted to Vim data structures.

+ 		Numbers and strings are returned as they are (strings are 

+ 		copied though).

+ 		Lists are represented as Vim |List| type.

+ 		Dictionaries are represented as Vim |Dictionary| type with 

+ 		keys converted to strings.

+ 		{only available when compiled with the |+python| feature}

+ 

  							*E726* *E727*

  range({expr} [, {max} [, {stride}]])				*range()*

  		Returns a |List| with Numbers:

***************

*** 4807,4812 ****

--- 4868,4877 ----

  		Search for regexp pattern {pattern}.  The search starts at the

  		cursor position (you can use |cursor()| to set it).

+ 		If there is no match a 0 is returned and the cursor doesn't

+ 		move.  No error message is given.

+ 		When a match has been found its line number is returned.

+ 

  		{flags} is a String, which can contain these character flags:

  		'b'	search backward instead of forward

  		'c'	accept a match at the cursor position

*** ../vim-7.3.568/runtime/doc/if_pyth.txt	2010-08-15 21:57:12.000000000 +0200

--- runtime/doc/if_pyth.txt	2012-06-20 18:01:02.000000000 +0200

***************

*** 1,4 ****

! *if_pyth.txt*   For Vim version 7.3.  Last change: 2010 Aug 13

  		  VIM REFERENCE MANUAL    by Paul Moore

--- 1,4 ----

! *if_pyth.txt*   For Vim version 7.3.  Last change: 2012 Feb 04

  		  VIM REFERENCE MANUAL    by Paul Moore

***************

*** 6,18 ****

  The Python Interface to Vim				*python* *Python*

! 1. Commands			|python-commands|

! 2. The vim module		|python-vim|

! 3. Buffer objects		|python-buffer|

! 4. Range objects		|python-range|

! 5. Window objects		|python-window|

! 6. Dynamic loading		|python-dynamic|

! 7. Python 3			|python3|

  {Vi does not have any of these commands}

--- 6,19 ----

  The Python Interface to Vim				*python* *Python*

! 1. Commands					|python-commands|

! 2. The vim module				|python-vim|

! 3. Buffer objects				|python-buffer|

! 4. Range objects				|python-range|

! 5. Window objects				|python-window|

! 6. pyeval(), py3eval() Vim functions		|python-pyeval|

! 7. Dynamic loading				|python-dynamic|

! 8. Python 3					|python3|

  {Vi does not have any of these commands}

***************

*** 150,155 ****

--- 151,172 ----

  	[{'cmd': '/^eval_expr(arg, nextcmd)$/', 'static': 0, 'name':

  	'eval_expr', 'kind': 'f', 'filename': './src/eval.c'}]

+ vim.bindeval(str)					*python-bindeval*

+ 	Like |python-eval|, but

+ 	1. if expression evaluates to |List| or |Dictionary| it is returned as 

+ 	   vimlist or vimdictionary python type that are connected to original 

+ 	   list or dictionary. Thus modifications to these objects imply 

+ 	   modifications of the original.

+ 	2. if expression evaluates to a function reference, then it returns 

+ 	   callable vimfunction object. Use self keyword argument to assign 

+ 	   |self| object for dictionary functions.

+ 

+ 	Note: this function has the same behavior as |lua-eval| (except that 

+ 	      lua does not support running vim functions), |python-eval| is 

+ 	      kept for backwards compatibility in order not to make scripts 

+ 	      relying on outputs of vim.eval() being a copy of original or 

+ 	      vim.eval("1") returning a string.

+ 

  Error object of the "vim" module

***************

*** 222,229 ****

  	- from indexing vim.buffers (|python-buffers|)

  	- from the "buffer" attribute of a window (|python-window|)

! Buffer objects have one read-only attribute - name - the full file name for

! the buffer.  They also have three methods (append, mark, and range; see below).

  You can also treat buffer objects as sequence objects.  In this context, they

  act as if they were lists (yes, they are mutable) of strings, with each

--- 239,247 ----

  	- from indexing vim.buffers (|python-buffers|)

  	- from the "buffer" attribute of a window (|python-window|)

! Buffer objects have two read-only attributes - name - the full file name for

! the buffer, and number - the buffer number.  They also have three methods

! (append, mark, and range; see below).

  You can also treat buffer objects as sequence objects.  In this context, they

  act as if they were lists (yes, they are mutable) of strings, with each

***************

*** 318,324 ****

  The width attribute is writable only if the screen is split vertically.

  ==============================================================================

! 6. Dynamic loading					*python-dynamic*

  On MS-Windows the Python library can be loaded dynamically.  The |:version|

  output then includes |+python/dyn|.

--- 336,348 ----

  The width attribute is writable only if the screen is split vertically.

  ==============================================================================

! 6. pyeval() and py3eval() Vim functions			*python-pyeval*

! 

! To facilitate bi-directional interface, you can use |pyeval()| and |py3eval()| 

! functions to evaluate Python expressions and pass their values to VimL.

! 

! ==============================================================================

! 7. Dynamic loading					*python-dynamic*

  On MS-Windows the Python library can be loaded dynamically.  The |:version|

  output then includes |+python/dyn|.

***************

*** 335,347 ****

  sure edit "gvim.exe" and search for "python\d*.dll\c".

  ==============================================================================

! 7. Python 3						*python3*

  							*:py3* *:python3*

  The |:py3| and |:python3| commands work similar to |:python|.

  							*:py3file*

  The |:py3file| command works similar to |:pyfile|.

  Vim can be built in four ways (:version output):

  1. No Python support	    (-python, -python3)

  2. Python 2 support only    (+python or +python/dyn, -python3)

--- 359,372 ----

  sure edit "gvim.exe" and search for "python\d*.dll\c".

  ==============================================================================

! 8. Python 3						*python3*

  							*:py3* *:python3*

  The |:py3| and |:python3| commands work similar to |:python|.

  							*:py3file*

  The |:py3file| command works similar to |:pyfile|.

+ 

  Vim can be built in four ways (:version output):

  1. No Python support	    (-python, -python3)

  2. Python 2 support only    (+python or +python/dyn, -python3)

***************

*** 355,361 ****

  When doing this on Linux/Unix systems and importing global symbols, this leads

  to a crash when the second Python version is used.  So either global symbols

  are loaded but only one Python version is activated, or no global symbols are

! loaded. The latter makes Python's "import" fail on libaries that expect the

  symbols to be provided by Vim.

  							*E836* *E837*

  Vim's configuration script makes a guess for all libraries based on one

--- 380,386 ----

  When doing this on Linux/Unix systems and importing global symbols, this leads

  to a crash when the second Python version is used.  So either global symbols

  are loaded but only one Python version is activated, or no global symbols are

! loaded. The latter makes Python's "import" fail on libraries that expect the

  symbols to be provided by Vim.

  							*E836* *E837*

  Vim's configuration script makes a guess for all libraries based on one

***************

*** 377,382 ****

--- 402,419 ----

  3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration.  This

     may crash Vim though.

+ 							*has-python*

+ You can test what Python version is available with: >

+ 	if has('python')

+ 	  echo 'there is Python 2.x'

+   	elseif has('python3')

+ 	  echo 'there is Python 3.x'

+ 	endif

+ 

+ Note however, that when Python 2 and 3 are both available and loaded

+ dynamically, these has() calls will try to load them.  If only one can be

+ loaded at a time, just checking if Python 2 or 3 are available will prevent

+ the other one from being available.

  ==============================================================================

   vim:tw=78:ts=8:ft=help:norl:

*** ../vim-7.3.568/src/eval.c	2012-06-20 14:13:02.000000000 +0200

--- src/eval.c	2012-06-20 18:29:15.000000000 +0200

***************

*** 424,453 ****

  static int get_lit_string_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate));

  static int get_list_tv __ARGS((char_u **arg, typval_T *rettv, int evaluate));

  static int rettv_list_alloc __ARGS((typval_T *rettv));

- static listitem_T *listitem_alloc __ARGS((void));

  static void listitem_free __ARGS((listitem_T *item));

- static void listitem_remove __ARGS((list_T *l, listitem_T *item));

  static long list_len __ARGS((list_T *l));

  static int list_equal __ARGS((list_T *l1, list_T *l2, int ic, int recursive));

  static int dict_equal __ARGS((dict_T *d1, dict_T *d2, int ic, int recursive));

  static int tv_equal __ARGS((typval_T *tv1, typval_T *tv2, int ic, int recursive));

- static listitem_T *list_find __ARGS((list_T *l, long n));

  static long list_find_nr __ARGS((list_T *l, long idx, int *errorp));

  static long list_idx_of_item __ARGS((list_T *l, listitem_T *item));

- static void list_append __ARGS((list_T *l, listitem_T *item));

  static int list_append_number __ARGS((list_T *l, varnumber_T n));

- static int list_insert_tv __ARGS((list_T *l, typval_T *tv, listitem_T *item));

  static int list_extend __ARGS((list_T	*l1, list_T *l2, listitem_T *bef));

  static int list_concat __ARGS((list_T *l1, list_T *l2, typval_T *tv));

  static list_T *list_copy __ARGS((list_T *orig, int deep, int copyID));

- static void list_remove __ARGS((list_T *l, listitem_T *item, listitem_T *item2));

  static char_u *list2string __ARGS((typval_T *tv, int copyID));

  static int list_join_inner __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo_style, int copyID, garray_T *join_gap));

  static int list_join __ARGS((garray_T *gap, list_T *l, char_u *sep, int echo, int copyID));

  static int free_unref_items __ARGS((int copyID));

- static void set_ref_in_ht __ARGS((hashtab_T *ht, int copyID));

- static void set_ref_in_list __ARGS((list_T *l, int copyID));

- static void set_ref_in_item __ARGS((typval_T *tv, int copyID));

  static int rettv_dict_alloc __ARGS((typval_T *rettv));

  static void dict_free __ARGS((dict_T *d, int recurse));

  static dictitem_T *dictitem_copy __ARGS((dictitem_T *org));

--- 424,444 ----

***************

*** 654,659 ****

--- 645,656 ----

  static void f_prevnonblank __ARGS((typval_T *argvars, typval_T *rettv));

  static void f_printf __ARGS((typval_T *argvars, typval_T *rettv));

  static void f_pumvisible __ARGS((typval_T *argvars, typval_T *rettv));

+ #ifdef FEAT_PYTHON3

+ static void f_py3eval __ARGS((typval_T *argvars, typval_T *rettv));

+ #endif

+ #ifdef FEAT_PYTHON

+ static void f_pyeval __ARGS((typval_T *argvars, typval_T *rettv));

+ #endif

  static void f_range __ARGS((typval_T *argvars, typval_T *rettv));

  static void f_readfile __ARGS((typval_T *argvars, typval_T *rettv));

  static void f_reltime __ARGS((typval_T *argvars, typval_T *rettv));

***************

*** 824,831 ****

  static char_u *autoload_name __ARGS((char_u *name));

  static void cat_func_name __ARGS((char_u *buf, ufunc_T *fp));

  static void func_free __ARGS((ufunc_T *fp));

- static void func_unref __ARGS((char_u *name));

- static void func_ref __ARGS((char_u *name));

  static void call_user_func __ARGS((ufunc_T *fp, int argcount, typval_T *argvars, typval_T *rettv, linenr_T firstline, linenr_T lastline, dict_T *selfdict));

  static int can_free_funccal __ARGS((funccall_T *fc, int copyID)) ;

  static void free_funccal __ARGS((funccall_T *fc, int free_val));

--- 821,826 ----

***************

*** 5927,5933 ****

  /*

   * Allocate a list item.

   */

!     static listitem_T *

  listitem_alloc()

  {

      return (listitem_T *)alloc(sizeof(listitem_T));

--- 5922,5928 ----

  /*

   * Allocate a list item.

   */

!     listitem_T *

  listitem_alloc()

  {

      return (listitem_T *)alloc(sizeof(listitem_T));

***************

*** 5947,5953 ****

  /*

   * Remove a list item from a List and free it.  Also clears the value.

   */

!     static void

  listitem_remove(l, item)

      list_T  *l;

      listitem_T *item;

--- 5942,5948 ----

  /*

   * Remove a list item from a List and free it.  Also clears the value.

   */

!     void

  listitem_remove(l, item)

      list_T  *l;

      listitem_T *item;

***************

*** 6123,6129 ****

   * A negative index is counted from the end; -1 is the last item.

   * Returns NULL when "n" is out of range.

   */

!     static listitem_T *

  list_find(l, n)

      list_T	*l;

      long	n;

--- 6118,6124 ----

   * A negative index is counted from the end; -1 is the last item.

   * Returns NULL when "n" is out of range.

   */

!     listitem_T *

  list_find(l, n)

      list_T	*l;

      long	n;

***************

*** 6265,6271 ****

  /*

   * Append item "item" to the end of list "l".

   */

!     static void

  list_append(l, item)

      list_T	*l;

      listitem_T	*item;

--- 6260,6266 ----

  /*

   * Append item "item" to the end of list "l".

   */

!     void

  list_append(l, item)

      list_T	*l;

      listitem_T	*item;

***************

*** 6378,6384 ****

   * If "item" is NULL append at the end.

   * Return FAIL when out of memory.

   */

!     static int

  list_insert_tv(l, tv, item)

      list_T	*l;

      typval_T	*tv;

--- 6373,6379 ----

   * If "item" is NULL append at the end.

   * Return FAIL when out of memory.

   */

!     int

  list_insert_tv(l, tv, item)

      list_T	*l;

      typval_T	*tv;

***************

*** 6523,6529 ****

   * Remove items "item" to "item2" from list "l".

   * Does not free the listitem or the value!

   */

!     static void

  list_remove(l, item, item2)

      list_T	*l;

      listitem_T	*item;

--- 6518,6524 ----

   * Remove items "item" to "item2" from list "l".

   * Does not free the listitem or the value!

   */

!     void

  list_remove(l, item, item2)

      list_T	*l;

      listitem_T	*item;

***************

*** 6785,6790 ****

--- 6780,6793 ----

      set_ref_in_lua(copyID);

  #endif

+ #ifdef FEAT_PYTHON

+     set_ref_in_python(copyID);

+ #endif

+ 

+ #ifdef FEAT_PYTHON3

+     set_ref_in_python3(copyID);

+ #endif

+ 

      /*

       * 2. Free lists and dictionaries that are not referenced.

       */

***************

*** 6870,6876 ****

  /*

   * Mark all lists and dicts referenced through hashtab "ht" with "copyID".

   */

!     static void

  set_ref_in_ht(ht, copyID)

      hashtab_T	*ht;

      int		copyID;

--- 6873,6879 ----

  /*

   * Mark all lists and dicts referenced through hashtab "ht" with "copyID".

   */

!     void

  set_ref_in_ht(ht, copyID)

      hashtab_T	*ht;

      int		copyID;

***************

*** 6890,6896 ****

  /*

   * Mark all lists and dicts referenced through list "l" with "copyID".

   */

!     static void

  set_ref_in_list(l, copyID)

      list_T	*l;

      int		copyID;

--- 6893,6899 ----

  /*

   * Mark all lists and dicts referenced through list "l" with "copyID".

   */

!     void

  set_ref_in_list(l, copyID)

      list_T	*l;

      int		copyID;

***************

*** 6904,6910 ****

  /*

   * Mark all lists and dicts referenced through typval "tv" with "copyID".

   */

!     static void

  set_ref_in_item(tv, copyID)

      typval_T	*tv;

      int		copyID;

--- 6907,6913 ----

  /*

   * Mark all lists and dicts referenced through typval "tv" with "copyID".

   */

!     void

  set_ref_in_item(tv, copyID)

      typval_T	*tv;

      int		copyID;

***************

*** 7986,7991 ****

--- 7989,8000 ----

      {"prevnonblank",	1, 1, f_prevnonblank},

      {"printf",		2, 19, f_printf},

      {"pumvisible",	0, 0, f_pumvisible},

+ #ifdef FEAT_PYTHON3

+     {"py3eval",		1, 1, f_py3eval},

+ #endif

+ #ifdef FEAT_PYTHON

+     {"pyeval",		1, 1, f_pyeval},

+ #endif

      {"range",		1, 3, f_range},

      {"readfile",	1, 3, f_readfile},

      {"reltime",		0, 2, f_reltime},

***************

*** 9150,9155 ****

--- 9159,9203 ----

  #endif

  }

+     int

+ func_call(name, args, selfdict, rettv)

+     char_u	*name;

+     typval_T	*args;

+     dict_T	*selfdict;

+     typval_T	*rettv;

+ {

+     listitem_T	*item;

+     typval_T	argv[MAX_FUNC_ARGS + 1];

+     int		argc = 0;

+     int		dummy;

+     int		r = 0;

+ 

+     for (item = args->vval.v_list->lv_first; item != NULL;

+ 							 item = item->li_next)

+     {

+ 	if (argc == MAX_FUNC_ARGS)

+ 	{

+ 	    EMSG(_("E699: Too many arguments"));

+ 	    break;

+ 	}

+ 	/* Make a copy of each argument.  This is needed to be able to set

+ 	 * v_lock to VAR_FIXED in the copy without changing the original list.

+ 	 */

+ 	copy_tv(&item->li_tv, &argv[argc++]);

+     }

+ 

+     if (item == NULL)

+ 	r = call_func(name, (int)STRLEN(name), rettv, argc, argv,

+ 				 curwin->w_cursor.lnum, curwin->w_cursor.lnum,

+ 						      &dummy, TRUE, selfdict);

+ 

+     /* Free the arguments. */

+     while (argc > 0)

+ 	clear_tv(&argv[--argc]);

+ 

+     return r;

+ }

+ 

  /*

   * "call(func, arglist)" function

   */

***************

*** 9159,9168 ****

      typval_T	*rettv;

  {

      char_u	*func;

-     typval_T	argv[MAX_FUNC_ARGS + 1];

-     int		argc = 0;

-     listitem_T	*item;

-     int		dummy;

      dict_T	*selfdict = NULL;

      if (argvars[1].v_type != VAR_LIST)

--- 9207,9212 ----

***************

*** 9190,9217 ****

  	selfdict = argvars[2].vval.v_dict;

      }

!     for (item = argvars[1].vval.v_list->lv_first; item != NULL;

! 							 item = item->li_next)

!     {

! 	if (argc == MAX_FUNC_ARGS)

! 	{

! 	    EMSG(_("E699: Too many arguments"));

! 	    break;

! 	}

! 	/* Make a copy of each argument.  This is needed to be able to set

! 	 * v_lock to VAR_FIXED in the copy without changing the original list.

! 	 */

! 	copy_tv(&item->li_tv, &argv[argc++]);

!     }

! 

!     if (item == NULL)

! 	(void)call_func(func, (int)STRLEN(func), rettv, argc, argv,

! 				 curwin->w_cursor.lnum, curwin->w_cursor.lnum,

! 						      &dummy, TRUE, selfdict);

! 

!     /* Free the arguments. */

!     while (argc > 0)

! 	clear_tv(&argv[--argc]);

  }

  #ifdef FEAT_FLOAT

--- 9234,9240 ----

  	selfdict = argvars[2].vval.v_dict;

      }

!     (void)func_call(func, &argvars[1], selfdict, rettv);

  }

  #ifdef FEAT_FLOAT

***************

*** 14424,14429 ****

--- 14447,14486 ----

  #endif

  }

+ #ifdef FEAT_PYTHON3

+ /*

+  * "py3eval()" function

+  */

+     static void

+ f_py3eval(argvars, rettv)

+     typval_T	*argvars;

+     typval_T	*rettv;

+ {

+     char_u	*str;

+     char_u	buf[NUMBUFLEN];

+ 

+     str = get_tv_string_buf(&argvars[0], buf);

+     do_py3eval(str, rettv);

+ }

+ #endif

+ 

+ #ifdef FEAT_PYTHON

+ /*

+  * "pyeval()" function

+  */

+     static void

+ f_pyeval(argvars, rettv)

+     typval_T	*argvars;

+     typval_T	*rettv;

+ {

+     char_u	*str;

+     char_u	buf[NUMBUFLEN];

+ 

+     str = get_tv_string_buf(&argvars[0], buf);

+     do_pyeval(str, rettv);

+ }

+ #endif

+ 

  /*

   * "range()" function

   */

***************

*** 22139,22145 ****

   * Unreference a Function: decrement the reference count and free it when it

   * becomes zero.  Only for numbered functions.

   */

!     static void

  func_unref(name)

      char_u	*name;

  {

--- 22196,22202 ----

   * Unreference a Function: decrement the reference count and free it when it

   * becomes zero.  Only for numbered functions.

   */

!     void

  func_unref(name)

      char_u	*name;

  {

***************

*** 22163,22169 ****

  /*

   * Count a reference to a Function.

   */

!     static void

  func_ref(name)

      char_u	*name;

  {

--- 22220,22226 ----

  /*

   * Count a reference to a Function.

   */

!     void

  func_ref(name)

      char_u	*name;

  {

*** ../vim-7.3.568/src/if_lua.c	2012-04-06 14:30:55.000000000 +0200

--- src/if_lua.c	2012-06-20 18:16:33.000000000 +0200

***************

*** 199,207 ****

  lua_Number (*dll_lua_tonumberx) (lua_State *L, int idx, int *isnum);

  lua_Integer (*dll_lua_tointegerx) (lua_State *L, int idx, int *isnum);

  void (*dll_lua_callk) (lua_State *L, int nargs, int nresults, int ctx,

!         lua_CFunction k);

  int (*dll_lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,

!         int ctx, lua_CFunction k);

  void (*dll_lua_getglobal) (lua_State *L, const char *var);

  void (*dll_lua_setglobal) (lua_State *L, const char *var);

  #endif

--- 199,207 ----

  lua_Number (*dll_lua_tonumberx) (lua_State *L, int idx, int *isnum);

  lua_Integer (*dll_lua_tointegerx) (lua_State *L, int idx, int *isnum);

  void (*dll_lua_callk) (lua_State *L, int nargs, int nresults, int ctx,

! 	lua_CFunction k);

  int (*dll_lua_pcallk) (lua_State *L, int nargs, int nresults, int errfunc,

! 	int ctx, lua_CFunction k);

  void (*dll_lua_getglobal) (lua_State *L, const char *var);

  void (*dll_lua_setglobal) (lua_State *L, const char *var);

  #endif

***************

*** 394,400 ****

  luaL_typeerror (lua_State *L, int narg, const char *tname)

  {

      const char *msg = lua_pushfstring(L, "%s expected, got %s",

!             tname, luaL_typename(L, narg));

      return luaL_argerror(L, narg, msg);

  }

  #endif

--- 394,400 ----

  luaL_typeerror (lua_State *L, int narg, const char *tname)

  {

      const char *msg = lua_pushfstring(L, "%s expected, got %s",

! 	    tname, luaL_typename(L, narg));

      return luaL_argerror(L, narg, msg);

  }

  #endif

***************

*** 646,786 ****

  	return 1; \

      }

- 

- /* adapted from eval.c */

- 

- #define listitem_alloc() (listitem_T *)alloc(sizeof(listitem_T))

- 

-     static listitem_T *

- list_find (list_T *l, long n)

- {

-     listitem_T *li;

-     if (l == NULL || n < -l->lv_len || n >= l->lv_len)

- 	return NULL;

-     if (n < 0) /* search backward? */

- 	for (li = l->lv_last; n < -1; li = li->li_prev)

- 	    n++;

-     else /* search forward */

- 	for (li = l->lv_first; n > 0; li = li->li_next)

- 	    n--;

-     return li;

- }

- 

-     static void

- list_remove (list_T *l, listitem_T *li)

- {

-     listwatch_T *lw;

-     --l->lv_len;

-     /* fix watchers */

-     for (lw = l->lv_watch; lw != NULL; lw = lw->lw_next)

- 	if (lw->lw_item == li)

- 	    lw->lw_item = li->li_next;

-     /* fix list pointers */

-     if (li->li_next == NULL) /* last? */

- 	l->lv_last = li->li_prev;

-     else

- 	li->li_next->li_prev = li->li_prev;

-     if (li->li_prev == NULL) /* first? */

- 	l->lv_first = li->li_next;

-     else

- 	li->li_prev->li_next = li->li_next;

-     l->lv_idx_item = NULL;

- }

- 

-     static void

- list_append(list_T *l, listitem_T *item)

- {

-     if (l->lv_last == NULL) /* empty list? */

- 	l->lv_first = item;

-     else

- 	l->lv_last->li_next = item;

-     item->li_prev = l->lv_last;

-     item->li_next = NULL;

-     l->lv_last = item;

-     ++l->lv_len;

- }

- 

-     static int

- list_insert_tv(list_T *l, typval_T *tv, listitem_T *item)

- {

-     listitem_T	*ni = listitem_alloc();

- 

-     if (ni == NULL)

- 	return FAIL;

-     copy_tv(tv, &ni->li_tv);

-     if (item == NULL)

- 	list_append(l, ni);

-     else

-     {

- 	ni->li_prev = item->li_prev;

- 	ni->li_next = item;

- 	if (item->li_prev == NULL)

- 	{

- 	    l->lv_first = ni;

- 	    ++l->lv_idx;

- 	}

- 	else

- 	{

- 	    item->li_prev->li_next = ni;

- 	    l->lv_idx_item = NULL;

- 	}

- 	item->li_prev = ni;

- 	++l->lv_len;

-     }

-     return OK;

- }

- 

- /* set references */

- 

- static void set_ref_in_tv (typval_T *tv, int copyID);

- 

-     static void

- set_ref_in_dict(dict_T *d, int copyID)

- {

-     hashtab_T *ht = &d->dv_hashtab;

-     int n = ht->ht_used;

-     hashitem_T *hi;

-     for (hi = ht->ht_array; n > 0; ++hi)

- 	if (!HASHITEM_EMPTY(hi))

- 	{

- 	    dictitem_T *di = dict_lookup(hi);

- 	    set_ref_in_tv(&di->di_tv, copyID);

- 	    --n;

- 	}

- }

- 

-     static void

- set_ref_in_list(list_T *l, int copyID)

- {

-     listitem_T *li;