You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2002/09/05 03:38:21 UTC
cvs commit: xml-xalan/c/src/XSLT Constants.cpp Constants.hpp Stylesheet.cpp StylesheetHandler.cpp XSLTEngineImpl.cpp
dbertoni 2002/09/04 18:38:21
Modified: c/src/XSLT Constants.cpp Constants.hpp Stylesheet.cpp
StylesheetHandler.cpp XSLTEngineImpl.cpp
Log:
Reduce start-up dynamic memory utilization.
Revision Changes Path
1.20 +0 -33 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Constants.cpp 13 Aug 2002 05:37:06 -0000 1.19
+++ Constants.cpp 5 Sep 2002 01:38:21 -0000 1.20
@@ -100,7 +100,6 @@
static XalanDOMString ATTRNAME_GROUPINGSIZE;
static XalanDOMString ATTRNAME_HREF;
static XalanDOMString ATTRNAME_ID;
-static XalanDOMString ATTRNAME_IMPORTANCE;
static XalanDOMString ATTRNAME_INDENTAMOUNT;
static XalanDOMString ATTRNAME_INDENTRESULT;
static XalanDOMString ATTRNAME_INFINITY;
@@ -139,7 +138,6 @@
static XalanDOMString ATTRNAME_RESULT_PREFIX;
static XalanDOMString ATTRNAME_SCRIPT;
static XalanDOMString ATTRNAME_SELECT;
-static XalanDOMString ATTRNAME_SEQUENCESRC;
static XalanDOMString ATTRNAME_SRC;
static XalanDOMString ATTRNAME_STYLE;
static XalanDOMString ATTRNAME_STYLESHEET_PREFIX;
@@ -159,7 +157,6 @@
static XalanDOMString ATTRTYPE_CDATA;
static XalanDOMString ATTRVAL_ALPHABETIC;
-static XalanDOMString ATTRVAL_ANCESTOR;
static XalanDOMString ATTRVAL_ANY;
static XalanDOMString ATTRVAL_CASEORDER_LOWER;
static XalanDOMString ATTRVAL_CASEORDER_UPPER;
@@ -168,7 +165,6 @@
static XalanDOMString ATTRVAL_DEFAULT;
static XalanDOMString ATTRVAL_DEFAULT_PREFIX;
static XalanDOMString ATTRVAL_DEFAULT_TEXT_RULE;
-static XalanDOMString ATTRVAL_ID;
static XalanDOMString ATTRVAL_INFINITY;
static XalanDOMString ATTRVAL_MULTI;
static XalanDOMString ATTRVAL_NAN;
@@ -179,7 +175,6 @@
static XalanDOMString ATTRVAL_OUTPUT_METHOD_HTML;
static XalanDOMString ATTRVAL_OUTPUT_METHOD_TEXT;
static XalanDOMString ATTRVAL_OUTPUT_METHOD_XML;
-static XalanDOMString ATTRVAL_PARENT;
static XalanDOMString ATTRVAL_PRESERVE;
static XalanDOMString ATTRVAL_SIMPLE;
static XalanDOMString ATTRVAL_SINGLE;
@@ -232,7 +227,6 @@
static XalanDOMString ELEMNAME_IMPORT_STRING;
static XalanDOMString ELEMNAME_INCLUDE_STRING;
static XalanDOMString ELEMNAME_KEY_STRING;
-static XalanDOMString ELEMNAME_LOCALE_STRING;
static XalanDOMString ELEMNAME_MESSAGE_STRING;
static XalanDOMString ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_NSALIAS_STRING;
@@ -243,7 +237,6 @@
static XalanDOMString ELEMNAME_OUTPUT_STRING;
static XalanDOMString ELEMNAME_PARAMVARIABLE_STRING;
static XalanDOMString ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_PI_OLD_STRING;
static XalanDOMString ELEMNAME_PI_STRING;
static XalanDOMString ELEMNAME_PI_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_PRESERVESPACE_STRING;
@@ -258,7 +251,6 @@
static XalanDOMString ELEMNAME_TEXT_STRING;
static XalanDOMString ELEMNAME_TEXT_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_TRANSFORM_STRING;
-static XalanDOMString ELEMNAME_URL_STRING;
static XalanDOMString ELEMNAME_USE_STRING;
static XalanDOMString ELEMNAME_USE_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_VALUEOF_STRING;
@@ -315,7 +307,6 @@
const XalanDOMString& Constants::ATTRNAME_GROUPINGSIZE = ::ATTRNAME_GROUPINGSIZE;
const XalanDOMString& Constants::ATTRNAME_HREF = ::ATTRNAME_HREF;
const XalanDOMString& Constants::ATTRNAME_ID = ::ATTRNAME_ID;
-const XalanDOMString& Constants::ATTRNAME_IMPORTANCE = ::ATTRNAME_IMPORTANCE;
const XalanDOMString& Constants::ATTRNAME_INDENTAMOUNT = ::ATTRNAME_INDENTAMOUNT;
const XalanDOMString& Constants::ATTRNAME_INDENTRESULT = ::ATTRNAME_INDENTRESULT;
const XalanDOMString& Constants::ATTRNAME_INFINITY = ::ATTRNAME_INFINITY;
@@ -354,7 +345,6 @@
const XalanDOMString& Constants::ATTRNAME_RESULT_PREFIX = ::ATTRNAME_RESULT_PREFIX;
const XalanDOMString& Constants::ATTRNAME_SCRIPT = ::ATTRNAME_SCRIPT;
const XalanDOMString& Constants::ATTRNAME_SELECT = ::ATTRNAME_SELECT;
-const XalanDOMString& Constants::ATTRNAME_SEQUENCESRC = ::ATTRNAME_SEQUENCESRC;
const XalanDOMString& Constants::ATTRNAME_SRC = ::ATTRNAME_SRC;
const XalanDOMString& Constants::ATTRNAME_STYLE = ::ATTRNAME_STYLE;
const XalanDOMString& Constants::ATTRNAME_STYLESHEET_PREFIX = ::ATTRNAME_STYLESHEET_PREFIX;
@@ -374,7 +364,6 @@
const XalanDOMString& Constants::ATTRTYPE_CDATA = ::ATTRTYPE_CDATA;
const XalanDOMString& Constants::ATTRVAL_ALPHABETIC = ::ATTRVAL_ALPHABETIC;
-const XalanDOMString& Constants::ATTRVAL_ANCESTOR = ::ATTRVAL_ANCESTOR;
const XalanDOMString& Constants::ATTRVAL_ANY = ::ATTRVAL_ANY;
const XalanDOMString& Constants::ATTRVAL_CASEORDER_LOWER = ::ATTRVAL_CASEORDER_LOWER;
const XalanDOMString& Constants::ATTRVAL_CASEORDER_UPPER = ::ATTRVAL_CASEORDER_UPPER;
@@ -383,7 +372,6 @@
const XalanDOMString& Constants::ATTRVAL_DEFAULT = ::ATTRVAL_DEFAULT;
const XalanDOMString& Constants::ATTRVAL_DEFAULT_PREFIX = ::ATTRVAL_DEFAULT_PREFIX;
const XalanDOMString& Constants::ATTRVAL_DEFAULT_TEXT_RULE = ::ATTRVAL_DEFAULT_TEXT_RULE;
-const XalanDOMString& Constants::ATTRVAL_ID = ::ATTRVAL_ID;
const XalanDOMString& Constants::ATTRVAL_INFINITY = ::ATTRVAL_INFINITY;
const XalanDOMString& Constants::ATTRVAL_MULTI = ::ATTRVAL_MULTI;
const XalanDOMString& Constants::ATTRVAL_NAN = ::ATTRVAL_NAN;
@@ -394,7 +382,6 @@
const XalanDOMString& Constants::ATTRVAL_OUTPUT_METHOD_HTML = ::ATTRVAL_OUTPUT_METHOD_HTML;
const XalanDOMString& Constants::ATTRVAL_OUTPUT_METHOD_TEXT = ::ATTRVAL_OUTPUT_METHOD_TEXT;
const XalanDOMString& Constants::ATTRVAL_OUTPUT_METHOD_XML = ::ATTRVAL_OUTPUT_METHOD_XML;
-const XalanDOMString& Constants::ATTRVAL_PARENT = ::ATTRVAL_PARENT;
const XalanDOMString& Constants::ATTRVAL_PRESERVE = ::ATTRVAL_PRESERVE;
const XalanDOMString& Constants::ATTRVAL_SIMPLE = ::ATTRVAL_SIMPLE;
const XalanDOMString& Constants::ATTRVAL_SINGLE = ::ATTRVAL_SINGLE;
@@ -431,7 +418,6 @@
const XalanDOMString& Constants::ELEMNAME_COPY_WITH_PREFIX_STRING = ::ELEMNAME_COPY_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_DECIMALFORMAT_STRING = ::ELEMNAME_DECIMALFORMAT_STRING;
const XalanDOMString& Constants::ELEMNAME_DECIMALFORMAT_WITH_PREFIX_STRING = ::ELEMNAME_DECIMALFORMAT_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_DISPLAYIF_STRING = ::ELEMNAME_DISPLAYIF_STRING;
const XalanDOMString& Constants::ELEMNAME_ELEMENT_STRING = ::ELEMNAME_ELEMENT_STRING;
const XalanDOMString& Constants::ELEMNAME_ELEMENT_WITH_PREFIX_STRING = ::ELEMNAME_ELEMENT_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_EMPTY_STRING = ::ELEMNAME_EMPTY_STRING;
@@ -446,7 +432,6 @@
const XalanDOMString& Constants::ELEMNAME_IMPORT_STRING = ::ELEMNAME_IMPORT_STRING;
const XalanDOMString& Constants::ELEMNAME_INCLUDE_STRING = ::ELEMNAME_INCLUDE_STRING;
const XalanDOMString& Constants::ELEMNAME_KEY_STRING = ::ELEMNAME_KEY_STRING;
-const XalanDOMString& Constants::ELEMNAME_LOCALE_STRING = ::ELEMNAME_LOCALE_STRING;
const XalanDOMString& Constants::ELEMNAME_MESSAGE_STRING = ::ELEMNAME_MESSAGE_STRING;
const XalanDOMString& Constants::ELEMNAME_MESSAGE_WITH_PREFIX_STRING = ::ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_NSALIAS_STRING = ::ELEMNAME_NSALIAS_STRING;
@@ -457,7 +442,6 @@
const XalanDOMString& Constants::ELEMNAME_OUTPUT_STRING = ::ELEMNAME_OUTPUT_STRING;
const XalanDOMString& Constants::ELEMNAME_PARAMVARIABLE_STRING = ::ELEMNAME_PARAMVARIABLE_STRING;
const XalanDOMString& Constants::ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING = ::ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_PI_OLD_STRING = ::ELEMNAME_PI_OLD_STRING;
const XalanDOMString& Constants::ELEMNAME_PI_STRING = ::ELEMNAME_PI_STRING;
const XalanDOMString& Constants::ELEMNAME_PI_WITH_PREFIX_STRING = ::ELEMNAME_PI_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_PRESERVESPACE_STRING = ::ELEMNAME_PRESERVESPACE_STRING;
@@ -472,7 +456,6 @@
const XalanDOMString& Constants::ELEMNAME_TEXT_STRING = ::ELEMNAME_TEXT_STRING;
const XalanDOMString& Constants::ELEMNAME_TEXT_WITH_PREFIX_STRING = ::ELEMNAME_TEXT_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_TRANSFORM_STRING = ::ELEMNAME_TRANSFORM_STRING;
-const XalanDOMString& Constants::ELEMNAME_URL_STRING = ::ELEMNAME_URL_STRING;
const XalanDOMString& Constants::ELEMNAME_USE_STRING = ::ELEMNAME_USE_STRING;
const XalanDOMString& Constants::ELEMNAME_USE_WITH_PREFIX_STRING = ::ELEMNAME_USE_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_VALUEOF_STRING = ::ELEMNAME_VALUEOF_STRING;
@@ -532,7 +515,6 @@
::ATTRNAME_GROUPINGSIZE = XALAN_STATIC_UCODE_STRING("grouping-size");
::ATTRNAME_HREF = XALAN_STATIC_UCODE_STRING("href");
::ATTRNAME_ID = XALAN_STATIC_UCODE_STRING("id");
- ::ATTRNAME_IMPORTANCE = XALAN_STATIC_UCODE_STRING("importance");
::ATTRNAME_INDENTAMOUNT = XALAN_STATIC_UCODE_STRING("indent-amount");
::ATTRNAME_INDENTRESULT = XALAN_STATIC_UCODE_STRING("indent-result");
::ATTRNAME_INFINITY = XALAN_STATIC_UCODE_STRING("infinity");
@@ -571,7 +553,6 @@
::ATTRNAME_RESULT_PREFIX = XALAN_STATIC_UCODE_STRING("result-prefix");
::ATTRNAME_SCRIPT = XALAN_STATIC_UCODE_STRING("script");
::ATTRNAME_SELECT = XALAN_STATIC_UCODE_STRING("select");
- ::ATTRNAME_SEQUENCESRC = XALAN_STATIC_UCODE_STRING("sequence-src");
::ATTRNAME_SRC = XALAN_STATIC_UCODE_STRING("src");
::ATTRNAME_STYLE = XALAN_STATIC_UCODE_STRING("style");
::ATTRNAME_STYLESHEET_PREFIX = XALAN_STATIC_UCODE_STRING("stylesheet-prefix");
@@ -591,7 +572,6 @@
::ATTRTYPE_CDATA = XALAN_STATIC_UCODE_STRING("CDATA");
::ATTRVAL_ALPHABETIC = XALAN_STATIC_UCODE_STRING("alphabetic");
- ::ATTRVAL_ANCESTOR = XALAN_STATIC_UCODE_STRING("ancestor");
::ATTRVAL_ANY = XALAN_STATIC_UCODE_STRING("any");
::ATTRVAL_CASEORDER_LOWER = XALAN_STATIC_UCODE_STRING("lower-first");
::ATTRVAL_CASEORDER_UPPER = XALAN_STATIC_UCODE_STRING("upper-first");
@@ -600,7 +580,6 @@
::ATTRVAL_DEFAULT = XALAN_STATIC_UCODE_STRING("default");
::ATTRVAL_DEFAULT_PREFIX = XALAN_STATIC_UCODE_STRING("#default");
::ATTRVAL_DEFAULT_TEXT_RULE = XALAN_STATIC_UCODE_STRING("text() | @*");
- ::ATTRVAL_ID = XALAN_STATIC_UCODE_STRING("id");
::ATTRVAL_INFINITY = XALAN_STATIC_UCODE_STRING("Infinity");
::ATTRVAL_MULTI = XALAN_STATIC_UCODE_STRING("multiple");
::ATTRVAL_NAN = XALAN_STATIC_UCODE_STRING("NaN");
@@ -611,7 +590,6 @@
::ATTRVAL_OUTPUT_METHOD_HTML = XALAN_STATIC_UCODE_STRING("html");
::ATTRVAL_OUTPUT_METHOD_TEXT = XALAN_STATIC_UCODE_STRING("text");
::ATTRVAL_OUTPUT_METHOD_XML = XALAN_STATIC_UCODE_STRING("xml");
- ::ATTRVAL_PARENT = XALAN_STATIC_UCODE_STRING("..");
::ATTRVAL_PRESERVE = XALAN_STATIC_UCODE_STRING("preserve");
::ATTRVAL_SIMPLE = XALAN_STATIC_UCODE_STRING("simple");
::ATTRVAL_SINGLE = XALAN_STATIC_UCODE_STRING("single");
@@ -663,7 +641,6 @@
::ELEMNAME_IMPORT_STRING = XALAN_STATIC_UCODE_STRING("import");
::ELEMNAME_INCLUDE_STRING = XALAN_STATIC_UCODE_STRING("include");
::ELEMNAME_KEY_STRING = XALAN_STATIC_UCODE_STRING("key");
- ::ELEMNAME_LOCALE_STRING = XALAN_STATIC_UCODE_STRING("locale");
::ELEMNAME_MESSAGE_STRING = XALAN_STATIC_UCODE_STRING("message");
::ELEMNAME_MESSAGE_WITH_PREFIX_STRING = XALAN_STATIC_UCODE_STRING("xsl:message");
::ELEMNAME_NSALIAS_STRING = XALAN_STATIC_UCODE_STRING("namespace-alias");
@@ -674,7 +651,6 @@
::ELEMNAME_OUTPUT_STRING = XALAN_STATIC_UCODE_STRING("output");
::ELEMNAME_PARAMVARIABLE_STRING = XALAN_STATIC_UCODE_STRING("param");
::ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING = XALAN_STATIC_UCODE_STRING("xsl:param");
- ::ELEMNAME_PI_OLD_STRING = XALAN_STATIC_UCODE_STRING("pi");
::ELEMNAME_PI_STRING = XALAN_STATIC_UCODE_STRING("processing-instruction");
::ELEMNAME_PI_WITH_PREFIX_STRING = XALAN_STATIC_UCODE_STRING("xsl:processing-instruction");
::ELEMNAME_PRESERVESPACE_STRING = XALAN_STATIC_UCODE_STRING("preserve-space");
@@ -689,7 +665,6 @@
::ELEMNAME_TEXT_STRING = XALAN_STATIC_UCODE_STRING("text");
::ELEMNAME_TEXT_WITH_PREFIX_STRING = XALAN_STATIC_UCODE_STRING("xsl:text");
::ELEMNAME_TRANSFORM_STRING = XALAN_STATIC_UCODE_STRING("transform");
- ::ELEMNAME_URL_STRING = XALAN_STATIC_UCODE_STRING("uri");
::ELEMNAME_USE_STRING = XALAN_STATIC_UCODE_STRING("use");
::ELEMNAME_USE_WITH_PREFIX_STRING = XALAN_STATIC_UCODE_STRING("xsl:use");
::ELEMNAME_VALUEOF_STRING = XALAN_STATIC_UCODE_STRING("value-of");
@@ -750,7 +725,6 @@
releaseMemory(::ATTRNAME_GROUPINGSIZE);
releaseMemory(::ATTRNAME_HREF);
releaseMemory(::ATTRNAME_ID);
- releaseMemory(::ATTRNAME_IMPORTANCE);
releaseMemory(::ATTRNAME_INDENTAMOUNT);
releaseMemory(::ATTRNAME_INDENTRESULT);
releaseMemory(::ATTRNAME_INFINITY);
@@ -789,7 +763,6 @@
releaseMemory(::ATTRNAME_RESULT_PREFIX);
releaseMemory(::ATTRNAME_SCRIPT);
releaseMemory(::ATTRNAME_SELECT);
- releaseMemory(::ATTRNAME_SEQUENCESRC);
releaseMemory(::ATTRNAME_SRC);
releaseMemory(::ATTRNAME_STYLE);
releaseMemory(::ATTRNAME_STYLESHEET_PREFIX);
@@ -809,7 +782,6 @@
releaseMemory(::ATTRTYPE_CDATA);
releaseMemory(::ATTRVAL_ALPHABETIC);
- releaseMemory(::ATTRVAL_ANCESTOR);
releaseMemory(::ATTRVAL_ANY);
releaseMemory(::ATTRVAL_CASEORDER_LOWER);
releaseMemory(::ATTRVAL_CASEORDER_UPPER);
@@ -818,7 +790,6 @@
releaseMemory(::ATTRVAL_DEFAULT);
releaseMemory(::ATTRVAL_DEFAULT_PREFIX);
releaseMemory(::ATTRVAL_DEFAULT_TEXT_RULE);
- releaseMemory(::ATTRVAL_ID);
releaseMemory(::ATTRVAL_INFINITY);
releaseMemory(::ATTRVAL_MULTI);
releaseMemory(::ATTRVAL_NAN);
@@ -829,7 +800,6 @@
releaseMemory(::ATTRVAL_OUTPUT_METHOD_HTML);
releaseMemory(::ATTRVAL_OUTPUT_METHOD_TEXT);
releaseMemory(::ATTRVAL_OUTPUT_METHOD_XML);
- releaseMemory(::ATTRVAL_PARENT);
releaseMemory(::ATTRVAL_PRESERVE);
releaseMemory(::ATTRVAL_SIMPLE);
releaseMemory(::ATTRVAL_SINGLE);
@@ -882,7 +852,6 @@
releaseMemory(::ELEMNAME_IMPORT_STRING);
releaseMemory(::ELEMNAME_INCLUDE_STRING);
releaseMemory(::ELEMNAME_KEY_STRING);
- releaseMemory(::ELEMNAME_LOCALE_STRING);
releaseMemory(::ELEMNAME_MESSAGE_STRING);
releaseMemory(::ELEMNAME_MESSAGE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_NSALIAS_STRING);
@@ -893,7 +862,6 @@
releaseMemory(::ELEMNAME_OUTPUT_STRING);
releaseMemory(::ELEMNAME_PARAMVARIABLE_STRING);
releaseMemory(::ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_PI_OLD_STRING);
releaseMemory(::ELEMNAME_PI_STRING);
releaseMemory(::ELEMNAME_PI_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_PRESERVESPACE_STRING);
@@ -908,7 +876,6 @@
releaseMemory(::ELEMNAME_TEXT_STRING);
releaseMemory(::ELEMNAME_TEXT_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_TRANSFORM_STRING);
- releaseMemory(::ELEMNAME_URL_STRING);
releaseMemory(::ELEMNAME_USE_STRING);
releaseMemory(::ELEMNAME_USE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_VALUEOF_STRING);
1.17 +1 -25 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Constants.hpp 13 Aug 2002 05:37:06 -0000 1.16
+++ Constants.hpp 5 Sep 2002 01:38:21 -0000 1.17
@@ -110,13 +110,7 @@
ELEMNAME_COPY = 9,
ELEMNAME_COPY_OF = 74,
ELEMNAME_DEFINEATTRIBUTESET = 40,
- // ELEMNAME_DEFINECONSTANT = 29,
- // ELEMNAME_DEFINEMACRO = 10,
- ELEMNAME_DEFINESCRIPT = 11,
- ELEMNAME_DISPLAYIF = 12, // my own
ELEMNAME_EMPTY = 14,
- ELEMNAME_EVAL = 15,
- ELEMNAME_EXPECTEDCHILDREN = 16,
ELEMNAME_EXTENSION = 54,
ELEMNAME_EXTENSIONHANDLER = 63,
ELEMNAME_FOREACH = 28,
@@ -130,7 +124,6 @@
ELEMNAME_OTHERWISE = 39,
ELEMNAME_PI = 58,
ELEMNAME_PRESERVESPACE = 33,
- ELEMNAME_REMOVEATTRIBUTE = 5,
ELEMNAME_TEMPLATE = 19,
ELEMNAME_SORT = 64,
ELEMNAME_STRIPSPACE = 32,
@@ -144,17 +137,14 @@
ELEMNAME_ANY = 45,
ELEMNAME_ELEMENT = 46,
ELEMNAME_ATTRIBUTE = 48,
- ELEMNAME_URL = 52, // my own
- ELEMNAME_CALL = 55, // my own
ELEMNAME_PARAM = 56,
- ELEMNAME_FALLBACK = 57, // my own
+ ELEMNAME_FALLBACK = 57,
ELEMNAME_APPLY_IMPORTS = 72,
ELEMNAME_VARIABLE = 73,
ELEMNAME_MESSAGE = 75,
- ELEMNAME_LOCALE = 76,
ELEMNAME_LITERALRESULT = 77,
ELEMNAME_TEXTLITERALRESULT = 78,
@@ -201,7 +191,6 @@
static const XalanDOMString& ELEMNAME_COPY_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_DECIMALFORMAT_STRING;
static const XalanDOMString& ELEMNAME_DECIMALFORMAT_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_DISPLAYIF_STRING;
static const XalanDOMString& ELEMNAME_ELEMENT_STRING;
static const XalanDOMString& ELEMNAME_ELEMENT_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_EMPTY_STRING;
@@ -217,7 +206,6 @@
static const XalanDOMString& ELEMNAME_IMPORT_STRING;
static const XalanDOMString& ELEMNAME_INCLUDE_STRING;
static const XalanDOMString& ELEMNAME_KEY_STRING;
- static const XalanDOMString& ELEMNAME_LOCALE_STRING;
static const XalanDOMString& ELEMNAME_MESSAGE_STRING;
static const XalanDOMString& ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_NSALIAS_STRING;
@@ -236,7 +224,6 @@
static const XalanDOMString& ELEMNAME_TEXT_STRING;
static const XalanDOMString& ELEMNAME_TEXT_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_TRANSFORM_STRING;
- static const XalanDOMString& ELEMNAME_URL_STRING;
static const XalanDOMString& ELEMNAME_USE_STRING;
static const XalanDOMString& ELEMNAME_USE_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_VALUEOF_STRING;
@@ -249,7 +236,6 @@
static const XalanDOMString& ELEMNAME_OUTPUT_STRING;
static const XalanDOMString& ELEMNAME_PARAMVARIABLE_STRING;
static const XalanDOMString& ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_PI_OLD_STRING;
static const XalanDOMString& ELEMNAME_PI_STRING;
static const XalanDOMString& ELEMNAME_PI_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_SCRIPT_STRING;
@@ -289,7 +275,6 @@
static const XalanDOMString& ATTRNAME_GROUPINGSIZE;
static const XalanDOMString& ATTRNAME_HREF;
static const XalanDOMString& ATTRNAME_ID;
- static const XalanDOMString& ATTRNAME_IMPORTANCE;
static const XalanDOMString& ATTRNAME_INDENTAMOUNT;
static const XalanDOMString& ATTRNAME_INDENTRESULT;
static const XalanDOMString& ATTRNAME_INFINITY;
@@ -316,7 +301,6 @@
static const XalanDOMString& ATTRNAME_RESULT_PREFIX;
static const XalanDOMString& ATTRNAME_SCRIPT;
static const XalanDOMString& ATTRNAME_SELECT;
- static const XalanDOMString& ATTRNAME_SEQUENCESRC;
static const XalanDOMString& ATTRNAME_SRC;
static const XalanDOMString& ATTRNAME_STYLE;
static const XalanDOMString& ATTRNAME_STYLESHEET_PREFIX;
@@ -372,18 +356,13 @@
static const XalanDOMString& ATTRNAME_OUTPUT_MEDIATYPE;
static const XalanDOMString& ATTRNAME_OUTPUT_STANDALONE;
static const XalanDOMString& ATTRNAME_OUTPUT_VERSION;
-// static const XalanDOMString& ATTRNAME_OUTPUT_XMLDECL;
static const XalanDOMString& ATTRNAME_OUTPUT_OMITXMLDECL;
static const XalanDOMString& ATTRVAL_OUTPUT_METHOD_HTML;
static const XalanDOMString& ATTRVAL_OUTPUT_METHOD_XML;
static const XalanDOMString& ATTRVAL_OUTPUT_METHOD_TEXT;
- // some stuff for my patterns-by-example
static const XalanDOMString& ATTRVAL_THIS;
- static const XalanDOMString& ATTRVAL_PARENT;
- static const XalanDOMString& ATTRVAL_ANCESTOR;
- static const XalanDOMString& ATTRVAL_ID;
// Stuff for sorting
static const XalanDOMString& ATTRVAL_DATATYPE_TEXT;
@@ -453,7 +432,6 @@
TATTRNAME_GROUPINGSIZE = 28,
TATTRNAME_HREF = 29,
TATTRNAME_ID = 30,
- TATTRNAME_IMPORTANCE = 31,
TATTRNAME_INDENTRESULT = 32,
TATTRNAME_LANG = 33,
TATTRNAME_LETTERVALUE = 34,
@@ -476,12 +454,10 @@
TATTRNAME_OUTPUT_STANDALONE= 51,
TATTRNAME_OUTPUT_VERSION = 52,
TATTRNAME_OUTPUT_OMITXMLDECL = 53,
- // TATTRNAME_OUTPUT_XMLDECL = 53,
TATTRNAME_PRIORITY = 54,
TATTRNAME_REFID = 55,
TATTRNAME_RESULTNS = 56,
TATTRNAME_SELECT = 57,
- TATTRNAME_SEQUENCESRC = 58,
TATTRNAME_STYLE = 59,
TATTRNAME_TEST = 60,
TATTRNAME_TOSTRING = 61,
1.78 +14 -10 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.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- Stylesheet.cpp 26 Jun 2002 01:21:14 -0000 1.77
+++ Stylesheet.cpp 5 Sep 2002 01:38:21 -0000 1.78
@@ -665,16 +665,20 @@
if(nTargets != 0)
{
+ XalanDOMString tempString;
+
for(TargetDataVectorType::size_type i = 0;
i < nTargets; ++i)
{
- const XalanDOMString& target = data[i].getString();
+ assert(data[i].getString() != 0);
+
+ tempString = data[i].getString();
m_matchPattern2Container.push_back(
MatchPattern2(
*theTemplate,
m_matchPattern2Container.size(),
- target,
+ tempString,
*xp,
xp->getExpression().getCurrentPattern(),
data[i].getDefaultPriority()));
@@ -685,23 +689,23 @@
// Always put things on the front of the list, so
// templates later in the stylesheet are always
// selected first.
- if (equals(target, XPath::PSEUDONAME_TEXT) == true)
+ if (equals(tempString, XPath::PSEUDONAME_TEXT) == true)
{
addToList(m_textPatternList, newMatchPat);
}
- else if (equals(target, XPath::PSEUDONAME_COMMENT) == true)
+ else if (equals(tempString, XPath::PSEUDONAME_COMMENT) == true)
{
addToList(m_commentPatternList, newMatchPat);
}
- else if (equals(target, XPath::PSEUDONAME_ROOT) == true)
+ else if (equals(tempString, XPath::PSEUDONAME_ROOT) == true)
{
addToList(m_rootPatternList, newMatchPat);
}
- else if (equals(target, XPath::PSEUDONAME_PI) == true)
+ else if (equals(tempString, XPath::PSEUDONAME_PI) == true)
{
addToList(m_piPatternList, newMatchPat);
}
- else if (equals(target, XPath::PSEUDONAME_NODE) == true)
+ else if (equals(tempString, XPath::PSEUDONAME_NODE) == true)
{
addToList(m_nodePatternList, newMatchPat);
@@ -711,7 +715,7 @@
addToList(m_textPatternList, newMatchPat);
addToList(m_piPatternList, newMatchPat);
}
- else if (equals(target, XPath::PSEUDONAME_ANY) == true)
+ else if (equals(tempString, XPath::PSEUDONAME_ANY) == true)
{
if (data[i].getTargetType() == XPath::TargetData::eElement)
{
@@ -731,11 +735,11 @@
{
if (data[i].getTargetType() == XPath::TargetData::eElement)
{
- addToList(m_elementPatternTable[target], newMatchPat);
+ addToList(m_elementPatternTable[tempString], newMatchPat);
}
else if (data[i].getTargetType() == XPath::TargetData::eAttribute)
{
- addToList(m_attributePatternTable[target], newMatchPat);
+ addToList(m_attributePatternTable[tempString], newMatchPat);
}
}
}
1.85 +0 -10 xml-xalan/c/src/XSLT/StylesheetHandler.cpp
Index: StylesheetHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- StylesheetHandler.cpp 5 Aug 2002 04:57:50 -0000 1.84
+++ StylesheetHandler.cpp 5 Sep 2002 01:38:21 -0000 1.85
@@ -676,9 +676,7 @@
break;
case Constants::ELEMNAME_TEMPLATE:
- case Constants::ELEMNAME_LOCALE:
case Constants::ELEMNAME_DEFINEATTRIBUTESET:
- case Constants::ELEMNAME_DEFINESCRIPT:
case Constants::ELEMNAME_EXTENSION:
case Constants::ELEMNAME_EXTENSIONHANDLER:
case Constants::ELEMNAME_KEY:
@@ -995,10 +993,6 @@
}
break;
- case Constants::ELEMNAME_LOCALE:
- m_constructionContext.warn(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING("xsl:locale not yet supported.")));
- break;
-
case Constants::ELEMNAME_PRESERVESPACE:
case Constants::ELEMNAME_STRIPSPACE:
processPreserveStripSpace(name, atts, locator, xslToken);
@@ -1064,9 +1058,6 @@
case Constants::ELEMNAME_CONTENTS:
case Constants::ELEMNAME_COPY:
case Constants::ELEMNAME_COPY_OF:
- case Constants::ELEMNAME_DISPLAYIF:
- case Constants::ELEMNAME_EVAL:
- case Constants::ELEMNAME_EXPECTEDCHILDREN:
case Constants::ELEMNAME_FOREACH:
case Constants::ELEMNAME_IF:
case Constants::ELEMNAME_CALLTEMPLATE:
@@ -1074,7 +1065,6 @@
case Constants::ELEMNAME_NUMBER:
case Constants::ELEMNAME_OTHERWISE:
case Constants::ELEMNAME_PI:
- case Constants::ELEMNAME_REMOVEATTRIBUTE:
case Constants::ELEMNAME_SORT:
case Constants::ELEMNAME_TEXT:
case Constants::ELEMNAME_VALUEOF:
1.153 +0 -4 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- XSLTEngineImpl.cpp 19 Aug 2002 23:05:11 -0000 1.152
+++ XSLTEngineImpl.cpp 5 Sep 2002 01:38:21 -0000 1.153
@@ -3485,7 +3485,6 @@
theAttributeKeys[Constants::ATTRNAME_GROUPINGSIZE] = Constants::TATTRNAME_GROUPINGSIZE;
theAttributeKeys[Constants::ATTRNAME_HREF] = Constants::TATTRNAME_HREF;
theAttributeKeys[Constants::ATTRNAME_ID] = Constants::TATTRNAME_ID;
- theAttributeKeys[Constants::ATTRNAME_IMPORTANCE] = Constants::TATTRNAME_IMPORTANCE;
theAttributeKeys[Constants::ATTRNAME_INDENTRESULT] = Constants::TATTRNAME_INDENTRESULT;
theAttributeKeys[Constants::ATTRNAME_LANG] = Constants::TATTRNAME_LANG;
theAttributeKeys[Constants::ATTRNAME_LETTERVALUE] = Constants::TATTRNAME_LETTERVALUE;
@@ -3512,7 +3511,6 @@
theAttributeKeys[Constants::ATTRNAME_REFID] = Constants::TATTRNAME_REFID;
theAttributeKeys[Constants::ATTRNAME_RESULTNS] = Constants::TATTRNAME_RESULTNS;
theAttributeKeys[Constants::ATTRNAME_SELECT] = Constants::TATTRNAME_SELECT;
- theAttributeKeys[Constants::ATTRNAME_SEQUENCESRC] = Constants::TATTRNAME_SEQUENCESRC;
theAttributeKeys[Constants::ATTRNAME_STYLE] = Constants::TATTRNAME_STYLE;
theAttributeKeys[Constants::ATTRNAME_TEST] = Constants::TATTRNAME_TEST;
theAttributeKeys[Constants::ATTRNAME_TOSTRING] = Constants::TATTRNAME_TOSTRING;
@@ -3545,7 +3543,6 @@
theElementKeys[Constants::ELEMNAME_VARIABLE_STRING] = Constants::ELEMNAME_VARIABLE;
theElementKeys[Constants::ELEMNAME_PARAMVARIABLE_STRING] = Constants::ELEMNAME_PARAMVARIABLE;
- theElementKeys[Constants::ELEMNAME_DISPLAYIF_STRING] = Constants::ELEMNAME_DISPLAYIF;
theElementKeys[Constants::ELEMNAME_EMPTY_STRING] = Constants::ELEMNAME_EMPTY;
theElementKeys[Constants::ELEMNAME_CALLTEMPLATE_STRING] = Constants::ELEMNAME_CALLTEMPLATE;
theElementKeys[Constants::ELEMNAME_TEMPLATE_STRING] = Constants::ELEMNAME_TEMPLATE;
@@ -3574,7 +3571,6 @@
theElementKeys[Constants::ELEMNAME_EXTENSION_STRING] = Constants::ELEMNAME_EXTENSION;
theElementKeys[Constants::ELEMNAME_MESSAGE_STRING] = Constants::ELEMNAME_MESSAGE;
- theElementKeys[Constants::ELEMNAME_LOCALE_STRING] = Constants::ELEMNAME_LOCALE;
theElementKeys[Constants::ELEMNAME_FALLBACK_STRING] = Constants::ELEMNAME_FALLBACK;
theElementKeys[Constants::ELEMNAME_OUTPUT_STRING] = Constants::ELEMNAME_OUTPUT;
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org