cvs commit: xml-xalan/src/org/apache/xalan/xpath XPathProcessorImpl.java

[mmidy]

mmidy       00/03/27 07:24:05

  Modified:    src/org/apache/xalan/xpath XPathProcessorImpl.java
  Log:
  Fix multiplication problem
  
  Revision  Changes    Path
  1.29      +5 -5      
xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java
  
  Index: XPathProcessorImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- XPathProcessorImpl.java   2000/03/17 03:06:33     1.28
  +++ XPathProcessorImpl.java   2000/03/27 15:24:05     1.29
  @@ -1551,17 +1551,17 @@
         if(tokenIs('*'))
         {
           nextToken();
  -        insertOp(opPos, 2, XPath.OP_MULT);
  +        insertOp(addPos, 2, XPath.OP_MULT);
           int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 
addPos;
           addPos = MultiplicativeExpr(addPos);
           m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
             = m_xpath.m_opMap[addPos+opPlusLeftHandLen+1] + opPlusLeftHandLen;
  -        addPos+=2;
  +        addPos+=2;        
         }
         else if(tokenIs("div"))
         {
           nextToken();
  -        insertOp(opPos, 2, XPath.OP_DIV);
  +        insertOp(addPos, 2, XPath.OP_DIV);
           int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 
addPos;
           addPos = MultiplicativeExpr(addPos);
           m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
  @@ -1571,7 +1571,7 @@
         else if(tokenIs("mod"))
         {
           nextToken();
  -        insertOp(opPos, 2, XPath.OP_MOD);
  +        insertOp(addPos, 2, XPath.OP_MOD);
           int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 
addPos;
           addPos = MultiplicativeExpr(addPos);
           m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]
  @@ -1581,7 +1581,7 @@
         else if(tokenIs("quo"))
         {
           nextToken();
  -        insertOp(opPos, 2, XPath.OP_QUO);
  +        insertOp(addPos, 2, XPath.OP_QUO);
           int opPlusLeftHandLen = m_xpath.m_opMap[XPath.MAPINDEX_LENGTH] - 
addPos;
           addPos = MultiplicativeExpr(addPos);
           m_xpath.m_opMap[addPos + XPath.MAPINDEX_LENGTH]