Merge remote-tracking branch 'upstream/master' into usermarks

1 files changed, 8 insertions, 21 deletions

diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
index c4bc9f603b..6373ead1a3 100644
--- a/src/nvim/eval/typval.h
+++ b/src/nvim/eval/typval.h
@@ -25,9 +25,6 @@
 typedef int64_t varnumber_T;
 typedef uint64_t uvarnumber_T;
 
-/// Type used for VimL VAR_FLOAT values
-typedef double float_T;
-
 /// Refcount for dict or list that should not be freed
 enum { DO_NOT_FREE_CNT = (INT_MAX / 2), };
 
@@ -289,12 +286,6 @@ typedef struct {
 /// Number of fixed variables used for arguments
 #define FIXVAR_CNT 12
 
-/// Callback interface for C function reference>
-///     Used for managing functions that were registered with |register_cfunc|
-typedef int (*cfunc_T)(int argcount, typval_T *argvars, typval_T *rettv, void *state);  // NOLINT
-/// Callback to clear cfunc_T and any associated state.
-typedef void (*cfunc_free_T)(void *state);
-
 // Structure to hold info for a function that is currently being executed.
 typedef struct funccall_S funccall_T;
 
@@ -333,10 +324,7 @@ struct ufunc {
   garray_T uf_lines;         ///< function lines
   int uf_profiling;     ///< true when func is being profiled
   int uf_prof_initialized;
-  // Managing cfuncs
-  cfunc_T uf_cb;            ///< C function extension callback
-  cfunc_free_T uf_cb_free;       ///< C function extension free callback
-  void *uf_cb_state;      ///< State of C function extension.
+  LuaRef uf_luaref;      ///< lua callback, used if (uf_flags & FC_LUAREF)
   // Profiling the function as a whole.
   int uf_tm_count;      ///< nr of calls
   proftime_T uf_tm_total;      ///< time spent in function + children
@@ -363,15 +351,14 @@ struct ufunc {
 };
 
 struct partial_S {
-  int pt_refcount;  ///< Reference count.
-  char_u *pt_name;  ///< Function name; when NULL use pt_func->name.
-  ufunc_T *pt_func;  ///< Function pointer; when NULL lookup function with
-                     ///< pt_name.
-  bool pt_auto;  ///< When true the partial was created by using dict.member
-                 ///< in handle_subscript().
-  int pt_argc;  ///< Number of arguments.
+  int pt_refcount;    ///< Reference count.
+  char *pt_name;      ///< Function name; when NULL use pt_func->name.
+  ufunc_T *pt_func;   ///< Function pointer; when NULL lookup function with pt_name.
+  bool pt_auto;       ///< When true the partial was created by using dict.member
+                      ///< in handle_subscript().
+  int pt_argc;        ///< Number of arguments.
   typval_T *pt_argv;  ///< Arguments in allocated array.
-  dict_T *pt_dict;  ///< Dict for "self".
+  dict_T *pt_dict;    ///< Dict for "self".
 };
 
 /// Structure used for explicit stack while garbage collecting hash tables