From b967cb2e03d32e7e525592049ca7f4f92413188c Mon Sep 17 00:00:00 2001
From: dundargoc <gocdundar@gmail.com>
Date: Fri, 14 Oct 2022 16:34:39 +0200
Subject: refactor(uncrustify): move macros definitions to enable formatting

Uncrustify struggles to format function-like macros which are defined in
deeply nested areas of the code. Un-nesting them unblocks useful
formatting rules from uncrustify.
---
 src/nvim/viml/parser/expressions.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/nvim/viml/parser/expressions.c')

diff --git a/src/nvim/viml/parser/expressions.c b/src/nvim/viml/parser/expressions.c
index 4564831824..8028950c07 100644
--- a/src/nvim/viml/parser/expressions.c
+++ b/src/nvim/viml/parser/expressions.c
@@ -2120,6 +2120,22 @@ viml_pexpr_parse_process_token:
     assert(kv_size(pt_stack));
     const ExprASTParseType cur_pt = kv_last(pt_stack);
     assert(lambda_node == NULL || cur_pt == kEPTLambdaArguments);
+#define SIMPLE_UB_OP(op) \
+  case kExprLex##op: { \
+      if (want_node == kENodeValue) { \
+        /* Value level: assume unary operator. */ \
+        NEW_NODE_WITH_CUR_POS(cur_node, kExprNodeUnary##op); \
+        *top_node_p = cur_node; \
+        kvi_push(ast_stack, &cur_node->children); \
+        HL_CUR_TOKEN(Unary##op); \
+      } else { \
+        NEW_NODE_WITH_CUR_POS(cur_node, kExprNodeBinary##op); \
+        ADD_OP_NODE(cur_node); \
+        HL_CUR_TOKEN(Binary##op); \
+      } \
+      want_node = kENodeValue; \
+      break; \
+  }
     switch (tok_type) {
     case kExprLexMissing:
     case kExprLexSpacing:
@@ -2141,22 +2157,6 @@ viml_pexpr_parse_process_token:
       HL_CUR_TOKEN(Register);
       break;
     }
-#define SIMPLE_UB_OP(op) \
-  case kExprLex##op: { \
-      if (want_node == kENodeValue) { \
-        /* Value level: assume unary operator. */ \
-        NEW_NODE_WITH_CUR_POS(cur_node, kExprNodeUnary##op); \
-        *top_node_p = cur_node; \
-        kvi_push(ast_stack, &cur_node->children); \
-        HL_CUR_TOKEN(Unary##op); \
-      } else { \
-        NEW_NODE_WITH_CUR_POS(cur_node, kExprNodeBinary##op); \
-        ADD_OP_NODE(cur_node); \
-        HL_CUR_TOKEN(Binary##op); \
-      } \
-      want_node = kENodeValue; \
-      break; \
-  }
       SIMPLE_UB_OP(Plus)
       SIMPLE_UB_OP(Minus)
 #undef SIMPLE_UB_OP
-- 
cgit