[GME-commit] GMESRC/GME/Include/xalanc/XSLT XalanMatchPatternData.hpp, NONE, 1.1 XalanMatchPatternDataAllocator.hpp, NONE, 1.1 XalanSpaceNodeTester.hpp, NONE, 1.1 AVT.hpp, 1.1.1.1, 1.2 AVTPart.hpp, 1.1.1.1, 1.2 AVTPartSimple.hpp, 1.1.1.1, 1.2 AVTPartXPath.hpp, 1.1.1.1, 1.2 Constants.hpp, 1.1.1.1, 1.2 CountersTable.hpp, 1.1.1.1, 1.2 DecimalToRoman.hpp, 1.1.1.1, 1.2 ElemApplyImport.hpp, 1.1.1.1, 1.2 ElemApplyTemplates.hpp, 1.1.1.1, 1.2 ElemAttribute.hpp, 1.1.1.1, 1.2 ElemAttributeSet.hpp, 1.1.1.1, 1.2 ElemCallTemplate.hpp, 1.1.1.1, 1.2 ElemChoose.hpp, 1.1.1.1, 1.2 ElemComment.hpp, 1.1.1.1, 1.2 ElemCopy.hpp, 1.1.1.1, 1.2 ElemCopyOf.hpp, 1.1.1.1, 1.2 ElemDecimalFormat.hpp, 1.1.1.1, 1.2 ElemElement.hpp, 1.1.1.1, 1.2 ElemEmpty.hpp, 1.1.1.1, 1.2 ElemExtensionCall.hpp, 1.1.1.1, 1.2 ElemFallback.hpp, 1.1.1.1, 1.2 ElemForEach.hpp, 1.1.1.1, 1.2 ElemForwardCompatible.hpp, 1.1.1.1, 1.2 ElemIf.hpp, 1.1.1.1, 1.2 ElemLiteralResult.hpp, 1.1.1.1, 1.2 ElemMessage.hpp, 1.1.1.1, 1.2 ElemNumber.hpp, 1.1.1.1, 1.2 ElemOtherwise.hpp, 1.1.1.1, 1.2 ElemPI.hpp, 1.1.1.1 , 1.2 ElemParam.hpp, 1.1.1.1, 1.2 ElemSort.hpp, 1.1.1.1, 1.2 ElemTemplate.hpp, 1.1.1.1, 1.2 ElemTemplateElement.hpp, 1.1.1.1, 1.2 ElemText.hpp, 1.1.1.1, 1.2 ElemTextLiteral.hpp, 1.1.1.1, 1.2 ElemUse.hpp, 1.1.1.1, 1.2 ElemValueOf.hpp, 1.1.1.1, 1.2 ElemVariable.hpp, 1.1.1.1, 1.2 ElemWhen.hpp, 1.1.1.1, 1.2 ElemWithParam.hpp, 1.1.1.1, 1.2 ExtensionFunctionHandler.hpp, 1.1.1.1, 1.2 ExtensionNSHandler.hpp, 1.1.1.1, 1.2 FunctionCurrent.hpp, 1.1.1.1, 1.2 FunctionDocument.hpp, 1.1.1.1, 1.2 FunctionElementAvailable.hpp, 1.1.1.1, 1.2 FunctionFormatNumber.hpp, 1.1.1.1, 1.2 FunctionFunctionAvailable.hpp, 1.1.1.1, 1.2 FunctionGenerateID.hpp, 1.1.1.1, 1.2 FunctionKey.hpp, 1.1.1.1, 1.2 FunctionSystemProperty.hpp, 1.1.1.1, 1.2 FunctionUnparsedEntityURI.hpp, 1.1.1.1, 1.2 GenerateEvent.hpp, 1.1.1.1, 1.2 KeyDeclaration.hpp, 1.1.1.1, 1.2 KeyTable.hpp, 1.1.1.1, 1.2 NamespacesHandler.hpp, 1.1.1.1, 1.2 NodeSortKey.hpp, 1.1.1.1, 1.2 NodeSorter.hpp, 1.1.1.1, 1.2 OutputContextStack.hpp, 1.1.1.1, 1.2 ProblemListener.hpp, 1.1.1.1, 1.2 ProblemListenerDefault.hpp, 1 .1.1.1, 1.2 ResultNamespacesStack.hpp, 1.1.1.1, 1.2 SelectionEvent.hpp, 1.1.1.1, 1.2 Stylesheet.hpp, 1.1.1.1, 1.2 StylesheetConstructionContext.hpp, 1.1.1.1, 1.2 StylesheetConstructionContextDefault.hpp, 1.1.1.1, 1.2 StylesheetExecutionContext.hpp, 1.1.1.1, 1.2 StylesheetExecutionContextDefault.hpp, 1.1.1.1, 1.2 StylesheetHandler.hpp, 1.1.1.1, 1.2 StylesheetRoot.hpp, 1.1.1.1, 1.2 TopLevelArg.hpp, 1.1.1.1, 1.2 TraceListener.hpp, 1.1.1.1, 1.2 TraceListenerDefault.hpp, 1.1.1.1, 1.2 TracerEvent.hpp, 1.1.1.1, 1.2 VariablesStack.hpp, 1.1.1.1, 1.2 XResultTreeFrag.hpp, 1.1.1.1, 1.2 XResultTreeFragAllocator.hpp, 1.1.1.1, 1.2 XSLTDefinitions.hpp, 1.1.1.1, 1.2 XSLTEngineImpl.hpp, 1.1.1.1, 1.2 XSLTInit.hpp, 1.1.1.1, 1.2 XSLTInputSource.hpp, 1.1.1.1, 1.2 XSLTProcessor.hpp, 1.1.1.1, 1.2 XSLTProcessorEnvSupport.hpp, 1.1.1.1, 1.2 XSLTProcessorEnvSupportDefault.hpp, 1.1.1.1, 1.2 XSLTProcessorException.hpp, 1.1.1.1, 1.2 XSLTResultTarget.hpp, 1.1.1.1, 1.2 XalanAVTAllocator.hpp, 1.1.1.1, 1.2 XalanAVTPartSimpleAllocator.hpp, 1.1.1.1, 1.2 XalanAVTPar tXPathAllocator.hpp, 1.1.1.1, 1.2 XalanElemApplyTemplatesAllocator.hpp, 1.1.1.1, 1.2 XalanElemAttributeAllocator.hpp, 1.1.1.1, 1.2 XalanElemAttributeSetAllocator.hpp, 1.1.1.1, 1.2 XalanElemCallTemplateAllocator.hpp, 1.1.1.1, 1.2 XalanElemElementAllocator.hpp, 1.1.1.1, 1.2 XalanElemEmptyAllocator.hpp, 1.1.1.1, 1.2 XalanElemLiteralResultAllocator.hpp, 1.1.1.1, 1.2 XalanElemTemplateAllocator.hpp, 1.1.1.1, 1.2 XalanElemTextAllocator.hpp, 1.1.1.1, 1.2 XalanElemTextLiteralAllocator.hpp, 1.1.1.1, 1.2 XalanElemValueOfAllocator.hpp, 1.1.1.1, 1.2 XalanElemVariableAllocator.hpp, 1.1.1.1, 1.2 XalanNumberingResourceBundle.hpp, 1.1.1.1, 1.2 XalanSourceTreeDocumentAllocator.hpp, 1.1.1.1, 1.2 XalanSourceTreeDocumentFragmentAllocator.hpp, 1.1.1.1, 1.2
Log messages of CVS commits
gme-commit at list.isis.vanderbilt.edu
Tue Feb 19 14:14:17 CST 2008
- Previous message: [GME-commit] GMESRC/GME/Include/xalanc/XPath ElementPrefixResolverProxy.hpp, 1.1.1.1, 1.2 FormatterStringLengthCounter.hpp, 1.1.1.1, 1.2 Function.hpp, 1.1.1.1, 1.2 FunctionConcat.hpp, 1.1.1.1, 1.2 FunctionContains.hpp, 1.1.1.1, 1.2 FunctionID.hpp, 1.1.1.1, 1.2 FunctionLang.hpp, 1.1.1.1, 1.2 FunctionNamespaceURI.hpp, 1.1.1.1, 1.2 FunctionNormalizeSpace.hpp, 1.1.1.1, 1.2 FunctionStartsWith.hpp, 1.1.1.1, 1.2 FunctionString.hpp, 1.1.1.1, 1.2 FunctionSubstring.hpp, 1.1.1.1, 1.2 FunctionSubstringAfter.hpp, 1.1.1.1, 1.2 FunctionSubstringBefore.hpp, 1.1.1.1, 1.2 FunctionTranslate.hpp, 1.1.1.1, 1.2 MutableNodeRefList.hpp, 1.1.1.1, 1.2 NameSpace.hpp, 1.1.1.1, 1.2 NodeRefList.hpp, 1.1.1.1, 1.2 NodeRefListBase.hpp, 1.1.1.1, 1.2 XBoolean.hpp, 1.1.1.1, 1.2 XNodeSet.hpp, 1.1.1.1, 1.2 XNodeSetAllocator.hpp, 1.1.1.1, 1.2 XNodeSetBase.hpp, 1.1.1.1, 1.2 XNodeSetNodeProxy.hpp, 1.1.1.1, 1.2 XNodeSetNodeProxyAllocator.hpp, 1.1.1.1, 1.2 XNodeSetResultTreeFragProxy.hpp, 1.1.1.1, 1.2 XNull.hpp, 1.1.1.1, 1.2 XNumber.hpp, 1.1.1.1, 1.2 XNumberAllocator.hpp, 1.1.1 .1, 1.2 XNumberBase.hpp, 1.1.1.1, 1.2 XObject.hpp, 1.1.1.1, 1.2 XObjectFactory.hpp, 1.1.1.1, 1.2 XObjectFactoryDefault.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxy.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxyBase.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxyText.hpp, 1.1.1.1, 1.2 XObjectTypeCallback.hpp, 1.1.1.1, 1.2 XPath.hpp, 1.1.1.1, 1.2 XPathAllocator.hpp, 1.1.1.1, 1.2 XPathConstructionContext.hpp, 1.1.1.1, 1.2 XPathConstructionContextDefault.hpp, 1.1.1.1, 1.2 XPathDefinitions.hpp, 1.1.1.1, 1.2 XPathEnvSupport.hpp, 1.1.1.1, 1.2 XPathEnvSupportDefault.hpp, 1.1.1.1, 1.2 XPathEvaluator.hpp, 1.1.1.1, 1.2 XPathExecutionContext.hpp, 1.1.1.1, 1.2 XPathExecutionContextDefault.hpp, 1.1.1.1, 1.2 XPathExpression.hpp, 1.1.1.1, 1.2 XPathFactory.hpp, 1.1.1.1, 1.2 XPathFactoryBlock.hpp, 1.1.1.1, 1.2 XPathFactoryDefault.hpp, 1.1.1.1, 1.2 XPathFunctionTable.hpp, 1.1.1.1, 1.2 XPathInit.hpp, 1.1.1.1, 1.2 XPathParserException.hpp, 1.1.1.1, 1.2 XPathProcessor.hpp, 1.1.1.1, 1.2 XPathProcessorImpl.hpp, 1.1.1.1, 1.2 XSpan.hpp, 1.1.1.1, 1.2 XString.hpp , 1.1.1.1, 1.2 XStringAdapter.hpp, 1.1.1.1, 1.2 XStringAdapterAllocator.hpp, 1.1.1.1, 1.2 XStringAllocator.hpp, 1.1.1.1, 1.2 XStringBase.hpp, 1.1.1.1, 1.2 XStringCached.hpp, 1.1.1.1, 1.2 XStringCachedAllocator.hpp, 1.1.1.1, 1.2 XStringReference.hpp, 1.1.1.1, 1.2 XStringReferenceAllocator.hpp, 1.1.1.1, 1.2 XToken.hpp, 1.1.1.1, 1.2 XTokenNumberAdapter.hpp, 1.1.1.1, 1.2 XTokenNumberAdapterAllocator.hpp, 1.1.1.1, 1.2 XTokenStringAdapter.hpp, 1.1.1.1, 1.2 XTokenStringAdapterAllocator.hpp, 1.1.1.1, 1.2 XUnknown.hpp, 1.1.1.1, 1.2 XalanDocumentFragmentNodeRefListBaseProxy.hpp, 1.1.1.1, 1.2 XalanQName.hpp, 1.1.1.1, 1.2 XalanQNameByReference.hpp, 1.1.1.1, 1.2 XalanQNameByValue.hpp, 1.1.1.1, 1.2 XalanQNameByValueAllocator.hpp, 1.1.1.1, 1.2 XalanXPathException.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xercesc/com BindStatusCallback.cpp, NONE, 1.1 BindStatusCallback.h, NONE, 1.1 IXMLDOMCharacterDataImpl.h, NONE, 1.1 IXMLDOMNodeImpl.h, NONE, 1.1 IXMLDOMNodeImpl.inl, NONE, 1.1 IXMLDOMTextImpl.h, NONE, 1.1 NodeContainerImpl.h, NONE, 1.1 README.txt, NONE, 1.1 StdAfx.cpp, NONE, 1.1 StdAfx.h, NONE, 1.1 XMLDOMAttribute.cpp, NONE, 1.1 XMLDOMAttribute.h, NONE, 1.1 XMLDOMCDATASection.h, NONE, 1.1 XMLDOMComment.h, NONE, 1.1 XMLDOMDocument.cpp, NONE, 1.1 XMLDOMDocument.h, NONE, 1.1 XMLDOMDocumentFragment.h, NONE, 1.1 XMLDOMDocumentType.cpp, NONE, 1.1 XMLDOMDocumentType.h, NONE, 1.1 XMLDOMElement.cpp, NONE, 1.1 XMLDOMElement.h, NONE, 1.1 XMLDOMEntity.cpp, NONE, 1.1 XMLDOMEntity.h, NONE, 1.1 XMLDOMEntityReference.h, NONE, 1.1 XMLDOMImplementation.cpp, NONE, 1.1 XMLDOMImplementation.h, NONE, 1.1 XMLDOMNamedNodeMap.cpp, NONE, 1.1 XMLDOMNamedNodeMap.h, NONE, 1.1 XMLDOMNodeList.cpp, NONE, 1.1 XMLDOMNodeList.h, NONE, 1.1 XMLDOMNotation.cpp, NONE, 1.1 XMLDOMNotation.h, NONE, 1.1 XMLDOMParseError.cpp, NONE, 1.1 XMLDOMParseError.h, N ONE, 1.1 XMLDOMProcessingInstruction.cpp, NONE, 1.1 XMLDOMProcessingInstruction.h, NONE, 1.1 XMLDOMText.h, NONE, 1.1 XMLDOMUtil.cpp, NONE, 1.1 XMLDOMUtil.h, NONE, 1.1 XMLDOMXMLDecl.cpp, NONE, 1.1 XMLDOMXMLDecl.h, NONE, 1.1 XMLHTTPRequest.cpp, NONE, 1.1 XMLHttpRequest.h, NONE, 1.1 registry.bin, NONE, 1.1 resource.h, NONE, 1.1 xml4com.cpp, NONE, 1.1 xml4com.def, NONE, 1.1 xml4com.idl, NONE, 1.1 xml4com.rc, NONE, 1.1 xml4comCP.h, NONE, 1.1 xml4comps.def, NONE, 1.1 xml4comps.mk, NONE, 1.1 xmldocument.rgs, NONE, 1.1 xmlhttprequest.rgs, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT
In directory escher:/tmp/cvs-serv25974/XSLT
Modified Files:
AVT.hpp AVTPart.hpp AVTPartSimple.hpp AVTPartXPath.hpp
Constants.hpp CountersTable.hpp DecimalToRoman.hpp
ElemApplyImport.hpp ElemApplyTemplates.hpp ElemAttribute.hpp
ElemAttributeSet.hpp ElemCallTemplate.hpp ElemChoose.hpp
ElemComment.hpp ElemCopy.hpp ElemCopyOf.hpp
ElemDecimalFormat.hpp ElemElement.hpp ElemEmpty.hpp
ElemExtensionCall.hpp ElemFallback.hpp ElemForEach.hpp
ElemForwardCompatible.hpp ElemIf.hpp ElemLiteralResult.hpp
ElemMessage.hpp ElemNumber.hpp ElemOtherwise.hpp ElemPI.hpp
ElemParam.hpp ElemSort.hpp ElemTemplate.hpp
ElemTemplateElement.hpp ElemText.hpp ElemTextLiteral.hpp
ElemUse.hpp ElemValueOf.hpp ElemVariable.hpp ElemWhen.hpp
ElemWithParam.hpp ExtensionFunctionHandler.hpp
ExtensionNSHandler.hpp FunctionCurrent.hpp
FunctionDocument.hpp FunctionElementAvailable.hpp
FunctionFormatNumber.hpp FunctionFunctionAvailable.hpp
FunctionGenerateID.hpp FunctionKey.hpp
FunctionSystemProperty.hpp FunctionUnparsedEntityURI.hpp
GenerateEvent.hpp KeyDeclaration.hpp KeyTable.hpp
NamespacesHandler.hpp NodeSortKey.hpp NodeSorter.hpp
OutputContextStack.hpp ProblemListener.hpp
ProblemListenerDefault.hpp ResultNamespacesStack.hpp
SelectionEvent.hpp Stylesheet.hpp
StylesheetConstructionContext.hpp
StylesheetConstructionContextDefault.hpp
StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.hpp StylesheetHandler.hpp
StylesheetRoot.hpp TopLevelArg.hpp TraceListener.hpp
TraceListenerDefault.hpp TracerEvent.hpp VariablesStack.hpp
XResultTreeFrag.hpp XResultTreeFragAllocator.hpp
XSLTDefinitions.hpp XSLTEngineImpl.hpp XSLTInit.hpp
XSLTInputSource.hpp XSLTProcessor.hpp
XSLTProcessorEnvSupport.hpp XSLTProcessorEnvSupportDefault.hpp
XSLTProcessorException.hpp XSLTResultTarget.hpp
XalanAVTAllocator.hpp XalanAVTPartSimpleAllocator.hpp
XalanAVTPartXPathAllocator.hpp
XalanElemApplyTemplatesAllocator.hpp
XalanElemAttributeAllocator.hpp
XalanElemAttributeSetAllocator.hpp
XalanElemCallTemplateAllocator.hpp
XalanElemElementAllocator.hpp XalanElemEmptyAllocator.hpp
XalanElemLiteralResultAllocator.hpp
XalanElemTemplateAllocator.hpp XalanElemTextAllocator.hpp
XalanElemTextLiteralAllocator.hpp
XalanElemValueOfAllocator.hpp XalanElemVariableAllocator.hpp
XalanNumberingResourceBundle.hpp
XalanSourceTreeDocumentAllocator.hpp
XalanSourceTreeDocumentFragmentAllocator.hpp
Added Files:
XalanMatchPatternData.hpp XalanMatchPatternDataAllocator.hpp
XalanSpaceNodeTester.hpp
Log Message:
Xalan1.10 include files.
CVS User: Zoltan Molnar, ISIS (zolmol)
Index: FunctionFunctionAvailable.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionFunctionAvailable.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionFunctionAvailable.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- FunctionFunctionAvailable.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONFUNCTIONAVAILABLE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONFUNCTIONAVAILABLE_HEADER_GUARD_1357924680)
***************
*** 65,73 ****
- #include <set>
- #include <vector>
-
-
-
#include <xalanc/XPath/Function.hpp>
--- 24,27 ----
***************
*** 114,123 ****
virtual FunctionFunctionAvailable*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 68,77 ----
virtual FunctionFunctionAvailable*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: Stylesheet.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/Stylesheet.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Stylesheet.hpp 8 Apr 2004 07:57:25 -0000 1.1.1.1
--- Stylesheet.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
***************
*** 69,79 ****
! #include <deque>
! #include <map>
! #include <vector>
! #include <xalanc/XalanDOM/XalanNode.hpp>
--- 25,36 ----
! #include <xalanc/XalanDOM/XalanNode.hpp>
! #include <xalanc/XalanDOM/XalanDOMString.hpp>
! #include <xalanc/Include/XalanVector.hpp>
! #include <xalanc/Include/XalanMap.hpp>
!
***************
*** 90,94 ****
--- 47,53 ----
#include <xalanc/XSLT/NamespacesHandler.hpp>
#include <xalanc/XSLT/KeyDeclaration.hpp>
+ #include <xalanc/XSLT/StylesheetConstructionContext.hpp>
#include <xalanc/XSLT/StylesheetExecutionContext.hpp>
+ #include <xalanc/XSLT/XalanSpaceNodeTester.hpp>
***************
*** 109,112 ****
--- 68,72 ----
class StylesheetConstructionContext;
class StylesheetRoot;
+ class XalanMatchPatternData;
class XalanQName;
class XObject;
***************
*** 114,117 ****
--- 74,80 ----
+ typedef XalanVector<const XalanMatchPatternData*> PatternTableVectorTypeDecl;
+ XALAN_USES_MEMORY_MANAGER(PatternTableVectorTypeDecl)
+
/**
***************
*** 124,164 ****
public:
! #if defined(XALAN_STRICT_ANSI_HEADERS)
! typedef std::size_t size_type;
! #else
! typedef size_t size_type;
! #endif
!
typedef StylesheetExecutionContext::ParamVectorType ParamVectorType;
typedef XalanQName::NamespaceVectorType NamespaceVectorType;
typedef XalanQName::NamespacesStackType NamespacesStackType;
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef map<XalanDOMString,
! ExtensionNSHandler*,
! less<XalanDOMString> > ExtensionNamespacesMapType;
! typedef map<XalanQNameByReference,
! const ElemTemplate*,
! less<XalanQName> > ElemTemplateMapType;
! typedef vector<ElemVariable*> ElemVariableVectorType;
! typedef vector<KeyDeclaration> KeyDeclarationVectorType;
! typedef map<const XalanNode*,
! KeyTable*,
! less<const XalanNode*> > KeyTablesTableType;
! typedef vector<Stylesheet*> StylesheetVectorType;
! typedef vector<XalanDOMString> URLStackType;
! typedef vector<ElemDecimalFormat*> ElemDecimalFormatVectorType;
! #else
! typedef std::map<XalanDOMString, ExtensionNSHandler*> ExtensionNamespacesMapType;
! typedef std::map<XalanQNameByReference,
! const ElemTemplate*,
! std::less<XalanQName> > ElemTemplateMapType;
! typedef std::vector<ElemVariable*> ElemVariableVectorType;
! typedef std::vector<KeyDeclaration> KeyDeclarationVectorType;
! typedef std::map<const XalanNode*, KeyTable*> KeyTablesTableType;
! typedef std::vector<Stylesheet*> StylesheetVectorType;
! typedef std::vector<XalanDOMString> URLStackType;
! typedef std::vector<ElemDecimalFormat*> ElemDecimalFormatVectorType;
! #endif
/**
--- 87,113 ----
public:
! typedef StylesheetConstructionContext::size_type size_type;
typedef StylesheetExecutionContext::ParamVectorType ParamVectorType;
typedef XalanQName::NamespaceVectorType NamespaceVectorType;
typedef XalanQName::NamespacesStackType NamespacesStackType;
! typedef XalanVector<ElemVariable*> ElemVariableVectorType;
! typedef XalanVector<KeyDeclaration> KeyDeclarationVectorType;
! typedef XalanVector<Stylesheet*> StylesheetVectorType;
! typedef XalanVector<XalanDOMString> URLStackType;
! typedef XalanVector<ElemDecimalFormat*> ElemDecimalFormatVectorType;
! typedef XalanVector<XalanSpaceNodeTester> WhitespaceElementsVectorType;
! typedef PatternTableVectorTypeDecl PatternTableVectorType;
!
! typedef XalanMap<XalanDOMString, ExtensionNSHandler*> ExtensionNamespacesMapType;
!
! typedef XalanMap<XalanQNameByReference,
! const ElemTemplate* > ElemTemplateMapType;
!
! typedef XalanMap<const XalanNode*, KeyTable* > KeyTablesTableType;
!
! typedef XalanMap<XalanDOMString, PatternTableVectorType> PatternTableMapType;
!
! typedef StylesheetConstructionContext::GetAndReleaseCachedString GetAndReleaseCachedString;
/**
***************
*** 175,178 ****
--- 124,139 ----
~Stylesheet();
+ static Stylesheet*
+ create(MemoryManagerType& theManager,
+ StylesheetRoot& root,
+ const XalanDOMString& baseIdentifier,
+ StylesheetConstructionContext& constructionContext);
+
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_elementPatternTable.getMemoryManager();
+ }
+
/**
* Retrieve XSLT version number
***************
*** 306,309 ****
--- 267,273 ----
}
+ void
+ addWhitespaceElement(const XalanSpaceNodeTester& theTester);
+
/**
* Called after construction is completed.
***************
*** 335,341 ****
*/
const XalanDOMString*
! getNamespaceFromStack(const XalanDOMString& nodeName) const
{
! return getNamespaceFromStack(c_wstr(nodeName));
}
--- 299,306 ----
*/
const XalanDOMString*
! getNamespaceFromStack(const XalanDOMString& nodeName,
! XalanDOMString& theBuffer) const
{
! return getNamespaceFromStack(c_wstr(nodeName), theBuffer);
}
***************
*** 347,351 ****
*/
const XalanDOMString*
! getNamespaceFromStack(const XalanDOMChar* nodeName) const;
/**
--- 312,317 ----
*/
const XalanDOMString*
! getNamespaceFromStack(const XalanDOMChar* nodeName,
! XalanDOMString& theBuffer) const;
/**
***************
*** 374,378 ****
assert(prefix != 0);
! return XalanQName::getNamespaceForPrefix(m_namespaces, XalanDOMString(prefix));
}
--- 340,344 ----
assert(prefix != 0);
! return XalanQName::getNamespaceForPrefix(m_namespaces, (const XalanDOMChar*)prefix);
}
***************
*** 608,752 ****
/**
- * A class to contain a match pattern and it's corresponding template.
- * This class also defines a node in a match pattern linked list.
- */
- class MatchPattern2
- {
- public:
-
- typedef XPath::eMatchScore eMatchScore;
-
- /**
- * Construct a match pattern from a pattern and template.
- *
- * @param theTemplate node that contains the template for this pattern
- * @param posInStylesheet position in stylesheet
- * @param targetString target string
- * @param matchPattern the match pattern
- * @param pattern the pattern string
- * @param priority the default priority
- */
- MatchPattern2(
- const ElemTemplate& theTemplate,
- size_type posInStylesheet,
- const XalanDOMString& targetString,
- const XPath& matchPattern,
- const XalanDOMString& pattern,
- eMatchScore priority) :
- m_template(&theTemplate),
- m_posInStylesheet(posInStylesheet),
- m_targetString(targetString),
- m_matchPattern(&matchPattern),
- m_pattern(&pattern),
- m_priority(priority)
- {
- }
-
- MatchPattern2() :
- m_template(0),
- m_posInStylesheet(0),
- m_targetString(),
- m_matchPattern(0),
- m_pattern(0),
- m_priority(XPath::eMatchScoreNone)
- {
- }
-
- ~MatchPattern2()
- {
- }
-
- /**
- * Retrieve string for target.
- *
- * @return target string
- */
- const XalanDOMString&
- getTargetString() const
- {
- return m_targetString;
- }
-
- /**
- * Retrieve the match pattern associated with pattern.
- *
- * @return XPath for pattern
- */
- const XPath*
- getExpression() const
- {
- return m_matchPattern;
- }
-
- /**
- * Retrieve position of pattern in stylesheet.
- *
- * @return position in stylesheet
- */
- size_type
- getPositionInStylesheet() const
- {
- return m_posInStylesheet;
- }
-
- /**
- * Retrieve pattern string.
- *
- * @return string that contains element pattern
- */
- const XalanDOMString*
- getPattern() const
- {
- return m_pattern;
- }
-
- /**
- * Retrieve node that contains the template for this pattern.
- *
- * @return template node
- */
- const ElemTemplate*
- getTemplate() const
- {
- return m_template;
- }
-
- eMatchScore
- getDefaultPriority() const
- {
- return m_priority;
- }
-
- double
- getPriorityOrDefault() const;
-
- private:
-
- const ElemTemplate* m_template;
- size_type m_posInStylesheet;
- XalanDOMString m_targetString;
- const XPath* m_matchPattern;
- const XalanDOMString* m_pattern;
- eMatchScore m_priority;
- };
-
- #if defined(XALAN_NO_STD_NAMESPACE)
- typedef vector<const MatchPattern2*> PatternTableVectorType;
-
- typedef map<XalanDOMString,
- PatternTableVectorType,
- less<XalanDOMString> > PatternTableMapType;
-
- typedef deque<MatchPattern2> MatchPattern2Container;
- #else
- typedef std::vector<const MatchPattern2*> PatternTableVectorType;
-
- typedef std::map<XalanDOMString,
- PatternTableVectorType> PatternTableMapType;
-
- typedef std::deque<MatchPattern2> MatchPattern2Container;
- #endif
-
- /**
* Add object to vector of match patterns if not already there.
*
--- 574,577 ----
***************
*** 756,761 ****
static void
addObjectIfNotFound(
! const MatchPattern2* thePattern,
! PatternTableVectorType& theVector);
/**
--- 581,586 ----
static void
addObjectIfNotFound(
! const XalanMatchPatternData* thePattern,
! PatternTableVectorType& theVector);
/**
***************
*** 770,776 ****
static void
addObjectIfNotFound(
! const MatchPattern2* thePattern,
! const MatchPattern2* theArray[],
! unsigned int& theArraySize);
/**
--- 595,601 ----
static void
addObjectIfNotFound(
! const XalanMatchPatternData* thePattern,
! const XalanMatchPatternData* theArray[],
! unsigned int& theArraySize);
/**
***************
*** 782,786 ****
*/
const PatternTableVectorType*
! locateElementMatchPatternList2(const XalanDOMString& theName) const;
/**
--- 607,611 ----
*/
const PatternTableVectorType*
! locateElementMatchPatternDataList(const XalanDOMString& theName) const;
/**
***************
*** 792,796 ****
*/
const PatternTableVectorType*
! locateAttributeMatchPatternList2(const XalanDOMString& theName) const;
/**
--- 617,621 ----
*/
const PatternTableVectorType*
! locateAttributeMatchPatternDataList(const XalanDOMString& theName) const;
/**
***************
*** 801,805 ****
*/
const PatternTableVectorType*
! locateMatchPatternList2(
const XalanNode& theNode,
XalanNode::NodeType targetNodeType) const;
--- 626,630 ----
*/
const PatternTableVectorType*
! locateMatchPatternDataList(
const XalanNode& theNode,
XalanNode::NodeType targetNodeType) const;
***************
*** 902,905 ****
--- 727,732 ----
KeyDeclarationVectorType m_keyDeclarations;
+ WhitespaceElementsVectorType m_whitespaceElements;
+
static const XalanQNameByReference s_emptyQName;
***************
*** 1034,1047 ****
PatternTableVectorType m_nodePatternList;
! /**
! * This will hold all of the MatchPattern2 instances for the
! * stylesheet.
! */
! MatchPattern2Container m_matchPattern2Container;
!
! /**
! * This caches the number of possible patterns we can match.
! */
! MatchPattern2Container::size_type m_patternCount;
ElemDecimalFormatVectorType m_elemDecimalFormats;
--- 861,865 ----
PatternTableVectorType m_nodePatternList;
! size_type m_patternCount;
ElemDecimalFormatVectorType m_elemDecimalFormats;
Index: ElemForEach.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemForEach.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemForEach.hpp 8 Apr 2004 07:57:17 -0000 1.1.1.1
--- ElemForEach.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMFOREACH_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMFOREACH_HEADER_GUARD)
***************
*** 65,69 ****
! #include <vector>
--- 24,28 ----
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 75,78 ****
--- 34,39 ----
#include <xalanc/XPath/NodeRefListBase.hpp>
+ #include <xalanc/XPath/MutableNodeRefList.hpp>
+ #include <xalanc/XPath/XObject.hpp>
***************
*** 116,125 ****
~ElemForEach();
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<ElemSort*> SortElemsVectorType;
! #else
! typedef std::vector<ElemSort*> SortElemsVectorType;
! #endif
!
// These methods are inherited from ElemTemplateElement ...
--- 77,81 ----
~ElemForEach();
! typedef XalanVector<ElemSort*> SortElemsVectorType;
// These methods are inherited from ElemTemplateElement ...
***************
*** 140,145 ****
--- 96,114 ----
const NamespacesHandler& theParentHandler);
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual const ElemTemplateElement*
+ getNextChildElemToExecute(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* currentElem) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
virtual const XPath*
***************
*** 164,167 ****
--- 133,175 ----
int xslToken);
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+
+ /*
+ * Returns a pointer to a list of the selected nodes. The
+ * nodes are sorted if required.
+ *
+ * @param executionContext context for executing this element
+ * @return pointer to the list of selected (and sorted) nodes
+ */
+ virtual const NodeRefListBase*
+ createSelectedAndSortedNodeList(
+ StylesheetExecutionContext& executionContext) const;
+
+ /*
+ * Release any objects used to maintain the last selected
+ * (and sorted) node list to be created
+ *
+ * @param executionContext context for executing this element
+ */
+ virtual void
+ releaseSelectedAndSortedNodeList(
+ StylesheetExecutionContext& executionContext) const;
+
+ /*
+ * Sorts a list of nodes
+ *
+ * @param executionContext context for executing this element
+ * @param selectedNodeList list of nodes to be sorted
+ * @param sortedNodeList list for sorted nodes
+ *
+ * @returns pointer to list of sorted nodes
+ */
+ virtual const NodeRefListBase*
+ sortChildren(
+ StylesheetExecutionContext& executionContext,
+ const NodeRefListBase& selectedNodeList,
+ MutableNodeRefList& sortedNodeList) const;
+
+ #else
/**
* Perform a query if needed, and call transformChild for each child.
***************
*** 206,209 ****
--- 214,218 ----
NodeSorter* sorter,
int selectStackFrameIndex) const;
+ #endif
const XPath* m_selectPattern;
Index: XalanSourceTreeDocumentAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanSourceTreeDocumentAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanSourceTreeDocumentAllocator.hpp 8 Apr 2004 07:57:32 -0000 1.1.1.1
--- XalanSourceTreeDocumentAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 111,115 ****
* @param theBlockSize The block size.
*/
! XalanSourceTreeDocumentAllocator(size_type theBlockCount);
~XalanSourceTreeDocumentAllocator();
--- 70,74 ----
* @param theBlockSize The block size.
*/
! XalanSourceTreeDocumentAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanSourceTreeDocumentAllocator();
Index: StylesheetConstructionContext.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/StylesheetConstructionContext.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StylesheetConstructionContext.hpp 8 Apr 2004 07:57:25 -0000 1.1.1.1
--- StylesheetConstructionContext.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(STYLESHEETCONSTRUCTIONCONTEXT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(STYLESHEETCONSTRUCTIONCONTEXT_HEADER_GUARD_1357924680)
***************
*** 76,79 ****
--- 33,37 ----
#include <xalanc/XPath/XalanQName.hpp>
+ #include <xalanc/XPath/XPath.hpp>
#include <xalanc/XPath/XPathConstructionContext.hpp>
***************
*** 96,99 ****
--- 54,58 ----
class AVT;
class AVTPart;
+ class ElemTemplate;
class ElemTemplateElement;
class ExtensionNSHandler;
***************
*** 102,107 ****
class StylesheetRoot;
class XalanDocument;
class XalanNode;
- class XPath;
class XSLTInputSource;
--- 61,66 ----
class StylesheetRoot;
class XalanDocument;
+ class XalanMatchPatternData;
class XalanNode;
class XSLTInputSource;
***************
*** 195,199 ****
explicit
! StylesheetConstructionContext();
virtual
--- 154,158 ----
explicit
! StylesheetConstructionContext(MemoryManagerType& theManager);
virtual
***************
*** 268,273 ****
* @return string to fully qualified URI
*/
! virtual XalanDOMString
! getURLStringFromString(const XalanDOMString& urlString) = 0;
/**
--- 227,233 ----
* @return string to fully qualified URI
*/
! virtual XalanDOMString&
! getURLStringFromString(const XalanDOMString& urlString,
! XalanDOMString& theResult) = 0;
/**
***************
*** 290,297 ****
* @return string to fully qualified URI
*/
! virtual XalanDOMString
getURLStringFromString(
const XalanDOMString& urlString,
! const XalanDOMString& base) = 0;
/**
--- 250,258 ----
* @return string to fully qualified URI
*/
! virtual XalanDOMString&
getURLStringFromString(
const XalanDOMString& urlString,
! const XalanDOMString& base,
! XalanDOMString& theResult) = 0;
/**
***************
*** 312,315 ****
--- 273,278 ----
* @param str string to match
* @param resolver resolver for namespace resolution
+ * @param allowVariableReferences If true, variable references are allowed.
+ * @param allowKeyFunction If true, calls to the key() function are allowed.
* @return XPath for match pattern
*/
***************
*** 318,322 ****
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver) = 0;
/**
--- 281,287 ----
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true) = 0;
/**
***************
*** 328,331 ****
--- 293,298 ----
* @param str string to match
* @param resolver resolver for namespace resolution
+ * @param allowVariableReferences If true, variable references are allowed.
+ * @param allowKeyFunction If true, calls to the key() function are allowed.
* @return XPath for match pattern
*/
***************
*** 334,338 ****
const LocatorType* locator,
const XalanDOMChar* str,
! const PrefixResolver& resolver) = 0;
/**
--- 301,307 ----
const LocatorType* locator,
const XalanDOMChar* str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true) = 0;
/**
***************
*** 350,354 ****
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver) = 0;
/**
--- 319,325 ----
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true) = 0;
/**
***************
*** 366,370 ****
const LocatorType* locator,
const XalanDOMChar* str,
! const PrefixResolver& resolver) = 0;
/**
--- 337,343 ----
const LocatorType* locator,
const XalanDOMChar* str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true) = 0;
/**
***************
*** 383,387 ****
const XalanDOMChar* str,
XalanDOMString::size_type len,
! const PrefixResolver& resolver) = 0;
/**
--- 356,362 ----
const XalanDOMChar* str,
XalanDOMString::size_type len,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true) = 0;
/**
***************
*** 736,739 ****
--- 711,740 ----
const LocatorType* locator = 0) = 0;
+ /**
+ * Create an instance of XalanMatchPatternData, which describes
+ * data related to a match pattern and template in stylesheet.
+ * The instance owns the memory and will delete the element when
+ * it goes out of scope and the containing stylesheet is
+ * destroyed.
+ *
+ * @param theTemplate The ElemTemplate node that contains the template for this pattern
+ * @param thePosition The position in the stylesheet
+ * @param theTargetString The target string for match pattern
+ * @param TheMatchPattern The match pattern
+ * @param thePatternString the pattern string
+ * @param thePriority The priority for the match pattern.
+ *
+ * @return A pointer to the new instance.
+ */
+ virtual const XalanMatchPatternData*
+ createXalanMatchPatternData(
+ const ElemTemplate& theTemplate,
+ size_type thePosition,
+ const XalanDOMString& theTargetString,
+ const XPath& theMatchPattern,
+ const XalanDOMString& thePatternString,
+ XPath::eMatchScore thePriority) = 0;
+
+
// These are inherited from XPathConstructionContext...
***************
*** 751,766 ****
virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const = 0;
-
- virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const = 0;
-
- virtual void
warn(
const XalanDOMString& msg,
--- 752,755 ----
***************
*** 775,790 ****
virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const = 0;
-
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const = 0;
-
- virtual void
message(
const XalanDOMString& msg,
--- 764,767 ----
***************
*** 798,812 ****
const LocatorType* locator) const = 0;
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const = 0;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const = 0;
};
--- 775,778 ----
Index: ElemApplyTemplates.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemApplyTemplates.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemApplyTemplates.hpp 8 Apr 2004 07:57:15 -0000 1.1.1.1
--- ElemApplyTemplates.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD)
***************
*** 106,111 ****
--- 65,89 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual const ElemTemplateElement*
+ getNextChildElemToExecute(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* currentElem) const;
+
+ virtual const ElemTemplateElement*
+ getFirstChildElemToExecute(
+ StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
+
+
protected:
***************
*** 114,117 ****
--- 92,99 ----
childTypeAllowed(int xslToken) const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ const ElemTemplateElement*
+ findNextTemplateToExecute(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
transformChild(
***************
*** 131,134 ****
--- 113,117 ----
NodeSorter* sorter,
int selectStackFrameIndex) const;
+ #endif
private:
Index: FunctionUnparsedEntityURI.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionUnparsedEntityURI.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionUnparsedEntityURI.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- FunctionUnparsedEntityURI.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONUNPARSEDENTITYURI_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONUNPARSEDENTITYURI_HEADER_GUARD_1357924680)
***************
*** 65,72 ****
- #include <vector>
-
-
-
// Base class header file...
#include <xalanc/XPath/Function.hpp>
--- 24,27 ----
***************
*** 109,121 ****
virtual FunctionUnparsedEntityURI*
#endif
! clone() const
! {
! return new FunctionUnparsedEntityURI(*this);
! }
protected:
! virtual const XalanDOMString
! getError() const;
private:
--- 64,73 ----
virtual FunctionUnparsedEntityURI*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XalanElemAttributeSetAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemAttributeSetAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemAttributeSetAllocator.hpp 8 Apr 2004 07:57:30 -0000 1.1.1.1
--- XalanElemAttributeSetAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemAttributeSetAllocator(size_type theBlockCount);
~XalanElemAttributeSetAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemAttributeSetAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemAttributeSetAllocator();
Index: TracerEvent.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/TracerEvent.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TracerEvent.hpp 8 Apr 2004 07:57:29 -0000 1.1.1.1
--- TracerEvent.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_TracerEvent_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_TracerEvent_HEADER_GUARD)
***************
*** 113,118 ****
* @return string representation of the given node
*/
! static XalanDOMString
! printNode(const XalanNode& n);
/**
--- 72,77 ----
* @return string representation of the given node
*/
! static XalanDOMString&
! printNode(const XalanNode& n, XalanDOMString& theResult);
/**
***************
*** 125,130 ****
* @return string representation of the given node list
*/
! static XalanDOMString
! printNodeList(const XalanNodeList& l);
/**
--- 84,89 ----
* @return string representation of the given node list
*/
! static XalanDOMString&
! printNodeList(const XalanNodeList& l, XalanDOMString& theResult);
/**
Index: XalanElemLiteralResultAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemLiteralResultAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemLiteralResultAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemLiteralResultAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemLiteralResultAllocator(size_type theBlockCount);
~XalanElemLiteralResultAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemLiteralResultAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemLiteralResultAllocator();
Index: XalanElemTextAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemTextAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemTextAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemTextAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 93,97 ****
* @param theBlockSize The block size.
*/
! XalanElemTextAllocator(size_type theBlockCount);
~XalanElemTextAllocator();
--- 52,56 ----
* @param theBlockSize The block size.
*/
! XalanElemTextAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemTextAllocator();
Index: KeyTable.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/KeyTable.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** KeyTable.hpp 8 Apr 2004 07:57:23 -0000 1.1.1.1
--- KeyTable.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_KEYTABLE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_KEYTABLE_HEADER_GUARD)
***************
*** 72,81 ****
! #if defined(XALAN_USE_HASH_MAP)
! #include <hash_map>
! #else
! #include <map>
! #endif
! #include <vector>
--- 31,40 ----
! #include <xalanc/XalanDOM/XalanDOMString.hpp>
!
!
!
! #include <xalanc/Include/XalanVector.hpp>
! #include <xalanc/Include/XalanMap.hpp>
***************
*** 111,146 ****
* to tables that contain mappings of identifier values to nodes.
*/
- class KeyTable
- {
- public:
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<KeyDeclaration> KeyDeclarationVectorType;
- typedef map<XalanDOMString,
- MutableNodeRefList,
- less<XalanDOMString> > NodeListMapType;
! typedef map<XalanQNameByReference,
! NodeListMapType,
! less<XalanQNameByReference> > KeysMapType;
! #else
! typedef std::vector<KeyDeclaration> KeyDeclarationVectorType;
!
! #if defined(XALAN_USE_HASH_MAP)
! typedef std::hash_map<XalanDOMString,
! MutableNodeRefList> NodeListMapType;
! typedef std::hash_map<XalanQNameByReference,
! NodeListMapType> KeysMapType;
! #else
! typedef std::map<XalanDOMString,
! MutableNodeRefList> NodeListMapType;
! typedef std::map<XalanQNameByReference,
! NodeListMapType> KeysMapType;
! #endif
! #endif
/**
--- 70,87 ----
* to tables that contain mappings of identifier values to nodes.
*/
! typedef XalanMap<XalanDOMString, MutableNodeRefList> NodeListMapTypeDefinitions;
! XALAN_USES_MEMORY_MANAGER(NodeListMapTypeDefinitions)
! class KeyTable
! {
! public:
! typedef XalanVector<KeyDeclaration> KeyDeclarationVectorType;
! typedef NodeListMapTypeDefinitions NodeListMapType;
+ typedef XalanMap<XalanQNameByReference, NodeListMapType> KeysMapType;
/**
***************
*** 154,157 ****
--- 95,105 ----
*/
KeyTable(
+ XalanNode* startNode,
+ const PrefixResolver& resolver,
+ const KeyDeclarationVectorType& keyDeclarations,
+ StylesheetExecutionContext& executionContext);
+
+ static KeyTable*
+ create(MemoryManagerType& theManager,
XalanNode* startNode,
const PrefixResolver& resolver,
Index: ElemWithParam.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemWithParam.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemWithParam.hpp 8 Apr 2004 07:57:21 -0000 1.1.1.1
--- ElemWithParam.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMWITHPARAM_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMWITHPARAM_HEADER_GUARD)
***************
*** 119,122 ****
--- 78,90 ----
virtual const XPath*
getXPath(unsigned int index = 0) const;
+
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #endif
+
private:
Index: XalanElemVariableAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemVariableAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemVariableAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemVariableAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemVariableAllocator(size_type theBlockCount);
~XalanElemVariableAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemVariableAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemVariableAllocator();
Index: ElemParam.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemParam.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemParam.hpp 8 Apr 2004 07:57:19 -0000 1.1.1.1
--- ElemParam.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMPARAM_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMPARAM_HEADER_GUARD)
***************
*** 99,104 ****
--- 58,71 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
};
Index: ProblemListener.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ProblemListener.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ProblemListener.hpp 8 Apr 2004 07:57:24 -0000 1.1.1.1
--- ProblemListener.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
/*
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
/*
Index: ElemCopy.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemCopy.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemCopy.hpp 8 Apr 2004 07:57:16 -0000 1.1.1.1
--- ElemCopy.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMCOPY_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMCOPY_HEADER_GUARD)
***************
*** 93,97 ****
int lineNumber,
int columnNumber);
!
// These methods are inherited from ElemTemplateElement ...
--- 52,56 ----
int lineNumber,
int columnNumber);
!
// These methods are inherited from ElemTemplateElement ...
***************
*** 99,104 ****
--- 58,71 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
};
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StylesheetExecutionContextDefault.hpp 8 Apr 2004 07:57:27 -0000 1.1.1.1
--- StylesheetExecutionContextDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...2362 lines suppressed...]
!
! bool m_hasStripOrPreserveSpace;
!
! static XalanNumberFormatFactory s_defaultXalanNumberFormatFactory;
!
! static XalanNumberFormatFactory* s_xalanNumberFormatFactory;
!
! static const DefaultCollationCompareFunctor s_defaultCollationFunctor;
};
***************
*** 1167,1169 ****
! #endif // STYLESHEETEXECUTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680
--- 1300,1302 ----
! #endif // STYLESHEETEXECUTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680
Index: XalanSourceTreeDocumentFragmentAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanSourceTreeDocumentFragmentAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanSourceTreeDocumentFragmentAllocator.hpp 8 Apr 2004 07:57:32 -0000 1.1.1.1
--- XalanSourceTreeDocumentFragmentAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XalanSourceTreeDocumentFragmentAllocator(size_type theBlockCount);
~XalanSourceTreeDocumentFragmentAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XalanSourceTreeDocumentFragmentAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanSourceTreeDocumentFragmentAllocator();
Index: StylesheetConstructionContextDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/StylesheetConstructionContextDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StylesheetConstructionContextDefault.hpp 8 Apr 2004 07:57:26 -0000 1.1.1.1
--- StylesheetConstructionContextDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(STYLESHEETCONSTRUCTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(STYLESHEETCONSTRUCTIONCONTEXTDEFAULT_HEADER_GUARD_1357924680)
***************
*** 67,71 ****
! #include <vector>
--- 24,28 ----
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 83,87 ****
! #include <xalanc/Include/XalanAutoPtr.hpp>
--- 40,44 ----
! #include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
***************
*** 118,121 ****
--- 75,79 ----
#include <xalanc/XSLT/XalanElemValueOfAllocator.hpp>
#include <xalanc/XSLT/XalanElemVariableAllocator.hpp>
+ #include "xalanc/XSLT/XalanMatchPatternDataAllocator.hpp"
***************
*** 163,167 ****
eDefaultElemTextLiteralBlockSize = 20,
eDefaultElemValueOfBlockSize = 10,
! eDefaultElemVariableBlockSize = 10 };
/*
--- 121,126 ----
eDefaultElemTextLiteralBlockSize = 20,
eDefaultElemValueOfBlockSize = 10,
! eDefaultElemVariableBlockSize = 10,
! eDefaultMatchPatternDataBlockSize = 10 };
/*
***************
*** 182,185 ****
--- 141,145 ----
*/
StylesheetConstructionContextDefault(
+ MemoryManagerType& theManager,
XSLTEngineImpl& processor,
XPathFactory& xpathFactory,
***************
*** 208,223 ****
virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
-
- virtual void
- error(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
- virtual void
warn(
const XalanDOMString& msg,
--- 168,171 ----
***************
*** 232,247 ****
virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
-
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
- virtual void
message(
const XalanDOMString& msg,
--- 180,183 ----
***************
*** 255,270 ****
const LocatorType* locator) const;
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
-
- virtual void
- message(
- const char* msg,
- const XalanNode* sourceNode,
- const LocatorType* locator) const;
-
// These interfaces are inherited from StylesheetConstructionContext...
--- 191,194 ----
***************
*** 289,294 ****
getURLFromString(const XalanDOMString& urlString);
! virtual XalanDOMString
! getURLStringFromString(const XalanDOMString& urlString);
virtual URLAutoPtrType
--- 213,219 ----
getURLFromString(const XalanDOMString& urlString);
! virtual XalanDOMString&
! getURLStringFromString(const XalanDOMString& urlString,
! XalanDOMString& theResult);
virtual URLAutoPtrType
***************
*** 297,304 ****
const XalanDOMString& base);
! virtual XalanDOMString
getURLStringFromString(
const XalanDOMString& urlString,
! const XalanDOMString& base);
virtual const XalanDOMString&
--- 222,230 ----
const XalanDOMString& base);
! virtual XalanDOMString&
getURLStringFromString(
const XalanDOMString& urlString,
! const XalanDOMString& base,
! XalanDOMString& theResult);
virtual const XalanDOMString&
***************
*** 309,313 ****
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver);
virtual XPath*
--- 235,241 ----
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true);
virtual XPath*
***************
*** 315,319 ****
const LocatorType* locator,
const XalanDOMChar* str,
! const PrefixResolver& resolver);
virtual XPath*
--- 243,249 ----
const LocatorType* locator,
const XalanDOMChar* str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true);
virtual XPath*
***************
*** 321,338 ****
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver);
virtual XPath*
createXPath(
! const LocatorType* locator,
! const XalanDOMChar* str,
! XalanDOMString::size_type len,
! const PrefixResolver& resolver);
virtual XPath*
createXPath(
! const LocatorType* locator,
! const XalanDOMChar* str,
! const PrefixResolver& resolver);
virtual const LocatorType*
--- 251,274 ----
const LocatorType* locator,
const XalanDOMString& str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true);
virtual XPath*
createXPath(
! const LocatorType* locator,
! const XalanDOMChar* str,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true);
virtual XPath*
createXPath(
! const LocatorType* locator,
! const XalanDOMChar* str,
! XalanDOMString::size_type len,
! const PrefixResolver& resolver,
! bool allowVariableReferences = true,
! bool allowKeyFunction = true);
virtual const LocatorType*
***************
*** 480,493 ****
const LocatorType* locator = 0);
static eElementToken
getElementNameToken(const XalanDOMString& name);
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<StylesheetRoot*> StylesheetVectorType;
! typedef vector<ElemTemplateElement*> ElemTemplateElementVectorType;
! #else
! typedef std::vector<StylesheetRoot*> StylesheetVectorType;
! typedef std::vector<ElemTemplateElement*> ElemTemplateElementVectorType;
! #endif
private:
--- 416,433 ----
const LocatorType* locator = 0);
+ virtual const XalanMatchPatternData*
+ createXalanMatchPatternData(
+ const ElemTemplate& theTemplate,
+ size_type thePosition,
+ const XalanDOMString& theTargetString,
+ const XPath& theMatchPattern,
+ const XalanDOMString& thePatternString,
+ XPath::eMatchScore thePriority);
+
static eElementToken
getElementNameToken(const XalanDOMString& name);
! typedef XalanVector<StylesheetRoot*> StylesheetVectorType;
! typedef XalanVector<ElemTemplateElement*> ElemTemplateElementVectorType;
private:
***************
*** 534,538 ****
XPathFactory& m_xpathFactory;
! typedef XalanAutoPtr<XPathProcessor> XPathProcessAutoPtr;
XPathProcessAutoPtr m_xpathProcessor;
--- 474,478 ----
XPathFactory& m_xpathFactory;
! typedef XalanMemMgrAutoPtr<XPathProcessor, true> XPathProcessAutoPtr;
XPathProcessAutoPtr m_xpathProcessor;
***************
*** 583,586 ****
--- 523,528 ----
XalanElemVariableAllocator m_elemVariableAllocator;
+
+ XalanMatchPatternDataAllocator m_matchPatternDataAllocator;
const XalanQNameByReference m_spaceAttrQName;
Index: KeyDeclaration.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/KeyDeclaration.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** KeyDeclaration.hpp 8 Apr 2004 07:57:23 -0000 1.1.1.1
--- KeyDeclaration.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_KEYDECLARATION_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_KEYDECLARATION_HEADER_GUARD)
Index: TraceListener.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/TraceListener.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TraceListener.hpp 8 Apr 2004 07:57:29 -0000 1.1.1.1
--- TraceListener.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_TraceListener_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_TraceListener_HEADER_GUARD)
Index: XSLTResultTarget.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTResultTarget.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTResultTarget.hpp 8 Apr 2004 07:57:35 -0000 1.1.1.1
--- XSLTResultTarget.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
!
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 105,109 ****
explicit
! XSLTResultTarget();
/**
--- 61,65 ----
explicit
! XSLTResultTarget(MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 112,116 ****
* @param fileName valid system file name
*/
! XSLTResultTarget(const XalanDOMString& fileName);
/**
--- 68,73 ----
* @param fileName valid system file name
*/
! XSLTResultTarget(const XalanDOMString& fileName,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 119,123 ****
* @param fileName valid system file name
*/
! XSLTResultTarget(const XalanDOMChar* fileName);
/**
--- 76,81 ----
* @param fileName valid system file name
*/
! XSLTResultTarget(const XalanDOMChar* fileName,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 126,130 ****
* @param fileName valid system file name
*/
! XSLTResultTarget(const char* fileName);
/**
--- 84,89 ----
* @param fileName valid system file name
*/
! XSLTResultTarget(const char* fileName,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 133,137 ****
* @param byteStream a pointer to a std ostream for the output
*/
! XSLTResultTarget(StreamType* theStream);
/**
--- 92,97 ----
* @param byteStream a pointer to a std ostream for the output
*/
! XSLTResultTarget(StreamType* theStream,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 140,144 ****
* @param byteStream a reference to a std ostream for the output
*/
! XSLTResultTarget(StreamType& theStream);
/**
--- 100,105 ----
* @param byteStream a reference to a std ostream for the output
*/
! XSLTResultTarget(StreamType& theStream,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 148,152 ****
* will be written
*/
! XSLTResultTarget(Writer* characterStream);
/**
--- 109,114 ----
* will be written
*/
! XSLTResultTarget(Writer* characterStream,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 156,160 ****
* will be written
*/
! XSLTResultTarget(FILE* characterStream);
/**
--- 118,123 ----
* will be written
*/
! XSLTResultTarget(FILE* characterStream,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
/**
***************
*** 163,168 ****
* @param flistener A FormatterListener instance for result tree events.
*/
! XSLTResultTarget(FormatterListener& flistener);
~XSLTResultTarget();
--- 126,134 ----
* @param flistener A FormatterListener instance for result tree events.
*/
! XSLTResultTarget(FormatterListener& flistener,
! MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
+ XSLTResultTarget(const XSLTResultTarget& other,
+ MemoryManagerType& theManager XALAN_DEFAULT_CONSTRACTOR_MEMORY_MGR);
~XSLTResultTarget();
***************
*** 338,341 ****
--- 304,312 ----
private:
+
+ #if defined(XALAN_DEVELOPMENT)
+ XSLTResultTarget();
+ XSLTResultTarget(const XSLTResultTarget&);
+ #endif
XalanDOMString m_fileName;
Index: ExtensionNSHandler.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ExtensionNSHandler.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ExtensionNSHandler.hpp 8 Apr 2004 07:57:21 -0000 1.1.1.1
--- ExtensionNSHandler.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_EXTENSIONNSHANDLER_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_EXTENSIONNSHANDLER_HEADER_GUARD)
***************
*** 69,73 ****
! #include <set>
--- 28,32 ----
! #include <xalanc/Include/XalanSet.hpp>
***************
*** 77,80 ****
--- 36,43 ----
+ #include <xalanc/PlatformSupport/DOMStringHelper.hpp>
+
+
+
XALAN_CPP_NAMESPACE_BEGIN
***************
*** 98,103 ****
* @param namespaceUri extension namespace URI being implemented
*/
! ExtensionNSHandler(const XalanDOMString& namespaceUri);
/**
* Construct a new extension namespace handler given all the information
--- 61,70 ----
* @param namespaceUri extension namespace URI being implemented
*/
! ExtensionNSHandler(const XalanDOMString& namespaceUri,
! MemoryManagerType& theManager);
+ static ExtensionNSHandler*
+ create(const XalanDOMString& namespaceUri,
+ MemoryManagerType& theManager);
/**
* Construct a new extension namespace handler given all the information
***************
*** 114,117 ****
--- 81,85 ----
*/
ExtensionNSHandler(
+ MemoryManagerType& theManager,
const XalanDOMString& namespaceUri,
const XalanDOMString& elemNames,
***************
*** 207,216 ****
private:
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef set<XalanDOMString,
! less<XalanDOMString> > ExtensionSetType;
! #else
! typedef std::set<XalanDOMString> ExtensionSetType;
! #endif
// Extension elements of this namespace
--- 175,179 ----
private:
! typedef XalanSet<XalanDOMString> ExtensionSetType;
// Extension elements of this namespace
***************
*** 242,247 ****
* nodes' values.
*/
! static XalanDOMString
! getScriptString(const XalanElement& elem);
};
--- 205,210 ----
* nodes' values.
*/
! static XalanDOMString&
! getScriptString(const XalanElement& elem, XalanDOMString& theResult);
};
Index: ElemUse.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemUse.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemUse.hpp 8 Apr 2004 07:57:20 -0000 1.1.1.1
--- ElemUse.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMUSE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMUSE_HEADER_GUARD)
***************
*** 131,139 ****
--- 90,136 ----
const NamespacesHandler& theParentHandler);
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual const ElemTemplateElement*
+ getNextChildElemToExecute(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* currentElem) const;
+
+ virtual const ElemTemplateElement*
+ getFirstChildElemToExecute(
+ StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
+
protected:
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ /**
+ * Get the next attribute set to execute.
+ *
+ * @param executionContext context to execute this element
+ * @returns a pointer to the attribute set element, 0 if no more attribute sets
+ */
+ const ElemTemplateElement*
+ getNextAttributeSet(
+ StylesheetExecutionContext& executionContext) const;
+
+ /**
+ * Evalute the AVTs for this element
+ *
+ * @param executionContext context to execute this element
+ */
+ virtual void
+ evaluateAVTs(
+ StylesheetExecutionContext& executionContext) const;
+ #else
/**
* Execute and conditionally apply any attribute sets. To be used
***************
*** 149,152 ****
--- 146,150 ----
StylesheetExecutionContext& executionContext,
bool applyAttributeSets) const;
+ #endif
private:
Index: StylesheetRoot.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/StylesheetRoot.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StylesheetRoot.hpp 8 Apr 2004 07:57:29 -0000 1.1.1.1
--- StylesheetRoot.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_STYLESHEETROOT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_STYLESHEETROOT_HEADER_GUARD)
***************
*** 69,72 ****
--- 28,36 ----
+ #include <xalanc/Include/XalanMap.hpp>
+ #include <xalanc/Include/STLHelper.hpp>
+
+
+
#include <xalanc/XalanDOM/XalanDOMString.hpp>
***************
*** 87,90 ****
--- 51,56 ----
+ typedef XalanVector<ElemAttributeSet*> AttributeSetVectorTypeDecl;
+ XALAN_USES_MEMORY_MANAGER(AttributeSetVectorTypeDecl)
/**
***************
*** 97,115 ****
public:
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<const XalanQName*> XalanQNameVectorType;
! typedef vector<const XPath*> XPathVectorType;
! typedef vector<ElemAttributeSet*> AttributeSetVectorType;
! typedef map<const XalanQName*,
! AttributeSetVectorType,
! pointer_less<const XalanQName> > AttributeSetMapType;
! #else
! typedef std::vector<const XalanQName*> XalanQNameVectorType;
! typedef std::vector<const XPath*> XPathVectorType;
! typedef std::vector<ElemAttributeSet*> AttributeSetVectorType;
! typedef std::map<const XalanQName*,
! AttributeSetVectorType,
! pointer_less<const XalanQName> > AttributeSetMapType;
! #endif
/**
--- 63,72 ----
public:
! typedef XalanVector<const XalanQName*> XalanQNameVectorType;
!
! typedef AttributeSetVectorTypeDecl AttributeSetVectorType;
!
! typedef XalanMap<const XalanQName*,
! AttributeSetVectorType> AttributeSetMapType;
/**
***************
*** 126,129 ****
--- 83,97 ----
~StylesheetRoot();
+ static StylesheetRoot*
+ create(
+ MemoryManagerType& theManager,
+ const XalanDOMString& baseIdentifier,
+ StylesheetConstructionContext& constructionContext);
+
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_version.getMemoryManager();
+ }
/**
* Called after construction is completed.
***************
*** 186,193 ****
* @return output version string
*/
! XalanDOMString
! getOutputVersion() const
{
! return m_version;
}
--- 154,163 ----
* @return output version string
*/
! XalanDOMString&
! getOutputVersion(XalanDOMString& theResult) const
{
! theResult.assign(m_version);
!
! return theResult;
}
***************
*** 201,205 ****
getOutputIndent() const
{
! return m_indentResult;
}
--- 171,190 ----
getOutputIndent() const
{
! return m_indentResult == eIndentNoImplicit ||
! m_indentResult == eIndentNoExplicit ? false : true;
! }
!
! /**
! * Determine if output indenting should be
! * enabled for HTML output. Semantically,
! * this implies the output method is implicit,
! * not explicit, but we don't really check that.
! *
! * @return true to indent
! */
! bool
! getHTMLOutputIndent() const
! {
! return m_indentResult == eIndentNoExplicit ? false : true;
}
***************
*** 210,217 ****
* @return encoding string
*/
! XalanDOMString
! getOutputEncoding() const
{
! return m_encoding;
}
--- 195,204 ----
* @return encoding string
*/
! XalanDOMString&
! getOutputEncoding(XalanDOMString& theResult) const
{
! theResult.assign(m_encoding);
!
! return theResult;
}
***************
*** 222,229 ****
* @return media type string
*/
! XalanDOMString
! getOutputMediaType() const
{
! return m_mediatype;
}
--- 209,218 ----
* @return media type string
*/
! XalanDOMString&
! getOutputMediaType(XalanDOMString& theResult) const
{
! theResult.assign(m_mediatype);
!
! return theResult;
}
***************
*** 234,241 ****
* @return document type string
*/
! XalanDOMString
! getOutputDoctypeSystem() const
{
! return m_doctypeSystem;
}
--- 223,232 ----
* @return document type string
*/
! XalanDOMString &
! getOutputDoctypeSystem(XalanDOMString& theResult) const
{
! theResult.assign(m_doctypeSystem);
!
! return theResult;
}
***************
*** 246,253 ****
* @return document type public id string
*/
! XalanDOMString
! getOutputDoctypePublic() const
{
! return m_doctypePublic;
}
--- 237,246 ----
* @return document type public id string
*/
! XalanDOMString&
! getOutputDoctypePublic(XalanDOMString& theResult) const
{
! theResult.assign(m_doctypePublic);
!
! return theResult;
}
***************
*** 269,276 ****
* @return standalone string
*/
! XalanDOMString
! getOutputStandalone() const
{
! return m_standalone;
}
--- 262,271 ----
* @return standalone string
*/
! XalanDOMString&
! getOutputStandalone(XalanDOMString& theResult) const
{
! theResult.assign(m_standalone);
!
! return theResult;
}
***************
*** 351,355 ****
setIndentResult(bool bIndent)
{
! m_indentResult = bIndent;
}
--- 346,350 ----
setIndentResult(bool bIndent)
{
! m_indentResult = bIndent == true ? eIndentYesExplicit : eIndentNoExplicit;
}
***************
*** 422,449 ****
hasPreserveOrStripSpaceElements() const
{
! return m_whitespacePreservingElements.empty() == false ||
! m_whitespaceStrippingElements.empty() == false;
! }
!
! void
! pushWhitespacePreservingElement(const XPath* theXPath)
! {
! m_whitespacePreservingElements.push_back(theXPath);
! }
!
! void
! pushWhitespaceStrippingElement(const XPath* theXPath)
! {
! m_whitespaceStrippingElements.push_back(theXPath);
}
bool
! shouldStripSourceNode(
! StylesheetExecutionContext& executionContext,
! const XalanText& textNode) const;
void
addAttributeSet(ElemAttributeSet& theAttributeSet);
!
void
executeAttributeSet(
--- 417,446 ----
hasPreserveOrStripSpaceElements() const
{
! return m_whitespaceElements.empty() == false;
}
bool
! shouldStripSourceNode(const XalanText& textNode) const;
void
addAttributeSet(ElemAttributeSet& theAttributeSet);
!
! #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
! /**
! * Get the nth attribute set with the specified name.
! *
! * @param execution context for executing this stylesheet
! * @param theQName the name of the attribute set
! * @param matchingIndex index of the attribute set with the specified name
! * @param theLocator the locator
! * @returns a pointer to the attribute, 0 if no matching attribute set
! */
! const ElemAttributeSet*
! getAttributeSet(
! StylesheetExecutionContext& theExecutionContext,
! const XalanQName& theQName,
! size_type matchingIndex,
! const LocatorType* theLocator) const;
! #else
void
executeAttributeSet(
***************
*** 451,454 ****
--- 448,453 ----
const XalanQName& theQName,
const LocatorType* theLocator) const;
+ #endif
+
private:
***************
*** 478,486 ****
XalanDOMString m_version;
/**
* indent-result is by default no, which means an XSL processor must not
* change the whitespace on output.
*/
! bool m_indentResult;
/**
--- 477,487 ----
XalanDOMString m_version;
+ enum eIndentType { eIndentNoImplicit, eIndentNoExplicit, eIndentYesImplicit, eIndentYesExplicit };
+
/**
* indent-result is by default no, which means an XSL processor must not
* change the whitespace on output.
*/
! eIndentType m_indentResult;
/**
***************
*** 591,604 ****
*/
unsigned long m_elemNumberNextID;
-
- /**
- * A lookup table of all space preserving elements.
- */
- XPathVectorType m_whitespacePreservingElements;
-
- /**
- * A lookup table of all space stripping elements.
- */
- XPathVectorType m_whitespaceStrippingElements;
/**
--- 592,595 ----
Index: ElemMessage.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemMessage.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemMessage.hpp 8 Apr 2004 07:57:18 -0000 1.1.1.1
--- ElemMessage.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMMESSAGE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMMESSAGE_HEADER_GUARD)
***************
*** 100,106 ****
--- 59,73 ----
virtual const XalanDOMString&
getElementName() const;
+
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
+ virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
class ElemMessageTerminateException : public XSLTProcessorException
***************
*** 113,117 ****
* @param theMessage message to print when exception thrown
*/
! ElemMessageTerminateException(const XalanDOMString& theMessage);
/**
--- 80,86 ----
* @param theMessage message to print when exception thrown
*/
! ElemMessageTerminateException(
! MemoryManagerType& theManager,
! const XalanDOMString& theMessage);
/**
***************
*** 122,125 ****
--- 91,95 ----
*/
ElemMessageTerminateException(
+ MemoryManagerType& theManager,
const LocatorType& theLocator,
const XalanDOMString& theMessage);
***************
*** 127,130 ****
--- 97,111 ----
virtual
~ElemMessageTerminateException();
+
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+
+ static const XalanDOMChar m_type[];
};
Index: XalanElemEmptyAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemEmptyAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemEmptyAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemEmptyAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 93,97 ****
* @param theBlockSize The block size.
*/
! XalanElemEmptyAllocator(size_type theBlockCount);
~XalanElemEmptyAllocator();
--- 52,56 ----
* @param theBlockSize The block size.
*/
! XalanElemEmptyAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemEmptyAllocator();
Index: ProblemListenerDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ProblemListenerDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ProblemListenerDefault.hpp 8 Apr 2004 07:57:24 -0000 1.1.1.1
--- ProblemListenerDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_PROBLEMLISTENERDEFAULT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_PROBLEMLISTENERDEFAULT_HEADER_GUARD)
***************
*** 81,85 ****
public:
! ProblemListenerDefault(PrintWriter* pw = 0);
virtual
--- 40,45 ----
public:
! ProblemListenerDefault(MemoryManagerType& theManager,
! PrintWriter* pw = 0);
virtual
***************
*** 123,126 ****
--- 83,88 ----
private:
+
+ MemoryManagerType& m_memoryManager;
PrintWriter* m_pw;
Index: FunctionDocument.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionDocument.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionDocument.hpp 8 Apr 2004 07:57:21 -0000 1.1.1.1
--- FunctionDocument.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONDOCUMENT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONDOCUMENT_HEADER_GUARD_1357924680)
***************
*** 112,121 ****
virtual FunctionDocument*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 71,80 ----
virtual FunctionDocument*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: AVTPart.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/AVTPart.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AVTPart.hpp 8 Apr 2004 07:57:14 -0000 1.1.1.1
--- AVTPart.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_AVTPART_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_AVTPART_HEADER_GUARD)
Index: ElemTemplate.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemTemplate.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemTemplate.hpp 8 Apr 2004 07:57:19 -0000 1.1.1.1
--- ElemTemplate.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMTEMPLATE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMTEMPLATE_HEADER_GUARD)
***************
*** 84,87 ****
--- 43,48 ----
public:
+ typedef ElemTemplateElement ParentType;
+
/**
* Construct an object corresponding to an "xsl:template" element
***************
*** 150,153 ****
--- 111,124 ----
// These methods are inherited from ElemTemplateElement ...
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual const ElemTemplateElement*
+ getInvoker(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
***************
*** 160,174 ****
StylesheetExecutionContext& executionContext,
XalanNode* sourceNode) const;
! virtual const XPath*
getXPath(unsigned int index = 0) const;
private:
// not implemented
! ElemTemplate(const ElemTemplate &);
ElemTemplate&
! operator=(const ElemTemplate &);
// Data members...
--- 131,156 ----
StylesheetExecutionContext& executionContext,
XalanNode* sourceNode) const;
+ void
+ executeAsNamed(StylesheetExecutionContext& executionContext) const
+ {
+ ParentType::executeChildren(executionContext);
+ }
+ #endif
! virtual const XPath*
getXPath(unsigned int index = 0) const;
+ protected:
+
+ virtual bool
+ childTypeAllowed(int xslToken) const;
+
private:
// not implemented
! ElemTemplate(const ElemTemplate&);
ElemTemplate&
! operator=(const ElemTemplate&);
// Data members...
Index: ElemElement.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemElement.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemElement.hpp 8 Apr 2004 07:57:17 -0000 1.1.1.1
--- ElemElement.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMELEMENT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMELEMENT_HEADER_GUARD)
***************
*** 113,121 ****
--- 72,94 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual bool
+ executeChildElement(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* element) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
protected:
+ #if defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
/**
* Process the children of a template.
***************
*** 128,131 ****
--- 101,105 ----
StylesheetExecutionContext& executionContext,
bool skipAttributeChildren) const;
+ #endif
virtual void
Index: ElemWhen.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemWhen.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemWhen.hpp 8 Apr 2004 07:57:21 -0000 1.1.1.1
--- ElemWhen.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMWHEN_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMWHEN_HEADER_GUARD)
***************
*** 101,106 ****
--- 60,73 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
virtual const XPath*
Index: ElemValueOf.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemValueOf.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemValueOf.hpp 8 Apr 2004 07:57:20 -0000 1.1.1.1
--- ElemValueOf.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMVALUEOF_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMVALUEOF_HEADER_GUARD)
***************
*** 107,113 ****
getElementName() const;
virtual void
execute(StylesheetExecutionContext& executionContext) const;
!
virtual const XPath*
getXPath(unsigned int index = 0) const;
--- 66,76 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
! #endif
virtual const XPath*
getXPath(unsigned int index = 0) const;
Index: XalanAVTAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanAVTAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanAVTAllocator.hpp 8 Apr 2004 07:57:30 -0000 1.1.1.1
--- XalanAVTAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanAVTAllocator(size_type theBlockCount);
~XalanAVTAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanAVTAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanAVTAllocator();
Index: ElemAttribute.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemAttribute.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemAttribute.hpp 8 Apr 2004 07:57:16 -0000 1.1.1.1
--- ElemAttribute.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMATTRIBUTE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMATTRIBUTE_HEADER_GUARD)
***************
*** 105,111 ****
getElementName() const;
virtual void
execute(StylesheetExecutionContext& executionContext) const;
!
protected:
--- 64,78 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
! #endif
!
protected:
Index: ElemFallback.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemFallback.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemFallback.hpp 8 Apr 2004 07:57:17 -0000 1.1.1.1
--- ElemFallback.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_FALLBACK_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_FALLBACK_HEADER_GUARD)
***************
*** 101,106 ****
--- 60,75 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual const ElemTemplateElement*
+ getNextChildElemToExecute(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* currentElem) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
private:
Index: ElemForwardCompatible.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemForwardCompatible.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemForwardCompatible.hpp 8 Apr 2004 07:57:18 -0000 1.1.1.1
--- ElemForwardCompatible.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMFORWARDCOMPATIBLE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMFORWARDCOMPATIBLE_HEADER_GUARD)
***************
*** 96,99 ****
--- 55,67 ----
int columnNumber);
+ static ElemForwardCompatible*
+ create(
+ MemoryManagerType& theManager,
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet& stylesheetTree,
+ const XalanDOMChar* name,
+ const AttributeListType& atts,
+ int lineNumber,
+ int columnNumber);
virtual
~ElemForwardCompatible();
***************
*** 104,109 ****
--- 72,87 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual bool
+ executeChildElement(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* element) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
private:
Index: FunctionGenerateID.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionGenerateID.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionGenerateID.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- FunctionGenerateID.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONGENERATEID_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONGENERATEID_HEADER_GUARD_1357924680)
***************
*** 112,121 ****
virtual FunctionGenerateID*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 71,80 ----
virtual FunctionGenerateID*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: StylesheetHandler.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/StylesheetHandler.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StylesheetHandler.hpp 8 Apr 2004 07:57:28 -0000 1.1.1.1
--- StylesheetHandler.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...1509 lines suppressed...]
! NamespacesHandler m_namespacesHandler;
! BoolStackType m_inExtensionElementStack;
! BoolStackType m_preserveSpaceStack;
! };
! static const XalanDOMString s_emptyString;
};
***************
*** 827,829 ****
! #endif // XALAN_STYLESHEETHANDLER_HEADER_GUARD
--- 777,779 ----
! #endif // XALAN_STYLESHEETHANDLER_HEADER_GUARD
Index: XalanElemTemplateAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemTemplateAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemTemplateAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemTemplateAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemTemplateAllocator(size_type theBlockCount);
~XalanElemTemplateAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemTemplateAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemTemplateAllocator();
Index: XSLTInputSource.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTInputSource.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTInputSource.hpp 8 Apr 2004 07:57:34 -0000 1.1.1.1
--- XSLTInputSource.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
***************
*** 77,81 ****
! #include <xercesc/sax/InputSource.hpp>
--- 33,41 ----
! #include "xercesc/sax/InputSource.hpp"
!
!
!
! #include "xalanc/Include/XalanMemoryManagement.hpp"
***************
*** 91,95 ****
typedef XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream BinInputStreamType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER InputSource InputSourceType;
!
--- 51,55 ----
typedef XERCES_CPP_NAMESPACE_QUALIFIER BinInputStream BinInputStreamType;
typedef XERCES_CPP_NAMESPACE_QUALIFIER InputSource InputSourceType;
! XALAN_USING_XERCES(MemoryManager)
***************
*** 110,119 ****
explicit
! XSLTInputSource();
/**
* Copy constructor.
*/
! XSLTInputSource(const XSLTInputSource& theSource);
/**
--- 70,81 ----
explicit
! XSLTInputSource(MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
* Copy constructor.
*/
! XSLTInputSource(
! const XSLTInputSource& theSource,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 132,137 ****
*
* @param systemId system identifier (URI)
*/
! XSLTInputSource(const XMLCh* systemId);
/**
--- 94,102 ----
*
* @param systemId system identifier (URI)
+ * @param theMemoryManager The MemoryManager instance to use.
*/
! XSLTInputSource(
! const XMLCh* systemId,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 144,149 ****
*
* @param systemId system identifier (URI)
*/
! XSLTInputSource(const XalanDOMString& systemId);
/**
--- 109,117 ----
*
* @param systemId system identifier (URI)
+ * @param theMemoryManager The MemoryManager instance to use.
*/
! XSLTInputSource(
! const XalanDOMString& systemId,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 156,161 ****
*
* @param systemId system identifier (URI)
*/
! XSLTInputSource(const char* systemId);
/**
--- 124,132 ----
*
* @param systemId system identifier (URI)
+ * @param theMemoryManager The MemoryManager instance to use.
*/
! XSLTInputSource(
! const char* systemId,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 167,174 ****
* @param systemId system identifier (URI)
* @param publicId public identifier
*/
XSLTInputSource(
const char* systemId,
! const char* publicId);
/**
--- 138,147 ----
* @param systemId system identifier (URI)
* @param publicId public identifier
+ * @param theMemoryManager The MemoryManager instance to use.
*/
XSLTInputSource(
const char* systemId,
! const char* publicId,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 180,187 ****
* @param systemId system identifier (URI)
* @param publicId public identifier
*/
XSLTInputSource(
const XMLCh* systemId,
! const XMLCh* publicId);
/**
--- 153,162 ----
* @param systemId system identifier (URI)
* @param publicId public identifier
+ * @param theMemoryManager The MemoryManager instance to use.
*/
XSLTInputSource(
const XMLCh* systemId,
! const XMLCh* publicId,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 193,200 ****
* @param systemId system identifier (URI)
* @param publicId public identifier
*/
XSLTInputSource(
const XalanDOMString& systemId,
! const XalanDOMString& publicId);
/**
--- 168,177 ----
* @param systemId system identifier (URI)
* @param publicId public identifier
+ * @param theMemoryManager The MemoryManager instance to use.
*/
XSLTInputSource(
const XalanDOMString& systemId,
! const XalanDOMString& publicId,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 206,211 ****
*
* @param node DOM node that is root of the document
*/
! XSLTInputSource(XalanNode* node);
/**
--- 183,191 ----
*
* @param node DOM node that is root of the document
+ * @param theMemoryManager The MemoryManager instance to use.
*/
! XSLTInputSource(
! XalanNode* node,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 217,222 ****
*
* @param stream the input stream...
*/
! XSLTInputSource(StreamType* stream);
/**
--- 197,205 ----
*
* @param stream the input stream...
+ * @param theMemoryManager The MemoryManager instance to use.
*/
! XSLTInputSource(
! StreamType* stream,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
***************
*** 228,233 ****
*
* @param stream the input stream...
*/
! XSLTInputSource(StreamType& stream);
/**
--- 211,219 ----
*
* @param stream the input stream...
+ * @param theMemoryManager The MemoryManager instance to use.
*/
! XSLTInputSource(
! StreamType& stream,
! MemoryManager& theMemoryManager = XalanMemMgrs::getDefault());
/**
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemTemplateElement.hpp 8 Apr 2004 07:57:20 -0000 1.1.1.1
--- ElemTemplateElement.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...1973 lines suppressed...]
!
! // Not implemented...
! ElemTemplateElement(const ElemTemplateElement&);
!
! ElemTemplateElement&
! operator=(const ElemTemplateElement&);
!
! bool
! operator==(const ElemTemplateElement&) const;
};
***************
*** 859,861 ****
! #endif // XALAN_ELEMTEMPLATEELEMENT_HEADER_GUARD
--- 1211,1213 ----
! #endif // XALAN_ELEMTEMPLATEELEMENT_HEADER_GUARD
Index: Constants.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/Constants.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Constants.hpp 8 Apr 2004 07:57:15 -0000 1.1.1.1
--- Constants.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XALAN_CONSTANTS_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_CONSTANTS_HEADER_GUARD)
***************
*** 87,91 ****
*/
static void
! initialize();
/**
--- 44,48 ----
*/
static void
! initialize(MemoryManagerType& theManager);
/**
Index: ElemOtherwise.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemOtherwise.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemOtherwise.hpp 8 Apr 2004 07:57:19 -0000 1.1.1.1
--- ElemOtherwise.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMOTHERWISE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMOTHERWISE_HEADER_GUARD)
***************
*** 97,102 ****
--- 56,69 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
};
Index: ElemSort.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemSort.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemSort.hpp 8 Apr 2004 07:57:19 -0000 1.1.1.1
--- ElemSort.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMSORT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMSORT_HEADER_GUARD)
***************
*** 98,101 ****
--- 57,69 ----
*/
ElemSort(
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet& stylesheetTree,
+ const AttributeListType& atts,
+ int lineNumber,
+ int columnNumber);
+
+ static ElemSort*
+ create(
+ MemoryManagerType& theManager,
StylesheetConstructionContext& constructionContext,
Stylesheet& stylesheetTree,
Index: FunctionFormatNumber.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionFormatNumber.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionFormatNumber.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- FunctionFormatNumber.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONFORMATNUMBER_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONFORMATNUMBER_HEADER_GUARD_1357924680)
***************
*** 65,80 ****
- #include <vector>
-
-
-
- #include <xalanc/XalanDOM/XalanDOMString.hpp>
-
-
-
- #include <xalanc/PlatformSupport/XalanDecimalFormatSymbols.hpp>
-
-
-
#include <xalanc/XPath/Function.hpp>
--- 24,27 ----
***************
*** 83,94 ****
XALAN_CPP_NAMESPACE_BEGIN
-
-
- class XalanDecimalFormatSymbols;
- class XObject;
- class XPathExecutionContext;
-
-
-
// Implementation of the XSLT function format-number.
//
--- 30,33 ----
***************
*** 99,114 ****
typedef Function ParentType;
- /**
- * Perform static initialization. See class XSLTInit.
- */
- static void
- initialize();
-
- /**
- * Perform static shut down. See class XSLTInit.
- */
- static void
- terminate();
-
FunctionFormatNumber();
--- 38,41 ----
***************
*** 144,166 ****
virtual FunctionFormatNumber*
#endif
! clone() const;
!
! protected:
!
! virtual void
! doFormat(
! XPathExecutionContext& executionContext,
! XalanNode* context,
! double theNumber,
! const XalanDOMString& thePattern,
! const XalanDecimalFormatSymbols* theDFS,
! XalanDOMString& theResult,
! const LocatorType* locator,
! bool fWarn = true) const;
private:
! const XalanDOMString
! getError() const;
// Not implemented...
--- 71,80 ----
virtual FunctionFormatNumber*
#endif
! clone(MemoryManagerType& theManager) const;
private:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
// Not implemented...
***************
*** 171,182 ****
operator==(const FunctionFormatNumber&) const;
- // Data members...
- const XalanDecimalFormatSymbols m_decimalFormatSymbols;
-
- static const XalanDOMString& s_warningNotImplementedString;
-
- static const XalanDOMString& s_warningNotFoundString;
-
- static const XalanDOMString s_emptyString;
};
--- 85,88 ----
Index: TopLevelArg.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/TopLevelArg.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TopLevelArg.hpp 8 Apr 2004 07:57:29 -0000 1.1.1.1
--- TopLevelArg.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
***************
*** 101,107 ****
--- 57,69 ----
*/
TopLevelArg(
+ MemoryManagerType& theManager,
const XalanQName& name,
const XalanDOMString& expr);
+ static TopLevelArg*
+ create(
+ MemoryManagerType& theManager,
+ const XalanQName& name,
+ const XalanDOMString& expr);
/**
* Construct an argument object from an XObject instance.
***************
*** 111,117 ****
*/
TopLevelArg(
! const XalanQName& name = XalanQNameByValue(),
const XObjectPtr variable = XObjectPtr());
/**
* Copy constructor
--- 73,85 ----
*/
TopLevelArg(
! MemoryManagerType& theManager,
! const XalanQName& name,
const XObjectPtr variable = XObjectPtr());
+ static TopLevelArg*
+ create(
+ MemoryManagerType& theManager,
+ const XalanQName& name,
+ const XObjectPtr variable = XObjectPtr());
/**
* Copy constructor
***************
*** 119,123 ****
* @param theSource the TopLevelArg to copy.
*/
! TopLevelArg(const TopLevelArg& theSource);
/**
--- 87,94 ----
* @param theSource the TopLevelArg to copy.
*/
! TopLevelArg(
! const TopLevelArg& theSource,
! MemoryManagerType& theManager);
!
/**
***************
*** 176,179 ****
--- 147,152 ----
private:
+ // not implemented
+ TopLevelArg(const TopLevelArg& theSource);
XalanQNameByValue m_qname;
***************
*** 184,188 ****
};
!
XALAN_CPP_NAMESPACE_END
--- 157,161 ----
};
! XALAN_USES_MEMORY_MANAGER(TopLevelArg)
XALAN_CPP_NAMESPACE_END
--- NEW FILE: XalanMatchPatternDataAllocator.hpp ---
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(XALANMATCHPATTERNDATAALLOCATOR_INCLUDE_GUARD_12455133)
#define XALANMATCHPATTERNDATAALLOCATOR_INCLUDE_GUARD_12455133
// Base include file. Must be first.
#include "xalanc/XSLT/XSLTDefinitions.hpp"
#include "xalanc/XSLT/XalanMatchPatternData.hpp"
#include "xalanc/PlatformSupport/ArenaAllocator.hpp"
XALAN_CPP_NAMESPACE_BEGIN
class XALAN_XSLT_EXPORT XalanMatchPatternDataAllocator
{
public:
typedef XalanMatchPatternData data_type;
#if defined(XALAN_NO_DEFAULT_TEMPLATE_ARGUMENTS)
typedef ArenaBlock<data_type> ArenaBlockType;
typedef ArenaAllocator<data_type,
ArenaBlockType> ArenaAllocatorType;
#else
typedef ArenaAllocator<data_type> ArenaAllocatorType;
#endif
typedef ArenaAllocatorType::size_type size_type;
/**
* Construct an instance that will allocate blocks of the specified size.
*
* @param theBlockSize The block size.
*/
XalanMatchPatternDataAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanMatchPatternDataAllocator();
/**
* Construct an instance
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
*
* @param theTemplate The ElemTemplate node that contains the template for this pattern
* @param thePosition The position in the stylesheet
* @param theTargetString The target string for match pattern
* @param TheMatchPattern The match pattern
* @param thePatternString the pattern string
* @param thePriority The priority for the match pattern.
*
* @return A pointer to the new instance.
*/
data_type*
create(
const ElemTemplate& theTemplate,
data_type::size_type thePosition,
const XalanDOMString& theTargetString,
const XPath& theMatchPattern,
const XalanDOMString& thePatternString,
data_type::eMatchScore thePriority);
/**
* Determine if an object is owned by the allocator...
*/
bool
ownsObject(const data_type* theObject)
{
return m_allocator.ownsObject(theObject);
}
/**
* Delete all objects from the allocator.
*/
void
reset()
{
m_allocator.reset();
}
/**
* Get the number of ArenaBlocks currently allocated.
*
* @return The number of blocks.
*/
size_type
getBlockCount() const
{
return m_allocator.getBlockCount();
}
/**
* Get size of an ArenaBlock, that is, the number
* of objects in each block.
*
* @return The size of the block
*/
size_type
getBlockSize() const
{
return m_allocator.getBlockSize();
}
private:
// Not implemented...
XalanMatchPatternDataAllocator(const XalanMatchPatternDataAllocator&);
XalanMatchPatternDataAllocator&
operator=(const XalanMatchPatternDataAllocator&);
// Data members...
ArenaAllocatorType m_allocator;
};
XALAN_CPP_NAMESPACE_END
#endif // XALANMATCHPATTERNDATAALLOCATOR_INCLUDE_GUARD_12455133
Index: XSLTProcessorEnvSupportDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTProcessorEnvSupportDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTProcessorEnvSupportDefault.hpp 8 Apr 2004 07:57:34 -0000 1.1.1.1
--- XSLTProcessorEnvSupportDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XSLTPROCESSORENVSUPPORTDEFAULT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSLTPROCESSORENVSUPPORTDEFAULT_HEADER_GUARD_1357924680)
***************
*** 88,92 ****
public:
! XSLTProcessorEnvSupportDefault(XSLTProcessor* theProcessor = 0);
virtual
--- 45,50 ----
public:
! XSLTProcessorEnvSupportDefault( MemoryManagerType& theManager,
! XSLTProcessor* theProcessor = 0);
virtual
***************
*** 173,176 ****
--- 131,135 ----
virtual XalanDocument*
parseXML(
+ MemoryManagerType& theManager,
const XalanDOMString& urlString,
const XalanDOMString& base);
***************
*** 184,188 ****
XalanDocument* theDocument);
! virtual XalanDOMString
findURIFromDoc(const XalanDocument* owner) const;
--- 143,147 ----
XalanDocument* theDocument);
! virtual const XalanDOMString&
findURIFromDoc(const XalanDocument* owner) const;
--- NEW FILE: XalanSpaceNodeTester.hpp ---
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(XALAN_SPACENODETESTER_HEADER_GUARD_1357924680)
#define XALAN_SPACENODETESTER_HEADER_GUARD_1357924680
/**
* $Id: XalanSpaceNodeTester.hpp,v 1.1 2008/02/19 20:14:03 zolmol Exp $
*
* $State: Exp $
*
*/
// Base include file. Must be first.
#include "XSLTDefinitions.hpp"
#include "xalanc/XPath/XPath.hpp"
XALAN_CPP_NAMESPACE_BEGIN
class PrefixResolver;
class StylesheetConstructionContext;
class XalanSpaceNodeTester : public XPath::NodeTester
{
public:
typedef XPath::NodeTester ParentType;
enum eType
{
eStrip,
ePreserve
};
XalanSpaceNodeTester();
XalanSpaceNodeTester(const XalanSpaceNodeTester& theSource);
XalanSpaceNodeTester(
eType theType,
StylesheetConstructionContext& theContext,
const XalanDOMString& theNameTest,
const PrefixResolver& thePrefixResolver,
const LocatorType* theLocator);
~XalanSpaceNodeTester();
XPath::eMatchScore
getMatchScore() const
{
return m_matchScore;
}
eType
getType() const
{
return m_type;
}
XalanSpaceNodeTester&
operator=(const XalanSpaceNodeTester& theRHS)
{
m_matchScore = theRHS.m_matchScore;
m_type = theRHS.m_type;
ParentType::operator=(theRHS);
return *this;
}
private:
XPath::eMatchScore m_matchScore;
eType m_type;
};
XALAN_CPP_NAMESPACE_END
#endif // !defined(XALAN_SPACENODETESTER_HEADER_GUARD_1357924680)
Index: ExtensionFunctionHandler.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ExtensionFunctionHandler.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ExtensionFunctionHandler.hpp 8 Apr 2004 07:57:21 -0000 1.1.1.1
--- ExtensionFunctionHandler.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
***************
*** 69,74 ****
! #include <set>
! #include <vector>
--- 25,34 ----
! #include <xalanc/XalanDOM/XalanDOMString.hpp>
!
!
!
! #include <xalanc/Include/XalanVector.hpp>
! #include <xalanc/Include/XalanSet.hpp>
***************
*** 107,111 ****
* @param namespaceUri the extension namespace URI that I'm implementing
*/
! ExtensionFunctionHandler(const XalanDOMString& namespaceUri);
/**
--- 67,72 ----
* @param namespaceUri the extension namespace URI that I'm implementing
*/
! ExtensionFunctionHandler(const XalanDOMString& namespaceUri,
! MemoryManagerType& theManager);
/**
***************
*** 122,125 ****
--- 83,87 ----
*/
ExtensionFunctionHandler(
+ MemoryManagerType& theManager,
const XalanDOMString& namespaceUri,
const XalanDOMString& funcNames,
***************
*** 132,135 ****
--- 94,103 ----
~ExtensionFunctionHandler();
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_namespaceUri.getMemoryManager();
+ }
+
/**
* Set function local parts of extension NS.
***************
*** 170,180 ****
/// Vector of pointers to function arguments
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<void*> ArgVectorType;
! typedef set<XalanDOMString, less<XalanDOMString> > StringSetType;
! #else
! typedef std::vector<void*> ArgVectorType;
! typedef std::set<XalanDOMString> StringSetType;
! #endif
/**
--- 138,144 ----
/// Vector of pointers to function arguments
! typedef XalanVector<void*> ArgVectorType;
!
! typedef XalanSet<XalanDOMString> StringSetType;
/**
Index: DecimalToRoman.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/DecimalToRoman.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DecimalToRoman.hpp 8 Apr 2004 07:57:15 -0000 1.1.1.1
--- DecimalToRoman.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_DECIMALTOROMAN_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_DECIMALTOROMAN_HEADER_GUARD)
Index: CountersTable.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/CountersTable.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** CountersTable.hpp 8 Apr 2004 07:57:15 -0000 1.1.1.1
--- CountersTable.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_COUNTERSTABLE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_COUNTERSTABLE_HEADER_GUARD_1357924680)
***************
*** 70,74 ****
! #include <vector>
--- 29,34 ----
! #include <xalanc/Include/XalanVector.hpp>
!
***************
*** 98,107 ****
typedef unsigned long CountType;
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<XalanNode*> NodeVectorType;
! #else
! typedef std::vector<XalanNode*> NodeVectorType;
! #endif
!
/**
--- 58,62 ----
typedef unsigned long CountType;
! typedef XalanVector<XalanNode*> NodeVectorType;
/**
***************
*** 134,141 ****
*/
Counter(
const ElemNumber* numberElem,
NodeVectorType& countNodes) :
m_countNodesStartCount(0),
! m_countNodes(countNodes),
m_fromNode(0),
m_numberElem(numberElem)
--- 89,97 ----
*/
Counter(
+ MemoryManagerType& theManager,
const ElemNumber* numberElem,
NodeVectorType& countNodes) :
m_countNodesStartCount(0),
! m_countNodes(countNodes, theManager),
m_fromNode(0),
m_numberElem(numberElem)
***************
*** 146,152 ****
* Construct a counter object.
*/
! Counter(const ElemNumber* numberElem = 0) :
m_countNodesStartCount(0),
! m_countNodes(),
m_fromNode(0),
m_numberElem(numberElem)
--- 102,108 ----
* Construct a counter object.
*/
! Counter(MemoryManagerType& theManager, const ElemNumber* numberElem = 0) :
m_countNodesStartCount(0),
! m_countNodes(theManager),
m_fromNode(0),
m_numberElem(numberElem)
***************
*** 154,157 ****
--- 110,121 ----
}
+ Counter(const Counter& other, MemoryManagerType& theManager) :
+ m_countNodesStartCount(other.m_countNodesStartCount),
+ m_countNodes(other.m_countNodes, theManager),
+ m_fromNode(other.m_fromNode),
+ m_numberElem(other.m_numberElem)
+ {
+ }
+
/**
* Try to find a node that was previously counted. If found, return a
***************
*** 173,180 ****
--- 137,154 ----
return m_countNodes.empty() == true ? 0 : m_countNodes.back();
}
+
+ private:
+ // Not implemented
+ Counter();
+ Counter(const Counter&);
};
+ XALAN_USES_MEMORY_MANAGER(Counter)
+ typedef XalanVector<Counter> CounterVectorTypeDecl;
+ XALAN_USES_MEMORY_MANAGER(CounterVectorTypeDecl)
+ typedef XalanVector<CounterVectorTypeDecl> ElemCounterVectorVectorTypeDecl;
+ XALAN_USES_MEMORY_MANAGER(ElemCounterVectorVectorTypeDecl)
/**
* <meta name="usage" content="internal"/>
***************
*** 190,213 ****
typedef Counter::CountType CountType;
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<Counter> CounterVectorType;
! typedef vector<CounterVectorType> ElemCounterVectorVectorType;
! #else
! typedef std::vector<Counter> CounterVectorType;
! typedef std::vector<CounterVectorType> ElemCounterVectorVectorType;
! #endif
! typedef Counter::NodeVectorType NodeVectorType;
/**
* Construct a CountersTable.
*/
! CountersTable(unsigned long theSize = 0) :
! m_countersVector(),
! m_newFound()
{
resize(theSize);
};
/**
--- 164,186 ----
typedef Counter::CountType CountType;
! typedef CounterVectorTypeDecl CounterVectorType;
! typedef ElemCounterVectorVectorTypeDecl ElemCounterVectorVectorType;
! typedef Counter::NodeVectorType NodeVectorType;
/**
* Construct a CountersTable.
*/
! CountersTable(MemoryManagerType& theManager,
! unsigned long theSize = 0) :
! m_countersVector(theManager),
! m_newFound(theManager)
{
resize(theSize);
};
+ ~CountersTable()
+ {
+ }
/**
***************
*** 251,254 ****
--- 224,230 ----
private:
+ // not implemented
+ CountersTable();
+ CountersTable(const CountersTable&);
/**
Index: NamespacesHandler.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/NamespacesHandler.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NamespacesHandler.hpp 8 Apr 2004 07:57:23 -0000 1.1.1.1
--- NamespacesHandler.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
***************
*** 69,75 ****
! #include <map>
! #include <set>
! #include <vector>
--- 25,30 ----
! #include <xalanc/Include/XalanVector.hpp>
! #include <xalanc/Include/XalanMap.hpp>
***************
*** 95,98 ****
--- 50,54 ----
class XALAN_XSLT_EXPORT NamespacesHandler
{
+
public:
***************
*** 237,277 ****
typedef XalanQName::NamespacesStackType NamespacesStackType;
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<Namespace> NamespacesVectorType;
!
! typedef vector<NamespaceExtended> NamespaceExtendedVectorType;
!
! typedef map<const XalanDOMString*,
! const XalanDOMString*,
! DOMStringPointerLessThanFunction> ExcludedResultPrefixesMapType;
!
! typedef map<const XalanDOMString*,
! NamespaceExtended,
! DOMStringPointerLessThanFunction> NamespacesMapType;
!
! typedef map<const XalanDOMString*,
! const XalanDOMString*,
! DOMStringPointerLessThanFunction> NamespaceAliasesMapType;
!
! typedef vector<const XalanDOMString*> XalanDOMStringPointerVectorType;
! #else
! typedef std::vector<Namespace> NamespacesVectorType;
!
! typedef std::vector<NamespaceExtended> NamespaceExtendedVectorType;
!
! typedef std::map<const XalanDOMString*,
! const XalanDOMString*,
! DOMStringPointerLessThanFunction> ExcludedResultPrefixesMapType;
!
! typedef std::map<const XalanDOMString*,
! NamespaceExtended,
! DOMStringPointerLessThanFunction> NamespacesMapType;
! typedef std::map<const XalanDOMString*,
! const XalanDOMString*,
! DOMStringPointerLessThanFunction> NamespaceAliasesMapType;
- typedef std::vector<const XalanDOMString*> XalanDOMStringPointerVectorType;
- #endif
/**
--- 193,203 ----
typedef XalanQName::NamespacesStackType NamespacesStackType;
! typedef XalanVector<Namespace> NamespacesVectorType;
! typedef XalanVector<NamespaceExtended> NamespaceExtendedVectorType;
! typedef XalanVector<const XalanDOMString*> XalanDOMStringPointerVectorType;
! typedef XalanMap<const XalanDOMString*,
! const XalanDOMString*> NamespaceAliasesMapType;
/**
***************
*** 279,283 ****
*/
explicit
! NamespacesHandler();
/**
--- 205,209 ----
*/
explicit
! NamespacesHandler(MemoryManagerType& theManager);
/**
***************
*** 337,341 ****
StylesheetConstructionContext& theConstructionContext,
bool fProcessNamespaceAliases = true,
! const XalanDOMString& theElementName = XalanDOMString(),
const NamespacesHandler* parentNamespacesHandler = 0,
const PrefixChecker* prefixChecker = 0);
--- 263,267 ----
StylesheetConstructionContext& theConstructionContext,
bool fProcessNamespaceAliases = true,
! const XalanDOMString& theElementName = XalanDOMString(XalanMemMgrs::getDummyMemMgr()),
const NamespacesHandler* parentNamespacesHandler = 0,
const PrefixChecker* prefixChecker = 0);
***************
*** 431,435 ****
swap(NamespacesHandler& theOther);
! NamespacesMapType::size_type
getNamespaceDeclarationsCount() const
{
--- 357,361 ----
swap(NamespacesHandler& theOther);
! NamespaceExtendedVectorType::size_type
getNamespaceDeclarationsCount() const
{
Index: ElemDecimalFormat.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemDecimalFormat.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemDecimalFormat.hpp 8 Apr 2004 07:57:17 -0000 1.1.1.1
--- ElemDecimalFormat.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMDECIMALFORMAT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMDECIMALFORMAT_HEADER_GUARD)
***************
*** 102,105 ****
--- 61,65 ----
int columnNumber);
+
~ElemDecimalFormat();
***************
*** 108,114 ****
virtual const XalanDOMString&
getElementName() const;
-
- virtual void
- execute(StylesheetExecutionContext& executionContext) const;
const XalanDecimalFormatSymbols&
--- 68,71 ----
Index: ElemEmpty.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemEmpty.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemEmpty.hpp 8 Apr 2004 07:57:17 -0000 1.1.1.1
--- ElemEmpty.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMEMPTY_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMEMPTY_HEADER_GUARD)
***************
*** 119,124 ****
--- 78,88 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
protected:
Index: XSLTInit.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTInit.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTInit.hpp 8 Apr 2004 07:57:34 -0000 1.1.1.1
--- XSLTInit.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 95,102 ****
explicit
! XSLTInit();
~XSLTInit();
private:
--- 54,68 ----
explicit
! XSLTInit(MemoryManagerType& theManager);
~XSLTInit();
+ static XSLTInit*
+ create(MemoryManagerType& theManager);
+
+ inline MemoryManagerType&
+ getMemoryManager();
+
+
private:
***************
*** 109,113 ****
static void
! initialize();
static void
--- 75,79 ----
static void
! initialize(MemoryManagerType& theManager);
static void
Index: TraceListenerDefault.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/TraceListenerDefault.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TraceListenerDefault.hpp 8 Apr 2004 07:57:29 -0000 1.1.1.1
--- TraceListenerDefault.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_TraceListenerDefault_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_TraceListenerDefault_HEADER_GUARD)
***************
*** 68,72 ****
#include <xalanc/XSLT/TraceListener.hpp>
!
XALAN_CPP_NAMESPACE_BEGIN
--- 27,31 ----
#include <xalanc/XSLT/TraceListener.hpp>
! #include <xalanc/Include/XalanMemoryManagement.hpp>
XALAN_CPP_NAMESPACE_BEGIN
***************
*** 90,94 ****
bool traceElements = false,
bool traceGeneration = false,
! bool traceSelection = false);
virtual
--- 49,54 ----
bool traceElements = false,
bool traceGeneration = false,
! bool traceSelection = false,
! MemoryManagerType& theManager XALAN_DEFAULT_MEMMGR);
virtual
***************
*** 162,174 ****
// Data members...
! PrintWriter& m_printWriter;
! bool m_traceTemplates;
! bool m_traceElements;
! bool m_traceGeneration;
! bool m_traceSelection;
};
--- 122,136 ----
// Data members...
! PrintWriter& m_printWriter;
! bool m_traceTemplates;
! bool m_traceElements;
! bool m_traceGeneration;
! bool m_traceSelection;
!
! MemoryManagerType& m_memoryManager;
};
Index: XalanElemAttributeAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemAttributeAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemAttributeAllocator.hpp 8 Apr 2004 07:57:30 -0000 1.1.1.1
--- XalanElemAttributeAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemAttributeAllocator(size_type theBlockCount);
~XalanElemAttributeAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemAttributeAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemAttributeAllocator();
Index: XalanElemCallTemplateAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemCallTemplateAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemCallTemplateAllocator.hpp 8 Apr 2004 07:57:30 -0000 1.1.1.1
--- XalanElemCallTemplateAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemCallTemplateAllocator(size_type theBlockCount);
~XalanElemCallTemplateAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemCallTemplateAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemCallTemplateAllocator();
Index: NodeSorter.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/NodeSorter.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NodeSorter.hpp 8 Apr 2004 07:57:23 -0000 1.1.1.1
--- NodeSorter.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_NODESORTER_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_NODESORTER_HEADER_GUARD)
***************
*** 70,74 ****
#include <functional>
! #include <vector>
--- 29,36 ----
#include <functional>
!
!
!
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 92,95 ****
--- 54,63 ----
+ typedef XalanVector<double> NumberVectorTypeDecl;
+ XALAN_USES_MEMORY_MANAGER(NumberVectorTypeDecl)
+
+ typedef XalanVector<XalanDOMString> StringVectorTypeDecl;
+ XALAN_USES_MEMORY_MANAGER(StringVectorTypeDecl)
+
/**
***************
*** 116,129 ****
};
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<VectorEntry> NodeVectorType;
! typedef vector<NodeSortKey> NodeSortKeyVectorType;
! #else
! typedef std::vector<VectorEntry> NodeVectorType;
! typedef std::vector<NodeSortKey> NodeSortKeyVectorType;
! #endif
explicit
! NodeSorter();
~NodeSorter();
--- 84,92 ----
};
! typedef XalanVector<VectorEntry> NodeVectorType;
! typedef XalanVector<NodeSortKey> NodeSortKeyVectorType;
explicit
! NodeSorter(MemoryManagerType& theManager);
~NodeSorter();
***************
*** 233,253 ****
friend struct NodeSortKeyCompare;
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<double> NumberVectorType;
! typedef vector<XObjectPtr> XObjectVectorType;
! typedef vector<XalanDOMString> StringVectorType;
!
! typedef vector<NumberVectorType> NumberCacheType;
! typedef vector<XObjectVectorType> XObjectCacheType;
! typedef vector<StringVectorType> StringCacheType;
! #else
! typedef std::vector<double> NumberVectorType;
! typedef std::vector<XObjectPtr> XObjectVectorType;
! typedef std::vector<XalanDOMString> StringVectorType;
! typedef std::vector<NumberVectorType> NumberCacheType;
! typedef std::vector<XObjectVectorType> XObjectCacheType;
! typedef std::vector<StringVectorType> StringCacheType;
! #endif
typedef NumberCacheType NumberResultsCacheType;
--- 196,206 ----
friend struct NodeSortKeyCompare;
! typedef NumberVectorTypeDecl NumberVectorType;
! typedef XalanVector<XObjectPtr> XObjectVectorType;
! typedef StringVectorTypeDecl StringVectorType;
! typedef XalanVector<NumberVectorType> NumberCacheType;
! typedef XalanVector<XObjectVectorType> XObjectCacheType;
! typedef XalanVector<StringVectorType> StringCacheType;
typedef NumberCacheType NumberResultsCacheType;
Index: XalanElemTextLiteralAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemTextLiteralAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemTextLiteralAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemTextLiteralAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemTextLiteralAllocator(size_type theBlockCount);
~XalanElemTextLiteralAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemTextLiteralAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemTextLiteralAllocator();
Index: XSLTProcessorEnvSupport.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTProcessorEnvSupport.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTProcessorEnvSupport.hpp 8 Apr 2004 07:57:34 -0000 1.1.1.1
--- XSLTProcessorEnvSupport.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * @author <a href="mailto:david_n_bertoni at lotus.com">David N. Bertoni</a>
*/
#if !defined(XSLTPROCESSORENVSUPPORT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSLTPROCESSORENVSUPPORT_HEADER_GUARD_1357924680)
***************
*** 126,129 ****
--- 83,87 ----
virtual XalanDocument*
parseXML(
+ MemoryManagerType& theManager,
const XalanDOMString& urlString,
const XalanDOMString& base) = 0;
***************
*** 137,141 ****
XalanDocument* theDocument) = 0;
! virtual XalanDOMString
findURIFromDoc(const XalanDocument* owner) const = 0;
--- 95,99 ----
XalanDocument* theDocument) = 0;
! virtual const XalanDOMString&
findURIFromDoc(const XalanDocument* owner) const = 0;
Index: ElemChoose.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemChoose.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemChoose.hpp 8 Apr 2004 07:57:16 -0000 1.1.1.1
--- ElemChoose.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMCHOOSE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMCHOOSE_HEADER_GUARD)
***************
*** 94,97 ****
--- 53,57 ----
int columnNumber);
+
// These methods are inherited from ElemTemplateElement ...
***************
*** 99,104 ****
--- 59,75 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual const ElemTemplateElement*
+ getNextChildElemToExecute(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* currentElem) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
+
protected:
Index: XalanNumberingResourceBundle.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanNumberingResourceBundle.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanNumberingResourceBundle.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanNumberingResourceBundle.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 66,70 ****
! #include <vector>
--- 25,29 ----
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 76,80 ****
XALAN_CPP_NAMESPACE_BEGIN
!
class XalanNumberingResourceBundle
--- 35,39 ----
XALAN_CPP_NAMESPACE_BEGIN
! XALAN_USES_MEMORY_MANAGER(XalanDOMCharVectorType)
class XalanNumberingResourceBundle
***************
*** 84,94 ****
typedef unsigned long NumberType;
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<NumberType> NumberTypeVectorType;
! typedef vector<XalanDOMCharVectorType> DigitsTableVectorType;
! #else
! typedef std::vector<unsigned long> NumberTypeVectorType;
! typedef std::vector<XalanDOMCharVectorType> DigitsTableVectorType;
! #endif
// Enum to describe language orientation. (English is left-to-right,
--- 43,48 ----
typedef unsigned long NumberType;
! typedef XalanVector<NumberType> NumberTypeVectorType;
! typedef XalanVector<XalanDOMCharVectorType> DigitsTableVectorType;
// Enum to describe language orientation. (English is left-to-right,
***************
*** 118,129 ****
const XalanDOMCharVectorType& theMultiplierChars,
const DigitsTableVectorType& theDigitsTable,
! const NumberTypeVectorType& theDigitsTableTable);
explicit
! XalanNumberingResourceBundle();
! XalanNumberingResourceBundle(const XalanNumberingResourceBundle& theSource);
~XalanNumberingResourceBundle();
bool
--- 72,91 ----
const XalanDOMCharVectorType& theMultiplierChars,
const DigitsTableVectorType& theDigitsTable,
! const NumberTypeVectorType& theDigitsTableTable,
! MemoryManagerType& theManager);
explicit
! XalanNumberingResourceBundle(MemoryManagerType& theManager);
! XalanNumberingResourceBundle(const XalanNumberingResourceBundle& theSource,
! MemoryManagerType& theManager);
~XalanNumberingResourceBundle();
+
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_language.getMemoryManager();
+ }
bool
Index: ElemCopyOf.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemCopyOf.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemCopyOf.hpp 8 Apr 2004 07:57:16 -0000 1.1.1.1
--- ElemCopyOf.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMCOPYOF_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMCOPYOF_HEADER_GUARD)
***************
*** 59,68 ****
/**
! * $Id$
! *
! *
! * $State$
! *
! * @author Myriam Midy (Myriam_Midy @lotus.com
*/
--- 18,23 ----
/**
! * @author David Bertoni (david_n_bertoni at us.ibm.com)
! * @author Matthew Hoyt (mhoyt at ca.ibm.com)
*/
***************
*** 106,109 ****
--- 61,67 ----
int columnNumber);
+
+
+
// These methods are inherited from ElemTemplateElement ...
***************
*** 111,117 ****
getElementName() const;
virtual void
execute(StylesheetExecutionContext& executionContext) const;
!
virtual const XPath*
getXPath(unsigned int index = 0) const;
--- 69,79 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
! #endif
virtual const XPath*
getXPath(unsigned int index = 0) const;
Index: ElemNumber.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemNumber.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemNumber.hpp 8 Apr 2004 07:57:19 -0000 1.1.1.1
--- ElemNumber.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMNUMBER_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMNUMBER_HEADER_GUARD)
***************
*** 65,69 ****
! #include <vector>
--- 24,28 ----
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 109,117 ****
};
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<CountType> CountTypeArrayType;
! #else
! typedef std::vector<CountType> CountTypeArrayType;
! #endif
/**
--- 68,72 ----
};
! typedef XalanVector<CountType> CountTypeArrayType;
/**
***************
*** 119,123 ****
*/
static void
! initialize();
/**
--- 74,78 ----
*/
static void
! initialize(MemoryManagerType& theManager);
/**
***************
*** 145,148 ****
--- 100,113 ----
unsigned long id);
+ static ElemNumber*
+ create(
+ MemoryManagerType& theManager,
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet& stylesheetTree,
+ const AttributeListType& atts,
+ int lineNumber,
+ int columnNumber,
+ unsigned long id);
+
virtual
~ElemNumber();
***************
*** 153,158 ****
--- 118,128 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
unsigned long
***************
*** 320,339 ****
/**
- * Convert a long integer into traditional alphabetic counting, in other words
- * count using the traditional numbering.
- * @param val Value to convert -- must be greater than zero.
- * @param table a table containing one character for each digit in the radix
- * @return String representing alpha count of number.
- * @see XSLProcessor#DecimalToRoman
- *
- * Note that the radix of the conversion is inferred from the size
- * of the table.
- */
- static void
- tradAlphaCount(
- CountType val,
- XalanDOMString& theResult);
-
- /**
* Convert an integral into roman numerals.
* @param val Value to convert.
--- 290,293 ----
***************
*** 344,348 ****
*/
static void
! long2roman(
CountType val,
bool prefixesAreOK,
--- 298,302 ----
*/
static void
! toRoman(
CountType val,
bool prefixesAreOK,
***************
*** 465,468 ****
--- 419,423 ----
static const DecimalToRoman s_romanConvertTable[];
+ static const size_t s_romanConvertTableSize;
/**
* numbering resource bundle for Greek numbering.
***************
*** 507,518 ****
}
- /**
- * Retrieve the next token to be parsed; behavior is undefined if there
- * are no more tokens
- *
- * @return next token string
- */
- XalanDOMString
- nextToken();
/**
--- 462,465 ----
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTEngineImpl.hpp 8 Apr 2004 07:57:34 -0000 1.1.1.1
--- XSLTEngineImpl.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_XSLTENGINEIMPL_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_XSLTENGINEIMPL_HEADER_GUARD)
***************
*** 73,79 ****
// Standard library headers
#include <cassert>
- #include <ctime>
- #include <map>
- #include <set>
--- 32,35 ----
***************
*** 89,93 ****
! #include <xalanc/Include/XalanAutoPtr.hpp>
--- 45,50 ----
! #include <xalanc/Include/XalanMemMgrAutoPtr.hpp>
! #include <xalanc/Include/XalanMap.hpp>
***************
*** 138,142 ****
class PrintWriter;
class StylesheetConstructionContext;
- class StylesheetExecutionContext;
class StylesheetRoot;
class XalanAttr;
--- 95,98 ----
***************
*** 168,177 ****
public:
- #if defined(XALAN_STRICT_ANSI_HEADERS)
- typedef std::clock_t ClockType;
- #else
- typedef clock_t ClockType;
- #endif
-
struct LessXalanDOMStringPointers
{
--- 124,127 ----
***************
*** 196,222 ****
};
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef map<const void*,
! ClockType,
! less<const void*> > DurationsTableMapType;
! typedef vector<const LocatorType*> LocatorStack;
! typedef vector<TraceListener*> TraceListenerVectorType;
! #if defined(XALAN_USE_DEQUE_FOR_VECTOR_BOOL)
! typedef deque<bool> BoolVectorType;
! #else
! typedef vector<bool> BoolVectorType;
! #endif
! typedef vector<const XalanDOMString*> XalanDOMStringPointerVectorType;
! #else
! typedef std::map<const void*, ClockType> DurationsTableMapType;
! typedef std::vector<const LocatorType*> LocatorStack;
! typedef std::vector<TraceListener*> TraceListenerVectorType;
! #if defined(XALAN_USE_DEQUE_FOR_VECTOR_BOOL)
! typedef std::deque<bool> BoolVectorType;
! #else
! typedef std::vector<bool> BoolVectorType;
! #endif
! typedef std::vector<const XalanDOMString*> XalanDOMStringPointerVectorType;
! #endif
struct FindStringPointerFunctor
--- 146,154 ----
};
! typedef XalanVector<const LocatorType*> LocatorStack;
! typedef XalanVector<TraceListener*> TraceListenerVectorType;
! typedef XalanVector<const XalanDOMString*> XalanDOMStringPointerVectorType;
!
! typedef XalanVector<bool> BoolVectorType;
struct FindStringPointerFunctor
***************
*** 240,246 ****
};
! typedef XalanAutoPtr<XPathProcessor> XPathProcessorPtrType;
typedef Function::XObjectArgVectorType XObjectArgVectorType;
typedef StylesheetExecutionContext::ParamVectorType ParamVectorType;
// Public members
--- 172,180 ----
};
! typedef XalanMemMgrAutoPtr<XPathProcessor, true> XPathProcessorPtrType;
typedef Function::XObjectArgVectorType XObjectArgVectorType;
typedef StylesheetExecutionContext::ParamVectorType ParamVectorType;
+ typedef XPathConstructionContext::GetAndReleaseCachedString CCGetAndReleaseCachedString;
+ typedef XPathExecutionContext::GetAndReleaseCachedString ECGetAndReleaseCachedString;
// Public members
***************
*** 260,263 ****
--- 194,198 ----
*/
XSLTEngineImpl(
+ MemoryManagerType& theManager,
XMLParserLiaison& parserLiaison,
XPathEnvSupport& xpathEnvSupport,
***************
*** 269,272 ****
--- 204,213 ----
~XSLTEngineImpl();
+ MemoryManagerType&
+ getMemoryManager()
+ {
+ return m_xpathConstructionContext.getMemoryManager();
+ }
+
/**
* Perform initialization of statics -- must be called before any
***************
*** 274,278 ****
*/
static void
! initialize();
/**
--- 215,219 ----
*/
static void
! initialize(MemoryManagerType& theManager);
/**
***************
*** 317,323 ****
getXMLParserLiaison() const;
- virtual const XalanDOMString
- getUniqueNamespaceValue();
-
virtual void
getUniqueNamespaceValue(XalanDOMString& theValue);
--- 258,261 ----
***************
*** 333,341 ****
XObjectPtr value);
- virtual bool
- shouldStripSourceNode(
- StylesheetExecutionContext& executionContext,
- const XalanNode& node) const;
-
virtual FormatterListener*
getFormatterListener() const;
--- 271,274 ----
***************
*** 508,511 ****
--- 441,446 ----
* @param aname name of attribute
* @param value value of attribute
+ * @param fromCopy true if the attribute is being copied from the source tree
+ * @param locator The Locator for reporting errors.
*/
void
***************
*** 513,522 ****
AttributeListImpl& attList,
const XalanDOMString& aname,
! const XalanDOMString& value)
{
addResultAttribute(
attList,
aname,
! value.c_str());
}
--- 448,461 ----
AttributeListImpl& attList,
const XalanDOMString& aname,
! const XalanDOMString& value,
! bool fromCopy = false,
! const LocatorType* locator = 0)
{
addResultAttribute(
attList,
aname,
! value.c_str(),
! fromCopy,
! locator);
}
***************
*** 528,531 ****
--- 467,500 ----
* @param aname name of attribute
* @param value value of attribute
+ * @param fromCopy true if the attribute is being copied from the source tree
+ * @param locator The Locator for reporting errors.
+ */
+ void
+ addResultAttribute(
+ AttributeListImpl& attList,
+ const XalanDOMString& aname,
+ const XalanDOMChar* value,
+ bool fromCopy = false,
+ const LocatorType* locator = 0)
+ {
+ addResultAttribute(
+ attList,
+ aname,
+ value,
+ length(value),
+ fromCopy,
+ locator);
+ }
+
+ /**
+ * Add attribute to attribute list, and if it is a namespace, add it to the
+ * namespaces stack.
+ *
+ * @param attList attribute list added to
+ * @param aname name of attribute
+ * @param value value of attribute
+ * @param theLength The length of the value
+ * @param fromCopy true if the attribute is being copied from the source tree
+ * @param locator The Locator for reporting errors.
*/
void
***************
*** 533,537 ****
AttributeListImpl& attList,
const XalanDOMString& aname,
! const XalanDOMChar* value);
/**
--- 502,509 ----
AttributeListImpl& attList,
const XalanDOMString& aname,
! const XalanDOMChar* value,
! XalanDOMString::size_type theLength,
! bool fromCopy = false,
! const LocatorType* locator = 0);
/**
***************
*** 541,549 ****
* @param aname name of attribute
* @param value value of attribute
*/
void
addResultAttribute(
const XalanDOMString& aname,
! const XalanDOMChar* value)
{
assert(m_outputContextStack.empty() == false);
--- 513,525 ----
* @param aname name of attribute
* @param value value of attribute
+ * @param fromCopy true if the attribute is being copied from the source tree
+ * @param locator The Locator for reporting errors.
*/
void
addResultAttribute(
const XalanDOMString& aname,
! const XalanDOMChar* value,
! bool fromCopy = false,
! const LocatorType* locator = 0)
{
assert(m_outputContextStack.empty() == false);
***************
*** 552,556 ****
getPendingAttributesImpl(),
aname,
! value);
}
--- 528,534 ----
getPendingAttributesImpl(),
aname,
! value,
! fromCopy,
! locator);
}
***************
*** 561,569 ****
* @param aname name of attribute
* @param value value of attribute
*/
void
addResultAttribute(
const XalanDOMString& aname,
! const XalanDOMString& value)
{
assert(m_outputContextStack.empty() == false);
--- 539,551 ----
* @param aname name of attribute
* @param value value of attribute
+ * @param fromCopy true if the attribute is being copied from the source tree
+ * @param locator The Locator for reporting errors.
*/
void
addResultAttribute(
const XalanDOMString& aname,
! const XalanDOMString& value,
! bool fromCopy = false,
! const LocatorType* locator = 0)
{
assert(m_outputContextStack.empty() == false);
***************
*** 572,578 ****
getPendingAttributesImpl(),
aname,
! value);
}
void
setDocumentLocator(const LocatorType* locator);
--- 554,572 ----
getPendingAttributesImpl(),
aname,
! value,
! fromCopy,
! locator);
}
+ /**
+ * Report an error copying a duplicate namespace node.
+ *
+ * @param theName The name of the node.
+ */
+ void
+ reportDuplicateNamespaceNodeError(
+ const XalanDOMString& theName,
+ const LocatorType* locator);
+
void
setDocumentLocator(const LocatorType* locator);
***************
*** 727,731 ****
* @param node node to clone
* @param nodeType the type of the node
- * @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
--- 721,724 ----
***************
*** 737,741 ****
const XalanNode& node,
XalanNode::NodeType nodeType,
- bool isLiteral,
bool overrideStrip,
bool shouldCloneAttributes,
--- 730,733 ----
***************
*** 748,752 ****
* @param value the XObject to output
* @param outputTextNodesOnly if true, only text nodes will be copied
! * @param locator the Locator for the event, if any.
*/
void
--- 740,744 ----
* @param value the XObject to output
* @param outputTextNodesOnly if true, only text nodes will be copied
! * @param locator the Locator for the event, if any.
*/
void
***************
*** 863,878 ****
const ElemTemplateElement* styleNode = 0) const;
- /**
- * Report a message
- *
- * @param msg text of message to output
- * @param sourceNode node in source where error occurred
- * @param styleNode node in stylesheet where error occurred
- */
- virtual void
- warn(
- const char* msg,
- const XalanNode* sourceNode = 0,
- const ElemTemplateElement* styleNode = 0) const;
virtual void
--- 855,858 ----
***************
*** 897,957 ****
/**
- * Mark the time, so that displayDuration can later display the elapsed
- * clock ticks.
- *
- * @param theKey pointer to element to push
- */
- void
- pushTime(const void* key);
-
- /**
- * Returns the duration since pushTime was called for element
- * in milliseconds.
- *
- * @param key pointer to element involved
- */
- ClockType
- popDuration(const void* key);
-
- /**
- * Display the duration since pushTime was called for element in
- * milliseconds, and a descriptive message
- *
- * @param info message to display
- * @param key pointer to element involved
- */
- void
- displayDuration(
- const XalanDOMString& info,
- const void* key);
-
-
- /**
- * Whether diagnostic output is to be generated
- *
- * @return true for diagnostics output
- */
- bool doDiagnosticsOutput()
- {
- return 0 != m_diagnosticsPrintWriter ? true : false;
- }
-
- /**
- * Print a diagnostics string to the output device
- *
- * @param s string to print
- */
- void
- diag(const XalanDOMString& s) const;
-
- /**
- * Print a diagnostics string to the output device
- *
- * @param s string to print
- */
- void
- diag(const char* s) const;
-
- /**
* Retrieve the result namespace corresponding to a prefix.
*
--- 877,880 ----
***************
*** 1506,1510 ****
*
* @param node node to clone
- * @param isLiteral true if a literal element
* @param overrideStrip false if white space stripping should be done
*/
--- 1429,1432 ----
***************
*** 1512,1516 ****
cloneToResultTree(
const XalanText& node,
- bool isLiteral,
bool overrideStrip);
--- 1434,1437 ----
***************
*** 1588,1594 ****
PrintWriter* m_diagnosticsPrintWriter;
- /* For diagnostics */
- DurationsTableMapType m_durationsTable;
-
/**
* List of listeners who are interested in tracing what's
--- 1509,1512 ----
***************
*** 1695,1709 ****
const XalanDOMString& theElementNamespaceURI);
- void
- error(
- const char* theMessage,
- const LocatorType* theLocator,
- const XalanNode* theSourceNode);
-
- void
- warn(
- const char* theMessage,
- const LocatorType* theLocator,
- const XalanNode* theSourceNode);
--- 1613,1616 ----
***************
*** 1739,1744 ****
XalanDOMStringPointerVectorType m_attributeNamesVisited;
- bool m_hasStripOrPreserveSpace;
-
bool m_hasCDATASectionElements;
--- 1646,1649 ----
***************
*** 1746,1750 ****
static void
! installFunctions();
static void
--- 1651,1655 ----
static void
! installFunctions(MemoryManagerType& theManager);
static void
Index: XSLTProcessorException.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTProcessorException.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTProcessorException.hpp 8 Apr 2004 07:57:35 -0000 1.1.1.1
--- XSLTProcessorException.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSLTPROCESSOREXCEPTION_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSLTPROCESSOREXCEPTION_HEADER_GUARD_1357924680)
***************
*** 85,96 ****
* @param theLineNumber the line number of the related document.
* @param theColumnNumber the column number of the related document.
- * @param theType type of exception string, default is "XSLTProcessorException"
*/
XSLTProcessorException(
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
int theLineNumber,
! int theColumnNumber,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLTProcessorException")));
/**
--- 44,54 ----
* @param theLineNumber the line number of the related document.
* @param theColumnNumber the column number of the related document.
*/
XSLTProcessorException(
+ MemoryManagerType& theManager,
const XalanDOMString& theMessage,
const XalanDOMString& theURI,
int theLineNumber,
! int theColumnNumber);
/**
***************
*** 99,108 ****
* @param theLocator The locator instance for error reporting.
* @param theMessage message to write when exception thrown
- * @param theType type of exception, default is "XSLTProcessorException"
*/
XSLTProcessorException(
const LocatorType& theLocator,
! const XalanDOMString& theMessage,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLTProcessorException")));
/**
--- 57,65 ----
* @param theLocator The locator instance for error reporting.
* @param theMessage message to write when exception thrown
*/
XSLTProcessorException(
+ MemoryManagerType& theManager,
const LocatorType& theLocator,
! const XalanDOMString& theMessage);
/**
***************
*** 110,121 ****
*
* @param theMessage message to print when exception thrown
- * @param theType type of exception string, default is "XSLTProcessorException"
*/
XSLTProcessorException(
! const XalanDOMString& theMessage,
! const XalanDOMString& theType = XalanDOMString(XALAN_STATIC_UCODE_STRING("XSLTProcessorException")));
virtual
~XSLTProcessorException();
};
--- 67,87 ----
*
* @param theMessage message to print when exception thrown
*/
XSLTProcessorException(
! MemoryManagerType& theManager,
! const XalanDOMString& theMessage);
virtual
~XSLTProcessorException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
+ private:
+
+ static const XalanDOMChar m_type[];
};
--- NEW FILE: XalanMatchPatternData.hpp ---
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#if !defined(XALAN_MATCHPATTERNDATA_HEADER_GUARD)
#define XALAN_MATCHPATTERNDATA_HEADER_GUARD
// Base include file. Must be first.
#include "xalanc/XSLT/XSLTDefinitions.hpp"
#include <cstddef>
#include "xalanc/XalanDOM/XalanDOMString.hpp"
#include "xalanc/XPath/XPath.hpp"
XALAN_CPP_NAMESPACE_BEGIN
class ElemTemplate;
/**
* This class contains information concerning a match pattern in
* a stylesheet.
*/
class XALAN_XSLT_EXPORT XalanMatchPatternData
{
public:
typedef XPath::eMatchScore eMatchScore;
#if defined(XALAN_STRICT_ANSI_HEADERS)
typedef std::size_t size_type;
#else
typedef size_t size_type;
#endif
/**
* Construct a XalanMatchPatternData from a pattern and template.
*
* @param theTemplate The ElemTemplate node that contains the template for this pattern
* @param thePosition The position in the stylesheet
* @param theTargetString The target string for match pattern
* @param TheMatchPattern The match pattern
* @param thePatternString the pattern string
* @param thePriority The priority for the match pattern.
*/
XalanMatchPatternData(
MemoryManagerType& theManager,
const ElemTemplate& theTemplate,
size_type thePosition,
const XalanDOMString& theTargetString,
const XPath& theMatchPattern,
const XalanDOMString& thePatternString,
eMatchScore thePriority) :
m_template(&theTemplate),
m_position(thePosition),
m_targetString(theTargetString, theManager),
m_matchPattern(&theMatchPattern),
m_pattern(&thePatternString),
m_priority(thePriority)
{
}
~XalanMatchPatternData()
{
}
/**
* Retrieve string for target.
*
* @return target string
*/
const XalanDOMString&
getTargetString() const
{
return m_targetString;
}
/**
* Retrieve the match pattern associated with pattern.
*
* @return XPath for pattern
*/
const XPath*
getExpression() const
{
return m_matchPattern;
}
/**
* Retrieve position of pattern in stylesheet.
*
* @return The position in the stylesheet
*/
size_type
getPosition() const
{
return m_position;
}
/**
* Retrieve pattern string.
*
* @return string that contains element pattern
*/
const XalanDOMString*
getPattern() const
{
return m_pattern;
}
/**
* Retrieve node that contains the template for this pattern.
*
* @return template node
*/
const ElemTemplate*
getTemplate() const
{
return m_template;
}
eMatchScore
getDefaultPriority() const
{
return m_priority;
}
double
getPriorityOrDefault() const;
private:
// not implemented
XalanMatchPatternData();
XalanMatchPatternData( const XalanMatchPatternData&);
const ElemTemplate* m_template;
size_type m_position;
XalanDOMString m_targetString;
const XPath* m_matchPattern;
const XalanDOMString* m_pattern;
eMatchScore m_priority;
};
XALAN_CPP_NAMESPACE_END
#endif // XALAN_MATCHPATTERNDATA_HEADER_GUARD
Index: XalanElemValueOfAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemValueOfAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemValueOfAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemValueOfAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemValueOfAllocator(size_type theBlockCount);
~XalanElemValueOfAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemValueOfAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemValueOfAllocator();
Index: ElemIf.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemIf.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemIf.hpp 8 Apr 2004 07:57:18 -0000 1.1.1.1
--- ElemIf.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMIF_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMIF_HEADER_GUARD)
***************
*** 101,106 ****
--- 60,73 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
virtual const XPath*
Index: XResultTreeFrag.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XResultTreeFrag.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XResultTreeFrag.hpp 8 Apr 2004 07:57:32 -0000 1.1.1.1
--- XResultTreeFrag.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XRESULTTREEFRAG_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XRESULTTREEFRAG_HEADER_GUARD_1357924680)
***************
*** 75,81 ****
- #include <xalanc/Include/XalanAutoPtr.hpp>
-
-
// Base class header file.
--- 34,37 ----
***************
*** 109,113 ****
* @param val source result tree fragment.
*/
! XResultTreeFrag(XalanDocumentFragment& value);
/**
--- 65,70 ----
* @param val source result tree fragment.
*/
! XResultTreeFrag(XalanDocumentFragment& value,
! MemoryManagerType& theManager);
/**
***************
*** 119,122 ****
--- 76,80 ----
XResultTreeFrag(
const XResultTreeFrag& source,
+ MemoryManagerType& theManager,
bool deepClone = false);
***************
*** 124,127 ****
--- 82,90 ----
~XResultTreeFrag();
+ MemoryManagerType&
+ getMemoryManager()const
+ {
+ return m_cachedStringValue.getMemoryManager();
+ }
void
***************
*** 133,144 ****
// These methods are inherited from XObject ...
! #if defined(XALAN_NO_COVARIANT_RETURN_TYPE)
! virtual XObject*
! #else
! virtual XResultTreeFrag*
! #endif
! clone(void* theAddress = 0) const;
!
! virtual XalanDOMString
getTypeString() const;
--- 96,100 ----
// These methods are inherited from XObject ...
! virtual const XalanDOMString&
getTypeString() const;
***************
*** 154,158 ****
virtual void
str(
! FormatterListener& formatterListener,
MemberFunctionPtr function) const;
--- 110,114 ----
virtual void
str(
! FormatterListener& formatterListener,
MemberFunctionPtr function) const;
***************
*** 195,198 ****
--- 151,157 ----
private:
+ //not implemented
+ XResultTreeFrag();
+ XResultTreeFrag(const XResultTreeFrag&);
// Data members...
Index: AVTPartXPath.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/AVTPartXPath.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AVTPartXPath.hpp 8 Apr 2004 07:57:14 -0000 1.1.1.1
--- AVTPartXPath.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_AVTPARTXPATH_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_AVTPARTXPATH_HEADER_GUARD)
Index: ElemCallTemplate.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemCallTemplate.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemCallTemplate.hpp 8 Apr 2004 07:57:16 -0000 1.1.1.1
--- ElemCallTemplate.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMCALLTEMPLATE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMCALLTEMPLATE_HEADER_GUARD)
***************
*** 106,112 ****
getElementName() const;
virtual void
! execute(StylesheetExecutionContext& executionContext) const;
virtual void
postConstruction(
--- 65,87 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
virtual void
! endElement(StylesheetExecutionContext& executionContext) const;
+ virtual const ElemTemplateElement*
+ getNextChildElemToExecute(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* currentElem) const;
+
+ virtual const ElemTemplateElement*
+ getFirstChildElemToExecute(
+ StylesheetExecutionContext& executionContext) const;
+ #else
+ virtual void
+ execute(StylesheetExecutionContext& executionContext) const;
+ #endif
virtual void
postConstruction(
Index: ElemText.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemText.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemText.hpp 8 Apr 2004 07:57:20 -0000 1.1.1.1
--- ElemText.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMTEXT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMTEXT_HEADER_GUARD)
Index: XalanElemApplyTemplatesAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemApplyTemplatesAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemApplyTemplatesAllocator.hpp 8 Apr 2004 07:57:30 -0000 1.1.1.1
--- XalanElemApplyTemplatesAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemApplyTemplatesAllocator(size_type theBlockCount);
~XalanElemApplyTemplatesAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemApplyTemplatesAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemApplyTemplatesAllocator();
Index: FunctionKey.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionKey.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionKey.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- FunctionKey.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONKEY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONKEY_HEADER_GUARD_1357924680)
***************
*** 65,72 ****
- #include <vector>
-
-
-
#include <xalanc/XPath/Function.hpp>
--- 24,27 ----
***************
*** 114,123 ****
virtual FunctionKey*
#endif
! clone() const;
protected:
! const XalanDOMString
! getError() const;
private:
--- 69,78 ----
virtual FunctionKey*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
Index: XSLTDefinitions.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTDefinitions.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTDefinitions.hpp 8 Apr 2004 07:57:32 -0000 1.1.1.1
--- XSLTDefinitions.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XSLTDEFINITIONS_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XSLTDEFINITIONS_HEADER_GUARD_1357924680)
Index: XalanElemElementAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanElemElementAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanElemElementAllocator.hpp 8 Apr 2004 07:57:31 -0000 1.1.1.1
--- XalanElemElementAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanElemElementAllocator(size_type theBlockCount);
~XalanElemElementAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanElemElementAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanElemElementAllocator();
Index: ResultNamespacesStack.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ResultNamespacesStack.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ResultNamespacesStack.hpp 8 Apr 2004 07:57:24 -0000 1.1.1.1
--- ResultNamespacesStack.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_RESULTNAMESPACESSTACK_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_RESULTNAMESPACESSTACK_HEADER_GUARD)
***************
*** 65,69 ****
! #include <vector>
--- 24,28 ----
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 85,100 ****
public:
! #if defined(XALAN_NO_STD_NAMESPACE)
#if defined(XALAN_USE_DEQUE_FOR_VECTOR_BOOL)
typedef deque<bool> BoolVectorType;
! #else
! typedef vector<bool> BoolVectorType;
! #endif
! #else
! #if defined(XALAN_USE_DEQUE_FOR_VECTOR_BOOL)
typedef std::deque<bool> BoolVectorType;
#else
! typedef std::vector<bool> BoolVectorType;
! #endif
#endif
--- 44,56 ----
public:
!
#if defined(XALAN_USE_DEQUE_FOR_VECTOR_BOOL)
+ #if defined(XALAN_NO_STD_NAMESPACE)
typedef deque<bool> BoolVectorType;
! #else
typedef std::deque<bool> BoolVectorType;
+ #endif
#else
! typedef XalanVector<bool> BoolVectorType;
#endif
***************
*** 106,110 ****
explicit
! ResultNamespacesStack();
~ResultNamespacesStack();
--- 62,66 ----
explicit
! ResultNamespacesStack(MemoryManagerType& theManager);
~ResultNamespacesStack();
Index: ElemApplyImport.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemApplyImport.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemApplyImport.hpp 8 Apr 2004 07:57:15 -0000 1.1.1.1
--- ElemApplyImport.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMAPPLYIMPORT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMAPPLYIMPORT_HEADER_GUARD)
***************
*** 94,98 ****
int lineNumber,
int columnNumber);
!
// These methods are inherited from ElemTemplateElement ...
--- 53,57 ----
int lineNumber,
int columnNumber);
!
// These methods are inherited from ElemTemplateElement ...
***************
*** 101,107 ****
getElementName() const;
virtual void
! execute(StylesheetExecutionContext& executionContext) const;
virtual ElemTemplateElement*
appendChildElem(ElemTemplateElement* newChild);
--- 60,78 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
virtual void
! endElement(StylesheetExecutionContext& executionContext) const;
+ virtual const ElemTemplateElement*
+ getNextChildElemToExecute(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* currentElem) const;
+ #else
+ virtual void
+ execute(StylesheetExecutionContext& executionContext) const;
+ #endif
virtual ElemTemplateElement*
appendChildElem(ElemTemplateElement* newChild);
Index: OutputContextStack.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/OutputContextStack.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OutputContextStack.hpp 8 Apr 2004 07:57:24 -0000 1.1.1.1
--- OutputContextStack.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_OUTPUTCONTEXTSTACK_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_OUTPUTCONTEXTSTACK_HEADER_GUARD)
***************
*** 65,69 ****
! #include <deque>
--- 24,28 ----
! #include <xalanc/Include/XalanDeque.hpp>
***************
*** 92,99 ****
struct OutputContext
{
! OutputContext(FormatterListener* theListener = 0) :
m_flistener(theListener),
! m_pendingAttributes(),
! m_pendingElementName(),
m_hasPendingStartDocument(false),
m_mustFlushPendingStartDocument(false)
--- 51,59 ----
struct OutputContext
{
! OutputContext(MemoryManagerType& theManager,
! FormatterListener* theListener = 0) :
m_flistener(theListener),
! m_pendingAttributes(theManager),
! m_pendingElementName(theManager),
m_hasPendingStartDocument(false),
m_mustFlushPendingStartDocument(false)
***************
*** 101,104 ****
--- 61,74 ----
}
+ OutputContext( const OutputContext& other,
+ MemoryManagerType& theManager) :
+ m_flistener(other.m_flistener),
+ m_pendingAttributes(other.m_pendingAttributes , theManager),
+ m_pendingElementName(other.m_pendingElementName , theManager),
+ m_hasPendingStartDocument(other.m_hasPendingStartDocument),
+ m_mustFlushPendingStartDocument(other.m_mustFlushPendingStartDocument)
+ {
+ }
+
~OutputContext()
{
***************
*** 130,143 ****
};
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef deque<OutputContext> OutputContextStackType;
! #else
! typedef std::deque<OutputContext> OutputContextStackType;
! #endif
typedef OutputContextStackType::size_type size_type;
explicit
! OutputContextStack();
~OutputContextStack();
--- 100,109 ----
};
! typedef XalanDeque<OutputContext, ConstructWithMemoryManagerTraits<OutputContext> > OutputContextStackType;
typedef OutputContextStackType::size_type size_type;
explicit
! OutputContextStack(MemoryManagerType& theManager);
~OutputContextStack();
Index: ElemExtensionCall.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemExtensionCall.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemExtensionCall.hpp 8 Apr 2004 07:57:17 -0000 1.1.1.1
--- ElemExtensionCall.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMEXTENSIONCALL_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMEXTENSIONCALL_HEADER_GUARD)
***************
*** 102,110 ****
int columnNumber,
ExtensionNSHandler& ns);
!
// These methods are inherited from ElemLiteralResult ...
virtual void
execute(StylesheetExecutionContext& executionContext) const;
bool
--- 61,94 ----
int columnNumber,
ExtensionNSHandler& ns);
!
! static ElemExtensionCall*
! create(
! MemoryManagerType& theManager,
! StylesheetConstructionContext& constructionContext,
! Stylesheet& stylesheetTree,
! const XalanDOMChar* name,
! const AttributeListType& atts,
! int lineNumber,
! int columnNumber,
! ExtensionNSHandler& ns);
!
// These methods are inherited from ElemLiteralResult ...
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual bool
+ executeChildElement(
+ StylesheetExecutionContext& executionContext,
+ const ElemTemplateElement* element) const;
+
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
bool
Index: NodeSortKey.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/NodeSortKey.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NodeSortKey.hpp 8 Apr 2004 07:57:23 -0000 1.1.1.1
--- NodeSortKey.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
Index: XalanAVTPartXPathAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanAVTPartXPathAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanAVTPartXPathAllocator.hpp 8 Apr 2004 07:57:30 -0000 1.1.1.1
--- XalanAVTPartXPathAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanAVTPartXPathAllocator(size_type theBlockCount);
~XalanAVTPartXPathAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanAVTPartXPathAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanAVTPartXPathAllocator();
Index: FunctionSystemProperty.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionSystemProperty.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionSystemProperty.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- FunctionSystemProperty.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONSYSTEMPROPERTY_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONSYSTEMPROPERTY_HEADER_GUARD_1357924680)
***************
*** 81,85 ****
typedef Function ParentType;
! FunctionSystemProperty();
virtual
--- 40,46 ----
typedef Function ParentType;
! FunctionSystemProperty(MemoryManagerType& theManager);
!
! FunctionSystemProperty( const FunctionSystemProperty& other, MemoryManagerType& theManager);
virtual
***************
*** 104,115 ****
virtual FunctionSystemProperty*
#endif
! clone() const;
protected:
! virtual const XalanDOMString
! getError() const;
private:
// Not implemented...
--- 65,78 ----
virtual FunctionSystemProperty*
#endif
! clone(MemoryManagerType& theManager) const;
protected:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
private:
+
+ FunctionSystemProperty(const FunctionSystemProperty&);
// Not implemented...
Index: AVTPartSimple.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/AVTPartSimple.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AVTPartSimple.hpp 8 Apr 2004 07:57:14 -0000 1.1.1.1
--- AVTPartSimple.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_AVTPARTSIMPLE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_AVTPARTSIMPLE_HEADER_GUARD)
Index: ElemPI.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemPI.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemPI.hpp 8 Apr 2004 07:57:19 -0000 1.1.1.1
--- ElemPI.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMPI_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMPI_HEADER_GUARD)
***************
*** 107,112 ****
--- 66,79 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
protected:
Index: FunctionElementAvailable.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionElementAvailable.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionElementAvailable.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- FunctionElementAvailable.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONELEMENTAVAILABLE_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONELEMENTAVAILABLE_HEADER_GUARD_1357924680)
***************
*** 65,73 ****
- #include <set>
- #include <vector>
-
-
-
#include <xalanc/XPath/Function.hpp>
--- 24,27 ----
***************
*** 114,123 ****
virtual FunctionElementAvailable*
#endif
! clone() const;
private:
! virtual const XalanDOMString
! getError() const;
--- 68,77 ----
virtual FunctionElementAvailable*
#endif
! clone(MemoryManagerType& theManager) const;
private:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
Index: SelectionEvent.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/SelectionEvent.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** SelectionEvent.hpp 8 Apr 2004 07:57:24 -0000 1.1.1.1
--- SelectionEvent.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_SelectionEvent_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_SelectionEvent_HEADER_GUARD)
Index: ElemComment.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemComment.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemComment.hpp 8 Apr 2004 07:57:16 -0000 1.1.1.1
--- ElemComment.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMCOMMENT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMCOMMENT_HEADER_GUARD)
***************
*** 94,97 ****
--- 53,57 ----
int columnNumber);
+
virtual
~ElemComment();
***************
*** 102,107 ****
--- 62,75 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
protected:
Index: XResultTreeFragAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XResultTreeFragAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XResultTreeFragAllocator.hpp 8 Apr 2004 07:57:32 -0000 1.1.1.1
--- XResultTreeFragAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 92,96 ****
* @param theBlockSize The block size.
*/
! XResultTreeFragAllocator(size_type theBlockCount);
~XResultTreeFragAllocator();
--- 51,55 ----
* @param theBlockSize The block size.
*/
! XResultTreeFragAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XResultTreeFragAllocator();
Index: FunctionCurrent.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/FunctionCurrent.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** FunctionCurrent.hpp 8 Apr 2004 07:57:21 -0000 1.1.1.1
--- FunctionCurrent.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(FUNCTIONCURRENT_HEADER_GUARD_1357924680)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(FUNCTIONCURRENT_HEADER_GUARD_1357924680)
***************
*** 65,73 ****
- #include <set>
- #include <vector>
-
-
-
#include <xalanc/XPath/Function.hpp>
--- 24,27 ----
***************
*** 113,122 ****
virtual FunctionCurrent*
#endif
! clone() const;
private:
! virtual const XalanDOMString
! getError() const;
// Not implemented...
--- 67,76 ----
virtual FunctionCurrent*
#endif
! clone(MemoryManagerType& theManager) const;
private:
! virtual const XalanDOMString&
! getError(XalanDOMString& theResult) const;
// Not implemented...
Index: ElemVariable.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemVariable.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemVariable.hpp 8 Apr 2004 07:57:21 -0000 1.1.1.1
--- ElemVariable.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMVARIABLE_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMVARIABLE_HEADER_GUARD)
***************
*** 140,145 ****
--- 99,112 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ void
+ endElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
const XObjectPtr
Index: XSLTProcessor.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XSLTProcessor.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XSLTProcessor.hpp 8 Apr 2004 07:57:34 -0000 1.1.1.1
--- XSLTProcessor.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,60 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
! *
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
! *
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*
! * $ Id: $
*
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
***************
*** 252,262 ****
getXMLParserLiaison() const = 0;
- /**
- * Generate a random namespace prefix guaranteed to be unique.
- *
- * @return unique namespace prefix
- */
- virtual const XalanDOMString
- getUniqueNamespaceValue() = 0;
/**
--- 208,211 ----
***************
*** 291,312 ****
const XalanDOMString& key,
const XalanDOMString& expression) = 0;
-
- /**
- * Tells, through the combination of the default-space attribute on
- * xsl:stylesheet, xsl:strip-space, xsl:preserve-space, and the xml:space
- * attribute, whether or not extra whitespace should be stripped from the
- * node. Literal elements from template elements should <em>not</em> be
- * tested with this function.
- *
- * @param executionContext current execution context
- * @param node text node from the source tree
- * @return true if the text node should be stripped of extra whitespace
- *
- * $$$ ToDo: This has no business being here in the engine...
- */
- virtual bool
- shouldStripSourceNode(
- StylesheetExecutionContext& executionContext,
- const XalanNode& node) const = 0;
/**
--- 240,243 ----
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemAttributeSet.hpp 8 Apr 2004 07:57:16 -0000 1.1.1.1
--- ElemAttributeSet.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMATTRIBUTESET_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMATTRIBUTESET_HEADER_GUARD)
***************
*** 116,121 ****
--- 75,91 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ const ElemTemplateElement*
+ getInvoker(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
virtual void
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** StylesheetExecutionContext.hpp 8 Apr 2004 07:57:26 -0000 1.1.1.1
--- StylesheetExecutionContext.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,59 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
[...3927 lines suppressed...]
! /**
! * 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;
! #endif
};
***************
*** 2009,2011 ****
! #endif // STYLESHEETEXECUTIONCONTEXT_HEADER_GUARD_1357924680
--- 2092,2094 ----
! #endif // STYLESHEETEXECUTIONCONTEXT_HEADER_GUARD_1357924680
Index: ElemLiteralResult.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemLiteralResult.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemLiteralResult.hpp 8 Apr 2004 07:57:18 -0000 1.1.1.1
--- ElemLiteralResult.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMLITERALRESULT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMLITERALRESULT_HEADER_GUARD)
***************
*** 120,125 ****
--- 79,95 ----
StylesheetConstructionContext& constructionContext) const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ endElement(StylesheetExecutionContext& executionContext) const;
+
+ virtual void
+ evaluateAVTs(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
protected:
Index: ElemTextLiteral.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/ElemTextLiteral.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ElemTextLiteral.hpp 8 Apr 2004 07:57:20 -0000 1.1.1.1
--- ElemTextLiteral.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_ELEMTEXTLITERAL_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_ELEMTEXTLITERAL_HEADER_GUARD)
***************
*** 139,144 ****
--- 98,108 ----
getElementName() const;
+ #if !defined(XALAN_RECURSIVE_STYLESHEET_EXECUTION)
+ virtual const ElemTemplateElement*
+ startElement(StylesheetExecutionContext& executionContext) const;
+ #else
virtual void
execute(StylesheetExecutionContext& executionContext) const;
+ #endif
private:
Index: VariablesStack.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/VariablesStack.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** VariablesStack.hpp 8 Apr 2004 07:57:29 -0000 1.1.1.1
--- VariablesStack.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_VARIABLESSTACK_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_VARIABLESSTACK_HEADER_GUARD)
***************
*** 66,70 ****
#include <cassert>
! #include <vector>
--- 25,32 ----
#include <cassert>
!
!
!
! #include <xalanc/Include/XalanVector.hpp>
***************
*** 98,110 ****
public:
/**
* Constructor for a variable stack.
*/
explicit
! VariablesStack();
~VariablesStack();
-
/**
* Reset the stack.
--- 60,73 ----
public:
+ typedef unsigned long size_type;
+
/**
* Constructor for a variable stack.
*/
explicit
! VariablesStack(MemoryManagerType& theManager);
~VariablesStack();
/**
* Reset the stack.
***************
*** 179,191 ****
};
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<ParamsVectorEntry> ParamsVectorType;
! typedef vector<const ElemVariable*> RecursionGuardStackType;
! typedef vector<const ElemTemplateElement*> ElemTemplateElementStackType;
! #else
! typedef std::vector<ParamsVectorEntry> ParamsVectorType;
! typedef std::vector<const ElemVariable*> RecursionGuardStackType;
! typedef std::vector<const ElemTemplateElement*> ElemTemplateElementStackType;
! #endif
/**
--- 142,148 ----
};
! typedef XalanVector<ParamsVectorEntry> ParamsVectorType;
! typedef XalanVector<const ElemVariable*> RecursionGuardStackType;
! typedef XalanVector<const ElemTemplateElement*> ElemTemplateElementStackType;
/**
***************
*** 299,308 ****
*/
void
! setCurrentStackFrameIndex(int currentStackFrameIndex = -1)
{
! if (currentStackFrameIndex == -1)
! m_currentStackFrameIndex = m_stack.size();
else
m_currentStackFrameIndex = currentStackFrameIndex;
}
--- 256,271 ----
*/
void
! setCurrentStackFrameIndex(size_type currentStackFrameIndex = ~0u)
{
! if (currentStackFrameIndex == ~0u)
! {
! assert(size_type(m_stack.size()) == m_stack.size());
!
! m_currentStackFrameIndex = size_type(m_stack.size());
! }
else
+ {
m_currentStackFrameIndex = currentStackFrameIndex;
+ }
}
***************
*** 313,317 ****
* @return current value of index
*/
! int
getCurrentStackFrameIndex() const
{
--- 276,280 ----
* @return current value of index
*/
! size_type
getCurrentStackFrameIndex() const
{
***************
*** 324,328 ****
* @return current value of index
*/
! int
getGlobalStackFrameIndex() const
{
--- 287,291 ----
* @return current value of index
*/
! size_type
getGlobalStackFrameIndex() const
{
***************
*** 334,343 ****
public:
! InvalidStackContextException();
virtual
~InvalidStackContextException();
private:
};
--- 297,315 ----
public:
! InvalidStackContextException(XalanDOMString& theResult);
virtual
~InvalidStackContextException();
+
+ virtual const XalanDOMChar*
+ getType() const
+ {
+ return m_type;
+ }
+
private:
+
+ static const XalanDOMChar m_type[];
};
***************
*** 505,520 ****
};
! #if defined(XALAN_NO_STD_NAMESPACE)
! typedef vector<StackEntry> VariableStackStackType;
! #else
! typedef std::vector<StackEntry> VariableStackStackType;
! #endif
!
! typedef VariableStackStackType::size_type size_type;
size_type
getStackSize() const
{
! return m_stack.size();
}
--- 477,486 ----
};
! typedef XalanVector<StackEntry> VariableStackStackType;
size_type
getStackSize() const
{
! return size_type(m_stack.size());
}
***************
*** 596,600 ****
bool& fNameFound);
! VariableStackStackType::size_type
findEntry(
const XalanQName& name,
--- 562,566 ----
bool& fNameFound);
! size_type
findEntry(
const XalanQName& name,
***************
*** 605,609 ****
VariableStackStackType m_stack;
! int m_globalStackFrameIndex;
bool m_globalStackFrameMarked;
--- 571,575 ----
VariableStackStackType m_stack;
! size_type m_globalStackFrameIndex;
bool m_globalStackFrameMarked;
***************
*** 614,618 ****
* be the real stack top.
*/
! unsigned int m_currentStackFrameIndex;
/**
--- 580,584 ----
* be the real stack top.
*/
! size_type m_currentStackFrameIndex;
/**
Index: XalanAVTPartSimpleAllocator.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/XalanAVTPartSimpleAllocator.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** XalanAVTPartSimpleAllocator.hpp 8 Apr 2004 07:57:30 -0000 1.1.1.1
--- XalanAVTPartSimpleAllocator.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
***************
*** 99,103 ****
* @param theBlockSize The block size.
*/
! XalanAVTPartSimpleAllocator(size_type theBlockCount);
~XalanAVTPartSimpleAllocator();
--- 58,62 ----
* @param theBlockSize The block size.
*/
! XalanAVTPartSimpleAllocator(MemoryManagerType& theManager, size_type theBlockCount);
~XalanAVTPartSimpleAllocator();
Index: GenerateEvent.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/GenerateEvent.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** GenerateEvent.hpp 8 Apr 2004 07:57:22 -0000 1.1.1.1
--- GenerateEvent.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_GenerateEvent_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_GenerateEvent_HEADER_GUARD)
***************
*** 153,157 ****
* @param eventType one of the EVENTTYPE_XXX constants
*/
! GenerateEvent(EventType eventType);
/**
--- 112,117 ----
* @param eventType one of the EVENTTYPE_XXX constants
*/
! GenerateEvent(EventType eventType,
! MemoryManagerType& theManager);
/**
***************
*** 164,167 ****
--- 124,128 ----
GenerateEvent(
EventType eventType,
+ MemoryManagerType& theManager,
const XalanDOMChar* name,
AttributeListType* atts);
***************
*** 176,179 ****
--- 137,141 ----
GenerateEvent(
EventType eventType,
+ MemoryManagerType& theManager,
const XalanDOMString& name,
const AttributeListType* atts = 0);
***************
*** 189,192 ****
--- 151,155 ----
GenerateEvent(
EventType eventType,
+ MemoryManagerType& theManager,
const XalanDOMChar* ch,
XalanDOMString::size_type start,
***************
*** 202,205 ****
--- 165,169 ----
GenerateEvent(
EventType eventType,
+ MemoryManagerType& theManager,
const XalanDOMChar* name,
const XalanDOMChar* data);
***************
*** 214,217 ****
--- 178,182 ----
GenerateEvent(
EventType eventType,
+ MemoryManagerType& theManager,
const XalanDOMChar* data);
***************
*** 251,254 ****
--- 216,223 ----
*/
const AttributeListType* m_pAtts;
+ private:
+ // not imlplemented
+ GenerateEvent();
+ GenerateEvent(const GenerateEvent&);
};
Index: AVT.hpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Include/xalanc/XSLT/AVT.hpp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** AVT.hpp 8 Apr 2004 07:57:14 -0000 1.1.1.1
--- AVT.hpp 19 Feb 2008 20:14:03 -0000 1.2
***************
*** 1,57 ****
/*
! * The Apache Software License, Version 1.1
! *
! *
! * Copyright (c) 1999-2004 The Apache Software Foundation. All rights
! * reserved.
! *
! * Redistribution and use in source and binary forms, with or without
! * modification, are permitted provided that the following conditions
! * are met:
! *
! * 1. Redistributions of source code must retain the above copyright
! * notice, this list of conditions and the following disclaimer.
! *
! * 2. Redistributions in binary form must reproduce the above copyright
! * notice, this list of conditions and the following disclaimer in
! * the documentation and/or other materials provided with the
! * distribution.
! *
! * 3. The end-user documentation included with the redistribution,
! * if any, must include the following acknowledgment:
! * "This product includes software developed by the
! * Apache Software Foundation (http://www.apache.org/)."
! * Alternately, this acknowledgment may appear in the software itself,
! * if and wherever such third-party acknowledgments normally appear.
! *
! * 4. The names "Xalan" and "Apache Software Foundation" must
! * not be used to endorse or promote products derived from this
! * software without prior written permission. For written
! * permission, please contact apache at apache.org.
*
! * 5. Products derived from this software may not be called "Apache",
! * nor may "Apache" appear in their name, without prior written
! * permission of the Apache Software Foundation.
*
! * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
! * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
! * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
! * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
! * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
! * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
! * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
! * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
! * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
! * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
! * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
! * SUCH DAMAGE.
! * ====================================================================
*
! * This software consists of voluntary contributions made by many
! * individuals on behalf of the Apache Software Foundation and was
! * originally based on software copyright (c) 1999, International
! * Business Machines, Inc., http://www.ibm.com. For more
! * information on the Apache Software Foundation, please see
! * <http://www.apache.org/>.
*/
#if !defined(XALAN_AVT_HEADER_GUARD)
--- 1,16 ----
/*
! * Copyright 1999-2004 The Apache Software Foundation.
*
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
! * http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
*/
#if !defined(XALAN_AVT_HEADER_GUARD)
- Previous message: [GME-commit] GMESRC/GME/Include/xalanc/XPath ElementPrefixResolverProxy.hpp, 1.1.1.1, 1.2 FormatterStringLengthCounter.hpp, 1.1.1.1, 1.2 Function.hpp, 1.1.1.1, 1.2 FunctionConcat.hpp, 1.1.1.1, 1.2 FunctionContains.hpp, 1.1.1.1, 1.2 FunctionID.hpp, 1.1.1.1, 1.2 FunctionLang.hpp, 1.1.1.1, 1.2 FunctionNamespaceURI.hpp, 1.1.1.1, 1.2 FunctionNormalizeSpace.hpp, 1.1.1.1, 1.2 FunctionStartsWith.hpp, 1.1.1.1, 1.2 FunctionString.hpp, 1.1.1.1, 1.2 FunctionSubstring.hpp, 1.1.1.1, 1.2 FunctionSubstringAfter.hpp, 1.1.1.1, 1.2 FunctionSubstringBefore.hpp, 1.1.1.1, 1.2 FunctionTranslate.hpp, 1.1.1.1, 1.2 MutableNodeRefList.hpp, 1.1.1.1, 1.2 NameSpace.hpp, 1.1.1.1, 1.2 NodeRefList.hpp, 1.1.1.1, 1.2 NodeRefListBase.hpp, 1.1.1.1, 1.2 XBoolean.hpp, 1.1.1.1, 1.2 XNodeSet.hpp, 1.1.1.1, 1.2 XNodeSetAllocator.hpp, 1.1.1.1, 1.2 XNodeSetBase.hpp, 1.1.1.1, 1.2 XNodeSetNodeProxy.hpp, 1.1.1.1, 1.2 XNodeSetNodeProxyAllocator.hpp, 1.1.1.1, 1.2 XNodeSetResultTreeFragProxy.hpp, 1.1.1.1, 1.2 XNull.hpp, 1.1.1.1, 1.2 XNumber.hpp, 1.1.1.1, 1.2 XNumberAllocator.hpp, 1.1.1 .1, 1.2 XNumberBase.hpp, 1.1.1.1, 1.2 XObject.hpp, 1.1.1.1, 1.2 XObjectFactory.hpp, 1.1.1.1, 1.2 XObjectFactoryDefault.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxy.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxyBase.hpp, 1.1.1.1, 1.2 XObjectResultTreeFragProxyText.hpp, 1.1.1.1, 1.2 XObjectTypeCallback.hpp, 1.1.1.1, 1.2 XPath.hpp, 1.1.1.1, 1.2 XPathAllocator.hpp, 1.1.1.1, 1.2 XPathConstructionContext.hpp, 1.1.1.1, 1.2 XPathConstructionContextDefault.hpp, 1.1.1.1, 1.2 XPathDefinitions.hpp, 1.1.1.1, 1.2 XPathEnvSupport.hpp, 1.1.1.1, 1.2 XPathEnvSupportDefault.hpp, 1.1.1.1, 1.2 XPathEvaluator.hpp, 1.1.1.1, 1.2 XPathExecutionContext.hpp, 1.1.1.1, 1.2 XPathExecutionContextDefault.hpp, 1.1.1.1, 1.2 XPathExpression.hpp, 1.1.1.1, 1.2 XPathFactory.hpp, 1.1.1.1, 1.2 XPathFactoryBlock.hpp, 1.1.1.1, 1.2 XPathFactoryDefault.hpp, 1.1.1.1, 1.2 XPathFunctionTable.hpp, 1.1.1.1, 1.2 XPathInit.hpp, 1.1.1.1, 1.2 XPathParserException.hpp, 1.1.1.1, 1.2 XPathProcessor.hpp, 1.1.1.1, 1.2 XPathProcessorImpl.hpp, 1.1.1.1, 1.2 XSpan.hpp, 1.1.1.1, 1.2 XString.hpp , 1.1.1.1, 1.2 XStringAdapter.hpp, 1.1.1.1, 1.2 XStringAdapterAllocator.hpp, 1.1.1.1, 1.2 XStringAllocator.hpp, 1.1.1.1, 1.2 XStringBase.hpp, 1.1.1.1, 1.2 XStringCached.hpp, 1.1.1.1, 1.2 XStringCachedAllocator.hpp, 1.1.1.1, 1.2 XStringReference.hpp, 1.1.1.1, 1.2 XStringReferenceAllocator.hpp, 1.1.1.1, 1.2 XToken.hpp, 1.1.1.1, 1.2 XTokenNumberAdapter.hpp, 1.1.1.1, 1.2 XTokenNumberAdapterAllocator.hpp, 1.1.1.1, 1.2 XTokenStringAdapter.hpp, 1.1.1.1, 1.2 XTokenStringAdapterAllocator.hpp, 1.1.1.1, 1.2 XUnknown.hpp, 1.1.1.1, 1.2 XalanDocumentFragmentNodeRefListBaseProxy.hpp, 1.1.1.1, 1.2 XalanQName.hpp, 1.1.1.1, 1.2 XalanQNameByReference.hpp, 1.1.1.1, 1.2 XalanQNameByValue.hpp, 1.1.1.1, 1.2 XalanQNameByValueAllocator.hpp, 1.1.1.1, 1.2 XalanXPathException.hpp, 1.1.1.1, 1.2
- Next message: [GME-commit] GMESRC/GME/Include/xercesc/com BindStatusCallback.cpp, NONE, 1.1 BindStatusCallback.h, NONE, 1.1 IXMLDOMCharacterDataImpl.h, NONE, 1.1 IXMLDOMNodeImpl.h, NONE, 1.1 IXMLDOMNodeImpl.inl, NONE, 1.1 IXMLDOMTextImpl.h, NONE, 1.1 NodeContainerImpl.h, NONE, 1.1 README.txt, NONE, 1.1 StdAfx.cpp, NONE, 1.1 StdAfx.h, NONE, 1.1 XMLDOMAttribute.cpp, NONE, 1.1 XMLDOMAttribute.h, NONE, 1.1 XMLDOMCDATASection.h, NONE, 1.1 XMLDOMComment.h, NONE, 1.1 XMLDOMDocument.cpp, NONE, 1.1 XMLDOMDocument.h, NONE, 1.1 XMLDOMDocumentFragment.h, NONE, 1.1 XMLDOMDocumentType.cpp, NONE, 1.1 XMLDOMDocumentType.h, NONE, 1.1 XMLDOMElement.cpp, NONE, 1.1 XMLDOMElement.h, NONE, 1.1 XMLDOMEntity.cpp, NONE, 1.1 XMLDOMEntity.h, NONE, 1.1 XMLDOMEntityReference.h, NONE, 1.1 XMLDOMImplementation.cpp, NONE, 1.1 XMLDOMImplementation.h, NONE, 1.1 XMLDOMNamedNodeMap.cpp, NONE, 1.1 XMLDOMNamedNodeMap.h, NONE, 1.1 XMLDOMNodeList.cpp, NONE, 1.1 XMLDOMNodeList.h, NONE, 1.1 XMLDOMNotation.cpp, NONE, 1.1 XMLDOMNotation.h, NONE, 1.1 XMLDOMParseError.cpp, NONE, 1.1 XMLDOMParseError.h, N ONE, 1.1 XMLDOMProcessingInstruction.cpp, NONE, 1.1 XMLDOMProcessingInstruction.h, NONE, 1.1 XMLDOMText.h, NONE, 1.1 XMLDOMUtil.cpp, NONE, 1.1 XMLDOMUtil.h, NONE, 1.1 XMLDOMXMLDecl.cpp, NONE, 1.1 XMLDOMXMLDecl.h, NONE, 1.1 XMLHTTPRequest.cpp, NONE, 1.1 XMLHttpRequest.h, NONE, 1.1 registry.bin, NONE, 1.1 resource.h, NONE, 1.1 xml4com.cpp, NONE, 1.1 xml4com.def, NONE, 1.1 xml4com.idl, NONE, 1.1 xml4com.rc, NONE, 1.1 xml4comCP.h, NONE, 1.1 xml4comps.def, NONE, 1.1 xml4comps.mk, NONE, 1.1 xmldocument.rgs, NONE, 1.1 xmlhttprequest.rgs, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list