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 2001/05/04 00:14:06 UTC

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

dbertoni    01/05/03 15:14:06

  Modified:    c/src/XPath SimpleNodeLocator.cpp SimpleNodeLocator.hpp
  Log:
  Removed nodeTest() overload.
  
  Revision  Changes    Path
  1.38      +11 -16    xml-xalan/c/src/XPath/SimpleNodeLocator.cpp
  
  Index: SimpleNodeLocator.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/SimpleNodeLocator.cpp,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- SimpleNodeLocator.cpp	2001/05/02 15:52:41	1.37
  +++ SimpleNodeLocator.cpp	2001/05/03 22:14:02	1.38
  @@ -463,6 +463,7 @@
   			score = nodeTest(xpath,
   							 executionContext,
   							 context,
  +							 context->getNodeType(),
   							 opPos,
   							 argLen,
   							 XPathExpression::eFROM_ATTRIBUTES);
  @@ -702,6 +703,7 @@
   			const double	score = nodeTest(xpath,
   											 executionContext,
   											 theParent,
  +											 theParent->getNodeType(),
   											 opPos,
   											 argLen,
   											 stepType);
  @@ -746,6 +748,7 @@
   		const double	score = nodeTest(xpath,
   										 executionContext,
   										 context,
  +			 							 context->getNodeType(),
   										 opPos,
   										 argLen,
   										 stepType);
  @@ -792,6 +795,7 @@
   		const double	score = nodeTest(xpath,
   										 executionContext,
   										 contextNode,
  +										 contextNode->getNodeType(),
   										 opPos,
   										 argLen,
   										 stepType);
  @@ -838,6 +842,7 @@
   		const double	score = nodeTest(xpath,
   										 executionContext,
   										 contextNode,
  +										 contextNode->getNodeType(),
   										 opPos,
   										 argLen,
   										 stepType);
  @@ -941,6 +946,7 @@
   		const double	score = nodeTest(xpath,
   										 executionContext,
   										 child,
  +										 child->getNodeType(),
   										 opPos,
   										 argLen,
   										 stepType);
  @@ -999,6 +1005,7 @@
   			const double	score = nodeTest(xpath,
   											 executionContext,
   											 pos,
  +											 pos->getNodeType(),
   											 opPos,
   											 argLen,
   											 stepType);
  @@ -1071,6 +1078,7 @@
   			const double	score = nodeTest(xpath,
   											 executionContext,
   											 pos,
  +											 pos->getNodeType(),
   											 opPos,
   											 argLen,
   											 stepType);
  @@ -1154,6 +1162,7 @@
   		const double	score = nodeTest(xpath,
   										 executionContext,
   										 pos,
  +										 pos->getNodeType(),
   										 opPos,
   										 argLen,
   										 stepType);
  @@ -1214,6 +1223,7 @@
   		const double	score = nodeTest(xpath,
   										 executionContext,
   										 pos,
  +										 pos->getNodeType(),
   										 opPos,
   										 argLen,
   										 stepType);
  @@ -1306,6 +1316,7 @@
   		const double	score = nodeTest(xpath,
   										 executionContext,
   										 pos,
  +										 pos->getNodeType(),
   										 opPos,
   										 argLen,
   										 stepType);
  @@ -1689,22 +1700,6 @@
   	} // end switch(testType)
   
   	return score;
  -}
  -
  -
  -
  -inline double
  -SimpleNodeLocator::nodeTest(
  -			const XPath&			xpath,
  -			XPathExecutionContext&	executionContext,
  -			XalanNode*				context, 
  -			int 					opPos,
  -			int 					argLen,
  -			int 					stepType)
  -{
  -	assert(context != 0);
  -
  -	return nodeTest(xpath, executionContext, context, context->getNodeType(), opPos, argLen, stepType);
   }
   
   
  
  
  
  1.14      +0 -9      xml-xalan/c/src/XPath/SimpleNodeLocator.hpp
  
  Index: SimpleNodeLocator.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/SimpleNodeLocator.hpp,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- SimpleNodeLocator.hpp	2001/05/02 15:52:43	1.13
  +++ SimpleNodeLocator.hpp	2001/05/03 22:14:03	1.14
  @@ -287,15 +287,6 @@
   			const XPath&			xpath,
   			XPathExecutionContext&	executionContext,
   			XalanNode* 				context,
  -			int 					opPos,
  -			int 					argLen,
  -			int 					stepType);
  -
  -	double
  -	nodeTest(
  -			const XPath&			xpath,
  -			XPathExecutionContext&	executionContext,
  -			XalanNode* 				context,
   			XalanNode::NodeType		nodeType,
   			int 					opPos,
   			int 					argLen,
  
  
  

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