PATCH: bad debug test stripping quotes.

PATCH: bad debug test stripping quotes.

[Peter Stephenson]

Talking of fiddly little changes, if you have debugging turned on and
try to strip quotes from an expression needing RCQUOTES handling:

% ARG="'this is OK, isn''t it?'"
% print -r ${(Q)ARG}
Oops. Bug in parse_subst_string: len < l
'this is OK, isn't it?'

We could probably salvage the test with some ingenuity, but frankly I'd
rather it just worked for now...

Index: Src/lex.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/lex.c,v
retrieving revision 1.34
diff -u -r1.34 lex.c
--- Src/lex.c	10 Jul 2006 13:08:23 -0000	1.34
+++ Src/lex.c	13 Dec 2006 18:44:32 -0000
@@ -1536,9 +1536,13 @@
 	return 1;
     }
 #ifdef DEBUG
-    if (c != STRING || olen != l || errflag) {
+    /*
+     * Historical note: we used to check here for olen == l, but
+     * that's not necessarily the case if we stripped an RCQUOTE.
+     */
+    if (c != STRING || errflag) {
 	fprintf(stderr, "Oops. Bug in parse_subst_string: %s\n",
-		olen < l ? "len < l" : errflag ? "errflag" : "c != STRING");
+		errflag ? "errflag" : "c != STRING");
 	fflush(stderr);
 	untokenize(s);
 	return 1;

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


To access the latest news from CSR copy this link into a web browser:  http://www.csr.com/email_sig.php