cvs commit: xml-xalan/c/src/XPath FunctionSum.hpp XNodeSet.cpp XObject.cpp XPathProcessorImpl.cpp XResultTreeFrag.cpp XString.cpp

[dbertoni]

dbertoni    00/07/13 15:22:33

  Modified:    c/src/XPath FunctionSum.hpp XNodeSet.cpp XObject.cpp
                        XPathProcessorImpl.cpp XResultTreeFrag.cpp
                        XString.cpp
  Log:
  Changed code to use DoubleSupport::toDouble() instead of WideStringToDouble().
  
  Revision  Changes    Path
  1.6       +2 -1      xml-xalan/c/src/XPath/FunctionSum.hpp
  
  Index: FunctionSum.hpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionSum.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- FunctionSum.hpp   2000/04/11 14:46:08     1.5
  +++ FunctionSum.hpp   2000/07/13 22:22:31     1.6
  @@ -69,6 +69,7 @@
   
   
   #include <PlatformSupport/DOMStringHelper.hpp>
  +#include <PlatformSupport/DoubleSupport.hpp>
   
   
   
  @@ -118,7 +119,7 @@
   
                for (unsigned int i = 0; i < count; i++)
                {
  -                     sum += 
DOMStringToDouble(executionContext.getNodeData(*nl.item(i)));
  +                     sum += 
DoubleSupport::toDouble(executionContext.getNodeData(*nl.item(i)));
                }
   
                return executionContext.getXObjectFactory().createNumber(sum);
  
  
  
  1.8       +2 -2      xml-xalan/c/src/XPath/XNodeSet.cpp
  
  Index: XNodeSet.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSet.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XNodeSet.cpp      2000/07/07 22:53:27     1.7
  +++ XNodeSet.cpp      2000/07/13 22:22:31     1.8
  @@ -172,9 +172,9 @@
        if (m_cachedNumberValue == 0.0)
        {
   #if defined(XALAN_NO_MUTABLE)
  -             ((XString*)this)->m_cachedNumberValue = 
DOMStringToDouble(str());
  +             ((XString*)this)->m_cachedNumberValue = 
DoubleSupport::toDouble(str());
   #else
  -             m_cachedNumberValue = DOMStringToDouble(str());
  +             m_cachedNumberValue = DoubleSupport::toDouble(str());
   #endif
        }
   
  
  
  
  1.8       +1 -1      xml-xalan/c/src/XPath/XObject.cpp
  
  Index: XObject.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XObject.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XObject.cpp       2000/07/12 21:46:51     1.7
  +++ XObject.cpp       2000/07/13 22:22:31     1.8
  @@ -186,7 +186,7 @@
                        const XalanNode&        theNode,
                        XPathSupport*           theXPathSupport)
   {
  -     return DOMStringToDouble(getStringFromNode(theNode, theXPathSupport));
  +     return DoubleSupport::toDouble(getStringFromNode(theNode, 
theXPathSupport));
   }
   
   
  
  
  
  1.15      +2 -1      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- XPathProcessorImpl.cpp    2000/07/06 20:16:28     1.14
  +++ XPathProcessorImpl.cpp    2000/07/13 22:22:32     1.15
  @@ -64,6 +64,7 @@
   
   #include <PlatformSupport/DOMStringHelper.hpp>
   #include <PlatformSupport/DOMStringPrintWriter.hpp>
  +#include <PlatformSupport/DoubleSupport.hpp>
   
   
   
  @@ -2117,7 +2118,7 @@
        {
                // Mutate the token to remove the quotes and have the XNumber 
object
                // already made.
  -             const double    num = DOMStringToDouble(m_token);
  +             const double    num = DoubleSupport::toDouble(m_token);
   
                XObject* const  theArgument =
                        m_xobjectFactory->createNumber(num);
  
  
  
  1.6       +2 -1      xml-xalan/c/src/XPath/XResultTreeFrag.cpp
  
  Index: XResultTreeFrag.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XResultTreeFrag.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- XResultTreeFrag.cpp       2000/07/06 20:16:28     1.5
  +++ XResultTreeFrag.cpp       2000/07/13 22:22:32     1.6
  @@ -65,6 +65,7 @@
   
   
   #include <PlatformSupport/DOMStringHelper.hpp>
  +#include <PlatformSupport/DoubleSupport.hpp>
   
   
   
  @@ -138,7 +139,7 @@
   {
        const XalanDOMString    theValue = 
m_support->getNodeData(*m_value.get());
   
  -     return DOMStringToDouble(theValue);
  +     return DoubleSupport::toDouble(theValue);
   }
   
   
  
  
  
  1.7       +3 -2      xml-xalan/c/src/XPath/XString.cpp
  
  Index: XString.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XPath/XString.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XString.cpp       2000/07/07 22:53:28     1.6
  +++ XString.cpp       2000/07/13 22:22:32     1.7
  @@ -64,6 +64,7 @@
   
   
   #include <PlatformSupport/DOMStringHelper.hpp>
  +#include <PlatformSupport/DoubleSupport.hpp>
   
   
   
  @@ -138,9 +139,9 @@
        if (m_cachedNumberValue == 0.0)
        {
   #if defined(XALAN_NO_MUTABLE)
  -             ((XString*)this)->m_cachedNumberValue = 
DOMStringToDouble(m_value);
  +             ((XString*)this)->m_cachedNumberValue = 
DoubleSupport::toDouble(m_value);
   #else
  -             m_cachedNumberValue = DOMStringToDouble(m_value);
  +             m_cachedNumberValue = DoubleSupport::toDouble(m_value);
   #endif
        }