From 53cbfd02209caee54190aae7f1ff8b407ae4039b Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Fri, 9 Apr 2021 21:46:02 -0400 Subject: vim-patch:8.2.0044: expression type is used inconsistently Problem: Expression type is used inconsistently. Solution: Add "ETYPE_IS" and "ETYPE_ISNOT" as separate enum values. Rename "TYPE_" to "ETYPE_" to avoid confusion. https://github.com/vim/vim/commit/07a3db89b8953bd0964895badb3b662f7514bc10 --- src/nvim/eval.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src/nvim/eval.h') diff --git a/src/nvim/eval.h b/src/nvim/eval.h index a62d87fcc4..9e74f1380d 100644 --- a/src/nvim/eval.h +++ b/src/nvim/eval.h @@ -230,15 +230,17 @@ typedef enum /// types for expressions. typedef enum { - TYPE_UNKNOWN = 0, - TYPE_EQUAL, ///< == - TYPE_NEQUAL, ///< != - TYPE_GREATER, ///< > - TYPE_GEQUAL, ///< >= - TYPE_SMALLER, ///< < - TYPE_SEQUAL, ///< <= - TYPE_MATCH, ///< =~ - TYPE_NOMATCH, ///< !~ + ETYPE_UNKNOWN = 0, + ETYPE_EQUAL, ///< == + ETYPE_NEQUAL, ///< != + ETYPE_GREATER, ///< > + ETYPE_GEQUAL, ///< >= + ETYPE_SMALLER, ///< < + ETYPE_SEQUAL, ///< <= + ETYPE_MATCH, ///< =~ + ETYPE_NOMATCH, ///< !~ + ETYPE_IS, ///< is + ETYPE_ISNOT, ///< isnot } exptype_T; /// Type for dict_list function -- cgit From ca214311d23e687b9607ba97d01c9ae361d3743a Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Wed, 7 Apr 2021 21:57:40 -0400 Subject: vim-patch:8.2.0069: ETYPE_ is used for two different enums Problem: ETYPE_ is used for two different enums. Solution: Rename one to use EXPR_. https://github.com/vim/vim/commit/87396072c5c468f0c129e4ec7cd944ac897b7752 --- src/nvim/eval.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/nvim/eval.h') diff --git a/src/nvim/eval.h b/src/nvim/eval.h index 9e74f1380d..167879020c 100644 --- a/src/nvim/eval.h +++ b/src/nvim/eval.h @@ -230,17 +230,17 @@ typedef enum /// types for expressions. typedef enum { - ETYPE_UNKNOWN = 0, - ETYPE_EQUAL, ///< == - ETYPE_NEQUAL, ///< != - ETYPE_GREATER, ///< > - ETYPE_GEQUAL, ///< >= - ETYPE_SMALLER, ///< < - ETYPE_SEQUAL, ///< <= - ETYPE_MATCH, ///< =~ - ETYPE_NOMATCH, ///< !~ - ETYPE_IS, ///< is - ETYPE_ISNOT, ///< isnot + EXPR_UNKNOWN = 0, + EXPR_EQUAL, ///< == + EXPR_NEQUAL, ///< != + EXPR_GREATER, ///< > + EXPR_GEQUAL, ///< >= + EXPR_SMALLER, ///< < + EXPR_SEQUAL, ///< <= + EXPR_MATCH, ///< =~ + EXPR_NOMATCH, ///< !~ + EXPR_IS, ///< is + EXPR_ISNOT, ///< isnot } exptype_T; /// Type for dict_list function -- cgit From b2971ebeedc3b305cde1f1ddf0e56403e8105092 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Sun, 11 Apr 2021 11:58:29 -0400 Subject: vim-patch:8.2.2319: "exptype_T" can be read as "expected type" Problem: "exptype_T" can be read as "expected type". Solution: Rename to "exprtype_T", expression type. https://github.com/vim/vim/commit/657137ca487c60d63989236115115161def270a5 Vim9 changes omitted. --- src/nvim/eval.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/eval.h') diff --git a/src/nvim/eval.h b/src/nvim/eval.h index 167879020c..3da4bb8655 100644 --- a/src/nvim/eval.h +++ b/src/nvim/eval.h @@ -241,7 +241,7 @@ typedef enum { EXPR_NOMATCH, ///< !~ EXPR_IS, ///< is EXPR_ISNOT, ///< isnot -} exptype_T; +} exprtype_T; /// Type for dict_list function typedef enum { -- cgit