Collapse the "VAR" token into ID.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5005 d4fa192b-c00b-0410-8231-f00ffab90ce4

lib/libvcl/generate.py

@@ -67,7 +67,6 @@ tokens = {
 
 	# These have handwritten recognizers
 	"ID":		None,
-	"VAR":		None,
 	"CNUM":		None,
 	"CSTR":		None,
 	"EOI":		None,

lib/libvcl/vcc_action.c

@@ -68,7 +68,7 @@ parse_error(struct vcc *tl)
 	struct var *vp;
 
 	vcc_NextToken(tl);
-	if (tl->t->tok == VAR) {
+	if (tl->t->tok == ID) {
 		vp = vcc_FindVar(tl, tl->t, vcc_vars, 0, "read");
 		ERRCHK(tl);
 		assert(vp != NULL);
@@ -85,7 +85,7 @@ parse_error(struct vcc *tl)
 	if (tl->t->tok == CSTR) {
 		Fb(tl, 0, ", %.*s", PF(tl->t));
 		vcc_NextToken(tl);
-	} else if (tl->t->tok == VAR) {
+	} else if (tl->t->tok == ID) {
 		Fb(tl, 0, ", ");
 		if (!vcc_StringVal(tl)) {
 			ERRCHK(tl);
@@ -118,7 +118,7 @@ parse_set(struct vcc *tl)
 	struct token *at, *vt;
 
 	vcc_NextToken(tl);
-	ExpectErr(tl, VAR);
+	ExpectErr(tl, ID);
 	vt = tl->t;
 	vp = vcc_FindVar(tl, tl->t, vcc_vars, 1, "set");
 	ERRCHK(tl);
@@ -240,7 +240,7 @@ parse_unset(struct vcc *tl)
 	struct var *vp;
 
 	vcc_NextToken(tl);
-	ExpectErr(tl, VAR);
+	ExpectErr(tl, ID);
 	vp = vcc_FindVar(tl, tl->t, vcc_vars, 1, "unset");
 	ERRCHK(tl);
 	assert(vp != NULL);
@@ -277,11 +277,11 @@ parse_purge(struct vcc *tl)
 	ExpectErr(tl, '(');
 	vcc_NextToken(tl);
 
-	if (tl->t->tok == VAR) {
+	if (tl->t->tok == ID) {
 		Fb(tl, 1, "VRT_ban(sp,\n");
 		tl->indent += INDENT;
 		while (1) {
-			ExpectErr(tl, VAR);
+			ExpectErr(tl, ID);
 
 			/* Check valididity of purge variable */
 			for (pv = purge_var; pv->name != NULL; pv++) {

lib/libvcl/vcc_fixed_token.c

@@ -152,7 +152,6 @@ const char * const vcl_tnames[256] = {
 	[T_NOMATCH] = "!~",
 	[T_SHL] = "<<",
 	[T_SHR] = ">>",
-	[VAR] = "VAR",
 };
 
 void
@@ -246,8 +245,8 @@ vcl_output_lang_h(struct vsb *sb)
 	    "OF LIABILITY, WHETHER IN CONTRACT, STRICT\n * LIABILITY, OR "
 	    "TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY\n"
 	    " * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE "
-	    "POSSIBILITY OF\n * SUCH DAMAGE.\n *\n * $Id: vrt.h 4984 2010-06-"
-	    "22 13:01:22Z phk $\n *\n * Runtime support for compiled VCL "
+	    "POSSIBILITY OF\n * SUCH DAMAGE.\n *\n * $Id: vrt.h 5001 2010-07-"
+	    "04 14:40:33Z phk $\n *\n * Runtime support for compiled VCL "
 	    "programs.\n *\n * XXX: When this file is changed, lib/libvcl/gen"
 	    "erate.py *MUST* be rerun.\n */\n\nstruct sess;\nstruct vsb;\n"
 	    "struct cli;\nstruct director;\nstruct VCL_conf;\n"
@@ -296,6 +295,7 @@ vcl_output_lang_h(struct vsb *sb)
 	    "const char *);\nvoid VRT_SetHdr(const struct sess *, enum "
 	    "gethdr_e where, const char *,\n    const char *, ...);\n"
 	    "void VRT_handling(struct sess *sp, unsigned hand);\n"
+	    "\nvoid VRT_hashdata(struct sess *sp, const char *str, ...);\n"
 	    "\n/* Simple stuff */\nint VRT_strcmp(const char *s1, const "
 	    "char *s2);\nvoid VRT_memmove(void *dst, const void *src, unsigne"
 	    "d len);\n\nvoid VRT_ESI(struct sess *sp);\nvoid VRT_Rollback(str"
@@ -315,7 +315,7 @@ vcl_output_lang_h(struct vsb *sb)
 
 	/* ../../include/vrt_obj.h */
 
-	vsb_cat(sb, "\n/*\n * $Id: vrt_obj.h 5000 2010-07-04 14:15:28Z "
+	vsb_cat(sb, "\n/*\n * $Id: vrt_obj.h 5001 2010-07-04 14:40:33Z "
 	    "phk $\n *\n * NB:  This file is machine generated, DO NOT "
 	    "EDIT!\n *\n * Edit and run generate.py instead\n */\n"
 	    "struct sockaddr * VRT_r_client_ip(const struct sess *);\n"
@@ -328,9 +328,8 @@ vcl_output_lang_h(struct vsb *sb)
 	    "onst struct sess *);\nvoid VRT_l_req_url(const struct sess "
 	    "*, const char *, ...);\nconst char * VRT_r_req_proto(const "
 	    "struct sess *);\nvoid VRT_l_req_proto(const struct sess *, "
-	    "const char *, ...);\nvoid VRT_l_req_hash(struct sess *, const "
-	    "char *);\nstruct director * VRT_r_req_backend(struct sess "
-	    "*);\nvoid VRT_l_req_backend(struct sess *, struct director "
+	    "const char *, ...);\nstruct director * VRT_r_req_backend(struct "
+	    "sess *);\nvoid VRT_l_req_backend(struct sess *, struct director "
 	    "*);\nint VRT_r_req_restarts(const struct sess *);\n"
 	    "double VRT_r_req_grace(struct sess *);\nvoid VRT_l_req_grace(str"
 	    "uct sess *, double);\nconst char * VRT_r_req_xid(struct sess "

lib/libvcl/vcc_parse.c

@@ -339,7 +339,7 @@ vcc_Cond_2(struct vcc *tl)
 		vcc_NextToken(tl);
 		vcc_Cond_0(tl);
 		SkipToken(tl, ')');
-	} else if (tl->t->tok == VAR) {
+	} else if (tl->t->tok == ID) {
 		vp = vcc_FindVar(tl, tl->t, vcc_vars, 0, "read");
 		ERRCHK(tl);
 		assert(vp != NULL);

lib/libvcl/vcc_string.c

@@ -158,7 +158,7 @@ vcc_StringVal(struct vcc *tl)
 		vcc_NextToken(tl);
 		return 1;
 	}
-	if (tl->t->tok == VAR) {
+	if (tl->t->tok == ID) {
 		vp = vcc_FindVar(tl, tl->t, vcc_vars, 0, "read");
 		if (tl->err)
 			return (0);

lib/libvcl/vcc_token.c

@@ -462,16 +462,9 @@ vcc_Lexer(struct vcc *tl, struct source *sp)
 		/* Match Identifiers */
 		if (isident1(*p)) {
 			for (q = p; q < sp->e; q++)
-				if (!isident(*q))
+				if (!isvar(*q))
 					break;
-			if (isvar(*q)) {
-				for (; q < sp->e; q++)
-					if (!isvar(*q))
-						break;
-				vcc_AddToken(tl, VAR, p, q);
-			} else {
-				vcc_AddToken(tl, ID, p, q);
-			}
+			vcc_AddToken(tl, ID, p, q);
 			p = q;
 			continue;
 		}

lib/libvcl/vcc_token_defs.h

@@ -31,4 +31,3 @@
 #define	T_NOMATCH 150
 #define	T_SHL 151
 #define	T_SHR 152
-#define	VAR 153