dbertoni 2002/09/23 22:59:39
Modified: c/src/XSLT Constants.cpp Constants.hpp ElemFallback.cpp
ElemIf.cpp ElemParam.cpp ElemTemplate.cpp
ElemTemplateElement.cpp ElemTemplateElement.hpp
ElemUse.cpp ElemValueOf.cpp ElemVariable.cpp
ElemWhen.cpp StylesheetConstructionContext.hpp
StylesheetConstructionContextDefault.cpp
StylesheetConstructionContextDefault.hpp
StylesheetExecutionContextDefault.cpp
StylesheetHandler.cpp StylesheetHandler.hpp
XSLTEngineImpl.cpp XSLTEngineImpl.hpp
Log:
More constant string cleanup.
Revision Changes Path
1.23 +8 -258 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Constants.cpp 6 Sep 2002 01:39:17 -0000 1.22
+++ Constants.cpp 24 Sep 2002 05:59:37 -0000 1.23
@@ -71,31 +71,23 @@
static XalanDOMString ATTRNAME_ATTRIBUTE;
static XalanDOMString ATTRNAME_ATTRIBUTE_SET;
static XalanDOMString ATTRNAME_CASEORDER;
-static XalanDOMString ATTRNAME_CLASS;
static XalanDOMString ATTRNAME_CLASSID;
static XalanDOMString ATTRNAME_CODEBASE;
static XalanDOMString ATTRNAME_CODETYPE;
-static XalanDOMString ATTRNAME_COMPONENTS;
-static XalanDOMString ATTRNAME_CONDITION;
-static XalanDOMString ATTRNAME_COPYTYPE;
static XalanDOMString ATTRNAME_COUNT;
static XalanDOMString ATTRNAME_DATATYPE;
static XalanDOMString ATTRNAME_DECIMALSEPARATOR;
static XalanDOMString ATTRNAME_DEFAULT;
static XalanDOMString ATTRNAME_DEFAULTSPACE;
-static XalanDOMString ATTRNAME_DEPTH;
static XalanDOMString ATTRNAME_DIGIT;
static XalanDOMString ATTRNAME_DIGITGROUPSEP;
static XalanDOMString ATTRNAME_DISABLE_OUTPUT_ESCAPING;
-static XalanDOMString ATTRNAME_ELEMENT;
static XalanDOMString ATTRNAME_ELEMENTS;
static XalanDOMString ATTRNAME_EXCLUDE_RESULT_PREFIXES;
-static XalanDOMString ATTRNAME_EXPR;
static XalanDOMString ATTRNAME_EXTENSIONELEMENTPREFIXES;
static XalanDOMString ATTRNAME_ESCAPE_URLS;
static XalanDOMString ATTRNAME_FORMAT;
static XalanDOMString ATTRNAME_FROM;
-static XalanDOMString ATTRNAME_FUNCTIONS;
static XalanDOMString ATTRNAME_GROUPINGSEPARATOR;
static XalanDOMString ATTRNAME_GROUPINGSIZE;
static XalanDOMString ATTRNAME_HREF;
@@ -115,7 +107,6 @@
static XalanDOMString ATTRNAME_NDIGITSPERGROUP;
static XalanDOMString ATTRNAME_NS;
static XalanDOMString ATTRNAME_OMIT_META_TAG;
-static XalanDOMString ATTRNAME_ONLY;
static XalanDOMString ATTRNAME_ORDER;
static XalanDOMString ATTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS;
static XalanDOMString ATTRNAME_OUTPUT_DOCTYPE_PUBLIC;
@@ -132,25 +123,18 @@
static XalanDOMString ATTRNAME_PERMILLE;
static XalanDOMString ATTRNAME_PREFIX;
static XalanDOMString ATTRNAME_PRIORITY;
-static XalanDOMString ATTRNAME_REFID;
static XalanDOMString ATTRNAME_RESULTNS;
static XalanDOMString ATTRNAME_RESULT_PREFIX;
-static XalanDOMString ATTRNAME_SCRIPT;
static XalanDOMString ATTRNAME_SELECT;
-static XalanDOMString ATTRNAME_SRC;
-static XalanDOMString ATTRNAME_STYLE;
static XalanDOMString ATTRNAME_STYLESHEET_PREFIX;
static XalanDOMString ATTRNAME_TERMINATE;
static XalanDOMString ATTRNAME_TEST;
-static XalanDOMString ATTRNAME_TOSTRING;
static XalanDOMString ATTRNAME_TYPE;
static XalanDOMString ATTRNAME_USE;
static XalanDOMString ATTRNAME_USEATTRIBUTESETS;
static XalanDOMString ATTRNAME_VALUE;
static XalanDOMString ATTRNAME_VERSION;
-static XalanDOMString ATTRNAME_XMLNS;
-static XalanDOMString ATTRNAME_XMLNSDEF;
-static XalanDOMString ATTRNAME_XMLSPACE;
+static XalanDOMString ATTRNAME_SPACE;
static XalanDOMString ATTRNAME_ZERODIGIT;
static XalanDOMString ATTRTYPE_CDATA;
@@ -179,80 +163,33 @@
static XalanDOMString DEFAULT_WHITESPACE_SEPARATOR_STRING;
static XalanDOMString ELEMNAME_ANY_STRING;
-static XalanDOMString ELEMNAME_APPLY_IMPORTS_STRING;
static XalanDOMString
ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_APPLY_TEMPLATES_STRING;
static XalanDOMString
ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_ATTRIBUTESET_STRING;
static XalanDOMString
ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_ATTRIBUTE_STRING;
static XalanDOMString ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_CALLTEMPLATE_STRING;
static XalanDOMString
ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_CALL_STRING;
-static XalanDOMString ELEMNAME_CHILDREN_STRING;
-static XalanDOMString ELEMNAME_CHOOSE_STRING;
static XalanDOMString ELEMNAME_CHOOSE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_COMMENT_STRING;
static XalanDOMString ELEMNAME_COMMENT_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_COMPONENT_STRING;
-static XalanDOMString ELEMNAME_CONSTRUCT_STRING;
-static XalanDOMString ELEMNAME_CONTENTS_STRING;
-static XalanDOMString ELEMNAME_COPY_OF_STRING;
static XalanDOMString ELEMNAME_COPY_OF_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_COPY_STRING;
static XalanDOMString ELEMNAME_COPY_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_DECIMALFORMAT_STRING;
static XalanDOMString
ELEMNAME_DECIMALFORMAT_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_DISPLAYIF_STRING;
-static XalanDOMString ELEMNAME_ELEMENT_STRING;
static XalanDOMString ELEMNAME_ELEMENT_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_EMPTY_STRING;
-static XalanDOMString ELEMNAME_EXTENSIONHANDLER_STRING;
-static XalanDOMString ELEMNAME_EXTENSION_STRING;
-static XalanDOMString ELEMNAME_FALLBACK_STRING;
static XalanDOMString ELEMNAME_FALLBACK_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_FOREACH_STRING;
static XalanDOMString ELEMNAME_FOREACH_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_HTML_STRING;
-static XalanDOMString ELEMNAME_IF_STRING;
static XalanDOMString ELEMNAME_IF_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_IMPORT_STRING;
-static XalanDOMString ELEMNAME_INCLUDE_STRING;
-static XalanDOMString ELEMNAME_KEY_STRING;
-static XalanDOMString ELEMNAME_MESSAGE_STRING;
static XalanDOMString ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_NSALIAS_STRING;
-static XalanDOMString ELEMNAME_NUMBER_STRING;
static XalanDOMString ELEMNAME_NUMBER_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_OTHERWISE_STRING;
static XalanDOMString ELEMNAME_OTHERWISE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_OUTPUT_STRING;
-static XalanDOMString ELEMNAME_PARAMVARIABLE_STRING;
-static XalanDOMString
ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_PI_STRING;
+static XalanDOMString ELEMNAME_PARAM_WITH_PREFIX_STRING;
static XalanDOMString ELEMNAME_PI_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_PRESERVESPACE_STRING;
-static XalanDOMString ELEMNAME_ROOT_STRING;
-static XalanDOMString ELEMNAME_SCRIPT_STRING;
-static XalanDOMString ELEMNAME_SORT_STRING;
static XalanDOMString ELEMNAME_SORT_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_STRIPSPACE_STRING;
-static XalanDOMString ELEMNAME_STYLESHEET_STRING;
-static XalanDOMString ELEMNAME_TEMPLATE_STRING;
static XalanDOMString ELEMNAME_TEMPLATE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_TEXT_STRING;
static XalanDOMString ELEMNAME_TEXT_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_TRANSFORM_STRING;
-static XalanDOMString ELEMNAME_USE_STRING;
-static XalanDOMString ELEMNAME_USE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_VALUEOF_STRING;
static XalanDOMString ELEMNAME_VALUEOF_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_VARIABLE_STRING;
static XalanDOMString ELEMNAME_VARIABLE_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_WHEN_STRING;
static XalanDOMString ELEMNAME_WHEN_WITH_PREFIX_STRING;
-static XalanDOMString ELEMNAME_WITHPARAM_STRING;
static XalanDOMString ELEMNAME_WITHPARAM_WITH_PREFIX_STRING;
static XalanDOMString PSEUDONAME_NODE;
@@ -265,31 +202,23 @@
const XalanDOMString& Constants::ATTRNAME_ATTRIBUTE =
::ATTRNAME_ATTRIBUTE;
const XalanDOMString& Constants::ATTRNAME_ATTRIBUTE_SET =
::ATTRNAME_ATTRIBUTE_SET;
const XalanDOMString& Constants::ATTRNAME_CASEORDER =
::ATTRNAME_CASEORDER;
-const XalanDOMString& Constants::ATTRNAME_CLASS =
::ATTRNAME_CLASS;
const XalanDOMString& Constants::ATTRNAME_CLASSID =
::ATTRNAME_CLASSID;
const XalanDOMString& Constants::ATTRNAME_CODEBASE =
::ATTRNAME_CODEBASE;
const XalanDOMString& Constants::ATTRNAME_CODETYPE =
::ATTRNAME_CODETYPE;
-const XalanDOMString& Constants::ATTRNAME_COMPONENTS =
::ATTRNAME_COMPONENTS;
-const XalanDOMString& Constants::ATTRNAME_CONDITION =
::ATTRNAME_CONDITION;
-const XalanDOMString& Constants::ATTRNAME_COPYTYPE =
::ATTRNAME_COPYTYPE;
const XalanDOMString& Constants::ATTRNAME_COUNT =
::ATTRNAME_COUNT;
const XalanDOMString& Constants::ATTRNAME_DATATYPE =
::ATTRNAME_DATATYPE;
const XalanDOMString& Constants::ATTRNAME_DECIMALSEPARATOR =
::ATTRNAME_DECIMALSEPARATOR;
const XalanDOMString& Constants::ATTRNAME_DEFAULT =
::ATTRNAME_DEFAULT;
const XalanDOMString& Constants::ATTRNAME_DEFAULTSPACE =
::ATTRNAME_DEFAULTSPACE;
-const XalanDOMString& Constants::ATTRNAME_DEPTH =
::ATTRNAME_DEPTH;
const XalanDOMString& Constants::ATTRNAME_DIGIT =
::ATTRNAME_DIGIT;
const XalanDOMString& Constants::ATTRNAME_DIGITGROUPSEP =
::ATTRNAME_DIGITGROUPSEP;
const XalanDOMString&
Constants::ATTRNAME_DISABLE_OUTPUT_ESCAPING =
::ATTRNAME_DISABLE_OUTPUT_ESCAPING;
-const XalanDOMString& Constants::ATTRNAME_ELEMENT =
::ATTRNAME_ELEMENT;
const XalanDOMString& Constants::ATTRNAME_ELEMENTS =
::ATTRNAME_ELEMENTS;
const XalanDOMString& Constants::ATTRNAME_ESCAPE_URLS =
::ATTRNAME_ESCAPE_URLS;
const XalanDOMString&
Constants::ATTRNAME_EXCLUDE_RESULT_PREFIXES =
::ATTRNAME_EXCLUDE_RESULT_PREFIXES;
-const XalanDOMString& Constants::ATTRNAME_EXPR =
::ATTRNAME_EXPR;
const XalanDOMString&
Constants::ATTRNAME_EXTENSIONELEMENTPREFIXES =
::ATTRNAME_EXTENSIONELEMENTPREFIXES;
const XalanDOMString& Constants::ATTRNAME_FORMAT =
::ATTRNAME_FORMAT;
const XalanDOMString& Constants::ATTRNAME_FROM =
::ATTRNAME_FROM;
-const XalanDOMString& Constants::ATTRNAME_FUNCTIONS =
::ATTRNAME_FUNCTIONS;
const XalanDOMString& Constants::ATTRNAME_GROUPINGSEPARATOR =
::ATTRNAME_GROUPINGSEPARATOR;
const XalanDOMString& Constants::ATTRNAME_GROUPINGSIZE =
::ATTRNAME_GROUPINGSIZE;
const XalanDOMString& Constants::ATTRNAME_HREF =
::ATTRNAME_HREF;
@@ -309,7 +238,6 @@
const XalanDOMString& Constants::ATTRNAME_NDIGITSPERGROUP =
::ATTRNAME_NDIGITSPERGROUP;
const XalanDOMString& Constants::ATTRNAME_NS = ::ATTRNAME_NS;
const XalanDOMString& Constants::ATTRNAME_OMIT_META_TAG =
::ATTRNAME_OMIT_META_TAG;
-const XalanDOMString& Constants::ATTRNAME_ONLY =
::ATTRNAME_ONLY;
const XalanDOMString& Constants::ATTRNAME_ORDER =
::ATTRNAME_ORDER;
const XalanDOMString&
Constants::ATTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS =
::ATTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS;
const XalanDOMString&
Constants::ATTRNAME_OUTPUT_DOCTYPE_PUBLIC = ::ATTRNAME_OUTPUT_DOCTYPE_PUBLIC;
@@ -326,25 +254,18 @@
const XalanDOMString& Constants::ATTRNAME_PERMILLE =
::ATTRNAME_PERMILLE;
const XalanDOMString& Constants::ATTRNAME_PREFIX =
::ATTRNAME_PREFIX;
const XalanDOMString& Constants::ATTRNAME_PRIORITY =
::ATTRNAME_PRIORITY;
-const XalanDOMString& Constants::ATTRNAME_REFID =
::ATTRNAME_REFID;
const XalanDOMString& Constants::ATTRNAME_RESULTNS =
::ATTRNAME_RESULTNS;
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_SRC =
::ATTRNAME_SRC;
-const XalanDOMString& Constants::ATTRNAME_STYLE =
::ATTRNAME_STYLE;
const XalanDOMString& Constants::ATTRNAME_STYLESHEET_PREFIX =
::ATTRNAME_STYLESHEET_PREFIX;
const XalanDOMString& Constants::ATTRNAME_TERMINATE =
::ATTRNAME_TERMINATE;
const XalanDOMString& Constants::ATTRNAME_TEST =
::ATTRNAME_TEST;
-const XalanDOMString& Constants::ATTRNAME_TOSTRING =
::ATTRNAME_TOSTRING;
const XalanDOMString& Constants::ATTRNAME_TYPE =
::ATTRNAME_TYPE;
const XalanDOMString& Constants::ATTRNAME_USE =
::ATTRNAME_USE;
const XalanDOMString& Constants::ATTRNAME_USEATTRIBUTESETS =
::ATTRNAME_USEATTRIBUTESETS;
const XalanDOMString& Constants::ATTRNAME_VALUE =
::ATTRNAME_VALUE;
const XalanDOMString& Constants::ATTRNAME_VERSION =
::ATTRNAME_VERSION;
-const XalanDOMString& Constants::ATTRNAME_XMLNS =
::ATTRNAME_XMLNS;
-const XalanDOMString& Constants::ATTRNAME_XMLNSDEF =
::ATTRNAME_XMLNSDEF;
-const XalanDOMString& Constants::ATTRNAME_XMLSPACE =
::ATTRNAME_XMLSPACE;
+const XalanDOMString& Constants::ATTRNAME_SPACE =
::ATTRNAME_SPACE;
const XalanDOMString& Constants::ATTRNAME_ZERODIGIT =
::ATTRNAME_ZERODIGIT;
const XalanDOMString& Constants::ATTRTYPE_CDATA =
::ATTRTYPE_CDATA;
@@ -373,78 +294,32 @@
const XalanDOMString&
Constants::DEFAULT_WHITESPACE_SEPARATOR_STRING =
::DEFAULT_WHITESPACE_SEPARATOR_STRING;
const XalanDOMString& Constants::ELEMNAME_ANY_STRING =
::ELEMNAME_ANY_STRING;
-const XalanDOMString&
Constants::ELEMNAME_APPLY_IMPORTS_STRING = ::ELEMNAME_APPLY_IMPORTS_STRING;
const XalanDOMString&
Constants::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING =
::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING;
-const XalanDOMString&
Constants::ELEMNAME_APPLY_TEMPLATES_STRING = ::ELEMNAME_APPLY_TEMPLATES_STRING;
const XalanDOMString&
Constants::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING =
::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_ATTRIBUTESET_STRING
= ::ELEMNAME_ATTRIBUTESET_STRING;
const XalanDOMString&
Constants::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING =
::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_ATTRIBUTE_STRING =
::ELEMNAME_ATTRIBUTE_STRING;
const XalanDOMString&
Constants::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING =
::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_CALLTEMPLATE_STRING
= ::ELEMNAME_CALLTEMPLATE_STRING;
const XalanDOMString&
Constants::ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING =
::ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_CALL_STRING =
::ELEMNAME_CALL_STRING;
-const XalanDOMString& Constants::ELEMNAME_CHILDREN_STRING =
::ELEMNAME_CHILDREN_STRING;
-const XalanDOMString& Constants::ELEMNAME_CHOOSE_STRING =
::ELEMNAME_CHOOSE_STRING;
const XalanDOMString&
Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING =
::ELEMNAME_CHOOSE_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_COMMENT_STRING =
::ELEMNAME_COMMENT_STRING;
const XalanDOMString&
Constants::ELEMNAME_COMMENT_WITH_PREFIX_STRING =
::ELEMNAME_COMMENT_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_COMPONENT_STRING =
::ELEMNAME_COMPONENT_STRING;
-const XalanDOMString& Constants::ELEMNAME_CONSTRUCT_STRING =
::ELEMNAME_CONSTRUCT_STRING;
-const XalanDOMString& Constants::ELEMNAME_CONTENTS_STRING =
::ELEMNAME_CONTENTS_STRING;
-const XalanDOMString& Constants::ELEMNAME_COPY_OF_STRING =
::ELEMNAME_COPY_OF_STRING;
const XalanDOMString&
Constants::ELEMNAME_COPY_OF_WITH_PREFIX_STRING =
::ELEMNAME_COPY_OF_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_COPY_STRING =
::ELEMNAME_COPY_STRING;
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_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;
-const XalanDOMString& Constants::ELEMNAME_EXTENSION_STRING =
::ELEMNAME_EXTENSION_STRING;
-const XalanDOMString& Constants::ELEMNAME_FALLBACK_STRING =
::ELEMNAME_FALLBACK_STRING;
const XalanDOMString&
Constants::ELEMNAME_FALLBACK_WITH_PREFIX_STRING =
::ELEMNAME_FALLBACK_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_FOREACH_STRING =
::ELEMNAME_FOREACH_STRING;
const XalanDOMString&
Constants::ELEMNAME_FOREACH_WITH_PREFIX_STRING =
::ELEMNAME_FOREACH_WITH_PREFIX_STRING;
const XalanDOMString& Constants::ELEMNAME_HTML_STRING =
::ELEMNAME_HTML_STRING;
-const XalanDOMString& Constants::ELEMNAME_IF_STRING =
::ELEMNAME_IF_STRING;
const XalanDOMString&
Constants::ELEMNAME_IF_WITH_PREFIX_STRING = ::ELEMNAME_IF_WITH_PREFIX_STRING;
-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_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;
-const XalanDOMString& Constants::ELEMNAME_NUMBER_STRING =
::ELEMNAME_NUMBER_STRING;
const XalanDOMString&
Constants::ELEMNAME_NUMBER_WITH_PREFIX_STRING =
::ELEMNAME_NUMBER_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_OTHERWISE_STRING =
::ELEMNAME_OTHERWISE_STRING;
const XalanDOMString&
Constants::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING =
::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING;
-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_STRING =
::ELEMNAME_PI_STRING;
+const XalanDOMString&
Constants::ELEMNAME_PARAM_WITH_PREFIX_STRING =
::ELEMNAME_PARAM_WITH_PREFIX_STRING;
const XalanDOMString&
Constants::ELEMNAME_PI_WITH_PREFIX_STRING = ::ELEMNAME_PI_WITH_PREFIX_STRING;
-const XalanDOMString&
Constants::ELEMNAME_PRESERVESPACE_STRING = ::ELEMNAME_PRESERVESPACE_STRING;
-const XalanDOMString& Constants::ELEMNAME_ROOT_STRING =
::ELEMNAME_ROOT_STRING;
-const XalanDOMString& Constants::ELEMNAME_SCRIPT_STRING =
::ELEMNAME_SCRIPT_STRING;
-const XalanDOMString& Constants::ELEMNAME_SORT_STRING =
::ELEMNAME_SORT_STRING;
const XalanDOMString&
Constants::ELEMNAME_SORT_WITH_PREFIX_STRING =
::ELEMNAME_SORT_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_STRIPSPACE_STRING =
::ELEMNAME_STRIPSPACE_STRING;
-const XalanDOMString& Constants::ELEMNAME_STYLESHEET_STRING =
::ELEMNAME_STYLESHEET_STRING;
-const XalanDOMString& Constants::ELEMNAME_TEMPLATE_STRING =
::ELEMNAME_TEMPLATE_STRING;
const XalanDOMString&
Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING =
::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING;
-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_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;
const XalanDOMString&
Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING =
::ELEMNAME_VALUEOF_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_VARIABLE_STRING =
::ELEMNAME_VARIABLE_STRING;
const XalanDOMString&
Constants::ELEMNAME_VARIABLE_WITH_PREFIX_STRING =
::ELEMNAME_VARIABLE_WITH_PREFIX_STRING;
-const XalanDOMString& Constants::ELEMNAME_WHEN_STRING =
::ELEMNAME_WHEN_STRING;
const XalanDOMString&
Constants::ELEMNAME_WHEN_WITH_PREFIX_STRING =
::ELEMNAME_WHEN_WITH_PREFIX_STRING;
-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_NODE =
::PSEUDONAME_NODE;
@@ -460,31 +335,23 @@
::ATTRNAME_ATTRIBUTE = XALAN_STATIC_UCODE_STRING("attribute");
::ATTRNAME_ATTRIBUTE_SET = XALAN_STATIC_UCODE_STRING("attribute-set");
::ATTRNAME_CASEORDER = XALAN_STATIC_UCODE_STRING("case-order");
- ::ATTRNAME_CLASS = XALAN_STATIC_UCODE_STRING("class");
::ATTRNAME_CLASSID = XALAN_STATIC_UCODE_STRING("classid");
::ATTRNAME_CODEBASE = XALAN_STATIC_UCODE_STRING("codebase");
::ATTRNAME_CODETYPE = XALAN_STATIC_UCODE_STRING("type");
- ::ATTRNAME_COMPONENTS = XALAN_STATIC_UCODE_STRING("component");
- ::ATTRNAME_CONDITION = XALAN_STATIC_UCODE_STRING("condition");
- ::ATTRNAME_COPYTYPE = XALAN_STATIC_UCODE_STRING("copy-type");
::ATTRNAME_COUNT = XALAN_STATIC_UCODE_STRING("count");
::ATTRNAME_DATATYPE = XALAN_STATIC_UCODE_STRING("data-type");
::ATTRNAME_DECIMALSEPARATOR =
XALAN_STATIC_UCODE_STRING("decimal-separator");
::ATTRNAME_DEFAULT = XALAN_STATIC_UCODE_STRING("default");
::ATTRNAME_DEFAULTSPACE = XALAN_STATIC_UCODE_STRING("default-space");
- ::ATTRNAME_DEPTH = XALAN_STATIC_UCODE_STRING("with-children");
::ATTRNAME_DIGIT = XALAN_STATIC_UCODE_STRING("digit");
::ATTRNAME_DIGITGROUPSEP = XALAN_STATIC_UCODE_STRING("digit-group-sep");
::ATTRNAME_DISABLE_OUTPUT_ESCAPING =
XALAN_STATIC_UCODE_STRING("disable-output-escaping");
- ::ATTRNAME_ELEMENT = XALAN_STATIC_UCODE_STRING("element");
::ATTRNAME_ELEMENTS = XALAN_STATIC_UCODE_STRING("elements");
::ATTRNAME_ESCAPE_URLS = XALAN_STATIC_UCODE_STRING("use-url-escaping");
::ATTRNAME_EXCLUDE_RESULT_PREFIXES =
XALAN_STATIC_UCODE_STRING("exclude-result-prefixes");
- ::ATTRNAME_EXPR = XALAN_STATIC_UCODE_STRING("expr");
::ATTRNAME_EXTENSIONELEMENTPREFIXES =
XALAN_STATIC_UCODE_STRING("extension-element-prefixes");
::ATTRNAME_FORMAT = XALAN_STATIC_UCODE_STRING("format");
::ATTRNAME_FROM = XALAN_STATIC_UCODE_STRING("from");
- ::ATTRNAME_FUNCTIONS = XALAN_STATIC_UCODE_STRING("functions");
::ATTRNAME_GROUPINGSEPARATOR =
XALAN_STATIC_UCODE_STRING("grouping-separator");
::ATTRNAME_GROUPINGSIZE = XALAN_STATIC_UCODE_STRING("grouping-size");
::ATTRNAME_HREF = XALAN_STATIC_UCODE_STRING("href");
@@ -504,7 +371,6 @@
::ATTRNAME_NDIGITSPERGROUP =
XALAN_STATIC_UCODE_STRING("n-digits-per-group");
::ATTRNAME_NS = XALAN_STATIC_UCODE_STRING("ns");
::ATTRNAME_OMIT_META_TAG = XALAN_STATIC_UCODE_STRING("omit-meta-tag");
- ::ATTRNAME_ONLY = XALAN_STATIC_UCODE_STRING("only");
::ATTRNAME_ORDER = XALAN_STATIC_UCODE_STRING("order");
::ATTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS =
XALAN_STATIC_UCODE_STRING("cdata-section-elements");
::ATTRNAME_OUTPUT_DOCTYPE_PUBLIC =
XALAN_STATIC_UCODE_STRING("doctype-public");
@@ -521,25 +387,18 @@
::ATTRNAME_PERMILLE = XALAN_STATIC_UCODE_STRING("per-mille");
::ATTRNAME_PREFIX = XALAN_STATIC_UCODE_STRING("prefix");
::ATTRNAME_PRIORITY = XALAN_STATIC_UCODE_STRING("priority");
- ::ATTRNAME_REFID = XALAN_STATIC_UCODE_STRING("refID");
::ATTRNAME_RESULTNS = XALAN_STATIC_UCODE_STRING("result-ns");
::ATTRNAME_RESULT_PREFIX = XALAN_STATIC_UCODE_STRING("result-prefix");
- ::ATTRNAME_SCRIPT = XALAN_STATIC_UCODE_STRING("script");
::ATTRNAME_SELECT = XALAN_STATIC_UCODE_STRING("select");
- ::ATTRNAME_SRC = XALAN_STATIC_UCODE_STRING("src");
- ::ATTRNAME_STYLE = XALAN_STATIC_UCODE_STRING("style");
::ATTRNAME_STYLESHEET_PREFIX =
XALAN_STATIC_UCODE_STRING("stylesheet-prefix");
::ATTRNAME_TERMINATE = XALAN_STATIC_UCODE_STRING("terminate");
::ATTRNAME_TEST = XALAN_STATIC_UCODE_STRING("test");
- ::ATTRNAME_TOSTRING = XALAN_STATIC_UCODE_STRING("to-string");
::ATTRNAME_TYPE = XALAN_STATIC_UCODE_STRING("type");
::ATTRNAME_USE = XALAN_STATIC_UCODE_STRING("use");
::ATTRNAME_USEATTRIBUTESETS =
XALAN_STATIC_UCODE_STRING("use-attribute-sets");
::ATTRNAME_VALUE = XALAN_STATIC_UCODE_STRING("value");
::ATTRNAME_VERSION = XALAN_STATIC_UCODE_STRING("version");
- ::ATTRNAME_XMLNS = XALAN_STATIC_UCODE_STRING("xmlns:");
- ::ATTRNAME_XMLNSDEF = XALAN_STATIC_UCODE_STRING("xmlns");
- ::ATTRNAME_XMLSPACE = XALAN_STATIC_UCODE_STRING("xml:space");
+ ::ATTRNAME_SPACE = XALAN_STATIC_UCODE_STRING("space");
::ATTRNAME_ZERODIGIT = XALAN_STATIC_UCODE_STRING("zero-digit");
::ATTRTYPE_CDATA = XALAN_STATIC_UCODE_STRING("CDATA");
@@ -568,79 +427,33 @@
::DEFAULT_WHITESPACE_SEPARATOR_STRING = XALAN_STATIC_UCODE_STRING("
\t\n\r");
::ELEMNAME_ANY_STRING = XALAN_STATIC_UCODE_STRING("any");
- ::ELEMNAME_APPLY_IMPORTS_STRING =
XALAN_STATIC_UCODE_STRING("apply-imports");
::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:apply-imports");
- ::ELEMNAME_APPLY_TEMPLATES_STRING =
XALAN_STATIC_UCODE_STRING("apply-templates");
::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:apply-templates");
- ::ELEMNAME_ATTRIBUTESET_STRING =
XALAN_STATIC_UCODE_STRING("attribute-set");
::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:attribute-set");
- ::ELEMNAME_ATTRIBUTE_STRING = XALAN_STATIC_UCODE_STRING("attribute");
::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:attribute");
- ::ELEMNAME_CALLTEMPLATE_STRING =
XALAN_STATIC_UCODE_STRING("call-template");
::ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:call-template");
- ::ELEMNAME_CALL_STRING = XALAN_STATIC_UCODE_STRING("call");
- ::ELEMNAME_CHILDREN_STRING = XALAN_STATIC_UCODE_STRING("children");
- ::ELEMNAME_CHOOSE_STRING = XALAN_STATIC_UCODE_STRING("choose");
::ELEMNAME_CHOOSE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:choose");
- ::ELEMNAME_COMMENT_STRING = XALAN_STATIC_UCODE_STRING("comment");
::ELEMNAME_COMMENT_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:comment");
- ::ELEMNAME_COMPONENT_STRING = XALAN_STATIC_UCODE_STRING("component");
- ::ELEMNAME_CONSTRUCT_STRING = XALAN_STATIC_UCODE_STRING("construct");
- ::ELEMNAME_CONTENTS_STRING = XALAN_STATIC_UCODE_STRING("contents");
- ::ELEMNAME_COPY_OF_STRING = XALAN_STATIC_UCODE_STRING("copy-of");
::ELEMNAME_COPY_OF_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:copy-of");
- ::ELEMNAME_COPY_STRING = XALAN_STATIC_UCODE_STRING("copy");
::ELEMNAME_COPY_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:copy");
- ::ELEMNAME_DECIMALFORMAT_STRING =
XALAN_STATIC_UCODE_STRING("decimal-format");
::ELEMNAME_DECIMALFORMAT_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:decimal-format");
::ELEMNAME_DISPLAYIF_STRING = XALAN_STATIC_UCODE_STRING("display-if");
- ::ELEMNAME_ELEMENT_STRING = XALAN_STATIC_UCODE_STRING("element");
::ELEMNAME_ELEMENT_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:element");
- ::ELEMNAME_EMPTY_STRING = XALAN_STATIC_UCODE_STRING("empty");
- ::ELEMNAME_EXTENSION_STRING = XALAN_STATIC_UCODE_STRING("functions");
- ::ELEMNAME_FALLBACK_STRING = XALAN_STATIC_UCODE_STRING("fallback");
::ELEMNAME_FALLBACK_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:fallback");
- ::ELEMNAME_FOREACH_STRING = XALAN_STATIC_UCODE_STRING("for-each");
::ELEMNAME_FOREACH_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:for-each");
::ELEMNAME_HTML_STRING = XALAN_STATIC_UCODE_STRING("HTML");
- ::ELEMNAME_IF_STRING = XALAN_STATIC_UCODE_STRING("if");
::ELEMNAME_IF_WITH_PREFIX_STRING = XALAN_STATIC_UCODE_STRING("xsl:if");
- ::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_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");
- ::ELEMNAME_NUMBER_STRING = XALAN_STATIC_UCODE_STRING("number");
::ELEMNAME_NUMBER_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:number");
- ::ELEMNAME_OTHERWISE_STRING = XALAN_STATIC_UCODE_STRING("otherwise");
::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:otherwise");
- ::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_STRING =
XALAN_STATIC_UCODE_STRING("processing-instruction");
+ ::ELEMNAME_PARAM_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:param");
::ELEMNAME_PI_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:processing-instruction");
- ::ELEMNAME_PRESERVESPACE_STRING =
XALAN_STATIC_UCODE_STRING("preserve-space");
- ::ELEMNAME_ROOT_STRING = XALAN_STATIC_UCODE_STRING("root");
- ::ELEMNAME_SCRIPT_STRING = XALAN_STATIC_UCODE_STRING("script");
- ::ELEMNAME_SORT_STRING = XALAN_STATIC_UCODE_STRING("sort");
::ELEMNAME_SORT_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:sort");
- ::ELEMNAME_STRIPSPACE_STRING = XALAN_STATIC_UCODE_STRING("strip-space");
- ::ELEMNAME_STYLESHEET_STRING = XALAN_STATIC_UCODE_STRING("stylesheet");
- ::ELEMNAME_TEMPLATE_STRING = XALAN_STATIC_UCODE_STRING("template");
::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:template");
- ::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_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");
::ELEMNAME_VALUEOF_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:value-of");
- ::ELEMNAME_VARIABLE_STRING = XALAN_STATIC_UCODE_STRING("variable");
::ELEMNAME_VARIABLE_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:variable");
- ::ELEMNAME_WHEN_STRING = XALAN_STATIC_UCODE_STRING("when");
::ELEMNAME_WHEN_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:when");
- ::ELEMNAME_WITHPARAM_STRING = XALAN_STATIC_UCODE_STRING("with-param");
::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING =
XALAN_STATIC_UCODE_STRING("xsl:with-param");
::PSEUDONAME_NODE = XALAN_STATIC_UCODE_STRING("node()");
@@ -657,31 +470,23 @@
releaseMemory(::ATTRNAME_ATTRIBUTE);
releaseMemory(::ATTRNAME_ATTRIBUTE_SET);
releaseMemory(::ATTRNAME_CASEORDER);
- releaseMemory(::ATTRNAME_CLASS);
releaseMemory(::ATTRNAME_CLASSID);
releaseMemory(::ATTRNAME_CODEBASE);
releaseMemory(::ATTRNAME_CODETYPE);
- releaseMemory(::ATTRNAME_COMPONENTS);
- releaseMemory(::ATTRNAME_CONDITION);
- releaseMemory(::ATTRNAME_COPYTYPE);
releaseMemory(::ATTRNAME_COUNT);
releaseMemory(::ATTRNAME_DATATYPE);
releaseMemory(::ATTRNAME_DECIMALSEPARATOR);
releaseMemory(::ATTRNAME_DEFAULT);
releaseMemory(::ATTRNAME_DEFAULTSPACE);
- releaseMemory(::ATTRNAME_DEPTH);
releaseMemory(::ATTRNAME_DIGIT);
releaseMemory(::ATTRNAME_DIGITGROUPSEP);
releaseMemory(::ATTRNAME_DISABLE_OUTPUT_ESCAPING);
- releaseMemory(::ATTRNAME_ELEMENT);
releaseMemory(::ATTRNAME_ELEMENTS);
releaseMemory(::ATTRNAME_ESCAPE_URLS);
releaseMemory(::ATTRNAME_EXCLUDE_RESULT_PREFIXES);
- releaseMemory(::ATTRNAME_EXPR);
releaseMemory(::ATTRNAME_EXTENSIONELEMENTPREFIXES);
releaseMemory(::ATTRNAME_FORMAT);
releaseMemory(::ATTRNAME_FROM);
- releaseMemory(::ATTRNAME_FUNCTIONS);
releaseMemory(::ATTRNAME_GROUPINGSEPARATOR);
releaseMemory(::ATTRNAME_GROUPINGSIZE);
releaseMemory(::ATTRNAME_HREF);
@@ -701,7 +506,6 @@
releaseMemory(::ATTRNAME_NDIGITSPERGROUP);
releaseMemory(::ATTRNAME_NS);
releaseMemory(::ATTRNAME_OMIT_META_TAG);
- releaseMemory(::ATTRNAME_ONLY);
releaseMemory(::ATTRNAME_ORDER);
releaseMemory(::ATTRNAME_OUTPUT_CDATA_SECTION_ELEMENTS);
releaseMemory(::ATTRNAME_OUTPUT_DOCTYPE_PUBLIC);
@@ -718,25 +522,18 @@
releaseMemory(::ATTRNAME_PERMILLE);
releaseMemory(::ATTRNAME_PREFIX);
releaseMemory(::ATTRNAME_PRIORITY);
- releaseMemory(::ATTRNAME_REFID);
releaseMemory(::ATTRNAME_RESULTNS);
releaseMemory(::ATTRNAME_RESULT_PREFIX);
- releaseMemory(::ATTRNAME_SCRIPT);
releaseMemory(::ATTRNAME_SELECT);
- releaseMemory(::ATTRNAME_SRC);
- releaseMemory(::ATTRNAME_STYLE);
releaseMemory(::ATTRNAME_STYLESHEET_PREFIX);
releaseMemory(::ATTRNAME_TERMINATE);
releaseMemory(::ATTRNAME_TEST);
- releaseMemory(::ATTRNAME_TOSTRING);
releaseMemory(::ATTRNAME_TYPE);
releaseMemory(::ATTRNAME_USE);
releaseMemory(::ATTRNAME_USEATTRIBUTESETS);
releaseMemory(::ATTRNAME_VALUE);
releaseMemory(::ATTRNAME_VERSION);
- releaseMemory(::ATTRNAME_XMLNS);
- releaseMemory(::ATTRNAME_XMLNSDEF);
- releaseMemory(::ATTRNAME_XMLSPACE);
+ releaseMemory(::ATTRNAME_SPACE);
releaseMemory(::ATTRNAME_ZERODIGIT);
releaseMemory(::ATTRTYPE_CDATA);
@@ -765,80 +562,33 @@
releaseMemory(::DEFAULT_WHITESPACE_SEPARATOR_STRING);
releaseMemory(::ELEMNAME_ANY_STRING);
- releaseMemory(::ELEMNAME_APPLY_IMPORTS_STRING);
releaseMemory(::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_APPLY_TEMPLATES_STRING);
releaseMemory(::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_ATTRIBUTESET_STRING);
releaseMemory(::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_ATTRIBUTE_STRING);
releaseMemory(::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_CALLTEMPLATE_STRING);
releaseMemory(::ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_CALL_STRING);
- releaseMemory(::ELEMNAME_CHILDREN_STRING);
- releaseMemory(::ELEMNAME_CHOOSE_STRING);
releaseMemory(::ELEMNAME_CHOOSE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_COMMENT_STRING);
releaseMemory(::ELEMNAME_COMMENT_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_COMPONENT_STRING);
- releaseMemory(::ELEMNAME_CONSTRUCT_STRING);
- releaseMemory(::ELEMNAME_CONTENTS_STRING);
- releaseMemory(::ELEMNAME_COPY_OF_STRING);
releaseMemory(::ELEMNAME_COPY_OF_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_COPY_STRING);
releaseMemory(::ELEMNAME_COPY_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_DECIMALFORMAT_STRING);
releaseMemory(::ELEMNAME_DECIMALFORMAT_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_DISPLAYIF_STRING);
- releaseMemory(::ELEMNAME_ELEMENT_STRING);
releaseMemory(::ELEMNAME_ELEMENT_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_EMPTY_STRING);
- releaseMemory(::ELEMNAME_EXTENSIONHANDLER_STRING);
- releaseMemory(::ELEMNAME_EXTENSION_STRING);
- releaseMemory(::ELEMNAME_FALLBACK_STRING);
releaseMemory(::ELEMNAME_FALLBACK_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_FOREACH_STRING);
releaseMemory(::ELEMNAME_FOREACH_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_HTML_STRING);
- releaseMemory(::ELEMNAME_IF_STRING);
releaseMemory(::ELEMNAME_IF_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_IMPORT_STRING);
- releaseMemory(::ELEMNAME_INCLUDE_STRING);
- releaseMemory(::ELEMNAME_KEY_STRING);
- releaseMemory(::ELEMNAME_MESSAGE_STRING);
releaseMemory(::ELEMNAME_MESSAGE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_NSALIAS_STRING);
- releaseMemory(::ELEMNAME_NUMBER_STRING);
releaseMemory(::ELEMNAME_NUMBER_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_OTHERWISE_STRING);
releaseMemory(::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_OUTPUT_STRING);
- releaseMemory(::ELEMNAME_PARAMVARIABLE_STRING);
- releaseMemory(::ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_PI_STRING);
+ releaseMemory(::ELEMNAME_PARAM_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_PI_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_PRESERVESPACE_STRING);
- releaseMemory(::ELEMNAME_ROOT_STRING);
- releaseMemory(::ELEMNAME_SCRIPT_STRING);
- releaseMemory(::ELEMNAME_SORT_STRING);
releaseMemory(::ELEMNAME_SORT_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_STRIPSPACE_STRING);
- releaseMemory(::ELEMNAME_STYLESHEET_STRING);
- releaseMemory(::ELEMNAME_TEMPLATE_STRING);
releaseMemory(::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_TEXT_STRING);
releaseMemory(::ELEMNAME_TEXT_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_TRANSFORM_STRING);
- releaseMemory(::ELEMNAME_USE_STRING);
- releaseMemory(::ELEMNAME_USE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_VALUEOF_STRING);
releaseMemory(::ELEMNAME_VALUEOF_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_VARIABLE_STRING);
releaseMemory(::ELEMNAME_VARIABLE_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_WHEN_STRING);
releaseMemory(::ELEMNAME_WHEN_WITH_PREFIX_STRING);
- releaseMemory(::ELEMNAME_WITHPARAM_STRING);
releaseMemory(::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING);
releaseMemory(::PSEUDONAME_NODE);
1.21 +2 -135 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Constants.hpp 24 Sep 2002 01:42:34 -0000 1.20
+++ Constants.hpp 24 Sep 2002 05:59:38 -0000 1.21
@@ -89,156 +89,39 @@
*/
static void
terminate();
-#if 0
- /**
- * IDs for XSL element types. These are associated
- * with the string literals in the XSLTProcessor class.
- * Don't change the numbers.
- */
- enum eElementName
- {
- ELEMNAME_UNDEFINED = -1,
- ELEMNAME_WITHPARAM = 2,
- ELEMNAME_ADDATTRIBUTE = 4,
- ELEMNAME_APPLY_TEMPLATES = 50,
- ELEMNAME_USE = 34,
- ELEMNAME_CHILDREN = 6,
- ELEMNAME_CHOOSE = 37,
- ELEMNAME_COMMENT = 59, // my own
- ELEMNAME_CONSTRUCT = 7, // my own
- ELEMNAME_CONTENTS = 8,
- ELEMNAME_COPY = 9,
- ELEMNAME_COPY_OF = 74,
- ELEMNAME_DEFINEATTRIBUTESET = 40,
- ELEMNAME_EMPTY = 14,
- ELEMNAME_EXTENSION = 54,
- ELEMNAME_EXTENSIONHANDLER = 63,
- ELEMNAME_FOREACH = 28,
- ELEMNAME_KEY = 31,
- ELEMNAME_IF = 36,
- ELEMNAME_IMPORT = 26,
- ELEMNAME_INCLUDE = 27,
- ELEMNAME_CALLTEMPLATE = 17,
- ELEMNAME_PARAMVARIABLE = 41,
- ELEMNAME_NUMBER = 35,
- ELEMNAME_OTHERWISE = 39,
- ELEMNAME_PI = 58,
- ELEMNAME_PRESERVESPACE = 33,
- ELEMNAME_TEMPLATE = 19,
- ELEMNAME_SORT = 64,
- ELEMNAME_STRIPSPACE = 32,
- ELEMNAME_STYLESHEET = 25,
- ELEMNAME_TEXT = 42,
- ELEMNAME_VALUEOF = 30,
- ELEMNAME_WHEN = 38,
-
- // Pattern by example support
- ELEMNAME_ROOT = 44,
- ELEMNAME_ANY = 45,
- ELEMNAME_ELEMENT = 46,
- ELEMNAME_ATTRIBUTE = 48,
-
- ELEMNAME_PARAM = 56,
- ELEMNAME_FALLBACK = 57,
-
- ELEMNAME_APPLY_IMPORTS = 72,
-
- ELEMNAME_VARIABLE = 73,
- ELEMNAME_MESSAGE = 75,
-
- ELEMNAME_LITERALRESULT = 77,
- ELEMNAME_TEXTLITERALRESULT = 78,
-
- ELEMNAME_EXTENSIONCALL = 79,
-
- ELEMNAME_OUTPUT = 80,
- ELEMNAME_COMPONENT = 81,
- ELEMNAME_SCRIPT = 82,
- ELEMNAME_DECIMALFORMAT = 83,
- ELEMNAME_NSALIAS = 84
- // Next free number: 85
- };
-#endif
/**
* Literals for XSL element names. Note that there are more
* names than IDs, because some names map to the same ID.
*/
// Result tree counting
static const XalanDOMString& ELEMNAME_ANY_STRING;
- static const XalanDOMString& ELEMNAME_APPLY_IMPORTS_STRING;
static const XalanDOMString&
ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_APPLY_TEMPLATES_STRING;
static const XalanDOMString&
ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_ATTRIBUTESET_STRING;
static const XalanDOMString&
ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_ATTRIBUTE_STRING;
static const XalanDOMString& ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_CALLTEMPLATE_STRING;
static const XalanDOMString&
ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_CALL_STRING;
- static const XalanDOMString& ELEMNAME_CHILDREN_STRING;
- static const XalanDOMString& ELEMNAME_CHOOSE_STRING;
static const XalanDOMString& ELEMNAME_CHOOSE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_COMMENT_STRING;
static const XalanDOMString& ELEMNAME_COMMENT_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_CONSTRUCT_STRING;
- static const XalanDOMString& ELEMNAME_CONTENTS_STRING;
- static const XalanDOMString& ELEMNAME_COPY_OF_STRING;
static const XalanDOMString& ELEMNAME_COPY_OF_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_COPY_STRING;
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_ELEMENT_STRING;
static const XalanDOMString& ELEMNAME_ELEMENT_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_EMPTY_STRING;
- static const XalanDOMString& ELEMNAME_EXTENSIONHANDLER_STRING;
- static const XalanDOMString& ELEMNAME_EXTENSION_STRING;
- static const XalanDOMString& ELEMNAME_FALLBACK_STRING;
static const XalanDOMString& ELEMNAME_FALLBACK_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_FOREACH_STRING;
static const XalanDOMString& ELEMNAME_FOREACH_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_HTML_STRING;
- static const XalanDOMString& ELEMNAME_IF_STRING;
static const XalanDOMString& ELEMNAME_IF_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_IMPORT_STRING;
- static const XalanDOMString& ELEMNAME_INCLUDE_STRING;
- static const XalanDOMString& ELEMNAME_KEY_STRING;
- static const XalanDOMString& ELEMNAME_MESSAGE_STRING;
static const XalanDOMString& ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_NSALIAS_STRING;
- static const XalanDOMString& ELEMNAME_NUMBER_STRING;
static const XalanDOMString& ELEMNAME_NUMBER_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_OTHERWISE_STRING;
static const XalanDOMString& ELEMNAME_OTHERWISE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_PRESERVESPACE_STRING;
- static const XalanDOMString& ELEMNAME_ROOT_STRING;
- static const XalanDOMString& ELEMNAME_SORT_STRING;
static const XalanDOMString& ELEMNAME_SORT_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_STRIPSPACE_STRING;
- static const XalanDOMString& ELEMNAME_STYLESHEET_STRING;
- static const XalanDOMString& ELEMNAME_TEMPLATE_STRING;
static const XalanDOMString& ELEMNAME_TEMPLATE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_TEXT_STRING;
static const XalanDOMString& ELEMNAME_TEXT_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_TRANSFORM_STRING;
- static const XalanDOMString& ELEMNAME_USE_STRING;
- static const XalanDOMString& ELEMNAME_USE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_VALUEOF_STRING;
static const XalanDOMString& ELEMNAME_VALUEOF_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_VARIABLE_STRING;
static const XalanDOMString& ELEMNAME_VARIABLE_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_WHEN_STRING;
static const XalanDOMString& ELEMNAME_WHEN_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_COMPONENT_STRING;
- 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_STRING;
+ static const XalanDOMString& ELEMNAME_PARAM_WITH_PREFIX_STRING;
static const XalanDOMString& ELEMNAME_PI_WITH_PREFIX_STRING;
- static const XalanDOMString& ELEMNAME_SCRIPT_STRING;
- static const XalanDOMString& ELEMNAME_WITHPARAM_STRING;
static const XalanDOMString& ELEMNAME_WITHPARAM_WITH_PREFIX_STRING;
/*---------------------------------------------
@@ -249,27 +132,19 @@
static const XalanDOMString& ATTRNAME_ATTRIBUTE;
static const XalanDOMString& ATTRNAME_ATTRIBUTE_SET;
static const XalanDOMString& ATTRNAME_CASEORDER;
- static const XalanDOMString& ATTRNAME_CLASS;
- static const XalanDOMString& ATTRNAME_COMPONENTS;
- static const XalanDOMString& ATTRNAME_CONDITION;
- static const XalanDOMString& ATTRNAME_COPYTYPE;
static const XalanDOMString& ATTRNAME_COUNT;
static const XalanDOMString& ATTRNAME_DATATYPE;
static const XalanDOMString& ATTRNAME_DECIMALSEPARATOR;
static const XalanDOMString& ATTRNAME_DEFAULT;
static const XalanDOMString& ATTRNAME_DEFAULTSPACE;
- static const XalanDOMString& ATTRNAME_DEPTH;
static const XalanDOMString& ATTRNAME_DIGIT;
static const XalanDOMString& ATTRNAME_DIGITGROUPSEP;
- static const XalanDOMString& ATTRNAME_ELEMENT;
static const XalanDOMString& ATTRNAME_ELEMENTS;
static const XalanDOMString& ATTRNAME_ESCAPE_URLS;
static const XalanDOMString& ATTRNAME_EXCLUDE_RESULT_PREFIXES;
- static const XalanDOMString& ATTRNAME_EXPR;
static const XalanDOMString& ATTRNAME_EXTENSIONELEMENTPREFIXES;
static const XalanDOMString& ATTRNAME_FORMAT;
static const XalanDOMString& ATTRNAME_FROM;
- static const XalanDOMString& ATTRNAME_FUNCTIONS;
static const XalanDOMString& ATTRNAME_GROUPINGSEPARATOR;
static const XalanDOMString& ATTRNAME_GROUPINGSIZE;
static const XalanDOMString& ATTRNAME_HREF;
@@ -287,32 +162,24 @@
static const XalanDOMString& ATTRNAME_NAN;
static const XalanDOMString& ATTRNAME_NDIGITSPERGROUP;
static const XalanDOMString& ATTRNAME_OMIT_META_TAG;
- static const XalanDOMString& ATTRNAME_ONLY;
static const XalanDOMString& ATTRNAME_ORDER;
static const XalanDOMString& ATTRNAME_PATTERNSEPARATOR;
static const XalanDOMString& ATTRNAME_PERCENT;
static const XalanDOMString& ATTRNAME_PERMILLE;
static const XalanDOMString& ATTRNAME_PREFIX;
static const XalanDOMString& ATTRNAME_PRIORITY;
- static const XalanDOMString& ATTRNAME_REFID;
static const XalanDOMString& ATTRNAME_RESULTNS;
static const XalanDOMString& ATTRNAME_RESULT_PREFIX;
- static const XalanDOMString& ATTRNAME_SCRIPT;
static const XalanDOMString& ATTRNAME_SELECT;
- static const XalanDOMString& ATTRNAME_SRC;
- static const XalanDOMString& ATTRNAME_STYLE;
static const XalanDOMString& ATTRNAME_STYLESHEET_PREFIX;
static const XalanDOMString& ATTRNAME_TERMINATE;
static const XalanDOMString& ATTRNAME_TEST;
- static const XalanDOMString& ATTRNAME_TOSTRING;
static const XalanDOMString& ATTRNAME_TYPE;
static const XalanDOMString& ATTRNAME_USE;
static const XalanDOMString& ATTRNAME_USEATTRIBUTESETS;
static const XalanDOMString& ATTRNAME_VALUE;
static const XalanDOMString& ATTRNAME_VERSION;
- static const XalanDOMString& ATTRNAME_XMLNS;
- static const XalanDOMString& ATTRNAME_XMLNSDEF;
- static const XalanDOMString& ATTRNAME_XMLSPACE;
+ static const XalanDOMString& ATTRNAME_SPACE;
static const XalanDOMString& ATTRNAME_ZERODIGIT;
// Atributes on the functions element
1.14 +2 -5 xml-xalan/c/src/XSLT/ElemFallback.cpp
Index: ElemFallback.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemFallback.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemFallback.cpp 24 Sep 2002 01:42:34 -0000 1.13
+++ ElemFallback.cpp 24 Sep 2002 05:59:38 -0000 1.14
@@ -93,11 +93,8 @@
{
const XalanDOMChar* const aname = atts.getName(i);
- if (equals(aname, Constants::ATTRNAME_XMLSPACE))
- {
- processSpaceAttr(atts, i, constructionContext);
- }
- else if (!isAttrOK(aname, atts, i, constructionContext))
+ if (!(isAttrOK(aname, atts, i, constructionContext) ||
+ processSpaceAttr(aname, atts, i, constructionContext)))
{
constructionContext.error(
"xsl:fallback has an illegal attribute",
1.21 +2 -6 xml-xalan/c/src/XSLT/ElemIf.cpp
Index: ElemIf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemIf.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ElemIf.cpp 24 Sep 2002 01:42:34 -0000 1.20
+++ ElemIf.cpp 24 Sep 2002 05:59:38 -0000 1.21
@@ -103,12 +103,8 @@
{
m_test = constructionContext.createXPath(getLocator(),
atts.getValue(i), *this);
}
- else if (equals(aname, Constants::ATTRNAME_XMLSPACE))
- {
- processSpaceAttr(atts, i, constructionContext);
- }
- else if (!processSpaceAttr(aname, atts, i, constructionContext)
||
- !isAttrOK(aname, atts, i, constructionContext))
+ else if(!(isAttrOK(aname, atts, i, constructionContext) ||
+ processSpaceAttr(aname, atts, i,
constructionContext)))
{
constructionContext.error(
"xsl:if has an illegal attribute",
1.14 +1 -1 xml-xalan/c/src/XSLT/ElemParam.cpp
Index: ElemParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemParam.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemParam.cpp 24 Sep 2002 01:42:34 -0000 1.13
+++ ElemParam.cpp 24 Sep 2002 05:59:38 -0000 1.14
@@ -91,7 +91,7 @@
const XalanDOMString&
ElemParam::getElementName() const
{
- return Constants::ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING;
+ return Constants::ELEMNAME_PARAM_WITH_PREFIX_STRING;
}
1.26 +2 -5 xml-xalan/c/src/XSLT/ElemTemplate.cpp
Index: ElemTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ElemTemplate.cpp 24 Sep 2002 01:42:34 -0000 1.25
+++ ElemTemplate.cpp 24 Sep 2002 05:59:38 -0000 1.26
@@ -117,11 +117,8 @@
{
m_mode = XalanQNameByValue(atts.getValue(i),
getStylesheet().getNamespaces());
}
- else if (equals(aname, Constants::ATTRNAME_XMLSPACE))
- {
- processSpaceAttr(atts, i, constructionContext);
- }
- else if (!isAttrOK(aname, atts, i, constructionContext))
+ else if(!(isAttrOK(aname, atts, i, constructionContext) ||
+ processSpaceAttr(aname, atts, i,
constructionContext)))
{
constructionContext.error(
"xsl:template has an illegal attribute",
1.79 +11 -32 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.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- ElemTemplateElement.cpp 24 Sep 2002 01:42:34 -0000 1.78
+++ ElemTemplateElement.cpp 24 Sep 2002 05:59:38 -0000 1.79
@@ -184,32 +184,6 @@
}
-void
-ElemTemplateElement::processSpaceAttr(
- const AttributeList& atts,
- int
which,
- StylesheetConstructionContext& constructionContext)
-{
- const XalanDOMChar* const spaceVal = atts.getValue(which);
-
- if(equals(spaceVal, Constants::ATTRVAL_DEFAULT) == true)
- {
- m_defaultSpace = true;
- }
- else if(equals(spaceVal, Constants::ATTRVAL_PRESERVE) == true)
- {
- m_defaultSpace = false;
- }
- else
- {
- constructionContext.error(
- "xml:space has an illegal value",
- 0,
- this);
- }
-}
-
-
bool
ElemTemplateElement::processSpaceAttr(
@@ -218,13 +192,18 @@
int
which,
StylesheetConstructionContext& constructionContext)
{
- const bool isSpaceAttr = equals(aname,
Constants::ATTRNAME_XMLSPACE);
-
- if(isSpaceAttr == true)
+ if(constructionContext.isXMLSpaceAttribute(
+ aname,
+ getStylesheet(),
+ getLocator()) == false)
+ {
+ return false;
+ }
+ else
{
const XalanDOMChar* const spaceVal = atts.getValue(which);
- if(equals(spaceVal, Constants::ATTRVAL_DEFAULT))
+ if (equals(spaceVal, Constants::ATTRVAL_DEFAULT))
{
m_defaultSpace = true;
}
@@ -239,9 +218,9 @@
0,
this);
}
- }
- return isSpaceAttr;
+ return true;
+ }
}
1.47 +0 -14 xml-xalan/c/src/XSLT/ElemTemplateElement.hpp
Index: ElemTemplateElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.hpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- ElemTemplateElement.hpp 21 Sep 2002 01:24:41 -0000 1.46
+++ ElemTemplateElement.hpp 24 Sep 2002 05:59:38 -0000 1.47
@@ -148,20 +148,6 @@
/**
* Tell whether or not this is a xml:space attribute and, if so,
process it.
*
- * @param atts attribute list that owns the attribute
- * @param which index of the attribute into the attribute list
- * @param constructionContext The current construction context
- * @return true if this is a xml:space attribute
- */
- void
- processSpaceAttr(
- const AttributeList& atts,
- int
which,
- StylesheetConstructionContext& constructionContext);
-
- /**
- * Tell whether or not this is a xml:space attribute and, if so,
process it.
- *
* @param aname name of the attribute in question
* @param atts attribute list that owns the attribute
* @param which index of the attribute into the attribute list
1.20 +1 -1 xml-xalan/c/src/XSLT/ElemUse.cpp
Index: ElemUse.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemUse.cpp 24 Sep 2002 01:42:35 -0000 1.19
+++ ElemUse.cpp 24 Sep 2002 05:59:38 -0000 1.20
@@ -106,7 +106,7 @@
const XalanDOMString&
ElemUse::getElementName() const
{
- return Constants::ELEMNAME_USE_WITH_PREFIX_STRING;
+ return s_emptyString;
}
1.31 +2 -5 xml-xalan/c/src/XSLT/ElemValueOf.cpp
Index: ElemValueOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ElemValueOf.cpp 24 Sep 2002 01:42:35 -0000 1.30
+++ ElemValueOf.cpp 24 Sep 2002 05:59:38 -0000 1.31
@@ -126,11 +126,8 @@
m_disableOutputEscaping =
getStylesheet().getYesOrNo(aname, atts.getValue(i), constructionContext);
}
- else if (equals(aname, Constants::ATTRNAME_XMLSPACE))
- {
- processSpaceAttr(atts, i, constructionContext);
- }
- else if (!isAttrOK(aname, atts, i, constructionContext))
+ else if(!(isAttrOK(aname, atts, i, constructionContext) ||
+ processSpaceAttr(aname, atts, i,
constructionContext)))
{
constructionContext.error(
"xsl:value-of has an illegal attribute",
1.27 +2 -5 xml-xalan/c/src/XSLT/ElemVariable.cpp
Index: ElemVariable.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ElemVariable.cpp 24 Sep 2002 01:42:35 -0000 1.26
+++ ElemVariable.cpp 24 Sep 2002 05:59:38 -0000 1.27
@@ -149,11 +149,8 @@
{
m_qname = XalanQNameByValue(atts.getValue(i),
stylesheetTree.getNamespaces());
}
- else if (equals(aname, Constants::ATTRNAME_XMLSPACE))
- {
- processSpaceAttr(atts, i, constructionContext);
- }
- else if (!isAttrOK(aname, atts, i, constructionContext))
+ else if(!(isAttrOK(aname, atts, i, constructionContext) ||
+ processSpaceAttr(aname, atts, i,
constructionContext)))
{
constructionContext.error(
"xsl:variable has an illegal attribute",
1.15 +2 -5 xml-xalan/c/src/XSLT/ElemWhen.cpp
Index: ElemWhen.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWhen.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemWhen.cpp 24 Sep 2002 01:42:35 -0000 1.14
+++ ElemWhen.cpp 24 Sep 2002 05:59:38 -0000 1.15
@@ -94,11 +94,8 @@
{
m_pTest = constructionContext.createXPath(getLocator(),
atts.getValue(i), *this);
}
- else if (equals(aname, Constants::ATTRNAME_XMLSPACE))
- {
- processSpaceAttr(atts, i, constructionContext);
- }
- else if (!isAttrOK(aname, atts, i, constructionContext))
+ else if(!(isAttrOK(aname, atts, i, constructionContext) ||
+ processSpaceAttr(aname, atts, i,
constructionContext)))
{
constructionContext.error(
"xsl:when has an illegal attribute",
1.16 +12 -0 xml-xalan/c/src/XSLT/StylesheetConstructionContext.hpp
Index: StylesheetConstructionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContext.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- StylesheetConstructionContext.hpp 24 Sep 2002 01:42:35 -0000 1.15
+++ StylesheetConstructionContext.hpp 24 Sep 2002 05:59:38 -0000 1.16
@@ -383,6 +383,18 @@
XalanDocument* docToRegister) = 0;
/**
+ * Given an name, determine if it is the xml:space attribute
+ *
+ * @param name a name
+ * @return true if the string is the xml:space attribute name
+ */
+ virtual bool
+ isXMLSpaceAttribute(
+ const XalanDOMChar* theAttributeName,
+ const Stylesheet& theStylesheet,
+ const Locator* theLocator) = 0;
+
+ /**
* Given an XSL tag name, return an integer token that corresponds to
* the enums defined above.
*
1.24 +45 -10
xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp
Index: StylesheetConstructionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StylesheetConstructionContextDefault.cpp 24 Sep 2002 01:42:35 -0000
1.23
+++ StylesheetConstructionContextDefault.cpp 24 Sep 2002 05:59:38 -0000
1.24
@@ -73,6 +73,10 @@
+#include <DOMSupport/DOMServices.hpp>
+
+
+
#include <XPath/XObjectFactory.hpp>
#include <XPath/XPathEnvSupport.hpp>
#include <XPath/XPathFactory.hpp>
@@ -80,6 +84,7 @@
+#include "Constants.hpp"
#include "ElemTemplateElement.hpp"
#include "StylesheetRoot.hpp"
#include "XSLTEngineImpl.hpp"
@@ -271,9 +276,10 @@
using std::for_each;
#endif
- for_each(m_stylesheets.begin(),
- m_stylesheets.end(),
- DeleteFunctor<StylesheetRoot>());
+ for_each(
+ m_stylesheets.begin(),
+ m_stylesheets.end(),
+ DeleteFunctor<StylesheetRoot>());
m_stylesheets.clear();
@@ -285,10 +291,12 @@
StylesheetRoot*
StylesheetConstructionContextDefault::create(const XalanDOMString&
theBaseIdentifier)
{
+ m_stylesheets.resize(m_stylesheets.size() + 1);
+
StylesheetRoot* const theStylesheetRoot =
new StylesheetRoot(theBaseIdentifier, *this);
- m_stylesheets.insert(theStylesheetRoot);
+ m_stylesheets.push_back(theStylesheetRoot);
return theStylesheetRoot;
}
@@ -329,8 +337,15 @@
void
StylesheetConstructionContextDefault::destroy(StylesheetRoot*
theStylesheetRoot)
{
- const StylesheetSetType::iterator i =
- m_stylesheets.find(theStylesheetRoot);
+#if !defined(XALAN_NO_NAMESPACES)
+ using std::find;
+#endif
+
+ const StylesheetVectorType::iterator i =
+ find(
+ m_stylesheets.begin(),
+ m_stylesheets.end(),
+ theStylesheetRoot);
if (i != m_stylesheets.end())
{
@@ -515,16 +530,31 @@
+bool
+StylesheetConstructionContextDefault::isXMLSpaceAttribute(
+ const XalanDOMChar* theAttributeName,
+ const Stylesheet& theStylesheet,
+ const Locator* theLocator)
+{
+ assert(theAttributeName != 0);
+
+ m_spaceAttributeQName.set(theAttributeName,
theStylesheet.getNamespaces(), theLocator, true);
+
+ return s_spaceAttrQName.equals(m_spaceAttributeQName);
+}
+
+
+
int
-StylesheetConstructionContextDefault::getElementToken(const XalanDOMString&
name)
+StylesheetConstructionContextDefault::getElementToken(const XalanDOMString&
name) const
{
- return StylesheetConstructionContextDefault::getElementToken(name);
+ return getElementNameToken(name);
}
int
-StylesheetConstructionContextDefault::getElementToken(const XalanDOMString&
name)
+StylesheetConstructionContextDefault::getElementNameToken(const
XalanDOMString& name)
{
// Find the entity, if any...
const ElementTokenTableEntry* theFirst = s_elementTokenTable;
@@ -559,7 +589,7 @@
double
StylesheetConstructionContextDefault::getXSLTVersionSupported() const
{
- return XSLTEngineImpl::getXSLTVerSupported();
+ return 1.0L;
}
@@ -614,6 +644,11 @@
return theVector;
}
+
+
+
+const XalanQNameByReference
StylesheetConstructionContextDefault::s_spaceAttrQName(DOMServices::s_XMLNamespaceURI,
Constants::ATTRNAME_SPACE);
+
1.24 +20 -5
xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.hpp
Index: StylesheetConstructionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetConstructionContextDefault.hpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- StylesheetConstructionContextDefault.hpp 24 Sep 2002 01:42:35 -0000
1.23
+++ StylesheetConstructionContextDefault.hpp 24 Sep 2002 05:59:38 -0000
1.24
@@ -81,12 +81,16 @@
+#include <XPath/XalanQNameByReference.hpp>
+#include <XPath/XalanQNameByValue.hpp>
+
+
+
// Base class header file...
#include <XSLT/StylesheetConstructionContext.hpp>
-#include <set>
#include <vector>
@@ -287,6 +291,12 @@
DocumentHandler* docHandler,
XalanDocument* docToRegister);
+ virtual bool
+ isXMLSpaceAttribute(
+ const XalanDOMChar* theAttributeName,
+ const Stylesheet& theStylesheet,
+ const Locator* theLocator);
+
virtual int
getElementToken(const XalanDOMString& name) const;
@@ -310,11 +320,13 @@
XalanDOMString::size_type theLength =
XalanDOMString::npos,
bool
fTerminate = true);
+ static int
+ getElementNameToken(const XalanDOMString& name);
+
#if defined(XALAN_NO_NAMESPACES)
- typedef set<StylesheetRoot*,
- less<StylesheetRoot*> >
StylesheetSetType;
+ typedef vector<StylesheetRoot*> StylesheetVectorType;
#else
- typedef std::set<StylesheetRoot*> StylesheetSetType;
+ typedef std::vector<StylesheetRoot*> StylesheetVectorType;
#endif
private:
@@ -327,7 +339,7 @@
XPathProcessAutoPtr
m_xpathProcessor;
- StylesheetSetType m_stylesheets;
+ StylesheetVectorType m_stylesheets;
XalanDOMStringPool m_stringPool;
@@ -335,6 +347,9 @@
mutable XalanDOMString m_tempBuffer;
+ XalanQNameByValue
m_spaceAttributeQName;
+
+ static const XalanQNameByReference s_spaceAttrQName;
// Static strings for stylesheet compilation...
1.101 +2 -2
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- StylesheetExecutionContextDefault.cpp 24 Sep 2002 01:42:35 -0000
1.100
+++ StylesheetExecutionContextDefault.cpp 24 Sep 2002 05:59:38 -0000
1.101
@@ -103,7 +103,7 @@
#include "Constants.hpp"
#include "ElemTemplateElement.hpp"
#include "ElemWithParam.hpp"
-#include "StylesheetConstructionContext.hpp"
+#include "StylesheetConstructionContextDefault.hpp"
#include "StylesheetRoot.hpp"
#include "XSLTEngineImpl.hpp"
#include "XSLTProcessorException.hpp"
@@ -1760,7 +1760,7 @@
{
if (equals(theNamespace, XSLTEngineImpl::getXSLNameSpaceURL()) == true)
{
- const int xslToken =
StylesheetConstructionContext::getElementToken(elementName);
+ const int xslToken =
StylesheetConstructionContextDefault::getElementNameToken(elementName);
return xslToken < 0 ? false : true;
}
1.88 +21 -141 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.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- StylesheetHandler.cpp 24 Sep 2002 01:42:35 -0000 1.87
+++ StylesheetHandler.cpp 24 Sep 2002 05:59:38 -0000 1.88
@@ -256,19 +256,17 @@
bool
StylesheetHandler::processSpaceAttr(
- const XalanDOMChar* aname,
- const AttributeList& atts,
- int which,
- const Locator* locator,
- bool& fPreserve)
+ const XalanDOMChar* aname,
+ const AttributeList& atts,
+ int
which,
+ const Locator* locator,
+ bool&
fPreserve)
{
- m_spaceAttributeQName.set(aname, m_stylesheet.getNamespaces(), locator,
true);
-
- const bool isSpaceAttr =
s_spaceAttrQName.equals(m_spaceAttributeQName);
-
- if(isSpaceAttr == false)
+ if(m_constructionContext.isXMLSpaceAttribute(aname, m_stylesheet,
locator) == false)
{
fPreserve = false;
+
+ return false;
}
else
{
@@ -286,9 +284,9 @@
{
error("xml:space has an illegal value", locator);
}
- }
- return isSpaceAttr;
+ return true;
+ }
}
@@ -311,9 +309,9 @@
bool
StylesheetHandler::processSpaceAttr(
- const AttributeList& atts,
- const Locator* locator,
- bool& fPreserve)
+ const AttributeList& atts,
+ const Locator* locator,
+ bool&
fPreserve)
{
const unsigned int len = atts.getLength();
@@ -1127,10 +1125,10 @@
m_stylesheet.addExtensionNamespace(extns, nsh);
}
}
- else if(equals(aname, Constants::ATTRNAME_ID))
- {
- //
- }
+ else if(equals(aname, Constants::ATTRNAME_ID))
+ {
+ //
+ }
else if(equals(aname, Constants::ATTRNAME_VERSION))
{
const XalanDOMChar* const versionStr =
atts.getValue(i);
@@ -1174,115 +1172,11 @@
void
StylesheetHandler::processExtensionElement(
- const XalanDOMChar* name,
- const XalanDOMString& localName,
- const AttributeList& atts,
- const Locator* locator)
+ const XalanDOMChar* /* name */,
+ const XalanDOMString& /* localName */,
+ const AttributeList& /* atts */,
+ const Locator* /* locator */)
{
- if (equals(localName, Constants::ATTRNAME_COMPONENTS))
- {
- XalanDOMString prefix;
- XalanDOMString elements;
- XalanDOMString functions;
-
- const int nAttrs = atts.getLength();
-
- for (int i = 0; i < nAttrs; i++)
- {
- const XalanDOMChar* const aname = atts.getName
(i);
-
- if (equals(aname, Constants::ATTRNAME_PREFIX))
- {
- prefix = atts.getValue(i);
- }
- else if (equals(aname, Constants::ATTRNAME_ELEMENTS))
- {
- elements = atts.getValue(i);
- }
- else if (equals(aname, Constants::ATTRNAME_FUNCTIONS))
- {
- functions = atts.getValue(i);
- }
- else if(!isAttrOK(aname, atts, i))
- {
- const XalanDOMString
msg(XalanDOMString(name) + " has an illegal attribute: " + aname);
-
- error(msg, locator);
- }
- }
-
- if (isEmpty(prefix) == true)
- {
- const XalanDOMString msg("StylesheetHandler) " +
XalanDOMString(name) + " attribute 'prefix' is missing");
-
- error(msg, locator);
- }
-
- // SCOTT: is the line below correct?
- const XalanDOMString& extns =
getNamespaceForPrefixFromStack(prefix);
-
- ExtensionNSHandler* nsh =
m_stylesheet.lookupExtensionNSHandler(extns);
-
- if (nsh == 0)
- {
- // The extension namespace might not yet be known...
- nsh = new ExtensionNSHandler(extns);
-
- m_stylesheet.addExtensionNamespace(extns, nsh);
-
- assert(m_inExtensionElementStack.empty() == false);
-
- m_inExtensionElementStack.back() = true;
- }
-
- if (!isEmpty(elements))
- {
- nsh->setElements(elements);
- }
-
- if (!isEmpty(functions))
- {
- nsh->setFunctions(functions);
- }
-
- m_pLXSLTExtensionNSH = nsh; // hang on to it for processing
- // endElement on lxslt:script
- }
- else if (equals(localName, Constants::ATTRNAME_SCRIPT))
- {
- // process this in end element so that I can see whether I had
- // a body as well. The default pushing logic will save the
- // attributes for me. The body will be accumulated into the
- // following string buffer
- m_inLXSLTScript = true;
- clear(m_LXSLTScriptBody);
-
- const int nAttrs = atts.getLength();
-
- for (int i = 0; i < nAttrs; i++)
- {
- const XalanDOMChar* const aname = atts.getName(i);
-
- if (equals(aname, Constants::ATTRNAME_LANG))
- {
- m_LXSLTScriptLang = atts.getValue (i);
- }
- else if (equals(aname, Constants::ATTRNAME_SRC))
- {
- m_LXSLTScriptSrcURL = atts.getValue (i);
- }
- else if(!isAttrOK(aname, atts, i))
- {
- const XalanDOMString
msg(XalanDOMString(name) + " has an illegal attribute: " + aname);
-
- error(msg, locator);
- }
- }
- }
- else
- {
- // other xslt4j: element. Not my business.
- }
}
@@ -2084,22 +1978,11 @@
const XalanDOMString StylesheetHandler::s_emptyString;
-XalanDOMString s_localPart;
-
-XalanQNameByReference s_spaceAttrQName;
-
-const XalanQName&
StylesheetHandler::s_spaceAttrQName = ::s_spaceAttrQName;
-
void
StylesheetHandler::initialize()
{
- ::s_localPart = XALAN_STATIC_UCODE_STRING("space");
-
- ::s_spaceAttrQName.setLocalPart(::s_localPart);
-
- ::s_spaceAttrQName.setNamespace(DOMServices::s_XMLNamespaceURI);
}
@@ -2107,7 +1990,4 @@
void
StylesheetHandler::terminate()
{
- releaseMemory(::s_localPart);
-
- ::s_spaceAttrQName.clear();
}
1.35 +8 -12 xml-xalan/c/src/XSLT/StylesheetHandler.hpp
Index: StylesheetHandler.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetHandler.hpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- StylesheetHandler.hpp 21 Sep 2002 01:24:41 -0000 1.34
+++ StylesheetHandler.hpp 24 Sep 2002 05:59:38 -0000 1.35
@@ -400,11 +400,11 @@
*/
bool
processSpaceAttr(
- const XalanDOMChar* aname,
- const AttributeList& atts,
- int which,
- const Locator* locator,
- bool& fPreserve);
+ const XalanDOMChar* aname,
+ const AttributeList& atts,
+ int
which,
+ const Locator* locator,
+ bool&
fPreserve);
/**
* Tell whether or not this is a xml:space attribute and, if so,
process it.
@@ -416,9 +416,9 @@
*/
bool
processSpaceAttr(
- const AttributeList& atts,
- const Locator* locator,
- bool& fPreserve);
+ const AttributeList& atts,
+ const Locator* locator,
+ bool&
fPreserve);
/**
* Process xsl:import.
@@ -597,8 +597,6 @@
XalanDOMString m_elementLocalName;
- XalanQNameByValue m_spaceAttributeQName;
-
/**
* Accumulate character buffer to create contiguous character data
* where possible.
@@ -686,8 +684,6 @@
friend class PushPopIncludeState;
static const XalanDOMString s_emptyString;
-
- static const XalanQName&
s_spaceAttrQName;
};
1.157 +0 -112 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.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- XSLTEngineImpl.cpp 24 Sep 2002 01:42:35 -0000 1.156
+++ XSLTEngineImpl.cpp 24 Sep 2002 05:59:38 -0000 1.157
@@ -935,51 +935,6 @@
}
-//==========================================================
-// SECTION: Stylesheet Tables
-//==========================================================
-
-
-double
-XSLTEngineImpl::getXSLTVerSupported()
-{
- return s_XSLTVerSupported;
-}
-
-
-//==========================================================
-// SECTION: XSL directive handling functions
-//==========================================================
-
-
-
-int
-XSLTEngineImpl::getXSLToken(const XalanNode& node) const
-{
- int tok = -2;
-
- if(XalanNode::ELEMENT_NODE != node.getNodeType()) return tok;
-
- const XalanDOMString& ns = node.getNamespaceURI();
-
- if(equals(ns, s_XSLNameSpaceURL))
- {
- const XalanDOMString& localName =
- DOMServices::getLocalNameOfNode(node);
-
- const ElementKeysMapType::const_iterator j =
- s_elementKeys.find(localName);
-
- if(j != s_elementKeys.end())
- {
- tok = (*j).second;
- }
- }
-
- return tok;
-}
-
-
const StylesheetRoot*
XSLTEngineImpl::getStylesheetRoot() const
@@ -3449,62 +3404,6 @@
-void
-XSLTEngineImpl::initializeElementKeysTable(ElementKeysMapType&
theElementKeys)
-{
-#if 0
- theElementKeys[Constants::ELEMNAME_APPLY_TEMPLATES_STRING] =
Constants::ELEMNAME_APPLY_TEMPLATES;
- theElementKeys[Constants::ELEMNAME_WITHPARAM_STRING] =
Constants::ELEMNAME_WITHPARAM;
- theElementKeys[Constants::ELEMNAME_CONSTRUCT_STRING] =
Constants::ELEMNAME_CONSTRUCT;
- theElementKeys[Constants::ELEMNAME_CONTENTS_STRING] =
Constants::ELEMNAME_CONTENTS;
- theElementKeys[Constants::ELEMNAME_COPY_STRING] =
Constants::ELEMNAME_COPY;
- theElementKeys[Constants::ELEMNAME_COPY_OF_STRING] =
Constants::ELEMNAME_COPY_OF;
-
- theElementKeys[Constants::ELEMNAME_ATTRIBUTESET_STRING] =
Constants::ELEMNAME_DEFINEATTRIBUTESET;
-
- theElementKeys[Constants::ELEMNAME_USE_STRING] =
Constants::ELEMNAME_USE;
-
- theElementKeys[Constants::ELEMNAME_VARIABLE_STRING] =
Constants::ELEMNAME_VARIABLE;
- theElementKeys[Constants::ELEMNAME_PARAMVARIABLE_STRING] =
Constants::ELEMNAME_PARAMVARIABLE;
-
- theElementKeys[Constants::ELEMNAME_EMPTY_STRING] =
Constants::ELEMNAME_EMPTY;
- theElementKeys[Constants::ELEMNAME_CALLTEMPLATE_STRING] =
Constants::ELEMNAME_CALLTEMPLATE;
- theElementKeys[Constants::ELEMNAME_TEMPLATE_STRING] =
Constants::ELEMNAME_TEMPLATE;
- theElementKeys[Constants::ELEMNAME_STYLESHEET_STRING] =
Constants::ELEMNAME_STYLESHEET;
- theElementKeys[Constants::ELEMNAME_TRANSFORM_STRING] =
Constants::ELEMNAME_STYLESHEET;
- theElementKeys[Constants::ELEMNAME_IMPORT_STRING] =
Constants::ELEMNAME_IMPORT;
- theElementKeys[Constants::ELEMNAME_INCLUDE_STRING] =
Constants::ELEMNAME_INCLUDE;
- theElementKeys[Constants::ELEMNAME_FOREACH_STRING] =
Constants::ELEMNAME_FOREACH;
- theElementKeys[Constants::ELEMNAME_VALUEOF_STRING] =
Constants::ELEMNAME_VALUEOF;
- theElementKeys[Constants::ELEMNAME_KEY_STRING] =
Constants::ELEMNAME_KEY;
- theElementKeys[Constants::ELEMNAME_STRIPSPACE_STRING] =
Constants::ELEMNAME_STRIPSPACE;
- theElementKeys[Constants::ELEMNAME_PRESERVESPACE_STRING] =
Constants::ELEMNAME_PRESERVESPACE;
- theElementKeys[Constants::ELEMNAME_NUMBER_STRING] =
Constants::ELEMNAME_NUMBER;
- theElementKeys[Constants::ELEMNAME_IF_STRING] = Constants::ELEMNAME_IF;
- theElementKeys[Constants::ELEMNAME_CHOOSE_STRING] =
Constants::ELEMNAME_CHOOSE;
- theElementKeys[Constants::ELEMNAME_WHEN_STRING] =
Constants::ELEMNAME_WHEN;
- theElementKeys[Constants::ELEMNAME_OTHERWISE_STRING] =
Constants::ELEMNAME_OTHERWISE;
- theElementKeys[Constants::ELEMNAME_TEXT_STRING] =
Constants::ELEMNAME_TEXT;
- theElementKeys[Constants::ELEMNAME_ELEMENT_STRING] =
Constants::ELEMNAME_ELEMENT;
- theElementKeys[Constants::ELEMNAME_ATTRIBUTE_STRING] =
Constants::ELEMNAME_ATTRIBUTE;
- theElementKeys[Constants::ELEMNAME_SORT_STRING] =
Constants::ELEMNAME_SORT;
- theElementKeys[Constants::ELEMNAME_PI_STRING] = Constants::ELEMNAME_PI;
- theElementKeys[Constants::ELEMNAME_COMMENT_STRING] =
Constants::ELEMNAME_COMMENT;
-
- theElementKeys[Constants::ELEMNAME_APPLY_IMPORTS_STRING] =
Constants::ELEMNAME_APPLY_IMPORTS;
-
- theElementKeys[Constants::ELEMNAME_EXTENSION_STRING] =
Constants::ELEMNAME_EXTENSION;
- theElementKeys[Constants::ELEMNAME_MESSAGE_STRING] =
Constants::ELEMNAME_MESSAGE;
- theElementKeys[Constants::ELEMNAME_FALLBACK_STRING] =
Constants::ELEMNAME_FALLBACK;
- theElementKeys[Constants::ELEMNAME_OUTPUT_STRING] =
Constants::ELEMNAME_OUTPUT;
-
- theElementKeys[Constants::ELEMNAME_DECIMALFORMAT_STRING] =
Constants::ELEMNAME_DECIMALFORMAT;
- theElementKeys[Constants::ELEMNAME_NSALIAS_STRING] =
Constants::ELEMNAME_NSALIAS;
-#endif
-}
-
-
-
static XalanDOMString s_XSLNameSpaceURL;
static XalanDOMString s_XalanNamespaceURL;
@@ -3528,11 +3427,6 @@
static XalanDOMString s_typeValueString4;
-static XSLTEngineImpl::ElementKeysMapType s_elementKeys;
-
-
-
-const double XSLTEngineImpl::s_XSLTVerSupported(1.0);
const XalanDOMString& XSLTEngineImpl::s_XSLNameSpaceURL =
::s_XSLNameSpaceURL;
@@ -3556,8 +3450,6 @@
const XalanDOMString& XSLTEngineImpl::s_typeValueString4 =
::s_typeValueString4;
-const XSLTEngineImpl::ElementKeysMapType&
XSLTEngineImpl::s_elementKeys = ::s_elementKeys;
-
#if 0
#include <fstream>
@@ -3666,8 +3558,6 @@
::s_typeValueString4 =
XALAN_STATIC_UCODE_STRING("application/xml+xslt");
installFunctions();
-
- initializeElementKeysTable(::s_elementKeys);
}
@@ -3675,8 +3565,6 @@
void
XSLTEngineImpl::terminate()
{
- ElementKeysMapType().swap(::s_elementKeys);
-
uninstallFunctions();
releaseMemory(::s_uniqueNamespacePrefix);
1.95 +0 -53 xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp
Index: XSLTEngineImpl.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.hpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- XSLTEngineImpl.hpp 21 Sep 2002 01:24:41 -0000 1.94
+++ XSLTEngineImpl.hpp 24 Sep 2002 05:59:38 -0000 1.95
@@ -181,9 +181,6 @@
};
#if defined(XALAN_NO_NAMESPACES)
- typedef map<XalanDOMString,
- int,
- less<XalanDOMString> >
ElementKeysMapType;
typedef map<const void*,
ClockType,
less<const void*> >
DurationsTableMapType;
@@ -193,7 +190,6 @@
typedef set<const XalanDOMString*,
LessXalanDOMStringPointers>
XalanDOMStringPointerSetType;
#else
- typedef std::map<XalanDOMString, int> ElementKeysMapType;
typedef std::map<const void*, ClockType> DurationsTableMapType;
typedef std::vector<const Locator*> LocatorStack;
typedef std::vector<TraceListener*>
TraceListenerVectorType;
@@ -779,43 +775,6 @@
}
/**
- * Get the latest XSLT version currently supported.
- *
- * @return XSLT version number
- */
- static double
- getXSLTVerSupported();
-
- /**
- * Given an XSL tag name, return an integer token that corresponds to
- * ELEMNAME_XXX constants defined in Constants.hpp
- *
- * @param name a probable xsl:xxx element
- * @return Constants.ELEMNAME_XXX token, -1 if in XSL or Xalan
namespace,
- * or -2 if not in known namespace
- */
- static int
- getElementToken(const XalanDOMString& name)
- {
- ElementKeysMapType::const_iterator iter=
- s_elementKeys.find(name);
-
- return iter == s_elementKeys.end() ? -2 : (*iter).second;
- }
-
- /**
- * Given an XSL tag name, return an integer token
- * that corresponds to ELEMNAME_XXX constants defined
- * in Constants.java.
- *
- * @param node a probable xsl:xxx element.
- * @return Constants.ELEMNAME_XXX token, -1 if in XSL or Xalan
namespace,
- * or -2 if not in known namespace
- */
- int
- getXSLToken(const XalanNode& node) const;
-
- /**
* Whether to warn about pattern match conflicts.
*
* @return true to not warn about pattern match conflicts
@@ -1602,11 +1561,6 @@
static const XalanDOMString& s_XSLNameSpaceURL;
//"http://www.w3.org/1999/XSL/Transform";
/**
- * The minimum version of XSLT supported.
- */
- static const double
s_XSLTVerSupported; // 1.0
-
- /**
* Special Xalan namespace for built-in extensions.
*/
static const XalanDOMString& s_XalanNamespaceURL; //
"http://xml.apache.org/xalan";
@@ -1617,11 +1571,6 @@
static const XalanDOMString& s_uniqueNamespacePrefix;
/**
- * Map of XSLT element IDs for element names.
- */
- static const ElementKeysMapType& s_elementKeys;
-
- /**
* If this is set to true, selects will be traced
*/
bool m_traceSelects;
@@ -1794,8 +1743,6 @@
static void
uninstallFunctions();
- static void
- initializeElementKeysTable(ElementKeysMapType& theElementKeys);
static const XalanDOMString s_emptyString;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
