From d74f39e9bdd73a662a3166e06cbe14af64579ee1 Mon Sep 17 00:00:00 2001 From: "axel%pike.org" Date: Tue, 9 Jan 2001 20:56:28 +0000 Subject: [PATCH] Not part of the build, fixes QNames really ending when hitting whitespace --- extensions/transformiix/source/xpath/ExprLexer.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/extensions/transformiix/source/xpath/ExprLexer.cpp b/extensions/transformiix/source/xpath/ExprLexer.cpp index 8041ca50c4ef..6a202b685397 100644 --- a/extensions/transformiix/source/xpath/ExprLexer.cpp +++ b/extensions/transformiix/source/xpath/ExprLexer.cpp @@ -29,13 +29,13 @@ * -- Fixed bug in parse method so that we make sure we check for * axis identifier wild cards, such as ancestor::* * - * $Id: ExprLexer.cpp,v 1.8 2000/11/07 08:30:51 kvisco%ziplink.net Exp $ + * $Id: ExprLexer.cpp,v 1.9 2001/01/09 20:56:28 axel%pike.org Exp $ */ /** * Lexical analyzer for XPath expressions * @author Keith Visco - * @version $Revision: 1.8 $ $Date: 2000/11/07 08:30:51 $ + * @version $Revision: 1.9 $ $Date: 2001/01/09 20:56:28 $ **/ #include @@ -631,7 +631,10 @@ void ExprLexer::parse(const String& pattern) { matchDelimiter(ch); break; case HYPHEN : - if ( isValidQName(tokenBuffer) ) tokenBuffer.append(ch); + if ( isValidQName(tokenBuffer) && + !( prevCh==SPACE || prevCh==TX_TAB|| + prevCh==TX_CR || prevCh==TX_LF ) ) + tokenBuffer.append(ch); else { switch ( prevToken->type ) { case Token::NULL_TOKEN: