re-enable alternation test

so it now complains about old-style alternations.  Mostly.

If the complaints cause problems, this commit can be reverted.
And then the ":-" text will just get parsed as a static string.

Author: alandekok

src/lib/unlang/xlat_tokenize.c

@@ -96,8 +96,7 @@ static fr_sbuff_escape_rules_t const xlat_escape = {
 
 /** Parse rules for literal values inside of an expansion
  *
- * These rules are used to parse literals as arguments to functions and
- * on the RHS of alternations.
+ * These rules are used to parse literals as arguments to functions.
  *
  * The caller sets the literal parse rules for outside of expansions when they
  * call xlat_tokenize.
@@ -836,7 +835,14 @@ static CC_HINT(nonnull(1,2,4)) ssize_t xlat_tokenize_input(xlat_exp_head_t *head
 		 */
 		if (fr_sbuff_adv_past_str_literal(&our_in, "%{")) {
 			TALLOC_FREE(node); /* nope, couldn't use it */
+
 			if (xlat_tokenize_expansion(head, &our_in, t_rules) < 0) goto error;
+
+			if (fr_sbuff_is_str_literal(&our_in, ":-")) {
+				fr_strerror_const("Old style alternation of %{...:-...} is no longer supported");
+				goto error;
+			}
+
 		next:
 			fr_sbuff_marker_release(&m_s);
 			continue;

…/tests/keywords/alternation-error.ignore src/tests/keywords/alternation-errorsrc/tests/keywords/alternation-error.ignore renamed to src/tests/keywords/alternation-error src/tests/keywords/alternation-error.ignore renamed to src/tests/keywords/alternation-error

@@ -54,5 +54,8 @@ match ERROR offset 23: Missing closing brace
 xlat %{%{User-Name}:}
 match %{%{User-Name}:}
 
+xlat %{%{User-Name}:-"foo"}
+match ERROR offset 15: Old style alternation of %{...:-...} is no longer supported
+
 count
-match 33
+match 35