[master] 1a5c5f1 Minor polish

[Poul-Henning Kamp]

commit 1a5c5f18c82321cfa19ac5d9b415b35391381792
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jan 24 09:38:34 2018 +0000

    Minor polish

diff --git a/lib/libvcc/vcc_acl.c b/lib/libvcc/vcc_acl.c
index ca27856..ba45ee2 100644
--- a/lib/libvcc/vcc_acl.c
+++ b/lib/libvcc/vcc_acl.c
@@ -470,7 +470,6 @@ vcc_ParseAcl(struct vcc *tl)
 	vcc_ExpectVid(tl, "ACL");
 	ERRCHK(tl);
 	sym = VCC_HandleSymbol(tl, ACL, ACL_SYMBOL_PREFIX);
-	vcc_NextToken(tl);
 
 	ERRCHK(tl);
 	AN(sym);
diff --git a/lib/libvcc/vcc_backend.c b/lib/libvcc/vcc_backend.c
index a5a693f..1655f92 100644
--- a/lib/libvcc/vcc_backend.c
+++ b/lib/libvcc/vcc_backend.c
@@ -259,7 +259,6 @@ vcc_ParseProbe(struct vcc *tl)
 	ERRCHK(tl);
 	t_probe = tl->t;
 	sym = VCC_HandleSymbol(tl, PROBE, "vgc_probe");
-	vcc_NextToken(tl);
 
 	ERRCHK(tl);
 	AN(sym);
@@ -472,7 +471,6 @@ vcc_ParseBackend(struct vcc *tl)
 
 	t_be = tl->t;
 	sym = VCC_HandleSymbol(tl, BACKEND, "vgc_backend");
-	vcc_NextToken(tl);
 
 	ERRCHK(tl);
 
diff --git a/lib/libvcc/vcc_compile.h b/lib/libvcc/vcc_compile.h
index 74a42a5..6824ec3 100644
--- a/lib/libvcc/vcc_compile.h
+++ b/lib/libvcc/vcc_compile.h
@@ -318,8 +318,7 @@ void vcc_stevedore(struct vcc *vcc, const char *stv_name);
 void VCC_PrintCName(struct vsb *vsb, const char *b, const char *e);
 struct symbol *VCC_Symbol(struct vcc *, struct symbol *,
     const char *, const char *, enum symkind, int);
-#define VCC_SymbolTok(vcc, sym, kind, create) \
-    VCC_Symbol(vcc, sym, (vcc)->t->b, (vcc)->t->e, kind, create)
+struct symbol *VCC_SymbolTok(struct vcc *, struct symbol *, enum symkind, int);
 const char * VCC_SymKind(struct vcc *tl, const struct symbol *s);
 typedef void symwalk_f(struct vcc *tl, const struct symbol *s);
 void VCC_WalkSymbols(struct vcc *tl, symwalk_f *func, enum symkind kind);
diff --git a/lib/libvcc/vcc_symb.c b/lib/libvcc/vcc_symb.c
index a485df6..c743767 100644
--- a/lib/libvcc/vcc_symb.c
+++ b/lib/libvcc/vcc_symb.c
@@ -105,6 +105,14 @@ vcc_new_symbol(struct vcc *tl, const char *b, const char *e)
 }
 
 struct symbol *
+VCC_SymbolTok(struct vcc *tl, struct symbol *parent,
+    enum symkind kind, int create)
+{
+
+	return (VCC_Symbol(tl, parent, tl->t->b, tl->t->e, kind, create));
+}
+
+struct symbol *
 VCC_Symbol(struct vcc *tl, struct symbol *parent,
     const char *b, const char *e, enum symkind kind, int create)
 {
@@ -269,5 +277,6 @@ VCC_HandleSymbol(struct vcc *tl, vcc_type_t fmt, const char *pfx)
 	sym->ndef = 1;
 	if (sym->def_b == NULL)
 		sym->def_b = tl->t;
+	vcc_NextToken(tl);
 	return (sym);
 }
diff --git a/lib/libvcc/vcc_vmod.c b/lib/libvcc/vcc_vmod.c
index 21a7216..79adcb6 100644
--- a/lib/libvcc/vcc_vmod.c
+++ b/lib/libvcc/vcc_vmod.c
@@ -284,8 +284,6 @@ vcc_ParseNew(struct vcc *tl)
 	/* We allow implicit use of VMOD objects:  Pretend it's ref'ed */
 	sy1->nref++;
 
-	vcc_NextToken(tl);
-
 	ExpectErr(tl, '=');
 	vcc_NextToken(tl);