aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/ex_eval.c
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2016-08-28 09:15:28 +0300
committerZyX <kp-pav@yandex.ru>2017-03-29 10:08:05 +0300
commit50ebd1dff5c4e995c4f7e7980870e43d9defabc6 (patch)
tree391ae8a9e6980f990d15f3c77d582629b840a549 /src/nvim/ex_eval.c
parent233b0c93bba66492d7b8b61f8ac61082f03668a1 (diff)
downloadrneovim-50ebd1dff5c4e995c4f7e7980870e43d9defabc6.tar.gz
rneovim-50ebd1dff5c4e995c4f7e7980870e43d9defabc6.tar.bz2
rneovim-50ebd1dff5c4e995c4f7e7980870e43d9defabc6.zip
eval: Move free_tv to eval/typval.h, remove most of its usages
Diffstat (limited to 'src/nvim/ex_eval.c')
-rw-r--r--src/nvim/ex_eval.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index 3f71ae1795..65112c4dd8 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -14,6 +14,7 @@
#include "nvim/ex_eval.h"
#include "nvim/charset.h"
#include "nvim/eval.h"
+#include "nvim/eval/typval.h"
#include "nvim/ex_cmds2.h"
#include "nvim/ex_docmd.h"
#include "nvim/message.h"
@@ -21,8 +22,6 @@
#include "nvim/regexp.h"
#include "nvim/strings.h"
-
-
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "ex_eval.c.generated.h"
#endif
@@ -59,12 +58,14 @@
* is an error exception.) - The macros can be defined as expressions checking
* for a variable that is allowed to be changed during execution of a script.
*/
-/* Values used for the Vim release. */
-# define THROW_ON_ERROR TRUE
-# define THROW_ON_ERROR_TRUE
-# define THROW_ON_INTERRUPT TRUE
-# define THROW_ON_INTERRUPT_TRUE
+// Values used for the Vim release.
+#define THROW_ON_ERROR true
+#define THROW_ON_ERROR_TRUE
+#define THROW_ON_INTERRUPT true
+#define THROW_ON_INTERRUPT_TRUE
+
+#define discard_pending_return(p) tv_free((typval_T *)(p))
/*
* When several errors appear in a row, setting "force_abort" is delayed until