eval: Remove v:none

To get v:none back just rever this commit. This will not make json*() functions
compatible with Vim though.

5 files changed, 2 insertions, 26 deletions

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index a8082655fd..9082dfd759 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -659,8 +659,7 @@ static Object vim_to_object_rec(typval_T *obj, PMap(ptr_t) *lookup)
           rv.data.boolean = (obj->vval.v_special == kSpecialVarTrue);
           break;
         }
-        case kSpecialVarNull:
-        case kSpecialVarNone: {
+        case kSpecialVarNull: {
           rv.type = kObjectTypeNil;
           break;
         }
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index dc7737e4ce..4919cc2ce8 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -368,7 +368,6 @@ static struct vimvar {
   { VV_NAME("false",            VAR_SPECIAL), VV_RO },
   { VV_NAME("true",             VAR_SPECIAL), VV_RO },
   { VV_NAME("null",             VAR_SPECIAL), VV_RO },
-  { VV_NAME("none",             VAR_SPECIAL), VV_RO },
 };
 
 /* shorthand */
@@ -512,7 +511,6 @@ void eval_init(void)
 
   set_vim_var_special(VV_FALSE, kSpecialVarFalse);
   set_vim_var_special(VV_TRUE, kSpecialVarTrue);
-  set_vim_var_special(VV_NONE, kSpecialVarNone);
   set_vim_var_special(VV_NULL, kSpecialVarNull);
 
   set_reg_var(0);  // default for v:register is not 0 but '"'
@@ -16204,7 +16202,6 @@ static void f_type(typval_T *argvars, typval_T *rettv)
           n = 6;
           break;
         }
-        case kSpecialVarNone:
         case kSpecialVarNull: {
           n = 7;
           break;
@@ -17520,7 +17517,6 @@ long get_tv_number_chk(typval_T *varp, int *denote)
         return 1;
       }
       case kSpecialVarFalse:
-      case kSpecialVarNone:
       case kSpecialVarNull: {
         return 0;
       }
diff --git a/src/nvim/eval.h b/src/nvim/eval.h
index 40111abf8d..c2b67cd12e 100644
--- a/src/nvim/eval.h
+++ b/src/nvim/eval.h
@@ -124,7 +124,6 @@ typedef enum {
     VV_FALSE,
     VV_TRUE,
     VV_NULL,
-    VV_NONE,
 } VimVarIndex;
 
 /// All recognized msgpack types
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c
index 0fc975ed42..1550a61f7f 100644
--- a/src/nvim/eval/encode.c
+++ b/src/nvim/eval/encode.c
@@ -55,7 +55,6 @@ typedef kvec_t(MPConvStackVal) MPConvStack;
 
 const char *const encode_special_var_names[] = {
   [kSpecialVarNull] = "null",
-  [kSpecialVarNone] = "none",
   [kSpecialVarTrue] = "true",
   [kSpecialVarFalse] = "false",
 };
@@ -358,10 +357,6 @@ static int name##_convert_one_value(firstargtype firstargname, \
           CONV_BOOL(tv->vval.v_special == kSpecialVarTrue); \
           break; \
         } \
-        case kSpecialVarNone: { \
-          CONV_NONE_VAL(); \
-          break; \
-        } \
       } \
       break; \
     } \
@@ -726,9 +721,6 @@ encode_vim_to_##name##_error_ret: \
 #define CONV_BOOL(num) \
     ga_concat(gap, ((num)? "v:true": "v:false"))
 
-#define CONV_NONE_VAL() \
-    ga_concat(gap, "v:none")
-
 #define CONV_UNSIGNED_NUMBER(num)
 
 #define CONV_DICT_START(len) \
@@ -1074,9 +1066,6 @@ static inline bool check_json_key(const typval_T *const tv)
       } \
     } while (0)
 
-#undef CONV_NONE_VAL
-#define CONV_NONE_VAL()
-
 DEFINE_VIML_CONV_FUNCTIONS(static, json, garray_T *const, gap)
 
 #undef CONV_STRING
@@ -1090,7 +1079,6 @@ DEFINE_VIML_CONV_FUNCTIONS(static, json, garray_T *const, gap)
 #undef CONV_EMPTY_DICT
 #undef CONV_NIL
 #undef CONV_BOOL
-#undef CONV_NONE_VAL
 #undef CONV_UNSIGNED_NUMBER
 #undef CONV_DICT_START
 #undef CONV_DICT_END
@@ -1226,10 +1214,6 @@ char *encode_tv2json(typval_T *tv, size_t *len)
 #define CONV_NIL() \
     msgpack_pack_nil(packer)
 
-#define CONV_NONE_VAL() \
-    return conv_error(_("E953: Attempt to convert v:none in %s, %s"), \
-                      mpstack, objname)
-
 #define CONV_BOOL(num) \
     do { \
       if ((num)) { \
@@ -1277,7 +1261,6 @@ DEFINE_VIML_CONV_FUNCTIONS(, msgpack, msgpack_packer *const, packer)
 #undef CONV_EMPTY_DICT
 #undef CONV_NIL
 #undef CONV_BOOL
-#undef CONV_NONE_VAL
 #undef CONV_UNSIGNED_NUMBER
 #undef CONV_DICT_START
 #undef CONV_DICT_END
diff --git a/src/nvim/eval_defs.h b/src/nvim/eval_defs.h
index bcd9e80f9a..3c119c44e1 100644
--- a/src/nvim/eval_defs.h
+++ b/src/nvim/eval_defs.h
@@ -20,7 +20,6 @@ typedef struct dictvar_S dict_T;
 typedef enum {
   kSpecialVarFalse,  ///< v:false
   kSpecialVarTrue,   ///< v:true
-  kSpecialVarNone,   ///< v:none
   kSpecialVarNull,   ///< v:null
 } SpecialVarValue;
 
@@ -40,7 +39,7 @@ typedef enum {
   VAR_LIST,         ///< List, .v_list is used.
   VAR_DICT,         ///< Dictionary, .v_dict is used.
   VAR_FLOAT,        ///< Floating-point value, .v_float is used.
-  VAR_SPECIAL,      ///< Special value (true, false, null, none), .v_special
+  VAR_SPECIAL,      ///< Special value (true, false, null), .v_special
                     ///< is used.
 } VarType;