dbertoni 01/11/07 17:08:48
Modified: c/src/XSLT ElemAttributeSet.cpp ElemAttributeSet.hpp
ElemUse.hpp Stylesheet.cpp
Log:
Backed-out changes to fix attribset42.
Revision Changes Path
1.16 +0 -25 xml-xalan/c/src/XSLT/ElemAttributeSet.cpp
Index: ElemAttributeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElemAttributeSet.cpp 2001/08/13 17:08:52 1.15
+++ ElemAttributeSet.cpp 2001/11/08 01:08:48 1.16
@@ -131,31 +131,6 @@
void
-ElemAttributeSet::adopt(ElemAttributeSet& theSource)
-{
- ElemTemplateElement* node = theSource.getFirstChildElem();
-
- while(node != 0)
- {
- assert(node->getXSLToken() == Constants::ELEMNAME_ATTRIBUTE);
-
- theSource.removeChild(node);
-
- XalanAutoPtr<ElemTemplateElement> theGuard(node);
-
- appendChild(node);
-
- theGuard.release();
-
- node = theSource.getFirstChildElem();
- }
-
- copyQNames(theSource);
-}
-
-
-
-void
ElemAttributeSet::execute(StylesheetExecutionContext&
executionContext) const
{
typedef StylesheetExecutionContext::SetAndRestoreCurrentStackFrameIndex
SetAndRestoreCurrentStackFrameIndex;
1.13 +0 -9 xml-xalan/c/src/XSLT/ElemAttributeSet.hpp
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemAttributeSet.hpp 2001/08/13 17:08:53 1.12
+++ ElemAttributeSet.hpp 2001/11/08 01:08:48 1.13
@@ -107,15 +107,6 @@
return m_QName;
}
- /**
- * Adopt the information of the supplied instance.
- * The children are removed from the supplied instance,
- * and any QNames for use-attribute-sets are copied.
- *
- * @param theSource The source ElemAttributeSet instance.
- */
- void
- adopt(ElemAttributeSet& theSource);
// These methods are inherited from ElemUse ...
1.15 +0 -14 xml-xalan/c/src/XSLT/ElemUse.hpp
Index: ElemUse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.hpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemUse.hpp 2001/08/13 17:08:53 1.14
+++ ElemUse.hpp 2001/11/08 01:08:48 1.15
@@ -118,20 +118,6 @@
const AttributeList& atts,
int
which);
- /**
- * Copy the QNames from the source
- *
- * @param theSource The source ElemUse instance.
- */
- void
- copyQNames(const ElemUse& theSource)
- {
- m_attributeSetsNames.insert(
- m_attributeSetsNames.end(),
- theSource.m_attributeSetsNames.begin(),
- theSource.m_attributeSetsNames.end());
- }
-
// These methods are inherited from ElemTemplateElement ...
virtual const XalanDOMString&
1.65 +2 -40 xml-xalan/c/src/XSLT/Stylesheet.cpp
Index: Stylesheet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Stylesheet.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Stylesheet.cpp 2001/09/26 21:30:23 1.64
+++ Stylesheet.cpp 2001/11/08 01:08:48 1.65
@@ -398,46 +398,8 @@
}
}
- {
-#if !defined(XALAN_NO_NAMESPACES)
- using std::find_if;
-#endif
- for (AttributeSetVectorType::size_type i = 0; i <
m_attributeSets.size(); ++i)
- {
- ElemAttributeSet* const theCurrent =
m_attributeSets[i];
-
- assert(theCurrent != 0);
-
- for(;;)
- {
- // Look for duplicate sets...
- const AttributeSetVectorType::iterator
theResult =
- find_if(
- m_attributeSets.begin()
+ (i + 1),
- m_attributeSets.end(),
-
attrSetCompare(*theCurrent));
-
- // Did we find it?
- if(theResult == m_attributeSets.end())
- {
- break;
- }
- else
- {
- theCurrent->adopt(**theResult);
-
- delete *theResult;
-
- m_attributeSets.erase(theResult);
- }
- }
-
- theCurrent->postConstruction(constructionContext,
m_namespacesHandler);
- }
-
- // Now that we're done with removing duplicates, cache the
size...
- m_attributeSetsSize = m_attributeSets.size();
- }
+ // Cache the size...
+ m_attributeSetsSize = m_attributeSets.size();
// OK, now we need to add everything template that matches "node()"
// to the end of the text, comment, and PI template lists.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
