[master] ce467f2 Get rid of SYM_WILDCARD, check the ->wildcard field instead.

[Poul-Henning Kamp]

commit ce467f20123a1e3a8a73373bd0bbfb4b93d14371
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jun 8 15:30:07 2016 +0000

    Get rid of SYM_WILDCARD, check the ->wildcard field instead.

diff --git a/include/tbl/symbol_kind.h b/include/tbl/symbol_kind.h
index bd90016..1ec18f4 100644
--- a/include/tbl/symbol_kind.h
+++ b/include/tbl/symbol_kind.h
@@ -40,5 +40,4 @@ VCC_SYMB(STEVEDORE,	stevedore)
 VCC_SYMB(SUB,		sub)		/* VCL subroutine */
 VCC_SYMB(VAR,		var)
 VCC_SYMB(VMOD,		vmod)
-VCC_SYMB(WILDCARD,	wildcard)
 /*lint -restore */
diff --git a/lib/libvcc/vcc_compile.c b/lib/libvcc/vcc_compile.c
index 6254794..35cf4f0 100644
--- a/lib/libvcc/vcc_compile.c
+++ b/lib/libvcc/vcc_compile.c
@@ -560,7 +560,7 @@ vcc_CompileSource(struct vcc *tl, struct source *sp)
 	for (v = vcc_vars; v->name != NULL; v++) {
 		if (v->fmt == HEADER) {
 			sym = VCC_Symbol(tl, NULL, v->name, NULL,
-			    SYM_WILDCARD, 1);
+			    SYM_NONE, 1);
 			sym->wildcard = vcc_Var_Wildcard;
 			sym->wildcard_priv = v;
 		} else {
@@ -574,7 +574,7 @@ vcc_CompileSource(struct vcc *tl, struct source *sp)
 		sym->lname = v->lname;
 	}
 
-	sym = VCC_Symbol(tl, NULL, "storage", NULL, SYM_WILDCARD, 1);
+	sym = VCC_Symbol(tl, NULL, "storage", NULL, SYM_NONE, 1);
 	sym->wildcard = vcc_Stv_Wildcard;
 
 	Fh(tl, 0, "/* ---===### VCC generated .h code ###===---*/\n");
diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index ee12862..701555a 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -133,7 +133,7 @@ VCC_Symbol(struct vcc *tl, struct symbol *parent,
 			continue;
 		break;
 	}
-	if (sym == NULL && create == 0 && parent->kind == SYM_WILDCARD) {
+	if (sym == NULL && create == 0 && parent->wildcard != NULL) {
 		AN(parent->wildcard);
 		parent->wildcard(tl, parent, b, e);
 		if (tl->err)