remove XLAT_VIRTUAL_UNRESOLVED

it hasn't been needed for a while.  The only XLAT_VIRTUAL is
Foreach-Variable-*, and that's going away soon.

Author: alandekok

src/lib/unlang/xlat_alloc.c

@@ -272,7 +272,6 @@ static int CC_HINT(nonnull) _xlat_copy_internal(NDEBUG_LOCATION_ARGS TALLOC_CTX
 
 		case XLAT_ONE_LETTER: /* Done with format */
 		case XLAT_FUNC_UNRESOLVED:
-		case XLAT_VIRTUAL_UNRESOLVED:
 			break;
 
 		case XLAT_VIRTUAL:

src/lib/unlang/xlat_eval.c

@@ -1174,6 +1174,11 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 			continue;
 
 		case XLAT_TMPL:
+			/*
+			 *	Everything should have been resolved.
+			 */
+			fr_assert(!tmpl_needs_resolving(node->vpt));
+
 			if (tmpl_is_data(node->vpt)) {
 				XLAT_DEBUG("** [%i] %s(value) - %s", unlang_interpret_stack_depth(request), __FUNCTION__,
 					   node->vpt->name);
@@ -1317,7 +1322,6 @@ xlat_action_t xlat_frame_eval(TALLOC_CTX *ctx, fr_dcursor_t *out, xlat_exp_head_
 		 */
 		case XLAT_INVALID:
 		case XLAT_FUNC_UNRESOLVED:
-		case XLAT_VIRTUAL_UNRESOLVED:
 			fr_assert(0);
 			return XLAT_ACTION_FAIL;
 		}

src/lib/unlang/xlat_priv.h

@@ -109,12 +109,11 @@ typedef enum {
 	XLAT_FUNC		= 0x0004,		//!< xlat module
 	XLAT_FUNC_UNRESOLVED	= 0x0008,		//!< func needs resolution during pass2.
 	XLAT_VIRTUAL		= 0x0010,		//!< virtual attribute
-	XLAT_VIRTUAL_UNRESOLVED = 0x0020,		//!< virtual attribute needs resolution during pass2.
-	XLAT_TMPL		= 0x0040,		//!< xlat attribute
+	XLAT_TMPL		= 0x0020,		//!< xlat attribute
 #ifdef HAVE_REGEX
-	XLAT_REGEX		= 0x0080,		//!< regex reference %{1}, etc.
+	XLAT_REGEX		= 0x0040,		//!< regex reference %{1}, etc.
 #endif
-	XLAT_GROUP		= 0x0200		//!< encapsulated string of xlats
+	XLAT_GROUP		= 0x0100		//!< encapsulated string of xlats
 } xlat_type_t;
 
 /** An xlat function call

src/lib/unlang/xlat_purify.c

@@ -163,7 +163,6 @@ static int xlat_purify_list_internal(xlat_exp_head_t *head, request_t *request,
 		case XLAT_INVALID:
 		case XLAT_FUNC_UNRESOLVED:
 		case XLAT_VIRTUAL:
-		case XLAT_VIRTUAL_UNRESOLVED:
 			fr_assert(0);
 			return -1;
 

src/lib/unlang/xlat_tokenize.c

@@ -567,21 +567,17 @@ static CC_HINT(nonnull(1,2,4)) ssize_t xlat_tokenize_attribute(xlat_exp_head_t *
 		}
 
 		/*
-		 *	We don't know it's virtual but
-		 *	we don't know it's not either...
-		 *
-		 *	Mark it up as virtual-unresolved
-		 *	and let the resolution code figure
-		 *	this out in a later pass.
+		 *	Try to resolve it later
 		 */
-		xlat_exp_set_type(node, XLAT_VIRTUAL_UNRESOLVED);
+		xlat_exp_set_type(node, XLAT_TMPL);
 		xlat_exp_set_name_shallow(node, vpt->name);
 		node->vpt = vpt;
 		node->flags.needs_resolving = true;
-	/*
-	 *	Deal with normal attribute (or list)
-	 */
+
 	} else {
+		/*
+		 *	Deal with normal attribute (or list)
+		 */
 		xlat_exp_set_type(node, XLAT_TMPL);
 		xlat_exp_set_name_shallow(node, vpt->name);
 		node->vpt = vpt;
@@ -1038,11 +1034,6 @@ static void _xlat_debug_node(xlat_exp_t const *node, int depth)
 		INFO_INDENT("virtual (%s)", node->fmt);
 		break;
 
-	case XLAT_VIRTUAL_UNRESOLVED:
-		fr_assert(node->fmt != NULL);
-		INFO_INDENT("virtual-unresolved (%s)", node->fmt);
-		break;
-
 	case XLAT_FUNC:
 		fr_assert(node->call.func != NULL);
 		INFO_INDENT("func (%s)", node->call.func->name);
@@ -1288,10 +1279,6 @@ ssize_t xlat_print_node(fr_sbuff_t *out, xlat_exp_head_t const *head, xlat_exp_t
 		FR_SBUFF_IN_BSTRCPY_BUFFER_RETURN(out, node->call.func->name);
 		break;
 
-	case XLAT_VIRTUAL_UNRESOLVED:
-		FR_SBUFF_IN_BSTRCPY_BUFFER_RETURN(out, node->fmt);
-		break;
-
 	case XLAT_FUNC:
 		FR_SBUFF_IN_BSTRCPY_BUFFER_RETURN(out, node->call.func->name);
 		FR_SBUFF_IN_CHAR_RETURN(out, '(');
@@ -1927,48 +1914,6 @@ int xlat_resolve(xlat_exp_head_t *head, xlat_res_rules_t const *xr_rules)
 			node->flags.impure_func = !node->call.func->flags.pure;
 			break;
 
-		/*
-		 *	This covers unresolved attributes as well as
-		 *	unresolved functions.
-		 */
-		case XLAT_VIRTUAL_UNRESOLVED:
-		{
-			if (xlat_resolve_virtual_attribute(node, node->vpt) == 0) break;
-
-			/*
-			 *	Try and resolve (in-place) as an attribute
-			 */
-			if ((tmpl_resolve(node->vpt, xr_rules->tr_rules) < 0) ||
-			    (node->vpt->type != TMPL_TYPE_ATTR)) {
-				/*
-				 *	FIXME - Produce proper error with marker
-				 */
-				if (!xr_rules->allow_unresolved) {
-				error_unresolved:
-					if (node->quote == T_BARE_WORD) {
-						fr_strerror_printf_push("Failed resolving expansion: %s",
-									node->fmt);
-					} else {
-						fr_strerror_printf_push("Failed resolving expansion: %c%s%c",
-									fr_token_quote[node->quote], node->fmt, fr_token_quote[node->quote]);
-					}
-					return -1;
-				}
-				break;
-			}
-
-			/*
-			 *	Just need to flip the type as the tmpl should already have been fixed up
-			 */
-			xlat_exp_set_type(node, XLAT_TMPL);
-
-			/*
-			 *	Reset node flags.  Attributes aren't pure, and don't need further resolving.
-			 */
-			node->flags = (xlat_flags_t){ };
-		}
-			break;
-
 		case XLAT_TMPL:
 			/*
 			 *	Double-quoted etc. strings may contain xlats, so we try to resolve them now.
@@ -1986,7 +1931,15 @@ int xlat_resolve(xlat_exp_head_t *head, xlat_res_rules_t const *xr_rules)
 			return -1;
 		}
 
-		if (node->flags.needs_resolving && !xr_rules->allow_unresolved) goto error_unresolved;
+		if (node->flags.needs_resolving && !xr_rules->allow_unresolved) {
+			if (node->quote == T_BARE_WORD) {
+				fr_strerror_printf_push("Failed resolving attribute: %s",
+							node->fmt);
+			} else {
+				fr_strerror_printf_push("Failed resolving attribute: %c%s%c",
+							fr_token_quote[node->quote], node->fmt, fr_token_quote[node->quote]);
+			}
+		}
 
 		xlat_flags_merge(&our_flags, &node->flags);
 	}