dbertoni 2002/10/03 23:58:08
Modified: c/src/XPath FunctionStringLength.cpp XBoolean.cpp
XBoolean.hpp XNodeSetBase.cpp XNodeSetBase.hpp
XNull.cpp XNull.hpp XNumber.cpp XNumber.hpp
XNumberBase.cpp XNumberBase.hpp XObject.hpp
XString.cpp XString.hpp XStringAdapter.cpp
XStringAdapter.hpp XStringBase.cpp XStringBase.hpp
XStringCached.cpp XStringCached.hpp
XStringReference.cpp XStringReference.hpp
XToken.cpp XToken.hpp XTokenNumberAdapter.cpp
XTokenNumberAdapter.hpp XTokenStringAdapter.cpp
XTokenStringAdapter.hpp XUnknown.cpp XUnknown.hpp
Log:
Added new member function to determine length of string value.
Revision Changes Path
1.9 +1 -1 xml-xalan/c/src/XPath/FunctionStringLength.cpp
Index: FunctionStringLength.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/FunctionStringLength.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FunctionStringLength.cpp 20 Sep 2001 18:05:34 -0000 1.8
+++ FunctionStringLength.cpp 4 Oct 2002 06:58:07 -0000 1.9
@@ -124,7 +124,7 @@
{
assert(arg.null() == false);
- return
executionContext.getXObjectFactory().createNumber(length(arg->str()));
+ return
executionContext.getXObjectFactory().createNumber(arg->stringLength());
}
1.14 +9 -1 xml-xalan/c/src/XPath/XBoolean.cpp
Index: XBoolean.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XBoolean.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XBoolean.cpp 10 Apr 2002 06:03:11 -0000 1.13
+++ XBoolean.cpp 4 Oct 2002 06:58:07 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -156,6 +156,14 @@
+double
+XBoolean::stringLength() const
+{
+ return m_value == true ? s_trueString.length() : s_falseString.length();
+}
+
+
+
void
XBoolean::ProcessXObjectTypeCallback(XObjectTypeCallback&
theCallbackObject)
{
1.11 +4 -1 xml-xalan/c/src/XPath/XBoolean.hpp
Index: XBoolean.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XBoolean.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XBoolean.hpp 2 May 2001 15:52:45 -0000 1.10
+++ XBoolean.hpp 4 Oct 2002 06:58:07 -0000 1.11
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -122,6 +122,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+ virtual double
+ stringLength() const;
virtual void
ProcessXObjectTypeCallback(XObjectTypeCallback&
theCallbackObject);
1.5 +28 -1 xml-xalan/c/src/XPath/XNodeSetBase.cpp
Index: XNodeSetBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetBase.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XNodeSetBase.cpp 19 Oct 2001 18:37:47 -0000 1.4
+++ XNodeSetBase.cpp 4 Oct 2002 06:58:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -72,6 +72,7 @@
+#include "FormatterStringLengthCounter.hpp"
#include "XObjectTypeCallback.hpp"
#include "XPathExecutionContext.hpp"
@@ -196,6 +197,32 @@
assert(theNode != 0);
DOMServices::getNodeData(*theNode, theBuffer);
+ }
+}
+
+
+
+double
+XNodeSetBase::stringLength() const
+{
+ if (isEmpty(m_cachedStringValue) == false)
+ {
+ return length(m_cachedStringValue);
+ }
+ else if (getLength() == 0)
+ {
+ return 0;
+ }
+ else
+ {
+ const XalanNode* const theNode = item(0);
+ assert(theNode != 0);
+
+ FormatterStringLengthCounter theCounter;
+
+ DOMServices::getNodeData(*theNode, theCounter,
FormatterListener::characters);
+
+ return theCounter.getCount();
}
}
1.5 +3 -0 xml-xalan/c/src/XPath/XNodeSetBase.hpp
Index: XNodeSetBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNodeSetBase.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XNodeSetBase.hpp 1 Nov 2001 15:57:13 -0000 1.4
+++ XNodeSetBase.hpp 4 Oct 2002 06:58:07 -0000 1.5
@@ -126,6 +126,9 @@
virtual void
str(XalanDOMString& theBuffer) const;
+ virtual double
+ stringLength() const;
+
virtual const ResultTreeFragBase&
rtree() const;
1.12 +9 -1 xml-xalan/c/src/XPath/XNull.cpp
Index: XNull.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNull.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XNull.cpp 10 Apr 2002 06:03:11 -0000 1.11
+++ XNull.cpp 4 Oct 2002 06:58:07 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -132,6 +132,14 @@
FormatterListener& /* formatterListener */,
MemberFunctionPtr /* function */) const
{
+}
+
+
+
+double
+XNull::stringLength() const
+{
+ return 0;
}
1.12 +4 -1 xml-xalan/c/src/XPath/XNull.hpp
Index: XNull.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNull.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XNull.hpp 2 May 2001 15:52:51 -0000 1.11
+++ XNull.hpp 4 Oct 2002 06:58:07 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -116,6 +116,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+ virtual double
+ stringLength() const;
virtual void
ProcessXObjectTypeCallback(XObjectTypeCallback&
theCallbackObject);
1.17 +9 -1 xml-xalan/c/src/XPath/XNumber.cpp
Index: XNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumber.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- XNumber.cpp 10 Apr 2002 06:03:11 -0000 1.16
+++ XNumber.cpp 4 Oct 2002 06:58:07 -0000 1.17
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -159,4 +159,12 @@
m_value = theValue;
clear(m_cachedStringValue);
+}
+
+
+
+double
+XNumber::stringLength() const
+{
+ return length(str());
}
1.14 +4 -1 xml-xalan/c/src/XPath/XNumber.hpp
Index: XNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumber.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XNumber.hpp 6 Jun 2001 21:49:02 -0000 1.13
+++ XNumber.hpp 4 Oct 2002 06:58:07 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -111,6 +111,9 @@
virtual void
str(XalanDOMString& theBuffer) const;
+
+ virtual double
+ stringLength() const;
// These methods are new to XNumber...
1.3 +1 -1 xml-xalan/c/src/XPath/XNumberBase.cpp
Index: XNumberBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberBase.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XNumberBase.cpp 20 Sep 2001 18:05:34 -0000 1.2
+++ XNumberBase.cpp 4 Oct 2002 06:58:07 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.3 +4 -1 xml-xalan/c/src/XPath/XNumberBase.hpp
Index: XNumberBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XNumberBase.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XNumberBase.hpp 2 May 2001 15:52:55 -0000 1.2
+++ XNumberBase.hpp 4 Oct 2002 06:58:07 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -100,6 +100,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const = 0;
+
+ virtual double
+ stringLength() const = 0;
virtual void
ProcessXObjectTypeCallback(XObjectTypeCallback&
theCallbackObject);
1.23 +8 -0 xml-xalan/c/src/XPath/XObject.hpp
Index: XObject.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XObject.hpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XObject.hpp 4 Jan 2002 17:29:07 -0000 1.22
+++ XObject.hpp 4 Oct 2002 06:58:07 -0000 1.23
@@ -182,6 +182,14 @@
MemberFunctionPtr function) const = 0;
/**
+ * Get the length of the string value of the instance..
+ *
+ * @return The length of the string value
+ */
+ virtual double
+ stringLength() const = 0;
+
+ /**
* Append the string value directly a string
*
* @param theBuffer The buffer for the data
1.19 +9 -1 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XString.cpp 10 Apr 2002 06:03:11 -0000 1.18
+++ XString.cpp 4 Oct 2002 06:58:07 -0000 1.19
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -131,4 +131,12 @@
assert(length(m_value) ==
FormatterListener::size_type(length(m_value)));
(formatterListener.*function)(c_wstr(m_value),
FormatterListener::size_type(length(m_value)));
+}
+
+
+
+double
+XString::stringLength() const
+{
+ return length(m_value);
}
1.18 +4 -1 xml-xalan/c/src/XPath/XString.hpp
Index: XString.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XString.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- XString.hpp 27 Aug 2002 22:00:29 -0000 1.17
+++ XString.hpp 4 Oct 2002 06:58:07 -0000 1.18
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -113,6 +113,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+ virtual double
+ stringLength() const;
private:
1.4 +9 -1 xml-xalan/c/src/XPath/XStringAdapter.cpp
Index: XStringAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapter.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringAdapter.cpp 10 Apr 2002 06:03:11 -0000 1.3
+++ XStringAdapter.cpp 4 Oct 2002 06:58:07 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -115,4 +115,12 @@
XStringAdapter::getRealType() const
{
return eTypeStringAdapter;
+}
+
+
+
+double
+XStringAdapter::stringLength() const
+{
+ return m_value->stringLength();
}
1.3 +4 -1 xml-xalan/c/src/XPath/XStringAdapter.hpp
Index: XStringAdapter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringAdapter.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XStringAdapter.hpp 2 May 2001 15:53:08 -0000 1.2
+++ XStringAdapter.hpp 4 Oct 2002 06:58:07 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -104,6 +104,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+ virtual double
+ stringLength() const;
protected:
1.6 +1 -1 xml-xalan/c/src/XPath/XStringBase.cpp
Index: XStringBase.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringBase.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XStringBase.cpp 19 Oct 2001 18:37:47 -0000 1.5
+++ XStringBase.cpp 4 Oct 2002 06:58:07 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
1.4 +4 -1 xml-xalan/c/src/XPath/XStringBase.hpp
Index: XStringBase.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringBase.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XStringBase.hpp 19 Oct 2001 18:37:47 -0000 1.3
+++ XStringBase.hpp 4 Oct 2002 06:58:07 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const = 0;
+
+ virtual double
+ stringLength() const = 0;
virtual const ResultTreeFragBase&
rtree() const;
1.6 +9 -1 xml-xalan/c/src/XPath/XStringCached.cpp
Index: XStringCached.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCached.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XStringCached.cpp 10 Apr 2002 06:03:11 -0000 1.5
+++ XStringCached.cpp 4 Oct 2002 06:58:07 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -122,4 +122,12 @@
XStringCached::getRealType() const
{
return eTypeStringCached;
+}
+
+
+
+double
+XStringCached::stringLength() const
+{
+ return length(m_value.get());
}
1.3 +4 -1 xml-xalan/c/src/XPath/XStringCached.hpp
Index: XStringCached.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringCached.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XStringCached.hpp 2 May 2001 15:53:13 -0000 1.2
+++ XStringCached.hpp 4 Oct 2002 06:58:07 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -108,6 +108,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+ virtual double
+ stringLength() const;
protected:
1.5 +9 -1 xml-xalan/c/src/XPath/XStringReference.cpp
Index: XStringReference.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReference.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XStringReference.cpp 10 Apr 2002 06:03:11 -0000 1.4
+++ XStringReference.cpp 4 Oct 2002 06:58:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999-2000 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -118,4 +118,12 @@
XStringReference::getRealType() const
{
return eTypeStringReference;
+}
+
+
+
+double
+XStringReference::stringLength() const
+{
+ return length(m_value);
}
1.3 +4 -1 xml-xalan/c/src/XPath/XStringReference.hpp
Index: XStringReference.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XStringReference.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XStringReference.hpp 2 May 2001 15:53:17 -0000 1.2
+++ XStringReference.hpp 4 Oct 2002 06:58:07 -0000 1.3
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -105,6 +105,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+ virtual double
+ stringLength() const;
protected:
1.6 +9 -1 xml-xalan/c/src/XPath/XToken.cpp
Index: XToken.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XToken.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XToken.cpp 26 Sep 2001 20:58:46 -0000 1.5
+++ XToken.cpp 4 Oct 2002 06:58:07 -0000 1.6
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -161,6 +161,14 @@
XToken::str(XalanDOMString& theBuffer) const
{
append(theBuffer, m_stringValue);
+}
+
+
+
+double
+XToken::stringLength() const
+{
+ return length(m_stringValue);
}
1.4 +3 -0 xml-xalan/c/src/XPath/XToken.hpp
Index: XToken.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XToken.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XToken.hpp 26 Jun 2001 16:00:21 -0000 1.3
+++ XToken.hpp 4 Oct 2002 06:58:07 -0000 1.4
@@ -109,6 +109,9 @@
virtual void
str(XalanDOMString& theBuffer) const;
+ virtual double
+ stringLength() const;
+
virtual void
ProcessXObjectTypeCallback(XObjectTypeCallback&
theCallbackObject);
1.5 +9 -1 xml-xalan/c/src/XPath/XTokenNumberAdapter.cpp
Index: XTokenNumberAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenNumberAdapter.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XTokenNumberAdapter.cpp 10 Apr 2002 06:03:11 -0000 1.4
+++ XTokenNumberAdapter.cpp 4 Oct 2002 06:58:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -127,6 +127,14 @@
XTokenNumberAdapter::str(XalanDOMString& theBuffer) const
{
m_value.str(theBuffer);
+}
+
+
+
+double
+XTokenNumberAdapter::stringLength() const
+{
+ return m_value.stringLength();
}
1.4 +4 -1 xml-xalan/c/src/XPath/XTokenNumberAdapter.hpp
Index: XTokenNumberAdapter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenNumberAdapter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XTokenNumberAdapter.hpp 26 Jun 2001 16:00:23 -0000 1.3
+++ XTokenNumberAdapter.hpp 4 Oct 2002 06:58:07 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,9 @@
virtual void
str(XalanDOMString& theBuffer) const;
+
+ virtual double
+ stringLength() const;
protected:
1.5 +9 -1 xml-xalan/c/src/XPath/XTokenStringAdapter.cpp
Index: XTokenStringAdapter.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenStringAdapter.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XTokenStringAdapter.cpp 10 Apr 2002 06:03:11 -0000 1.4
+++ XTokenStringAdapter.cpp 4 Oct 2002 06:58:07 -0000 1.5
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -127,6 +127,14 @@
XTokenStringAdapter::str(XalanDOMString& theBuffer) const
{
m_value.str(theBuffer);
+}
+
+
+
+double
+XTokenStringAdapter::stringLength() const
+{
+ return m_value.stringLength();
}
1.4 +4 -1 xml-xalan/c/src/XPath/XTokenStringAdapter.hpp
Index: XTokenStringAdapter.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XTokenStringAdapter.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XTokenStringAdapter.hpp 26 Jun 2001 16:00:25 -0000 1.3
+++ XTokenStringAdapter.hpp 4 Oct 2002 06:58:07 -0000 1.4
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -115,6 +115,9 @@
virtual void
str(XalanDOMString& theBuffer) const;
+
+ virtual double
+ stringLength() const;
protected:
1.14 +9 -1 xml-xalan/c/src/XPath/XUnknown.cpp
Index: XUnknown.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XUnknown.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XUnknown.cpp 10 Apr 2002 06:03:11 -0000 1.13
+++ XUnknown.cpp 4 Oct 2002 06:58:07 -0000 1.14
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -145,6 +145,14 @@
assert(length(m_value) ==
FormatterListener::size_type(length(m_value)));
(formatterListener.*function)(c_wstr(m_value),
FormatterListener::size_type(length(m_value)));
+}
+
+
+
+double
+XUnknown::stringLength() const
+{
+ return length(m_value);
}
1.12 +4 -1 xml-xalan/c/src/XPath/XUnknown.hpp
Index: XUnknown.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/XUnknown.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XUnknown.hpp 2 May 2001 15:53:29 -0000 1.11
+++ XUnknown.hpp 4 Oct 2002 06:58:07 -0000 1.12
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 1999 The Apache Software Foundation. All rights
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -126,6 +126,9 @@
str(
FormatterListener& formatterListener,
MemberFunctionPtr function) const;
+
+ virtual double
+ stringLength() const;
virtual void
ProcessXObjectTypeCallback(XObjectTypeCallback&
theCallbackObject);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
