add and set is_argv flag to node->call.args

so that we can add spaces as necessary when printing, and
we can also handle arguments better for the soon to be coming
argument tokenization changes

Author: alandekok

src/lib/unlang/xlat_alloc.c

@@ -116,6 +116,7 @@ void _xlat_exp_set_type(NDEBUG_LOCATION_ARGS xlat_exp_t *node, xlat_type_t type)
 	case XLAT_FUNC:
 	case XLAT_FUNC_UNRESOLVED:
 		node->call.args = _xlat_exp_head_alloc(NDEBUG_LOCATION_VALS node);
+		node->call.args->is_argv = true;
 		break;
 
 	case XLAT_BOX:
@@ -373,6 +374,8 @@ void xlat_exp_verify(xlat_exp_t const *node)
 		return;
 
 	case XLAT_FUNC:
+		fr_assert(node->call.args->is_argv);
+
 		xlat_exp_foreach(node->call.args, arg) {
 			fr_assert(arg->type == XLAT_GROUP);
 

src/lib/unlang/xlat_priv.h

@@ -189,7 +189,8 @@ struct xlat_exp_s {
 struct xlat_exp_head_s {
 	fr_dlist_head_t		dlist;
 	xlat_flags_t		flags;		//!< Flags that control resolution and evaluation.
-	bool			instantiated;	//!< temporary flag until we fix more things
+	uint8_t			instantiated : 1;  //!< temporary flag until we fix more things
+	uint8_t			is_argv : 1;	//!< this thing holds function arguments
 
 #ifndef NDEBUG
 	char const * _CONST	file;		//!< File where the xlat was allocated.

src/lib/unlang/xlat_tokenize.c

@@ -1041,11 +1041,7 @@ ssize_t xlat_print_node(fr_sbuff_t *out, xlat_exp_head_t const *head, xlat_exp_t
 		if (xlat_exp_next(head, node)) {
 			if (c) FR_SBUFF_IN_CHAR_RETURN(out, c);
 
-			/*
-			 *	This thing is %{...}, and we don't print a space between the last argument
-			 *	and the '}'.
-			 */
-			if (!node->flags.xlat) FR_SBUFF_IN_CHAR_RETURN(out, ' ');      /* Add ' ' between args */
+			if (head->is_argv) FR_SBUFF_IN_CHAR_RETURN(out, ' ');      /* Add ' ' between args */
 		}
 		goto done;
 
@@ -1531,6 +1527,7 @@ fr_slen_t xlat_tokenize_argv(TALLOC_CTX *ctx, xlat_exp_head_t **out, fr_sbuff_t
 	}
 
 	MEM(head = xlat_exp_head_alloc(ctx));
+	head->is_argv = true;
 
 	/*
 	 *	skip spaces at the beginning as we don't want them to become a whitespace literal.

src/tests/unit/xlat/purify.txt

@@ -231,7 +231,7 @@ match "hello 3 bob"
 #  @todo - xlat_purify doesn't hoist results.
 #
 xlat_purify "hello %{1 + 2} bob"
-match "hello 3  bob"
+match "hello 3 bob"
 
 #
 #  New syntax!