From xalanmartinnancy@example.net Tue Jul 01 20:32:17 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 26993 invoked by uid 500); 1 Jul 2003 20:32:16 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 26956 invoked from network); 1 Jul 2003 20:32:16 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 1 Jul 2003 20:32:16 -0000 Received: (qmail 86183 invoked by uid 1034); 1 Jul 2003 20:32:15 -0000 Date: 1 Jul 2003 20:32:15 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/Projects/Win32/VC6/AllInOne AllInOne.dsp AllInOneWithICU.dsp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/01 13:32:15 Modified: c/Projects/Win32/VC6/AllInOne AllInOne.dsp AllInOneWithICU.dsp Log: Added compiler flag to raise heap limits. Fixes problems building with STLport. Revision Changes Path 1.30 +2 -4 xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp Index: AllInOne.dsp =================================================================== RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- AllInOne.dsp 29 Jun 2003 05:06:40 -0000 1.29 +++ AllInOne.dsp 1 Jul 2003 20:32:14 -0000 1.30 @@ -44,8 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSLT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /FD /Zm125 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -100,8 +99,7 @@ # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_XERCES" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /FD /Zm125 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" 1.27 +2 -4 xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp Index: AllInOneWithICU.dsp =================================================================== RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- AllInOneWithICU.dsp 29 Jun 2003 05:06:40 -0000 1.26 +++ AllInOneWithICU.dsp 1 Jul 2003 20:32:14 -0000 1.27 @@ -44,8 +44,7 @@ # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XSLT_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I "..\..\..\..\..\..\icu\include" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D "XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_USE_ICU" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I "..\..\..\..\..\..\icu\include" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D "XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_USE_ICU" /FD /Zm125 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" @@ -100,8 +99,7 @@ # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W4 /GR /GX /O2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_XERCES" /FD /c # SUBTRACT BASE CPP /YX -# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I "..\..\..\..\..\..\icu\include" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D "XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_USE_ICU" /FD /c -# SUBTRACT CPP /YX +# ADD CPP /nologo /MD /W4 /GR /GX /Zi /O2 /Ob2 /I "..\..\..\..\..\..\xml-xerces\c\src" /I "..\..\..\..\src\\" /I "..\..\..\..\..\..\icu\include" /D "NDEBUG" /D "XALAN_DOMSUPPORT_BUILD_DLL" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "XALAN_XSLT_BUILD_DLL" /D "XALAN_PLATFORMSUPPORT_BUILD_DLL" /D "XALAN_DOM_BUILD_DLL" /D "XALAN_XALANEXTENSIONS_BUILD_DLL" /D "XALAN_XALANSOURCETREE_BUILD_DLL" /D "XALAN_TRANSFORMER_BUILD_DLL" /D "XALAN_XERCESPARSERLIAISON_BUILD_DLL" /D "XALAN_XMLSUPPORT_BUILD_DLL" /D "XALAN_XPATH_BUILD_DLL" /D "XALAN_XPATHCAPI_BUILD_DLL" /D "XALAN_ALLINONE_BUILD_DLL" /D "XALAN_EXSLT_BUILD_DLL" /D "XALAN_ICUBRIDGE_BUILD_DLL" /D "XALAN_USE_ICU" /FD /Zm125 /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Tue Jul 01 20:33:23 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 29394 invoked by uid 500); 1 Jul 2003 20:33:22 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 29381 invoked from network); 1 Jul 2003 20:33:22 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 1 Jul 2003 20:33:22 -0000 Received: (qmail 86382 invoked by uid 1034); 1 Jul 2003 20:33:22 -0000 Date: 1 Jul 2003 20:33:22 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/DOMSupport DOMServices.cpp DOMServices.hpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/01 13:33:22 Modified: c/src/xalanc/DOMSupport DOMServices.cpp DOMServices.hpp Log: New generic function for resolving namespace prefix. Revision Changes Path 1.2 +38 -0 xml-xalan/c/src/xalanc/DOMSupport/DOMServices.cpp Index: DOMServices.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/DOMSupport/DOMServices.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DOMServices.cpp 29 Jun 2003 03:57:53 -0000 1.1 +++ DOMServices.cpp 1 Jul 2003 20:33:22 -0000 1.2 @@ -77,6 +77,7 @@ #include <xalanc/PlatformSupport/DOMStringHelper.hpp> +#include <xalanc/PlatformSupport/PrefixResolver.hpp> #include <xalanc/PlatformSupport/XalanUnicode.hpp> @@ -780,6 +781,43 @@ } return theNamespace; +} + + + +const XalanDOMString* +DOMServices888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getNamespaceForPrefix( + const XalanDOMChar* theName, + const PrefixResolver& thePrefixResolver, + bool isAttribute, + XalanDOMString& thePrefix) +{ + const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theLength = length(theName); + + // Check for special default namespace value... + if (isAttribute == true && equals(s_XMLNamespace, theName, theLength) == true) + { + return &s_XMLNamespacePrefixURI; + } + else + { + const XalanDOMString888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type theColonIndex = indexOf(theName, XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charColon); + + if (theColonIndex == theLength) + { + clear(thePrefix); + + return thePrefixResolver.getNamespaceForPrefix(s_emptyString); + } + else + { + // Get the prefix from theName... + assign(thePrefix, theName, theColonIndex); + assert(length(thePrefix) != 0); + + return thePrefixResolver.getNamespaceForPrefix(thePrefix); + } + } } 1.2 +17 -0 xml-xalan/c/src/xalanc/DOMSupport/DOMServices.hpp Index: DOMServices.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/DOMSupport/DOMServices.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- DOMServices.hpp 29 Jun 2003 03:57:53 -0000 1.1 +++ DOMServices.hpp 1 Jul 2003 20:33:22 -0000 1.2 @@ -571,6 +571,23 @@ const XalanElement& namespaceContext); /** + * Retrieve the URI corresponding to a namespace prefix, using the supplied + * name, and PrefixResolver. The routine also returns the prefix. + * + * @param theName The name that contains the prefix + * @param thePrefixResolver The PrefixResolver to use + * @param isAttribute If true, special rules for attributes are used + * @param thePrefix The prefix + * @return URI corresponding to namespace + */ + static const XalanDOMString* + getNamespaceForPrefix( + const XalanDOMChar* theName, + const PrefixResolver& thePrefixResolver, + bool isAttribute, + XalanDOMString& thePrefix); + + /** * Determine if a node is after another node, in document order. * * @param node1 The first node --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Tue Jul 01 21:16:56 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 35687 invoked by uid 500); 1 Jul 2003 21:16:56 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 35672 invoked from network); 1 Jul 2003 21:16:55 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 1 Jul 2003 21:16:55 -0000 Received: (qmail 98773 invoked by uid 1034); 1 Jul 2003 21:16:55 -0000 Date: 1 Jul 2003 21:16:55 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XalanTransformer XalanTransformer.cpp XalanTransformer.hpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/01 14:16:55 Modified: c/src/xalanc/XalanTransformer XalanTransformer.cpp XalanTransformer.hpp Log: Added a convenience function to force the output encoding. Revision Changes Path 1.2 +8 -3 xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.cpp Index: XalanTransformer.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XalanTransformer.cpp 29 Jun 2003 03:58:23 -0000 1.1 +++ XalanTransformer.cpp 1 Jul 2003 21:16:55 -0000 1.2 @@ -156,6 +156,7 @@ #else m_warningStream(&st888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4cerr), #endif + m_outputEncoding(), m_stylesheetExecutionContext(new StylesheetExecutionContextDefault) { #if defined(XALAN_USE_ICU) @@ -1199,10 +1200,14 @@ addTraceListeners(m_traceListeners, theProcessor); - // Since the result target is not const in our - // internal intefaces, we'll pass in a local copy - // of the one provided... + // We may need to change the output encoding, so + // we make a copy of the result target. XSLTResultTarget tempResultTarget(theResultTarget); + + if (tempResultTarget.getEncoding().length() == 0 && m_outputEncoding.length() != 0) + { + tempResultTarget.setEncoding(m_outputEncoding); + } if (theCompiledStylesheet != 0) { 1.2 +28 -0 xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.hpp Index: XalanTransformer.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanTransformer/XalanTransformer.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XalanTransformer.hpp 29 Jun 2003 03:58:23 -0000 1.1 +++ XalanTransformer.hpp 1 Jul 2003 21:16:55 -0000 1.2 @@ -710,6 +710,32 @@ } /** + * Get the current output encoding, if any. Note this is not the output encoding + * specified in a stylesheet. Rather, it can override that encoding, if the + * + * @return A string containing the current encoding + */ + const XalanDOMString& + getOutputEncoding() const + { + return m_outputEncoding; + } + + /** + * Set the current output encoding. Note this will override the encoding + * specified in the stylesheet, if the encoding is available. However, + * it will not override any encoding specified by an XSLTResultTarget + * parameter to one of the transform() member functions. + * + * @param theEncoding The encoding to use. + */ + void + setOutputEncoding(const XalanDOMString& theEncoding) + { + m_outputEncoding = theEncoding; + } + + /** * Get the current number of spaces to indent. * * @return number of spaces @@ -956,6 +982,8 @@ ProblemListener* m_problemListener; StreamType* m_warningStream; + + XalanDOMString m_outputEncoding; // This should always be the latest data member!!! StylesheetExecutionContextDefault* m_stylesheetExecutionContext; --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Tue Jul 01 23:46:27 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 31723 invoked by uid 500); 1 Jul 2003 23:46:27 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 31707 invoked from network); 1 Jul 2003 23:46:26 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 1 Jul 2003 23:46:26 -0000 Received: (qmail 31008 invoked by uid 1034); 1 Jul 2003 23:46:26 -0000 Date: 1 Jul 2003 23:46:26 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/PlatformSupport FormatterListener.cpp FormatterListener.hpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/01 16:46:26 Modified: c/src/xalanc/PlatformSupport FormatterListener.cpp FormatterListener.hpp Log: Pushed some functions from derived classes here. Revision Changes Path 1.2 +52 -0 xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.cpp Index: FormatterListener.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatterListener.cpp 29 Jun 2003 03:57:55 -0000 1.1 +++ FormatterListener.cpp 1 Jul 2003 23:46:26 -0000 1.2 @@ -94,6 +94,58 @@ +Writer* +FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getWriter() const +{ + return 0; +} + + + +const XalanDOMString FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4s_emptyString; + + + +const XalanDOMString& +FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getDoctypeSystem() const +{ + return s_emptyString; +} + + + +const XalanDOMString& +FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getDoctypePublic() const +{ + return s_emptyString; +} + + + +const XalanDOMString& +FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getEncoding() const +{ + return s_emptyString; +} + + + +const XalanDOMString& +FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMediaType() const +{ + return s_emptyString; +} + + + +int +FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getIndent() const +{ + return 0; +} + + + const XalanDOMChar FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4s_piTarget[] = { XalanUnico888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4charLetter_X, 1.2 +21 -0 xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.hpp Index: FormatterListener.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/FormatterListener.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatterListener.hpp 29 Jun 2003 03:57:55 -0000 1.1 +++ FormatterListener.hpp 1 Jul 2003 23:46:26 -0000 1.2 @@ -85,6 +85,7 @@ class PrefixResolver; +class Writer; @@ -246,6 +247,24 @@ const XMLCh* const name, AttributeListType& attrs) = 0; + virtual Writer* + getWriter() const; + + virtual const XalanDOMString& + getDoctypeSystem() const; + + virtual const XalanDOMString& + getDoctypePublic() const; + + virtual const XalanDOMString& + getEncoding() const; + + virtual const XalanDOMString& + getMediaType() const; + + virtual int + getIndent() const; + // Used when creating PI to work around limitations of // our interfaces... @@ -265,6 +284,8 @@ // Data membmers... const PrefixResolver* m_prefixResolver; + + static const XalanDOMString s_emptyString; private: --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Tue Jul 01 23:46:58 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 32027 invoked by uid 500); 1 Jul 2003 23:46:57 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 32014 invoked from network); 1 Jul 2003 23:46:57 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 1 Jul 2003 23:46:57 -0000 Received: (qmail 31070 invoked by uid 1034); 1 Jul 2003 23:46:56 -0000 Date: 1 Jul 2003 23:46:56 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XMLSupport FormatterToXML.cpp FormatterToXML.hpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/01 16:46:56 Modified: c/src/xalanc/XMLSupport FormatterToXML.cpp FormatterToXML.hpp Log: Modifications due to changes in base class. Revision Changes Path 1.2 +48 -1 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.cpp Index: FormatterToXML.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatterToXML.cpp 29 Jun 2003 03:57:59 -0000 1.1 +++ FormatterToXML.cpp 1 Jul 2003 23:46:56 -0000 1.2 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -1217,6 +1217,53 @@ accumContent(chars, 0, length); } +} + + + +Writer* +FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getWriter() const +{ + return m_writer; +} + + + +const XalanDOMString& +FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getDoctypeSystem() const +{ + return m_doctypeSystem; +} + + + +const XalanDOMString& +FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getDoctypePublic() const +{ + return m_doctypePublic; +} + + + +const XalanDOMString& +FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getEncoding() const +{ + return m_encoding; +} + + + +const XalanDOMString& +FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getMediaType() const +{ + return m_mediaType; +} + + +int +FormatterToXML888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4getIndent() const +{ + return m_indent; } 1.2 +13 -37 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.hpp Index: FormatterToXML.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FormatterToXML.hpp 29 Jun 2003 03:57:59 -0000 1.1 +++ FormatterToXML.hpp 1 Jul 2003 23:46:56 -0000 1.2 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -197,41 +197,23 @@ const XMLCh* const ch, const unsigned int length); - const Writer* - getWriter() const - { - return m_writer; - } + virtual Writer* + getWriter() const; - Writer* - getWriter() - { - return m_writer; - } + virtual const XalanDOMString& + getDoctypeSystem() const; - const XalanDOMString& - getDoctypeSystem() const - { - return m_doctypeSystem; - } + virtual const XalanDOMString& + getDoctypePublic() const; - const XalanDOMString& - getDoctypePublic() const - { - return m_doctypePublic; - } + virtual const XalanDOMString& + getEncoding() const; - const XalanDOMString& - getEncoding() const - { - return m_encoding; - } + virtual const XalanDOMString& + getMediaType() const; - const XalanDOMString& - getMediaType() const - { - return m_mediaType; - } + virtual int + getIndent() const; const XalanDOMString& getVersion() const @@ -291,12 +273,6 @@ setDoIndent(bool value) { m_doIndent = value; - } - - int - getIndent() const - { - return m_indent; } void --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Tue Jul 01 23:48:07 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 33107 invoked by uid 500); 1 Jul 2003 23:48:07 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 33091 invoked from network); 1 Jul 2003 23:48:07 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 1 Jul 2003 23:48:07 -0000 Received: (qmail 31649 invoked by uid 1034); 1 Jul 2003 23:48:06 -0000 Date: 1 Jul 2003 23:48:06 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XSLT StylesheetExecutionContext.hpp StylesheetExecutionContextDefault.cpp StylesheetExecutionContextDefault.hpp StylesheetRoot.cpp XSLTEngineImpl.cpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/01 16:48:06 Modified: c/src/xalanc/XSLT StylesheetExecutionContext.hpp StylesheetExecutionContextDefault.cpp StylesheetExecutionContextDefault.hpp StylesheetRoot.cpp XSLTEngineImpl.cpp Log: Modifications to push functionality into base FormatterListener class to remove implementation classes from the interface and to remove dangerous downcast. Revision Changes Path 1.2 +26 -53 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp Index: StylesheetExecutionContext.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StylesheetExecutionContext.hpp 29 Jun 2003 03:58:08 -0000 1.1 +++ StylesheetExecutionContext.hpp 1 Jul 2003 23:48:05 -0000 1.2 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -99,7 +99,6 @@ -#include <xalanc/XSLT/KeyTable.hpp> #include <xalanc/XSLT/TopLevelArg.hpp> @@ -113,12 +112,9 @@ class ElemTemplateElement; class ElemVariable; class FormatterListener; -class FormatterToDOM; -class FormatterToHTML; class FormatterToText; -class FormatterToXML; class GenerateEvent; -class KeyTable; +class KeyDeclaration; class PrefixResolver; class NodeRefListBase; class NodeSorter; @@ -1386,7 +1382,7 @@ * standalone document declaration * @return a pointer to the new instance. */ - virtual FormatterToXML* + virtual FormatterListener* createFormatterToXML( Writer& writer, const XalanDOMString& version = XalanDOMString(), @@ -1416,7 +1412,7 @@ * @param omitMetaTag Whether or not to output a META TAG according to the recommendation. The default is false. * @return a pointer to the new instance. */ - virtual FormatterToHTML* + virtual FormatterListener* createFormatterToHTML( Writer& writer, const XalanDOMString& encoding = XalanDOMString(), @@ -1429,60 +1425,16 @@ bool omitMetaTag = false) = 0; /** - * Construct a FormatterToDOM instance. it will add the DOM nodes - * to the document fragment. - * - * @param doc document for nodes - * @param docFrag document fragment for nodes, default none - * @param currentElement current element for nodes, default none - */ - virtual FormatterToDOM* - createFormatterToDOM( - XalanDocument* doc, - XalanDocumentFragment* docFrag, - XalanElement* currentElement) = 0; - - /** - * Construct a FormatterToDOM instance. it will add the DOM nodes - * to the document fragment. - * - * @param doc document for nodes - * @param docFrag document fragment for nodes, default none - * @param currentElement current element for nodes, default none - */ - virtual FormatterToDOM* - createFormatterToDOM( - XalanDocument* doc, - XalanElement* elem) = 0; - - /** * FormatterToText instance constructor. * * @param writer writer for output * @param encoding character encoding for the writer */ - virtual FormatterToText* + virtual FormatterListener* createFormatterToText( Writer& writer, const XalanDOMString& encoding) = 0; - /** - * Borrow a cached FormatterToText instance. - * - * @return A pointer to the instance. - */ - virtual FormatterToText* - borrowFormatterToText() = 0; - - /** - * Return a previously borrowed FormatterToText instance. - * - * @param theFormatter A pointer the to previously borrowed instance. - * @return true if the instance was previously borrowed, false if not. - */ - virtual bool - returnFormatterToText(FormatterToText* theFormatter) = 0; - class BorrowReturnFormatterToText { public: @@ -1530,6 +1482,8 @@ }; + friend class BorrowReturnFormatterToText; + /** * Borrow a cached NodeSorter instance. * @@ -2025,6 +1979,25 @@ const char* msg, const XalanNode* sourceNode = 0, const LocatorType* locator = 0) const = 0; + +protected: + + /** + * Borrow a cached FormatterToText instance. + * + * @return A pointer to the instance. + */ + virtual FormatterToText* + borrowFormatterToText() = 0; + + /** + * Return a previously borrowed FormatterToText instance. + * + * @param theFormatter A pointer the to previously borrowed instance. + * @return true if the instance was previously borrowed, false if not. + */ + virtual bool + returnFormatterToText(FormatterToText* theFormatter) = 0; }; 1.2 +7 -6 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Index: StylesheetExecutionContextDefault.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StylesheetExecutionContextDefault.cpp 29 Jun 2003 03:58:08 -0000 1.1 +++ StylesheetExecutionContextDefault.cpp 1 Jul 2003 23:48:05 -0000 1.2 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -104,6 +104,7 @@ #include "Constants.hpp" #include "ElemTemplateElement.hpp" #include "ElemWithParam.hpp" +#include "KeyTable.hpp" #include "StylesheetConstructionContextDefault.hpp" #include "StylesheetRoot.hpp" #include "XSLTEngineImpl.hpp" @@ -1270,7 +1271,7 @@ -FormatterToXML* +FormatterListener* StylesheetExecutionContextDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reateFormatterToXML( Writer& writer, const XalanDOMString& version, @@ -1303,7 +1304,7 @@ -FormatterToHTML* +FormatterListener* StylesheetExecutionContextDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reateFormatterToHTML( Writer& writer, const XalanDOMString& encoding, @@ -1342,7 +1343,7 @@ -FormatterToDOM* +FormatterListener* StylesheetExecutionContextDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reateFormatterToDOM( XalanDocument* doc, XalanDocumentFragment* docFrag, @@ -1363,7 +1364,7 @@ -FormatterToDOM* +FormatterListener* StylesheetExecutionContextDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reateFormatterToDOM( XalanDocument* doc, XalanElement* elem) @@ -1382,7 +1383,7 @@ -FormatterToText* +FormatterListener* StylesheetExecutionContextDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4reateFormatterToText( Writer& writer, const XalanDOMString& encoding) 1.2 +14 -12 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp Index: StylesheetExecutionContextDefault.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StylesheetExecutionContextDefault.hpp 29 Jun 2003 03:58:08 -0000 1.1 +++ StylesheetExecutionContextDefault.hpp 1 Jul 2003 23:48:05 -0000 1.2 @@ -2,7 +2,7 @@ * The Apache Software License, Version 1.1 * * - * Copyright (c) 1999-2002 The Apache Software Foundation. All rights + * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -616,7 +616,7 @@ void setOmitMETATag(eOmitMETATag value); - virtual FormatterToXML* + virtual FormatterListener* createFormatterToXML( Writer& writer, const XalanDOMString& version = XalanDOMString(), @@ -629,7 +629,7 @@ bool xmlDecl = true, const XalanDOMString& standalone = XalanDOMString()); - virtual FormatterToHTML* + virtual FormatterListener* createFormatterToHTML( Writer& writer, const XalanDOMString& encoding = XalanDOMString(), @@ -641,28 +641,22 @@ bool escapeURLs = true, bool omitMetaTag = false); - virtual FormatterToDOM* + virtual FormatterListener* createFormatterToDOM( XalanDocument* doc, XalanDocumentFragment* docFrag, XalanElement* currentElement); - virtual FormatterToDOM* + virtual FormatterListener* createFormatterToDOM( XalanDocument* doc, XalanElement* elem); - virtual FormatterToText* + virtual FormatterListener* createFormatterToText( Writer& writer, const XalanDOMString& encoding); - virtual FormatterToText* - borrowFormatterToText(); - - virtual bool - returnFormatterToText(FormatterToText* theFormatter); - virtual NodeSorter* borrowNodeSorter(); @@ -1035,6 +1029,14 @@ */ XalanSourceTreeDocument* getSourceTreeFactory() const; + +protected: + + virtual FormatterToText* + borrowFormatterToText(); + + virtual bool + returnFormatterToText(FormatterToText* theFormatter); private: 1.2 +3 -2 xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp Index: StylesheetRoot.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- StylesheetRoot.cpp 29 Jun 2003 03:58:08 -0000 1.1 +++ StylesheetRoot.cpp 1 Jul 2003 23:48:05 -0000 1.2 @@ -96,9 +96,10 @@ #include "Constants.hpp" -#include "ElemApplyTemplates.hpp" -#include "ElemTemplate.hpp" +#include "ElemApplyTemplates.hpp" +#include "ElemTemplate.hpp" #include "ElemValueOf.hpp" +#include "KeyTable.hpp" #include "StylesheetConstructionContext.hpp" #include "StylesheetExecutionContext.hpp" #include "TraceListener.hpp" 1.2 +3 -9 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp Index: XSLTEngineImpl.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XSLTEngineImpl.cpp 29 Jun 2003 03:58:08 -0000 1.1 +++ XSLTEngineImpl.cpp 1 Jul 2003 23:48:05 -0000 1.2 @@ -96,9 +96,6 @@ -#include <xalanc/XMLSupport/FormatterToDOM.hpp> -#include <xalanc/XMLSupport/FormatterToText.hpp> -#include <xalanc/XMLSupport/FormatterToXML.hpp> #include <xalanc/XMLSupport/FormatterToHTML.hpp> #include <xalanc/XMLSupport/FormatterTreeWalker.hpp> #include <xalanc/XMLSupport/XMLParserLiaison.hpp> @@ -1620,12 +1617,9 @@ if (getFormatterListener()->getOutputFormat() == FormatterListener888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4OUTPUT_METHOD_XML) { // Yuck!!! Ugly hack to switch to HTML on-the-fly. - FormatterToXML* const theFormatter = -#if defined(XALAN_OLD_STYLE_CASTS) - (FormatterToXML*)getFormatterListener(); -#else - static_cast<FormatterToXML*>(getFormatterListener()); -#endif + FormatterListener* const theFormatter = + getFormatterListener(); + assert(theFormatter->getWriter() != 0); setFormatterListenerImpl( m_executionContext->createFormatterToHTML( --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 01:58:27 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 76296 invoked by uid 500); 2 Jul 2003 01:58:26 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 76283 invoked from network); 2 Jul 2003 01:58:26 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 01:58:26 -0000 Received: (qmail 56410 invoked by uid 1636); 2 Jul 2003 01:58:25 -0000 Date: 2 Jul 2003 01:58:25 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl OperatorImpl.java FunctionCallImpl.java ExprImpl.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N villard 2003/07/01 18:58:25 Modified: java/xpath_rwapi/src2/org/apache/xpath/impl Tag: xslt20 OperatorImpl.java FunctionCallImpl.java ExprImpl.java Log: Implements cloneExpression for FunctionCallImpl Revision Changes Path No revision No revision 83.161.120.155 +2 -3 xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/OperatorImpl.java Index: OperatorImpl.java =================================================================== RCS file: /home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/OperatorImpl.java,v retrieving revision 83.161.120.155 retrieving revision 83.161.120.155 diff -u -r83.161.120.155 -r83.161.120.155 --- OperatorImpl.java 24 Jun 2003 21:09:07 -0000 83.161.120.155 +++ OperatorImpl.java 2 Jul 2003 01:58:24 -0000 83.161.120.155 @@ -193,9 +193,7 @@ } /** - * Constructor for cloning - * - * @param expr DOCUMENT ME! + * Create a clone */ protected OperatorImpl(OperatorImpl expr) { @@ -206,6 +204,7 @@ m_children = expr.cloneChildren(); } + /** * Constructor for OperatorImpl. 83.161.120.155 +18 -0 xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/FunctionCallImpl.java Index: FunctionCallImpl.java =================================================================== RCS file: /home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/FunctionCallImpl.java,v retrieving revision 83.161.120.155 retrieving revision 83.161.120.155 diff -u -r83.161.120.155 -r83.161.120.155 --- FunctionCallImpl.java 31 Mar 2003 23:05:52 -0000 83.161.120.155 +++ FunctionCallImpl.java 2 Jul 2003 01:58:24 -0000 83.161.120.155 @@ -75,6 +75,8 @@ */ QName m_qname; + // Constructors + /** * Constructor for FunctionCallImpl. * @param i @@ -93,6 +95,18 @@ } /** + * Clone FunctionCall + */ + private FunctionCallImpl(FunctionCallImpl original) + { + super(original); + + m_qname = original.m_qname; + } + + // Implements FunctionCall + + /** * @see org.apache.xpath.expression.FunctionCall#getFunctionName() */ public QName getFunctionQName() { @@ -167,6 +181,10 @@ */ public short getOperatorType() { return COMMA; + } + + public Expr cloneExpression() { + return new FunctionCallImpl(this); } } 83.161.120.155 +17 -10 xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/ExprImpl.java Index: ExprImpl.java =================================================================== RCS file: /home/cvs/xml-xalan/java/xpath_rwapi/src2/org/apache/xpath/impl/Attic/ExprImpl.java,v retrieving revision 83.161.120.155 retrieving revision 83.161.120.155 diff -u -r83.161.120.155 -r83.161.120.155 --- ExprImpl.java 24 Jun 2003 21:09:07 -0000 83.161.120.155 +++ ExprImpl.java 2 Jul 2003 01:58:24 -0000 83.161.120.155 @@ -132,18 +132,25 @@ */ protected Node[] cloneChildren() { - Node[] clone = new Node[m_children.length]; + Node[] clone; + if (m_children != null) + { + clone = new Node[m_children.length]; - for (int i = 0; i < m_children.length; i++) - { - Node child = m_children[i]; - if (child instanceof Expr) { - clone[i] = (Node) ((Expr) child).cloneExpression(); - } else { - // immutable object, just copy reference - clone[i] = child; + for (int i = 0; i < m_children.length; i++) + { + Node child = m_children[i]; + if (child instanceof Expr) { + clone[i] = (Node) ((Expr) child).cloneExpression(); + } else { + // immutable object, just copy reference + clone[i] = child; + } } - } + } else + { + clone = null; + } return clone; } --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 15:38:13 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 92744 invoked by uid 500); 2 Jul 2003 15:38:12 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 92727 invoked from network); 2 Jul 2003 15:38:11 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 15:38:11 -0000 Received: (qmail 82372 invoked by uid 1034); 2 Jul 2003 15:38:11 -0000 Date: 2 Jul 2003 15:38:11 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/samples/SimpleXPathCAPI SimpleXPathCAPI.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/02 08:38:11 Modified: c/samples/SimpleXPathCAPI SimpleXPathCAPI.c Log: Changed deprecated header file. Fixes bugzilla 21268. Revision Changes Path 1.7 +1 -1 xml-xalan/c/samples/SimpleXPathCAPI/SimpleXPathCAPI.c Index: SimpleXPathCAPI.c =================================================================== RCS file: /home/cvs/xml-xalan/c/samples/SimpleXPathCAPI/SimpleXPathCAPI.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- SimpleXPathCAPI.c 29 Jun 2003 05:07:39 -0000 1.6 +++ SimpleXPathCAPI.c 2 Jul 2003 15:38:11 -0000 1.7 @@ -3,8 +3,8 @@ #include <assert.h> -#include <malloc.h> #include <stdio.h> +#include <stdlib.h> --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 17:07:21 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 29011 invoked by uid 500); 2 Jul 2003 17:07:20 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 28903 invoked from network); 2 Jul 2003 17:07:19 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 17:07:19 -0000 Received: (qmail 21733 invoked by uid 1537); 2 Jul 2003 17:07:19 -0000 Date: 2 Jul 2003 17:07:19 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/java/xdocs/sources/xalan downloads.xml X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N ilene 2003/07/02 10:07:19 Modified: java/src MANIFEST.MF manifest.xsltc java/xdocs/sources/xalan downloads.xml Log: Patch from Sarah McNamara (martinnancy@example.net) Moving java_cup.jar and runtime.jar from v0.10j to the latest version: v0.10k. Revision Changes Path 1.9 +1 -22 xml-xalan/java/src/MANIFEST.MF Index: MANIFEST.MF =================================================================== RCS file: /home/cvs/xml-xalan/java/src/MANIFEST.MF,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- MANIFEST.MF 2 Apr 2003 15:34:33 -0000 1.8 +++ MANIFEST.MF 2 Jul 2003 17:07:15 -0000 1.9 @@ -38,36 +38,15 @@ Implementation-Vendor: Apache Software Foundation Implementation-URL: http://xml.apache.org/xalan-j/dist/ -Name: JLex -Comment: A Lexical Analyzer for Java -Specification-Title: A Lexical Analyzer for Java -Specification-Vendor: Princeton University -Specification-Version: 1.2.5 -Implementation-Title: JLex -Implementation-Version: @impl.version@ -Implementation-Vendor: Princeton University -Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/JLex/ - -Name: java_cup -Comment: Parser Generator for Java -Specification-Title: Parser Generator for Java -Specification-Vendor: Princeton University -Specification-Version: 0.10j -Implementation-Title: java_cup -Implementation-Version: @impl.version@ -Implementation-Vendor: Princeton University -Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ - Name: runtime Comment: Runtime component of JCup Specification-Title: Runtime component of JCup Specification-Vendor: Princeton University -Specification-Version: 0.10j +Specification-Version: 0.10k Implementation-Title: runtime Implementation-Version: @impl.version@ Implementation-Vendor: Princeton University Implementation-URL: http://www.cs.princeton.edu/~appel/modern/java/CUP/ - Name: org/apache/bcel Comment: Byte Code Engineering Library 1.7 +2 -2 xml-xalan/java/src/manifest.xsltc Index: manifest.xsltc =================================================================== RCS file: /home/cvs/xml-xalan/java/src/manifest.xsltc,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- manifest.xsltc 14 Feb 2002 15:15:58 -0000 1.6 +++ manifest.xsltc 2 Jul 2003 17:07:15 -0000 1.7 @@ -25,7 +25,7 @@ Comment: Parser Generator for Java Specification-Title: Parser Generator for Java Specification-Vendor: Princeton University -Specification-Version: 0.10j +Specification-Version: 0.10k Implementation-Title: java_cup Implementation-Version: @impl.version@ Implementation-Vendor: Princeton University @@ -35,7 +35,7 @@ Comment: Runtime component of JCup Specification-Title: Runtime component of JCup Specification-Vendor: Princeton University -Specification-Version: 0.10j +Specification-Version: 0.10k Implementation-Title: runtime Implementation-Version: @impl.version@ Implementation-Vendor: Princeton University 1.3 +1 -1 xml-xalan/java/xdocs/sources/xalan/downloads.xml Index: downloads.xml =================================================================== RCS file: /home/cvs/xml-xalan/java/xdocs/sources/xalan/downloads.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- downloads.xml 26 May 2003 19:48:28 -0000 1.2 +++ downloads.xml 2 Jul 2003 17:07:18 -0000 1.3 @@ -78,7 +78,7 @@ (XSLTC) and the runtime support packages into a single jar, called xalan.jar. The second binary distribution contains the Xalan Interpretive processor in xalan.jar and the Xalan Compiled processor (XSLTC) and the runtime support packages in xsltc.jar. The runtime support packages - required by XSLTC are: java_cup runtime version 0.10j, bcel version 5.0, and regexp version 1.2. + required by XSLTC are: java_cup runtime version 0.10k, bcel version 5.0, and regexp version 1.2. Both binary distributions contain xml-apis.jar (the JAXP 1.2 implementation) and &xml4j-jar; from <resource-ref idref="xml4j-used"/>.</p> --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 17:07:59 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 31985 invoked by uid 500); 2 Jul 2003 17:07:58 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 31943 invoked from network); 2 Jul 2003 17:07:58 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 17:07:58 -0000 Received: (qmail 22792 invoked by uid 1537); 2 Jul 2003 17:07:58 -0000 Date: 2 Jul 2003 17:07:58 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/java/bin java_cup.jar runtime.jar X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N ilene 2003/07/02 10:07:57 Modified: java/bin java_cup.jar runtime.jar Log: Patch from Sarah McNamara (martinnancy@example.net) Moving java_cup.jar and runtime.jar from v0.10j to the latest version: v0.10k. Revision Changes Path 1.2 +222 -254 xml-xalan/java/bin/java_cup.jar <<Binary file>> 1.2 +35 -30 xml-xalan/java/bin/runtime.jar <<Binary file>> --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 20:50:48 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 52762 invoked by uid 500); 2 Jul 2003 20:50:47 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 52737 invoked from network); 2 Jul 2003 20:50:47 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 20:50:47 -0000 Received: (qmail 6846 invoked by uid 1601); 2 Jul 2003 20:50:46 -0000 Date: 2 Jul 2003 20:50:46 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/java/src/org/apache/xpath/axes UnionChildIterator.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N grchiu 2003/07/02 13:50:46 Modified: java/src/org/apache/xpath/axes UnionChildIterator.java Log: Patch for bugzilla 20909. Need to fix-up variables for PredicatedNodeTest sub-iterators in UnionChildIterator. Variables in the m_nodeTests expressions were not 'fixed up'. Revision Changes Path 1.4 +20 -0 xml-xalan/java/src/org/apache/xpath/axes/UnionChildIterator.java Index: UnionChildIterator.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/UnionChildIterator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- UnionChildIterator.java 27 Jan 2003 18:45:23 -0000 1.3 +++ UnionChildIterator.java 2 Jul 2003 20:50:46 -0000 1.4 @@ -117,6 +117,26 @@ } /** + * This function is used to fixup variables from QNames to stack frame + * indexes at stylesheet build time. + * @param vars List of QNames that correspond to variables. This list + * should be searched backwards for the first qualified name that + * corresponds to the variable reference qname. The position of the + * QName in the vector from the start of the vector will be its position + * in the stack frame (but variables above the globalsTop value will need + * to be offset to the current stack frame). + */ + public void fixupVariables(java.util.Vector vars, int globalsSize) + { + super.fixupVariables(vars, globalsSize); + if (m_nodeTests != null) { + for (int i = 0; i < m_nodeTests.length; i++) { + m_nodeTests[i].fixupVariables(vars, globalsSize); + } + } + } + + /** * Test whether a specified node is visible in the logical view of a * TreeWalker or NodeIterator. This function will be called by the * implementation of TreeWalker and NodeIterator; it is not intended to --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 21:21:36 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 5903 invoked by uid 500); 2 Jul 2003 21:21:36 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 5889 invoked from network); 2 Jul 2003 21:21:36 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 21:21:36 -0000 Received: (qmail 16550 invoked by uid 1601); 2 Jul 2003 21:21:35 -0000 Date: 2 Jul 2003 21:21:35 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/java/src/org/apache/xalan/templates ElemApplyTemplates.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N grchiu 2003/07/02 14:21:35 Modified: java/src/org/apache/xalan/templates ElemApplyTemplates.java Log: Adding missing trace events for xsl:with-param. Trace events for xsl:with-param are fired as the parameter expressions are executed. Revision Changes Path 1.30 +4 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java Index: ElemApplyTemplates.java =================================================================== RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ElemApplyTemplates.java 1 Apr 2003 20:16:26 -0000 1.29 +++ ElemApplyTemplates.java 2 Jul 2003 21:21:35 -0000 1.30 @@ -288,7 +288,11 @@ for (int i = 0; i < nParams; i++) { ElemWithParam ewp = m_paramElems[i]; + if (TransformerImpl.S_DEBUG) + transformer.getTraceManager().fireTraceEvent(ewp); XObject obj = ewp.getValue(transformer, sourceNode); + if (TransformerImpl.S_DEBUG) + transformer.getTraceManager().fireTraceEndEvent(ewp); vars.setLocalVariable(i, obj, argsFrame); } --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 21:32:13 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 28455 invoked by uid 500); 2 Jul 2003 21:32:12 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 28441 invoked from network); 2 Jul 2003 21:32:12 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 21:32:12 -0000 Received: (qmail 19561 invoked by uid 1034); 2 Jul 2003 21:32:11 -0000 Date: 2 Jul 2003 21:32:11 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XPath XPath.cpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/02 14:32:11 Modified: c/src/xalanc/XPath XPath.cpp Log: Make sure empty result node-sets have document order set. Revision Changes Path 1.2 +9 -4 xml-xalan/c/src/xalanc/XPath/XPath.cpp Index: XPath.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPath.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XPath.cpp 29 Jun 2003 03:58:00 -0000 1.1 +++ XPath.cpp 2 Jul 2003 21:32:11 -0000 1.2 @@ -2917,12 +2917,17 @@ { const NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type nContexts = subQueryResults->getLength(); - for(NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type i = 0; i < nContexts; i++) + if (nContexts == 0 && queryResults.empty() == true) { - XalanNode* const node = subQueryResults->item(i); - - if(0 != node) + queryResults.setDocumentOrder(); + } + else + { + for(NodeRefListBas888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4size_type i = 0; i < nContexts; i++) { + XalanNode* const node = subQueryResults->item(i); + assert(node != 0); + BorrowReturnMutableNodeRefList mnl(executionContext); step(executionContext, node, opPos, *mnl); --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 21:32:33 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 28672 invoked by uid 500); 2 Jul 2003 21:32:32 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 28659 invoked from network); 2 Jul 2003 21:32:32 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 21:32:32 -0000 Received: (qmail 19638 invoked by uid 1034); 2 Jul 2003 21:32:32 -0000 Date: 2 Jul 2003 21:32:32 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XSLT FunctionDocument.cpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/02 14:32:32 Modified: c/src/xalanc/XSLT FunctionDocument.cpp Log: Set document order before returning. Revision Changes Path 1.2 +3 -3 xml-xalan/c/src/xalanc/XSLT/FunctionDocument.cpp Index: FunctionDocument.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/FunctionDocument.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- FunctionDocument.cpp 29 Jun 2003 03:58:07 -0000 1.1 +++ FunctionDocument.cpp 2 Jul 2003 21:32:715-246-7911.2 @@ -261,7 +261,7 @@ XalanDOMString base; - bool fNoRelativeURI = false; + bool fNoRelativeURI = false; if (context == 0) { @@ -324,8 +324,6 @@ const LocatorType* locator, bool fNoRelativeURI) const { - typedef XPathExecutionContext888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4orrowReturnMutableNodeRefList BorrowReturnMutableNodeRefList; - // This list will hold the nodes... BorrowReturnMutableNodeRefList mnl(executionContext); @@ -430,6 +428,8 @@ } assert(mnl->checkForDuplicates() == false); + + mnl->setDocumentOrder(); return executionContext.getXObjectFactory().createNodeSet(mnl); } --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 22:43:36 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 32964 invoked by uid 500); 2 Jul 2003 22:43:35 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 32945 invoked from network); 2 Jul 2003 22:43:35 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 22:43:35 -0000 Received: (qmail 43274 invoked by uid 1034); 2 Jul 2003 22:43:34 -0000 Date: 2 Jul 2003 22:43:34 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/PlatformSupport XalanOutputStream.hpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/02 15:43:34 Modified: c/src/xalanc/PlatformSupport XalanOutputStream.hpp Log: Modify write() function to assume buffer has been flushed. Revision Changes Path 1.2 +6 -4 xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStream.hpp Index: XalanOutputStream.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanOutputStream.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XalanOutputStream.hpp 29 Jun 2003 03:57:55 -0000 1.1 +++ XalanOutputStream.hpp 2 Jul 2003 22:43:33 -0000 1.2 @@ -185,7 +185,8 @@ /** * Write a null-terminated string to the output file. The character - * will not be transcoded. + * will not be transcoded. The caller is responsible for making sure the + * buffer is flushed before calling this member function. * * @param theBuffer character buffer to write */ @@ -193,6 +194,7 @@ write(const char* theBuffer) { assert(theBuffer != 0); + assert(m_buffer.empty() == true); write(theBuffer, length(theBuffer)); } @@ -211,7 +213,8 @@ /** * Write a specified number of characters to the output stream. The string - * will not be transcoded. + * will not be transcoded. The caller is responsible for making sure the + * buffer is flushed before calling this member function. * * @param theBuffer character buffer to write * @param theBufferLength number of characters to write @@ -222,8 +225,7 @@ size_type theBufferLength) { assert(theBuffer != 0); - - flushBuffer(); + assert(m_buffer.empty() == true); writeData(theBuffer, theBufferLength); --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 23:13:59 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 65429 invoked by uid 500); 2 Jul 2003 23:13:58 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 65246 invoked from network); 2 Jul 2003 23:13:56 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 23:13:56 -0000 Received: (qmail 52293 invoked by uid 1034); 2 Jul 2003 23:13:55 -0000 Date: 2 Jul 2003 23:13:55 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XSLT XSLTEngineImpl.cpp XSLTEngineImpl.hpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/02 16:13:55 Modified: c/src/xalanc/XSLT XSLTEngineImpl.cpp XSLTEngineImpl.hpp Log: Handle document fragments consistently. Fixes bugzilla 21293. Revision Changes Path 1.3 +27 -9 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp Index: XSLTEngineImpl.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- XSLTEngineImpl.cpp 1 Jul 2003 23:48:05 -0000 1.2 +++ XSLTEngineImpl.cpp 2 Jul 2003 23:13:55 -0000 1.3 @@ -2129,7 +2129,18 @@ { XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4NodeType posNodeType = node.getNodeType(); - if (cloneTextNodesOnly == true && + if (posNodeType == XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4DOCUMENT_FRAGMENT_NODE) + { + outputResultTreeFragment( +#if defined(XALAN_OLD_STYLE_CASTS) + (const XalanDocumentFragment&)node, +#else + static_cast<const XalanDocumentFragment&>(node), +#endif + cloneTextNodesOnly, + styleNode); + } + else if (cloneTextNodesOnly == true && posNodeType != XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TEXT_NODE) { warnCopyTextNodesOnly( @@ -2177,7 +2188,11 @@ posNodeType = pos->getNodeType(); - if(&node == pos) + if (posNodeType == XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4DOCUMENT_FRAGMENT_NODE) + { + break; + } + else if (&node == pos) { if(XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ELEMENT_NODE == posNodeType) { @@ -2311,6 +2326,10 @@ c_wstr(node.getNodeValue())); break; + case XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4DOCUMENT_FRAGMENT_NODE: + assert(false); + break; + // Can't really do this, but we won't throw an error so that copy-of will // work case XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4DOCUMENT_NODE: @@ -2432,7 +2451,8 @@ case XObject888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TypeUnknown: case XObject888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4Unknown: default: - assert(0); + assert(false); + break; } } @@ -2440,13 +2460,11 @@ void XSLTEngineImpl888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4outputResultTreeFragment( - const XObject& theTree, - bool outputTextNodesOnly, - const ElemTemplateElement* styleNode) + const XalanDocumentFragment& theTree, + bool outputTextNodesOnly, + const ElemTemplateElement* styleNode) { - const ResultTreeFragBase& docFrag = theTree.rtree(); - - const XalanNodeList* const nl = docFrag.getChildNodes(); + const XalanNodeList* const nl = theTree.getChildNodes(); assert(nl != 0); const unsigned int nChildren = nl->getLength(); 1.2 +18 -1 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp Index: XSLTEngineImpl.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.hpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XSLTEngineImpl.hpp 29 Jun 2003 03:58:08 -0000 1.1 +++ XSLTEngineImpl.hpp 2 Jul 2003 23:13:55 -0000 1.2 @@ -767,7 +767,24 @@ outputResultTreeFragment( const XObject& theTree, bool outputTextNodesOnly, - const ElemTemplateElement* styleNode); + const ElemTemplateElement* styleNode) + { + outputResultTreeFragment(theTree.rtree(), outputTextNodesOnly, styleNode); + } + + /** + * Given a result tree fragment, walk the tree and output it to the result + * stream. + * + * @param theTree result tree fragment + * @param outputTextNodesOnly if true, only text nodes will be copied + * @param styleNode the stylesheet element that generate the fragment. + */ + void + outputResultTreeFragment( + const XalanDocumentFragment& theTree, + bool outputTextNodesOnly, + const ElemTemplateElement* styleNode); /** * Retrieve the root stylesheet. --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Wed Jul 02 23:37:35 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 90027 invoked by uid 500); 2 Jul 2003 23:37:34 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 90014 invoked from network); 2 Jul 2003 23:37:34 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 2 Jul 2003 23:37:34 -0000 Received: (qmail 58032 invoked by uid 1034); 2 Jul 2003 23:37:33 -0000 Date: 2 Jul 2003 23:37:33 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XSLT XSLTEngineImpl.cpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/02 16:37:33 Modified: c/src/xalanc/XSLT XSLTEngineImpl.cpp Log: Iterate document fragment through getFirstChild()/getNextSibling() instead of through getChildNodes(). Revision Changes Path 1.4 +2 -8 xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp Index: XSLTEngineImpl.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTEngineImpl.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- XSLTEngineImpl.cpp 2 Jul 2003 23:13:55 -0000 1.3 +++ XSLTEngineImpl.cpp 2 Jul 2003 23:37:33 -0000 1.4 @@ -2464,15 +2464,9 @@ bool outputTextNodesOnly, const ElemTemplateElement* styleNode) { - const XalanNodeList* const nl = theTree.getChildNodes(); - assert(nl != 0); - - const unsigned int nChildren = nl->getLength(); - - for(unsigned int i = 0; i < nChildren; i++) + for(XalanNode* child = theTree.getFirstChild(); child != 0; child = child->getNextSibling()) { - XalanNode* pos = nl->item(i); - assert(pos != 0); + XalanNode* pos = child; XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4NodeType posNodeType = pos->getNodeType(); --------------------------------------------------------------------- To unsubscribe, e-mail: martinnancy@example.net For additional commands, e-mail: martinnancy@example.net From xalanmartinnancy@example.net Thu Jul 03 00:42:12 2003 Return-Path: <xalanmartinnancy@example.net> Delivered-To: martinnancy@example.net Received: (qmail 42550 invoked by uid 500); 3 Jul 2003 00:42:11 -0000 Mailing-List: contact martinnancy@example.net; run by ezmlm Precedence: bulk list-help: <mailto:martinnancy@example.net> list-unsubscribe: <mailto:martinnancy@example.net> list-post: <mailto:martinnancy@example.net> Reply-To: <martinnancy@example.net> Delivered-To: mailing list martinnancy@example.net Received: (qmail 42531 invoked from network); 3 Jul 2003 00:42:11 -0000 Received: from icarus.apache.org (83.161.120.155) by daedalus.apache.org with SMTP; 3 Jul 2003 00:42:11 -0000 Received: (qmail 77580 invoked by uid 1034); 3 Jul 2003 00:42:10 -0000 Date: 3 Jul 2003 00:42:10 -0000 Message-ID: <martinnancy@example.net> From: martinnancy@example.net To: martinnancy@example.net Subject: cvs commit: xml-xalan/c/src/xalanc/XSLT ElemCopy.cpp ElemCopyOf.cpp ElemTemplateElement.cpp StylesheetExecutionContext.hpp StylesheetExecutionContextDefault.cpp StylesheetExecutionContextDefault.hpp XSLTEngineImpl.cpp XSLTEngineImpl.hpp X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N dbertoni 2003/07/02 17:42:10 Modified: c/src/xalanc/XSLT ElemCopy.cpp ElemCopyOf.cpp ElemTemplateElement.cpp StylesheetExecutionContext.hpp StylesheetExecutionContextDefault.cpp StylesheetExecutionContextDefault.hpp XSLTEngineImpl.cpp XSLTEngineImpl.hpp Log: Send Locators through interfaces, instead of the stylesheet node. Improved error and warning messages with Locator information. Revision Changes Path 1.2 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemCopy.cpp Index: ElemCopy.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCopy.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ElemCopy.cpp 29 Jun 2003 03:58:07 -0000 1.1 +++ ElemCopy.cpp 3 Jul 2003 00:42:09 -0000 1.2 @@ -136,7 +136,7 @@ false, false, false, - this); + getLocator()); if(XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ELEMENT_NODE == nodeType) { 1.2 +3 -3 xml-xalan/c/src/xalanc/XSLT/ElemCopyOf.cpp Index: ElemCopyOf.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemCopyOf.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ElemCopyOf.cpp 29 Jun 2003 03:58:07 -0000 1.1 +++ ElemCopyOf.cpp 3 Jul 2003 00:42:10 -0000 1.2 @@ -171,7 +171,7 @@ executionContext.getXObjectFactory().createNodeSet(theNodeList))); } - executionContext.cloneToResultTree(*sourceNode, this); + executionContext.cloneToResultTree(*sourceNode, getLocator()); } else { @@ -209,13 +209,13 @@ { assert(theNodeList.item(i) != 0); - executionContext.cloneToResultTree(*theNodeList.item(i), this); + executionContext.cloneToResultTree(*theNodeList.item(i), getLocator()); } } break; case XObject888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TypeResultTreeFrag: - executionContext.outputResultTreeFragment(*value.get(), this); + executionContext.outputResultTreeFragment(*value.get(), getLocator()); break; default: 1.2 +1 -1 xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp Index: ElemTemplateElement.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ElemTemplateElement.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ElemTemplateElement.cpp 29 Jun 2003 03:58:07 -0000 1.1 +++ ElemTemplateElement.cpp 3 Jul 2003 00:42:10 -0000 1.2 @@ -694,7 +694,7 @@ { case XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4CDATA_SECTION_NODE: case XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4TEXT_NODE: - executionContext.cloneToResultTree(*child, nodeType, false, false, false, this); + executionContext.cloneToResultTree(*child, nodeType, false, false, false, getLocator()); break; case XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4ATTRIBUTE_NODE: 1.3 +17 -17 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp Index: StylesheetExecutionContext.hpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContext.hpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- StylesheetExecutionContext.hpp 1 Jul 2003 23:48:05 -0000 1.2 +++ StylesheetExecutionContext.hpp 3 Jul 2003 00:42:10 -0000 1.3 @@ -1147,13 +1147,13 @@ /** * Clone a node to the result tree * - * @param node node to clone - * @param styleNode the stylesheet element that generated the clone. + * @param node node to clone + * @param locator The Locator, if any */ virtual void cloneToResultTree( - const XalanNode& node, - const ElemTemplateElement* styleNode) = 0; + const XalanNode& node, + const LocatorType* locator) = 0; /** * Clone a node to the result tree @@ -1163,16 +1163,16 @@ * @param isLiteral true if a literal element * @param overrideStrip false if white space stripping should be done * @param shouldCloneAttributes true if attributes should be cloned - * @param styleNode the stylesheet element that generated the clone. + * @param locator The Locator, if any */ virtual void cloneToResultTree( - const XalanNode& node, - XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4NodeType nodeType, - bool isLiteral, - bool overrideStrip, - bool shouldCloneAttributes, - const ElemTemplateElement* styleNode) = 0; + const XalanNode& node, + XalanNo888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4NodeType nodeType, + bool isLiteral, + bool overrideStrip, + bool shouldCloneAttributes, + const LocatorType* locator) = 0; /** * Create an XObject that represents a Result tree fragment. @@ -1191,24 +1191,24 @@ * This is public for access by extensions. * * @param obj the XObject to output - * @param styleNode the stylesheet element that generate the fragment. + * @param locator The Locator, if any */ virtual void outputToResultTree( - const XObject& xobj, - const ElemTemplateElement* styleNode) = 0; + const XObject& xobj, + const LocatorType* locator) = 0; /** * Given a result tree fragment, walk the tree and * output it to the result stream. * * @param theTree result tree fragment - * @param styleNode the stylesheet element that generate the fragment. + * @param locator The Locator, if any */ virtual void outputResultTreeFragment( - const XObject& theTree, - const ElemTemplateElement* styleNode) = 0; + const XObject& theTree, + const LocatorType* locator) = 0; /** * Determine the full XSLT Namespace URI. 1.3 +16 -16 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp Index: StylesheetExecutionContextDefault.cpp =================================================================== RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- StylesheetExecutionContextDefault.cpp 1 Jul 2003 23:48:05 -0000 1.2 +++ StylesheetExecutionContextDefault.cpp 3 Jul 2003 00:42:10 -0000 1.3 @@ -985,22 +985,22 @@ void StylesheetExecutionContextDefault888a:dbb7:2d49:b3f6:8605:bf4e:caed:e5a4loneToResultTree( - const XalanNode& node,
{'source': 'Apache Software Foundation Public Mail Archives'}