r1336 - in branches/1.0: . lib/libvcl
des at projects.linpro.no
des at projects.linpro.no
Thu Apr 19 16:50:58 CEST 2007
Author: des
Date: 2007-04-19 16:50:58 +0200 (Thu, 19 Apr 2007)
New Revision: 1336
Modified:
branches/1.0/
branches/1.0/lib/libvcl/vcc_fixed_token.c
branches/1.0/lib/libvcl/vcc_gen_fixed_token.tcl
Log:
r37069 at cat (orig r1293): phk | 2007-03-31 20:20:33 +0200
Fix typo, so we correctly recognize '-=' as T_DECR token.
Property changes on: branches/1.0
___________________________________________________________________
Name: svk:merge
- d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1292
+ d4fa192b-c00b-0410-8231-f00ffab90ce4:/trunk/varnish-cache:1293
Modified: branches/1.0/lib/libvcl/vcc_fixed_token.c
===================================================================
--- branches/1.0/lib/libvcl/vcc_fixed_token.c 2007-04-19 14:50:57 UTC (rev 1335)
+++ branches/1.0/lib/libvcl/vcc_fixed_token.c 2007-04-19 14:50:58 UTC (rev 1336)
@@ -85,6 +85,10 @@
}
return (0);
case '-':
+ if (p[0] == '-' && p[1] == '=') {
+ *q = p + 2;
+ return (T_DECR);
+ }
if (p[0] == '-' && p[1] == '-') {
*q = p + 2;
return (T_DEC);
@@ -103,10 +107,6 @@
case '/':
if (p[0] == '/' && p[1] == '=') {
*q = p + 2;
- return (T_DECR);
- }
- if (p[0] == '/' && p[1] == '=') {
- *q = p + 2;
return (T_DIV);
}
if (p[0] == '/') {
@@ -391,7 +391,7 @@
vcl_tnames[T_CAND] = "&&";
vcl_tnames[T_COR] = "||";
vcl_tnames[T_DEC] = "--";
- vcl_tnames[T_DECR] = "/=";
+ vcl_tnames[T_DECR] = "-=";
vcl_tnames[T_DELIVER] = "deliver";
vcl_tnames[T_DISCARD] = "discard";
vcl_tnames[T_DIV] = "/=";
Modified: branches/1.0/lib/libvcl/vcc_gen_fixed_token.tcl
===================================================================
--- branches/1.0/lib/libvcl/vcc_gen_fixed_token.tcl 2007-04-19 14:50:57 UTC (rev 1335)
+++ branches/1.0/lib/libvcl/vcc_gen_fixed_token.tcl 2007-04-19 14:50:58 UTC (rev 1336)
@@ -93,7 +93,7 @@
{">>" SHR}
{"<<" SHL}
{"+=" INCR}
- {"/=" DECR}
+ {"-=" DECR}
{"*=" MUL}
{"/=" DIV}
}
More information about the varnish-commit
mailing list