You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2002/10/09 18:49:17 UTC

cvs commit: xml-xalan/c/src/XPath XPathProcessorImpl.cpp

dbertoni    2002/10/09 09:49:17

  Modified:    c/src/XPath XPathProcessorImpl.cpp
  Log:
  Make sure . and .. are considered as axes.
  
  Revision  Changes    Path
  1.62      +7 -2      xml-xalan/c/src/XPath/XPathProcessorImpl.cpp
  
  Index: XPathProcessorImpl.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XPathProcessorImpl.cpp,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- XPathProcessorImpl.cpp	25 Sep 2002 04:39:16 -0000	1.61
  +++ XPathProcessorImpl.cpp	9 Oct 2002 16:49:17 -0000	1.62
  @@ -2007,7 +2007,7 @@
   
   	int		nodeTestPos = -1;
   
  -	if(lookahead(XalanUnicode::charLeftParenthesis, 1) == true)
  +	if (lookahead(XalanUnicode::charLeftParenthesis, 1) == true)
   	{
   		const XPathExpression::eOpCodes		theOpCode = getNodeTypeToken(m_token);
   
  @@ -2063,7 +2063,7 @@
   			m_expression->appendOpCode(XPathExpression::eEMPTY);
   		}
   
  -		if(tokenIs(XalanUnicode::charAsterisk) == true)
  +		if (tokenIs(XalanUnicode::charAsterisk) == true)
   		{
   			m_expression->appendOpCode(XPathExpression::eELEMWILDCARD);
   		}
  @@ -2544,6 +2544,11 @@
   	}
   	else if (theLength == 1 &&
   			 charAt(theToken, 0) == XalanUnicode::charCommercialAt)
  +	{
  +		return true;
  +	}
  +	else if (equals(theToken, s_dotString) == true ||
  +			 equals(theToken, s_dotDotString) == true)
   	{
   		return true;
   	}
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org