dbertoni 2002/09/05 15:01:16
Modified: c/src/XSLT Constants.cpp Constants.hpp StylesheetRoot.cpp
Log:
Reduce start-up dynamic memory utilization.
Revision Changes Path
1.21 +0 -24 xml-xalan/c/src/XSLT/Constants.cpp
Index: Constants.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Constants.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Constants.cpp 5 Sep 2002 01:38:21 -0000 1.20
+++ Constants.cpp 5 Sep 2002 22:01:15 -0000 1.21
@@ -262,13 +262,7 @@
static XalanDOMString ELEMNAME_WITHPARAM_STRING;
static XalanDOMString ELEMNAME_WITHPARAM_WITH_PREFIX_STRING;
-static XalanDOMString PSEUDONAME_ANY;
-static XalanDOMString PSEUDONAME_COMMENT;
static XalanDOMString PSEUDONAME_NODE;
-static XalanDOMString PSEUDONAME_OTHER;
-static XalanDOMString PSEUDONAME_PI;
-static XalanDOMString PSEUDONAME_ROOT;
-static XalanDOMString PSEUDONAME_TEXT;
@@ -467,13 +461,7 @@
const XalanDOMString& Constants::ELEMNAME_WITHPARAM_STRING =
::ELEMNAME_WITHPARAM_STRING;
const XalanDOMString&
Constants::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING =
::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::PSEUDONAME_ANY =
::PSEUDONAME_ANY;
-const XalanDOMString& Constants::PSEUDONAME_COMMENT =
::PSEUDONAME_COMMENT;
const XalanDOMString& Constants::PSEUDONAME_NODE =
::PSEUDONAME_NODE;
-const XalanDOMString& Constants::PSEUDONAME_OTHER =
::PSEUDONAME_OTHER;
-const XalanDOMString& Constants::PSEUDONAME_PI =
::PSEUDONAME_PI;
-const XalanDOMString& Constants::PSEUDONAME_ROOT =
::PSEUDONAME_ROOT;
-const XalanDOMString& Constants::PSEUDONAME_TEXT =
::PSEUDONAME_TEXT;
@@ -676,13 +664,7 @@
::ELEMNAME_WITHPARAM_STRING = XALAN_STATIC_UCODE_STRING("with-param");
::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:with-param");
- ::PSEUDONAME_ANY = XALAN_STATIC_UCODE_STRING("*");
- ::PSEUDONAME_COMMENT = XALAN_STATIC_UCODE_STRING("#comment");
::PSEUDONAME_NODE = XALAN_STATIC_UCODE_STRING("node()");
- ::PSEUDONAME_OTHER = XALAN_STATIC_UCODE_STRING("*");
- ::PSEUDONAME_PI = XALAN_STATIC_UCODE_STRING("#pi");
- ::PSEUDONAME_ROOT = XALAN_STATIC_UCODE_STRING("/");
- ::PSEUDONAME_TEXT = XALAN_STATIC_UCODE_STRING("#text");
}
@@ -887,11 +869,5 @@
releaseMemory(::ELEMNAME_WITHPARAM_STRING);
releaseMemory(::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING);
- releaseMemory(::PSEUDONAME_ANY);
- releaseMemory(::PSEUDONAME_COMMENT);
releaseMemory(::PSEUDONAME_NODE);
- releaseMemory(::PSEUDONAME_OTHER);
- releaseMemory(::PSEUDONAME_PI);
- releaseMemory(::PSEUDONAME_ROOT);
- releaseMemory(::PSEUDONAME_TEXT);
}
1.18 +1 -9 xml-xalan/c/src/XSLT/Constants.hpp
Index: Constants.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Constants.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Constants.hpp 5 Sep 2002 01:38:21 -0000 1.17
+++ Constants.hpp 5 Sep 2002 22:01:16 -0000 1.18
@@ -471,16 +471,8 @@
TATTRNAME_EXCLUDE_RESULT_PREFIXES = 69
};
- // These are used mainly for keys in the pattern lookup table,
- // for those nodes that don't have unique lookup values
- static const XalanDOMString& PSEUDONAME_ANY;
- static const XalanDOMString& PSEUDONAME_COMMENT;
+ // This is used for trace reporting.
static const XalanDOMString& PSEUDONAME_NODE;
- static const XalanDOMString& PSEUDONAME_OTHER;
- static const XalanDOMString& PSEUDONAME_PI;
- static const XalanDOMString& PSEUDONAME_ROOT;
- static const XalanDOMString& PSEUDONAME_TEXT;
-
};
1.61 +2 -2 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- StylesheetRoot.cpp 13 Aug 2002 05:37:07 -0000 1.60
+++ StylesheetRoot.cpp 5 Sep 2002 22:01:16 -0000 1.61
@@ -622,7 +622,7 @@
attrs.addAttribute(c_wstr(Constants::ATTRNAME_MATCH),
c_wstr(Constants::ATTRTYPE_CDATA),
-
c_wstr(Constants::PSEUDONAME_ANY));
+ XPath::PSEUDONAME_ANY);
m_defaultRule = new ElemTemplate(constructionContext,
*this,
@@ -674,7 +674,7 @@
attrs.clear();
attrs.addAttribute(c_wstr(Constants::ATTRNAME_MATCH),
c_wstr(Constants::ATTRTYPE_CDATA),
-
c_wstr(Constants::PSEUDONAME_ROOT));
+ XPath::PSEUDONAME_ROOT);
m_defaultRootRule =
new ElemTemplate(constructionContext,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
