auriemma 00/10/12 10:07:54
Modified: c/src/XSLT AVT.cpp AVT.hpp ElemTemplateElement.cpp
ElemTextLiteral.cpp NodeSortKey.hpp Stylesheet.cpp
StylesheetRoot.cpp
Log:
Reordered members.
Revision Changes Path
1.8 +1 -1 xml-xalan/c/src/XSLT/AVT.cpp
Index: AVT.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVT.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AVT.cpp 2000/09/05 02:24:52 1.7
+++ AVT.cpp 2000/10/12 17:07:44 1.8
@@ -114,8 +114,8 @@
const PrefixResolver& resolver,
StylesheetConstructionContext& constructionContext) :
AVTPart(),
- m_name(name),
m_simpleString(),
+ m_name(name),
m_pcType(type)
{
StringTokenizer tokenizer(stringedValue,
theTokenDelimiterCharacters, true);
1.8 +5 -5 xml-xalan/c/src/XSLT/AVT.hpp
Index: AVT.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/AVT.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AVT.hpp 2000/09/19 15:11:36 1.7
+++ AVT.hpp 2000/10/12 17:07:45 1.8
@@ -58,7 +58,7 @@
#define XALAN_AVT_HEADER_GUARD
/**
- * $Id: AVT.hpp,v 1.7 2000/09/19 15:11:36 dbertoni Exp $
+ * $Id: AVT.hpp,v 1.8 2000/10/12 17:07:45 auriemma Exp $
*
* $State: Exp $
*
@@ -155,13 +155,13 @@
// not implemented
AVT(const AVT &);
- AVT& operator=(const AVT &);
+ AVT& operator=(const AVT &);
- XalanDOMString m_simpleString;
-
AVTPartPtrVectorType m_parts;
+
+ XalanDOMString m_simpleString;
- const XalanDOMString m_name;
+ const XalanDOMString m_name;
const XalanDOMString m_pcType;
};
1.36 +2 -2 xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ElemTemplateElement.cpp 2000/10/11 19:43:06 1.35
+++ ElemTemplateElement.cpp 2000/10/12 17:07:47 1.36
@@ -124,11 +124,11 @@
int
xslToken) :
XalanElement(),
PrefixResolver(),
+ m_finishedConstruction(false),
m_stylesheet(stylesheetTree),
m_lineNumber(lineNumber),
m_columnNumber(columnNumber),
- m_defaultSpace(true),
- m_finishedConstruction(false),
+ m_defaultSpace(true),
m_elemName(name),
m_xslToken(xslToken),
m_parentNode(0),
1.6 +3 -3 xml-xalan/c/src/XSLT/ElemTextLiteral.cpp
Index: ElemTextLiteral.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemTextLiteral.cpp 2000/09/05 02:24:53 1.5
+++ ElemTextLiteral.cpp 2000/10/12 17:07:48 1.6
@@ -89,9 +89,9 @@
columnNumber,
Constants::ELEMNAME_TEXTLITERALRESULT),
m_isCData(isCData),
- m_preserveSpace(preserveSpace),
- m_ch(ch + start, ch + start + length),
- m_disableOutputEscaping(disableOutputEscaping)
+ m_preserveSpace(preserveSpace),
+ m_disableOutputEscaping(disableOutputEscaping),
+ m_ch(ch + start, ch + start + length)
{
assert(XMLChVectorType::size_type(int(m_ch.size())) == m_ch.size());
}
1.8 +3 -3 xml-xalan/c/src/XSLT/NodeSortKey.hpp
Index: NodeSortKey.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NodeSortKey.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NodeSortKey.hpp 2000/08/22 20:21:25 1.7
+++ NodeSortKey.hpp 2000/10/12 17:07:48 1.8
@@ -167,10 +167,10 @@
ExecutionContext* m_executionContext; // needed for error
reporting.
- bool m_treatAsNumbers;
- bool m_descending;
-
const XPath* m_selectPat;
+
+ bool m_treatAsNumbers;
+ bool m_descending;
const PrefixResolver* m_prefixResolver;
1.39 +4 -4 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.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- Stylesheet.cpp 2000/10/08 02:14:54 1.38
+++ Stylesheet.cpp 2000/10/12 17:07:48 1.39
@@ -118,9 +118,12 @@
XalanDocument(),
PrefixResolver(),
m_stylesheetRoot(root),
+ m_needToBuildKeysTable(false),
m_baseIdent(baseIdentifier),
m_keyDeclarations(),
- m_needToBuildKeysTable(false),
+ m_XSLTNamespaceURI(constructionContext.getXSLTNamespaceURI()),
+ m_whitespacePreservingElements(),
+ m_whitespaceStrippingElements(),
m_imports(),
m_namespaces(),
m_namespaceDecls(),
@@ -131,9 +134,6 @@
m_firstTemplate(0),
m_includeStack(),
m_defaultSpace(true),
- m_XSLTNamespaceURI(constructionContext.getXSLTNamespaceURI()),
- m_whitespacePreservingElements(),
- m_whitespaceStrippingElements(),
m_namedTemplates(),
m_topLevelVariables(),
m_XSLTVerDeclared(1.0L),
1.27 +5 -4 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- StylesheetRoot.cpp 2000/10/07 15:26:10 1.26
+++ StylesheetRoot.cpp 2000/10/12 17:07:49 1.27
@@ -122,10 +122,7 @@
StylesheetConstructionContext& constructionContext) :
Stylesheet(*this,
baseIdentifier,
- constructionContext),
- m_importStack(),
- m_resultNameSpaceURL(),
- m_outputMethod(FormatterListener::OUTPUT_METHOD_NONE),
+ constructionContext),
m_version(),
m_indentResult(false),
m_encoding(),
@@ -134,10 +131,14 @@
m_doctypePublic(),
m_omitxmlDecl(false),
m_standalone(),
+ m_resultNameSpaceURL(),
+ m_outputMethod(FormatterListener::OUTPUT_METHOD_NONE),
m_cdataSectionElems(),
+ m_importStack(),
m_defaultTextRule(0),
m_defaultRule(0),
m_defaultRootRule(0)
+
{
const XalanDOMString urlString =
constructionContext.getURLStringFromString(m_baseIdent);
