dbertoni 01/02/11 18:34:57
Modified: c/src/XSLT Constants.cpp Constants.hpp ElemApplyImport.cpp
ElemApplyImport.hpp ElemApplyTemplates.cpp
ElemApplyTemplates.hpp ElemAttribute.cpp
ElemAttribute.hpp ElemAttributeSet.cpp
ElemAttributeSet.hpp ElemCallTemplate.cpp
ElemCallTemplate.hpp ElemChoose.cpp ElemChoose.hpp
ElemComment.cpp ElemComment.hpp ElemCopy.cpp
ElemCopy.hpp ElemCopyOf.cpp ElemCopyOf.hpp
ElemDecimalFormat.cpp ElemDecimalFormat.hpp
ElemElement.cpp ElemElement.hpp ElemEmpty.cpp
ElemEmpty.hpp ElemExtensionCall.cpp
ElemExtensionCall.hpp ElemFallback.cpp
ElemFallback.hpp ElemForEach.cpp ElemForEach.hpp
ElemIf.cpp ElemIf.hpp ElemLiteralResult.cpp
ElemLiteralResult.hpp ElemMessage.cpp
ElemMessage.hpp ElemNumber.cpp ElemNumber.hpp
ElemOtherwise.cpp ElemOtherwise.hpp ElemPI.cpp
ElemPI.hpp ElemParam.cpp ElemParam.hpp ElemSort.cpp
ElemSort.hpp ElemTemplate.cpp ElemTemplate.hpp
ElemTemplateElement.cpp ElemTemplateElement.hpp
ElemText.cpp ElemText.hpp ElemTextLiteral.cpp
ElemTextLiteral.hpp ElemUse.cpp ElemUse.hpp
ElemValueOf.cpp ElemValueOf.hpp ElemVariable.cpp
ElemVariable.hpp ElemWhen.cpp ElemWhen.hpp
ElemWithParam.cpp ElemWithParam.hpp
StylesheetHandler.cpp StylesheetRoot.cpp
Log:
Don't store element names in ElemTemplateElement.
Revision Changes Path
1.13 +96 -0 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Constants.cpp 2001/02/09 19:22:29 1.12
+++ Constants.cpp 2001/02/12 02:34:51 1.13
@@ -191,55 +191,74 @@
static XalanDOMString ELEMNAME_ANCHOR_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_ARG_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_CALLTEMPLATEARG_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_COUNTERINCREMENT_STRING;
static XalanDOMString ELEMNAME_COUNTERRESET_STRING;
static XalanDOMString ELEMNAME_COUNTERSCOPE_STRING;
static XalanDOMString ELEMNAME_COUNTERS_STRING;
static XalanDOMString ELEMNAME_COUNTER_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_EVAL_STRING;
static XalanDOMString ELEMNAME_EXPECTEDCHILDREN_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_LOCALE_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_OLD_STRING;
static XalanDOMString ELEMNAME_PI_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_TARGETATTRIBUTE_STRING;
@@ -250,14 +269,19 @@
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_URL_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_ANY;
static XalanDOMString PSEUDONAME_COMMENT;
@@ -395,55 +419,74 @@
const XalanDOMString& Constants::ELEMNAME_ANCHOR_STRING =
::ELEMNAME_ANCHOR_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_ARG_STRING =
::ELEMNAME_ARG_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_CALLTEMPLATEARG_STRING = ::ELEMNAME_CALLTEMPLATEARG_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_COUNTERINCREMENT_STRING =
::ELEMNAME_COUNTERINCREMENT_STRING;
const XalanDOMString& Constants::ELEMNAME_COUNTERRESET_STRING
= ::ELEMNAME_COUNTERRESET_STRING;
const XalanDOMString& Constants::ELEMNAME_COUNTERSCOPE_STRING
= ::ELEMNAME_COUNTERSCOPE_STRING;
const XalanDOMString& Constants::ELEMNAME_COUNTERS_STRING =
::ELEMNAME_COUNTERS_STRING;
const XalanDOMString& Constants::ELEMNAME_COUNTER_STRING =
::ELEMNAME_COUNTER_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;
const XalanDOMString& Constants::ELEMNAME_EVAL_STRING =
::ELEMNAME_EVAL_STRING;
const XalanDOMString&
Constants::ELEMNAME_EXPECTEDCHILDREN_STRING =
::ELEMNAME_EXPECTEDCHILDREN_STRING;
const XalanDOMString&
Constants::ELEMNAME_EXTENSIONHANDLER_STRING =
::ELEMNAME_EXTENSIONHANDLER_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_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;
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_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;
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_TARGETATTRIBUTE_STRING = ::ELEMNAME_TARGETATTRIBUTE_STRING;
@@ -454,14 +497,19 @@
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_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;
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_ANY =
::PSEUDONAME_ANY;
const XalanDOMString& Constants::PSEUDONAME_COMMENT =
::PSEUDONAME_COMMENT;
@@ -601,55 +649,74 @@
::ELEMNAME_ANCHOR_STRING = XALAN_STATIC_UCODE_STRING("anchor");
::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_ARG_STRING = XALAN_STATIC_UCODE_STRING("arg");
::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_CALLTEMPLATEARG_STRING =
XALAN_STATIC_UCODE_STRING("invoke-arg");
::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_COUNTERINCREMENT_STRING =
XALAN_STATIC_UCODE_STRING("counter-increment");
::ELEMNAME_COUNTERRESET_STRING =
XALAN_STATIC_UCODE_STRING("counter-reset");
::ELEMNAME_COUNTERSCOPE_STRING =
XALAN_STATIC_UCODE_STRING("counter-scope");
::ELEMNAME_COUNTERS_STRING = XALAN_STATIC_UCODE_STRING("counters");
::ELEMNAME_COUNTER_STRING = XALAN_STATIC_UCODE_STRING("counter");
::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_EVAL_STRING = XALAN_STATIC_UCODE_STRING("eval");
::ELEMNAME_EXPECTEDCHILDREN_STRING =
XALAN_STATIC_UCODE_STRING("expectedchildren");
::ELEMNAME_EXTENSIONHANDLER_STRING =
XALAN_STATIC_UCODE_STRING("code-dispatcher");
::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_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");
::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_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");
::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_TARGETATTRIBUTE_STRING =
XALAN_STATIC_UCODE_STRING("target-attribute");
@@ -660,14 +727,19 @@
::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_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");
::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_ANY = XALAN_STATIC_UCODE_STRING("*");
::PSEUDONAME_COMMENT = XALAN_STATIC_UCODE_STRING("#comment");
@@ -806,55 +878,74 @@
releaseMemory(::ELEMNAME_ANCHOR_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_ARG_STRING);
releaseMemory(::ELEMNAME_ATTRIBUTESET_STRING);
+ releaseMemory(::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_ATTRIBUTE_STRING);
+ releaseMemory(::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING);
releaseMemory(::ELEMNAME_CALLTEMPLATEARG_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_COUNTERINCREMENT_STRING);
releaseMemory(::ELEMNAME_COUNTERRESET_STRING);
releaseMemory(::ELEMNAME_COUNTERSCOPE_STRING);
releaseMemory(::ELEMNAME_COUNTERS_STRING);
releaseMemory(::ELEMNAME_COUNTER_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_EVAL_STRING);
releaseMemory(::ELEMNAME_EXPECTEDCHILDREN_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_LOCALE_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_OLD_STRING);
releaseMemory(::ELEMNAME_PI_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_TARGETATTRIBUTE_STRING);
@@ -865,14 +956,19 @@
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_URL_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_ANY);
releaseMemory(::PSEUDONAME_COMMENT);
1.14 +33 -9 xml-xalan/c/src/XSLT/Constants.hpp
Index: Constants.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/Constants.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Constants.hpp 2001/01/26 16:25:32 1.13
+++ Constants.hpp 2001/02/12 02:34:51 1.14
@@ -192,75 +192,99 @@
// Result tree counting
static const XalanDOMString& ELEMNAME_ANCHOR_STRING;
- static const XalanDOMString& ELEMNAME_ANY_STRING; //
pattern-by-example support
+ 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_ARG_STRING;
static const XalanDOMString& ELEMNAME_ATTRIBUTESET_STRING;
- static const XalanDOMString& ELEMNAME_ATTRIBUTE_STRING; //
pattern-by-example support
+ 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_CALLTEMPLATEARG_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_CONSTRUCT_STRING; // my own
+ 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_COUNTERINCREMENT_STRING;
static const XalanDOMString& ELEMNAME_COUNTERRESET_STRING;
static const XalanDOMString& ELEMNAME_COUNTERSCOPE_STRING;
static const XalanDOMString& ELEMNAME_COUNTERS_STRING;
static const XalanDOMString& ELEMNAME_COUNTER_STRING;
static const XalanDOMString& ELEMNAME_DECIMALFORMAT_STRING;
- static const XalanDOMString& ELEMNAME_DISPLAYIF_STRING; // my own
- static const XalanDOMString& ELEMNAME_ELEMENT_STRING; //
pattern-by-example support
+ 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;
static const XalanDOMString& ELEMNAME_EVAL_STRING;
static const XalanDOMString& ELEMNAME_EXPECTEDCHILDREN_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_LOCALE_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; //
pattern-by-example support
+ 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_TARGETATTRIBUTE_STRING; //
pattern-by-example support
+ static const XalanDOMString& ELEMNAME_TARGETATTRIBUTE_STRING;
static const XalanDOMString& ELEMNAME_TARGETCOMMENT_STRING;
- static const XalanDOMString& ELEMNAME_TARGETELEMENT_STRING; //
pattern-by-example support
+ static const XalanDOMString& ELEMNAME_TARGETELEMENT_STRING;
static const XalanDOMString& ELEMNAME_TARGETPI_STRING;
static const XalanDOMString& ELEMNAME_TARGETTEXT_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_URL_STRING; //
pattern-by-example support
+ 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;
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_OLD_STRING;
static const XalanDOMString& ELEMNAME_PI_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;
/*---------------------------------------------
* Literals for XSL attribute names.
1.7 +10 -3 xml-xalan/c/src/XSLT/ElemApplyImport.cpp
Index: ElemApplyImport.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyImport.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemApplyImport.cpp 2001/01/03 19:32:48 1.6
+++ ElemApplyImport.cpp 2001/02/12 02:34:51 1.7
@@ -83,13 +83,11 @@
ElemApplyImport::ElemApplyImport(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_APPLY_IMPORTS)
@@ -102,13 +100,21 @@
if(isAttrOK(aname, atts, i, constructionContext) == false)
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING
+ " has an illegal attribute: " + aname);
}
}
}
+const XalanDOMString&
+ElemApplyImport::getElementName() const
+{
+ return Constants::ELEMNAME_APPLY_IMPORTS_WITH_PREFIX_STRING;
+}
+
+
+
void
ElemApplyImport::execute(
StylesheetExecutionContext&
executionContext,
@@ -140,5 +146,6 @@
ElemApplyImport::appendChildElem(ElemTemplateElement* /* newChild */)
{
throw XalanDOMException(XalanDOMException::HIERARCHY_REQUEST_ERR);
+
return 0;
}
1.6 +4 -3 xml-xalan/c/src/XSLT/ElemApplyImport.hpp
Index: ElemApplyImport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyImport.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemApplyImport.hpp 2000/11/02 01:46:18 1.5
+++ ElemApplyImport.hpp 2001/02/12 02:34:51 1.6
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYIMPORT_HEADER_GUARD
/**
- * $Id: ElemApplyImport.hpp,v 1.5 2000/11/02 01:46:18 dbertoni Exp $
+ * $Id: ElemApplyImport.hpp,v 1.6 2001/02/12 02:34:51 dbertoni Exp $
*
* $State: Exp $
*
@@ -86,7 +86,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -94,13 +93,15 @@
ElemApplyImport(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
// These methods are inherited from ElemTemplateElement ...
+
+ virtual const XalanDOMString&
+ getElementName() const;
virtual void
execute(
1.11 +9 -3 xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp
Index: ElemApplyTemplates.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemApplyTemplates.cpp 2000/11/27 21:44:05 1.10
+++ ElemApplyTemplates.cpp 2001/02/12 02:34:51 1.11
@@ -74,13 +74,11 @@
ElemApplyTemplates::ElemApplyTemplates(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemForEach(constructionContext,
stylesheetTree,
- name,
atts,
lineNumber,
columnNumber,
@@ -110,7 +108,7 @@
default:
if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING
+ " has an illegal attribute: " + aname);
}
break;
}
@@ -122,6 +120,14 @@
assert(m_pSelectPattern != 0);
}
+}
+
+
+
+const XalanDOMString&
+ElemApplyTemplates::getElementName() const
+{
+ return Constants::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING;
}
1.7 +4 -3 xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp
Index: ElemApplyTemplates.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemApplyTemplates.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemApplyTemplates.hpp 2000/11/27 21:44:07 1.6
+++ ElemApplyTemplates.hpp 2001/02/12 02:34:51 1.7
@@ -58,7 +58,7 @@
#define XALAN_ELEMAPPLYTEMPLATES_HEADER_GUARD
/**
- * $Id: ElemApplyTemplates.hpp,v 1.6 2000/11/27 21:44:07 dbertoni Exp $
+ * $Id: ElemApplyTemplates.hpp,v 1.7 2001/02/12 02:34:51 dbertoni Exp $
*
* $State: Exp $
*
@@ -88,7 +88,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -96,7 +95,6 @@
ElemApplyTemplates(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -125,6 +123,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.19 +10 -4 xml-xalan/c/src/XSLT/ElemAttribute.cpp
Index: ElemAttribute.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttribute.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemAttribute.cpp 2001/02/11 05:15:13 1.18
+++ ElemAttribute.cpp 2001/02/12 02:34:51 1.19
@@ -81,13 +81,11 @@
ElemAttribute::ElemAttribute(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_ATTRIBUTE),
@@ -113,7 +111,7 @@
else if(!(isAttrOK(aname, atts, i, constructionContext) ||
processSpaceAttr(aname, atts, i)))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
@@ -125,7 +123,7 @@
delete m_pNamespaceAVT;
#endif
- constructionContext.error(XalanDOMString(name) + " must have a
name attribute.");
+
constructionContext.error(Constants::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING + "
must have a name attribute.");
}
}
@@ -143,6 +141,14 @@
delete m_pNamespaceAVT;
#endif
+}
+
+
+
+const XalanDOMString&
+ElemAttribute::getElementName() const
+{
+ return Constants::ELEMNAME_ATTRIBUTE_WITH_PREFIX_STRING;
}
1.6 +5 -4 xml-xalan/c/src/XSLT/ElemAttribute.hpp
Index: ElemAttribute.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttribute.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemAttribute.hpp 2000/11/02 01:46:19 1.5
+++ ElemAttribute.hpp 2001/02/12 02:34:51 1.6
@@ -58,7 +58,7 @@
#define XALAN_ELEMATTRIBUTE_HEADER_GUARD
/**
- * $Id: ElemAttribute.hpp,v 1.5 2000/11/02 01:46:19 dbertoni Exp $
+ * $Id: ElemAttribute.hpp,v 1.6 2001/02/12 02:34:51 dbertoni Exp $
*
*
* $State: Exp $
@@ -89,7 +89,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -97,7 +96,6 @@
ElemAttribute (
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -106,7 +104,10 @@
~ElemAttribute();
// These methods are inherited from ElemTemplateElement ...
-
+
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.7 +10 -4 xml-xalan/c/src/XSLT/ElemAttributeSet.cpp
Index: ElemAttributeSet.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemAttributeSet.cpp 2000/11/27 21:44:12 1.6
+++ ElemAttributeSet.cpp 2001/02/12 02:34:51 1.7
@@ -73,13 +73,11 @@
ElemAttributeSet::ElemAttributeSet(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemUse(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_DEFINEATTRIBUTESET),
@@ -100,13 +98,13 @@
else if(!(processUseAttributeSets(constructionContext, aname,
atts, i) ||
isAttrOK(aname, atts, i,
constructionContext)))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING +
" has an illegal attribute: " + aname);
}
}
if(isEmpty(m_QName.getLocalPart()))
{
- constructionContext.error(XalanDOMString(name) + " must have a
name attribute.");
+
constructionContext.error(Constants::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING +
" must have a name attribute.");
}
}
@@ -114,6 +112,14 @@
ElemAttributeSet::~ElemAttributeSet()
{
+}
+
+
+
+const XalanDOMString&
+ElemAttributeSet::getElementName() const
+{
+ return Constants::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING;
}
1.7 +3 -2 xml-xalan/c/src/XSLT/ElemAttributeSet.hpp
Index: ElemAttributeSet.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemAttributeSet.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemAttributeSet.hpp 2000/11/27 21:44:14 1.6
+++ ElemAttributeSet.hpp 2001/02/12 02:34:51 1.7
@@ -82,7 +82,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -90,7 +89,6 @@
ElemAttributeSet (
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -111,6 +109,9 @@
// These methods are inherited from ElemUse ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.12 +10 -4 xml-xalan/c/src/XSLT/ElemCallTemplate.cpp
Index: ElemCallTemplate.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemCallTemplate.cpp 2001/02/04 05:42:11 1.11
+++ ElemCallTemplate.cpp 2001/02/12 02:34:51 1.12
@@ -79,13 +79,11 @@
ElemCallTemplate::ElemCallTemplate(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_CALLTEMPLATE),
@@ -103,13 +101,13 @@
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING +
" has an illegal attribute: " + aname);
}
}
if (m_templateName.isEmpty() == true)
{
- constructionContext.error(XalanDOMString(name) + " requires a
name attribute!");
+
constructionContext.error(Constants::ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING +
" requires a name attribute!");
}
}
@@ -117,6 +115,14 @@
ElemCallTemplate::~ElemCallTemplate()
{
+}
+
+
+
+const XalanDOMString&
+ElemCallTemplate::getElementName() const
+{
+ return Constants::ELEMNAME_CALLTEMPLATE_WITH_PREFIX_STRING;
}
1.9 +3 -2 xml-xalan/c/src/XSLT/ElemCallTemplate.hpp
Index: ElemCallTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCallTemplate.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemCallTemplate.hpp 2000/11/27 21:44:20 1.8
+++ ElemCallTemplate.hpp 2001/02/12 02:34:51 1.9
@@ -82,7 +82,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -90,7 +89,6 @@
ElemCallTemplate (
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -99,6 +97,9 @@
~ElemCallTemplate();
// These methods are inherited from ElemTemplateElement ...
+
+ virtual const XalanDOMString&
+ getElementName() const;
virtual void
execute(
1.10 +9 -3 xml-xalan/c/src/XSLT/ElemChoose.cpp
Index: ElemChoose.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemChoose.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemChoose.cpp 2000/11/21 21:09:56 1.9
+++ ElemChoose.cpp 2001/02/12 02:34:51 1.10
@@ -81,13 +81,11 @@
ElemChoose::ElemChoose(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_CHOOSE)
@@ -100,9 +98,17 @@
if(isAttrOK(aname, atts, i, constructionContext) == false ||
processSpaceAttr(aname, atts, i))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING + " has
an illegal attribute: " + aname);
}
}
+}
+
+
+
+const XalanDOMString&
+ElemChoose::getElementName() const
+{
+ return Constants::ELEMNAME_CHOOSE_WITH_PREFIX_STRING;
}
1.6 +3 -2 xml-xalan/c/src/XSLT/ElemChoose.hpp
Index: ElemChoose.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemChoose.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemChoose.hpp 2000/11/02 01:46:20 1.5
+++ ElemChoose.hpp 2001/02/12 02:34:51 1.6
@@ -82,7 +82,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -90,12 +89,14 @@
ElemChoose(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
// These methods are inherited from ElemTemplateElement ...
+
+ virtual const XalanDOMString&
+ getElementName() const;
virtual void
execute(
1.6 +9 -3 xml-xalan/c/src/XSLT/ElemComment.cpp
Index: ElemComment.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemComment.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemComment.cpp 2000/11/20 20:04:36 1.5
+++ ElemComment.cpp 2001/02/12 02:34:51 1.6
@@ -75,13 +75,11 @@
ElemComment::ElemComment(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_COMMENT)
@@ -94,7 +92,7 @@
if(isAttrOK(aname, atts, i, constructionContext) == false ||
processSpaceAttr(aname, atts, i))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_COMMENT_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
}
@@ -103,6 +101,14 @@
ElemComment::~ElemComment()
{
+}
+
+
+
+const XalanDOMString&
+ElemComment::getElementName() const
+{
+ return Constants::ELEMNAME_COMMENT_WITH_PREFIX_STRING;
}
1.6 +3 -3 xml-xalan/c/src/XSLT/ElemComment.hpp
Index: ElemComment.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemComment.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemComment.hpp 2000/11/02 01:46:21 1.5
+++ ElemComment.hpp 2001/02/12 02:34:51 1.6
@@ -78,7 +78,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -86,7 +85,6 @@
ElemComment(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -96,6 +94,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
@@ -107,7 +108,6 @@
virtual bool
childTypeAllowed(int xslToken) const;
-
};
1.10 +9 -3 xml-xalan/c/src/XSLT/ElemCopy.cpp
Index: ElemCopy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopy.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemCopy.cpp 2001/01/30 22:00:44 1.9
+++ ElemCopy.cpp 2001/02/12 02:34:51 1.10
@@ -78,13 +78,11 @@
ElemCopy::ElemCopy(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemUse(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_COPY)
@@ -99,9 +97,17 @@
processSpaceAttr(aname, atts, i) ||
isAttrOK(aname, atts, i, constructionContext)))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_COPY_WITH_PREFIX_STRING + " has
an illegal attribute: " + aname);
}
}
+}
+
+
+
+const XalanDOMString&
+ElemCopy::getElementName() const
+{
+ return Constants::ELEMNAME_COPY_WITH_PREFIX_STRING;
}
1.6 +3 -2 xml-xalan/c/src/XSLT/ElemCopy.hpp
Index: ElemCopy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopy.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemCopy.hpp 2000/11/02 01:46:21 1.5
+++ ElemCopy.hpp 2001/02/12 02:34:51 1.6
@@ -78,7 +78,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -86,13 +85,15 @@
ElemCopy(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.13 +9 -3 xml-xalan/c/src/XSLT/ElemCopyOf.cpp
Index: ElemCopyOf.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemCopyOf.cpp 2000/12/29 02:40:48 1.12
+++ ElemCopyOf.cpp 2001/02/12 02:34:51 1.13
@@ -81,13 +81,11 @@
ElemCopyOf::ElemCopyOf(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_COPY_OF),
@@ -105,9 +103,17 @@
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_COPY_OF_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
+}
+
+
+
+const XalanDOMString&
+ElemCopyOf::getElementName() const
+{
+ return Constants::ELEMNAME_COPY_OF_WITH_PREFIX_STRING;
}
1.6 +5 -4 xml-xalan/c/src/XSLT/ElemCopyOf.hpp
Index: ElemCopyOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemCopyOf.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemCopyOf.hpp 2000/11/02 01:46:22 1.5
+++ ElemCopyOf.hpp 2001/02/12 02:34:51 1.6
@@ -58,7 +58,7 @@
#define XALAN_ELEMCOPYOF_HEADER_GUARD
/**
- * $Id: ElemCopyOf.hpp,v 1.5 2000/11/02 01:46:22 dbertoni Exp $
+ * $Id: ElemCopyOf.hpp,v 1.6 2001/02/12 02:34:51 dbertoni Exp $
*
*
* $State: Exp $
@@ -89,7 +89,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -97,13 +96,15 @@
ElemCopyOf(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
// These methods are inherited from ElemTemplateElement ...
-
+
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.3 +8 -2 xml-xalan/c/src/XSLT/ElemDecimalFormat.cpp
Index: ElemDecimalFormat.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemDecimalFormat.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemDecimalFormat.cpp 2000/11/02 01:46:22 1.2
+++ ElemDecimalFormat.cpp 2001/02/12 02:34:51 1.3
@@ -75,13 +75,11 @@
ElemDecimalFormat::ElemDecimalFormat(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_DECIMALFORMAT),
@@ -270,6 +268,14 @@
ElemDecimalFormat::~ElemDecimalFormat()
{
+}
+
+
+
+const XalanDOMString&
+ElemDecimalFormat::getElementName() const
+{
+ return Constants::ELEMNAME_DECIMALFORMAT_WITH_PREFIX_STRING;
}
1.5 +4 -3 xml-xalan/c/src/XSLT/ElemDecimalFormat.hpp
Index: ElemDecimalFormat.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemDecimalFormat.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemDecimalFormat.hpp 2000/11/02 01:46:22 1.4
+++ ElemDecimalFormat.hpp 2001/02/12 02:34:51 1.5
@@ -86,7 +86,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -94,14 +93,16 @@
ElemDecimalFormat(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
+ ~ElemDecimalFormat();
+
// These methods are inherited from ElemTemplateElement ...
- ~ElemDecimalFormat();
+ virtual const XalanDOMString&
+ getElementName() const;
virtual void
execute(
1.19 +10 -4 xml-xalan/c/src/XSLT/ElemElement.cpp
Index: ElemElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemElement.cpp 2001/02/11 05:18:12 1.18
+++ ElemElement.cpp 2001/02/12 02:34:52 1.19
@@ -77,13 +77,11 @@
ElemElement::ElemElement(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemUse(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_ELEMENT),
@@ -116,13 +114,13 @@
else if(!(processUseAttributeSets(constructionContext, aname,
atts, i) || processSpaceAttr(aname, atts, i) ||
isAttrOK(aname, atts, i, constructionContext)))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_ELEMENT_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
if(0 == m_nameAVT)
{
- constructionContext.error(XalanDOMString(name) + " must have a
name attribute.");
+
constructionContext.error(Constants::ELEMNAME_ELEMENT_WITH_PREFIX_STRING + "
must have a name attribute.");
}
}
@@ -140,6 +138,14 @@
delete m_namespaceAVT;
#endif
+}
+
+
+
+const XalanDOMString&
+ElemElement::getElementName() const
+{
+ return Constants::ELEMNAME_ELEMENT_WITH_PREFIX_STRING;
}
1.8 +4 -3 xml-xalan/c/src/XSLT/ElemElement.hpp
Index: ElemElement.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemElement.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemElement.hpp 2001/01/30 22:05:12 1.7
+++ ElemElement.hpp 2001/02/12 02:34:52 1.8
@@ -58,7 +58,7 @@
#define XALAN_ELEMELEMENT_HEADER_GUARD
/**
- * $Id: ElemElement.hpp,v 1.7 2001/01/30 22:05:12 dbertoni Exp $
+ * $Id: ElemElement.hpp,v 1.8 2001/02/12 02:34:52 dbertoni Exp $
*
*
* $State: Exp $
@@ -93,7 +93,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -101,7 +100,6 @@
ElemElement(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -116,6 +114,9 @@
virtual void
postConstruction(const NamespacesHandler& theParentHandler);
+
+ virtual const XalanDOMString&
+ getElementName() const;
virtual void
execute(
1.5 +8 -2 xml-xalan/c/src/XSLT/ElemEmpty.cpp
Index: ElemEmpty.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemEmpty.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemEmpty.cpp 2000/11/02 01:46:23 1.4
+++ ElemEmpty.cpp 2001/02/12 02:34:52 1.5
@@ -68,12 +68,10 @@
ElemEmpty::ElemEmpty(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_UNDEFINED)
@@ -84,6 +82,14 @@
ElemEmpty::~ElemEmpty()
{
+}
+
+
+
+const XalanDOMString&
+ElemEmpty::getElementName() const
+{
+ return s_emptyString;
}
1.6 +3 -2 xml-xalan/c/src/XSLT/ElemEmpty.hpp
Index: ElemEmpty.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemEmpty.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemEmpty.hpp 2000/11/02 01:46:23 1.5
+++ ElemEmpty.hpp 2001/02/12 02:34:52 1.6
@@ -81,7 +81,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -89,7 +88,6 @@
ElemEmpty(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
int
lineNumber,
int
columnNumber);
@@ -98,6 +96,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.7 +9 -0 xml-xalan/c/src/XSLT/ElemExtensionCall.cpp
Index: ElemExtensionCall.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemExtensionCall.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemExtensionCall.cpp 2000/11/02 01:46:23 1.6
+++ ElemExtensionCall.cpp 2001/02/12 02:34:52 1.7
@@ -79,9 +79,18 @@
lineNumber,
columnNumber,
Constants::ELEMNAME_EXTENSIONCALL),
+ m_name(name),
m_nsh(ns),
m_localPart(localpart)
{
+}
+
+
+
+const XalanDOMString&
+ElemExtensionCall::getElementName() const
+{
+ return m_name;
}
1.7 +7 -2 xml-xalan/c/src/XSLT/ElemExtensionCall.hpp
Index: ElemExtensionCall.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemExtensionCall.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemExtensionCall.hpp 2000/11/02 01:46:23 1.6
+++ ElemExtensionCall.hpp 2001/02/12 02:34:52 1.7
@@ -100,7 +100,10 @@
const XalanDOMString& localpart);
// These methods are inherited from ElemLiteralResult ...
-
+
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
@@ -113,9 +116,11 @@
private:
+ const XalanDOMString m_name;
+
ExtensionNSHandler& m_nsh;
- XalanDOMString m_localPart;
+ const XalanDOMString m_localPart;
};
1.4 +9 -3 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemFallback.cpp 2000/11/02 01:46:24 1.3
+++ ElemFallback.cpp 2001/02/12 02:34:52 1.4
@@ -76,13 +76,11 @@
ElemFallback::ElemFallback(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_FALLBACK)
@@ -105,10 +103,18 @@
default:
if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_FALLBACK_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
}
+}
+
+
+
+const XalanDOMString&
+ElemFallback::getElementName() const
+{
+ return Constants::ELEMNAME_FALLBACK_WITH_PREFIX_STRING;
}
1.3 +4 -3 xml-xalan/c/src/XSLT/ElemFallback.hpp
Index: ElemFallback.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemFallback.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ElemFallback.hpp 2000/11/02 01:46:24 1.2
+++ ElemFallback.hpp 2001/02/12 02:34:52 1.3
@@ -77,7 +77,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name the name of the element
* @param atts the attribute list
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -85,7 +84,6 @@
ElemFallback(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -94,7 +92,10 @@
~ElemFallback();
// These methods are inherited from ElemTemplateElement ...
-
+
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.8 +43 -23 xml-xalan/c/src/XSLT/ElemForEach.cpp
Index: ElemForEach.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemForEach.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemForEach.cpp 2000/11/02 01:46:24 1.7
+++ ElemForEach.cpp 2001/02/12 02:34:52 1.8
@@ -81,46 +81,58 @@
ElemForEach::ElemForEach(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
- int
columnNumber,
- int
xslToken) :
+ int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
- xslToken),
+ Constants::ELEMNAME_FOREACH),
m_pSelectPattern(0)
{
- if(xslToken == Constants::ELEMNAME_FOREACH)
- {
- const unsigned int nAttrs = atts.getLength();
+ const unsigned int nAttrs = atts.getLength();
- for(unsigned int i = 0; i < nAttrs; i++)
- {
- const XalanDOMChar* const aname = atts.getName(i);
+ for(unsigned int i = 0; i < nAttrs; i++)
+ {
+ const XalanDOMChar* const aname = atts.getName(i);
- if(equals(aname, Constants::ATTRNAME_SELECT))
- {
- m_pSelectPattern =
constructionContext.createXPath(atts.getValue(i), *this);
- }
- else if(!(isAttrOK(aname, atts, i, constructionContext)
|| processSpaceAttr(aname, atts, i)))
- {
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
- }
+ if(equals(aname, Constants::ATTRNAME_SELECT))
+ {
+ m_pSelectPattern =
constructionContext.createXPath(atts.getValue(i), *this);
}
-
- if(0 == m_pSelectPattern)
+ else if(!(isAttrOK(aname, atts, i, constructionContext) ||
processSpaceAttr(aname, atts, i)))
{
- constructionContext.error(XalanDOMString(name) + "
requires attribute: " + Constants::ATTRNAME_SELECT);
+
constructionContext.error(Constants::ELEMNAME_FOREACH_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
+
+ if(0 == m_pSelectPattern)
+ {
+
constructionContext.error(Constants::ELEMNAME_FOREACH_WITH_PREFIX_STRING + "
requires attribute: " + Constants::ATTRNAME_SELECT);
+ }
+}
+
+
+
+ElemForEach::ElemForEach(
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet&
stylesheetTree,
+ const AttributeList& atts,
+ int
lineNumber,
+ int
columnNumber,
+ int
xslToken) :
+ ElemTemplateElement(constructionContext,
+ stylesheetTree,
+ lineNumber,
+ columnNumber,
+ xslToken),
+ m_pSelectPattern(0)
+{
}
+
-
ElemForEach::~ElemForEach()
{
#if !defined(XALAN_NO_NAMESPACES)
@@ -130,6 +142,14 @@
for_each(m_sortElems.begin(),
m_sortElems.end(),
DeleteFunctor<ElemSort>());
+}
+
+
+
+const XalanDOMString&
+ElemForEach::getElementName() const
+{
+ return Constants::ELEMNAME_FOREACH_WITH_PREFIX_STRING;
}
1.7 +22 -5 xml-xalan/c/src/XSLT/ElemForEach.hpp
Index: ElemForEach.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemForEach.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemForEach.hpp 2000/11/02 01:46:24 1.6
+++ ElemForEach.hpp 2001/02/12 02:34:52 1.7
@@ -88,20 +88,16 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
- * @param xslToken an integer representing the type of
instance.
*/
ElemForEach(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
- int
columnNumber,
- int
xslToken = Constants::ELEMNAME_FOREACH);
+ int
columnNumber);
virtual
~ElemForEach();
@@ -127,6 +123,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
@@ -135,6 +134,24 @@
const QName& mode)
const;
protected:
+
+ /**
+ * Construct an object derived from ElemForEach
+ *
+ * @param constructionContext context for construction of object
+ * @param stylesheetTree stylesheet containing element
+ * @param atts list of attributes for element
+ * @param lineNumber line number in document
+ * @param columnNumber column number in document
+ * @param xslToken an integer representing the type of
instance.
+ */
+ ElemForEach(
+ StylesheetConstructionContext& constructionContext,
+ Stylesheet&
stylesheetTree,
+ const AttributeList& atts,
+ int
lineNumber,
+ int
columnNumber,
+ int
xslToken);
const XPath* m_pSelectPattern;
1.10 +10 -4 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemIf.cpp 2000/11/21 21:09:57 1.9
+++ ElemIf.cpp 2001/02/12 02:34:52 1.10
@@ -83,13 +83,11 @@
ElemIf::ElemIf(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_IF),
@@ -117,15 +115,23 @@
default:
if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_IF_WITH_PREFIX_STRING + " has an
illegal attribute: " + aname);
}
}
}
if(0 == m_test)
{
- constructionContext.error(XalanDOMString(name) + " must have a
'test' attribute.");
+
constructionContext.error(Constants::ELEMNAME_IF_WITH_PREFIX_STRING + " must
have a 'test' attribute.");
}
+}
+
+
+
+const XalanDOMString&
+ElemIf::getElementName() const
+{
+ return Constants::ELEMNAME_IF_WITH_PREFIX_STRING;
}
1.6 +5 -4 xml-xalan/c/src/XSLT/ElemIf.hpp
Index: ElemIf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemIf.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemIf.hpp 2000/11/02 01:46:24 1.5
+++ ElemIf.hpp 2001/02/12 02:34:52 1.6
@@ -58,7 +58,7 @@
#define XALAN_ELEMIF_HEADER_GUARD
/**
- * $Id: ElemIf.hpp,v 1.5 2000/11/02 01:46:24 dbertoni Exp $
+ * $Id: ElemIf.hpp,v 1.6 2001/02/12 02:34:52 dbertoni Exp $
*
* $State: Exp $
*
@@ -88,7 +88,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -96,13 +95,15 @@
ElemIf(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
// These methods are inherited from ElemTemplateElement ...
-
+
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.29 +9 -1 xml-xalan/c/src/XSLT/ElemLiteralResult.cpp
Index: ElemLiteralResult.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ElemLiteralResult.cpp 2001/02/11 05:16:04 1.28
+++ ElemLiteralResult.cpp 2001/02/12 02:34:52 1.29
@@ -95,10 +95,10 @@
int
xslToken) :
ElemUse(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
xslToken),
+ m_elementName(name),
m_avts(),
m_namespacesHandler(stylesheetTree.getNamespacesHandler(),
stylesheetTree.getNamespaces(),
@@ -202,6 +202,14 @@
m_namespacesHandler.postConstruction(getElementName(),
&theParentHandler);
ElemUse::postConstruction(m_namespacesHandler);
+}
+
+
+
+const XalanDOMString&
+ElemLiteralResult::getElementName() const
+{
+ return m_elementName;
}
1.14 +8 -0 xml-xalan/c/src/XSLT/ElemLiteralResult.hpp
Index: ElemLiteralResult.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemLiteralResult.hpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemLiteralResult.hpp 2000/11/02 01:46:24 1.13
+++ ElemLiteralResult.hpp 2001/02/12 02:34:52 1.14
@@ -105,6 +105,9 @@
// These methods are inherited from ElemUse ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual const NamespacesHandler&
getNamespacesHandler() const;
@@ -173,6 +176,11 @@
shouldExcludeResultNamespaceNode(
const XalanDOMString& thePrefix,
const XalanDOMString& theURI) const;
+
+ /**
+ * The name of the literal result element.
+ */
+ const XalanDOMString m_elementName;
/**
* A vector to keep track of the attribute elements.
1.7 +9 -3 xml-xalan/c/src/XSLT/ElemMessage.cpp
Index: ElemMessage.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemMessage.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemMessage.cpp 2000/11/20 20:04:36 1.6
+++ ElemMessage.cpp 2001/02/12 02:34:52 1.7
@@ -75,13 +75,11 @@
ElemMessage::ElemMessage(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_MESSAGE),
@@ -109,9 +107,17 @@
}
else if(isAttrOK(aname, atts, i, constructionContext) == false
|| processSpaceAttr(aname, atts, i))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + XalanDOMString(aname));
+
constructionContext.error(Constants::ELEMNAME_MESSAGE_WITH_PREFIX_STRING + "
has an illegal attribute: " + XalanDOMString(aname));
}
}
+}
+
+
+
+const XalanDOMString&
+ElemMessage::getElementName() const
+{
+ return Constants::ELEMNAME_MESSAGE_WITH_PREFIX_STRING;
}
1.7 +4 -2 xml-xalan/c/src/XSLT/ElemMessage.hpp
Index: ElemMessage.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemMessage.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemMessage.hpp 2000/11/02 01:46:24 1.6
+++ ElemMessage.hpp 2001/02/12 02:34:52 1.7
@@ -87,13 +87,15 @@
ElemMessage(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
// These methods are inherited from ElemTemplateElement ...
-
+
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.39 +9 -3 xml-xalan/c/src/XSLT/ElemNumber.cpp
Index: ElemNumber.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ElemNumber.cpp 2001/02/09 19:22:31 1.38
+++ ElemNumber.cpp 2001/02/12 02:34:52 1.39
@@ -103,13 +103,11 @@
ElemNumber::ElemNumber(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_NUMBER),
@@ -182,7 +180,7 @@
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_NUMBER_WITH_PREFIX_STRING + " has
an illegal attribute: " + aname);
}
}
}
@@ -204,6 +202,14 @@
delete m_groupingSize_avt;
#endif
}
+
+
+const XalanDOMString&
+ElemNumber::getElementName() const
+{
+ return Constants::ELEMNAME_NUMBER_WITH_PREFIX_STRING;
+}
+
void
1.25 +4 -3 xml-xalan/c/src/XSLT/ElemNumber.hpp
Index: ElemNumber.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemNumber.hpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ElemNumber.hpp 2001/01/26 21:18:44 1.24
+++ ElemNumber.hpp 2001/02/12 02:34:52 1.25
@@ -58,7 +58,7 @@
#define XALAN_ELEMNUMBER_HEADER_GUARD
/**
- * $Id: ElemNumber.hpp,v 1.24 2001/01/26 21:18:44 dbertoni Exp $
+ * $Id: ElemNumber.hpp,v 1.25 2001/02/12 02:34:52 dbertoni Exp $
*
* $State: Exp $
*
@@ -130,7 +130,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -138,7 +137,6 @@
ElemNumber(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -148,6 +146,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.5 +9 -3 xml-xalan/c/src/XSLT/ElemOtherwise.cpp
Index: ElemOtherwise.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemOtherwise.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemOtherwise.cpp 2000/11/02 01:46:24 1.4
+++ ElemOtherwise.cpp 2001/02/12 02:34:53 1.5
@@ -74,13 +74,11 @@
ElemOtherwise::ElemOtherwise(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_OTHERWISE)
@@ -93,7 +91,15 @@
if(isAttrOK(aname, atts, i, constructionContext) == false ||
processSpaceAttr(aname, atts, i))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
+}
+
+
+
+const XalanDOMString&
+ElemOtherwise::getElementName() const
+{
+ return Constants::ELEMNAME_OTHERWISE_WITH_PREFIX_STRING;
}
1.6 +3 -2 xml-xalan/c/src/XSLT/ElemOtherwise.hpp
Index: ElemOtherwise.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemOtherwise.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemOtherwise.hpp 2000/11/02 01:46:25 1.5
+++ ElemOtherwise.hpp 2001/02/12 02:34:53 1.6
@@ -78,7 +78,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -86,10 +85,12 @@
ElemOtherwise(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
+
+ virtual const XalanDOMString&
+ getElementName() const;
};
1.7 +10 -4 xml-xalan/c/src/XSLT/ElemPI.cpp
Index: ElemPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemPI.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemPI.cpp 2000/11/20 20:04:37 1.6
+++ ElemPI.cpp 2001/02/12 02:34:53 1.7
@@ -75,13 +75,11 @@
ElemPI::ElemPI(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_PI),
@@ -99,13 +97,13 @@
}
else if(isAttrOK(aname, atts, i, constructionContext) == false
|| processSpaceAttr(aname, atts, i))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_PI_WITH_PREFIX_STRING + " has an
illegal attribute: " + aname);
}
}
if(isEmpty(m_name_atv) == true)
{
- constructionContext.error(XalanDOMString(name) + " must have a
name attribute.");
+
constructionContext.error(Constants::ELEMNAME_PI_WITH_PREFIX_STRING + " must
have a name attribute.");
}
}
@@ -113,6 +111,14 @@
ElemPI::~ElemPI()
{
+}
+
+
+
+const XalanDOMString&
+ElemPI::getElementName() const
+{
+ return Constants::ELEMNAME_PI_WITH_PREFIX_STRING;
}
1.7 +3 -2 xml-xalan/c/src/XSLT/ElemPI.hpp
Index: ElemPI.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemPI.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemPI.hpp 2000/11/02 01:46:25 1.6
+++ ElemPI.hpp 2001/02/12 02:34:53 1.7
@@ -79,7 +79,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -87,7 +86,6 @@
ElemPI(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -96,6 +94,9 @@
~ElemPI();
// These methods are inherited from ElemTemplateElement ...
+
+ virtual const XalanDOMString&
+ getElementName() const;
virtual void
execute(
1.9 +8 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemParam.cpp 2000/12/04 20:48:33 1.8
+++ ElemParam.cpp 2001/02/12 02:34:53 1.9
@@ -73,18 +73,24 @@
ElemParam::ElemParam(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemVariable(constructionContext,
stylesheetTree,
- name,
atts,
lineNumber,
columnNumber,
Constants::ELEMNAME_PARAMVARIABLE)
{
+}
+
+
+
+const XalanDOMString&
+ElemParam::getElementName() const
+{
+ return Constants::ELEMNAME_PARAMVARIABLE_WITH_PREFIX_STRING;
}
1.6 +3 -2 xml-xalan/c/src/XSLT/ElemParam.hpp
Index: ElemParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemParam.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemParam.hpp 2000/11/02 01:46:25 1.5
+++ ElemParam.hpp 2001/02/12 02:34:53 1.6
@@ -78,7 +78,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -86,13 +85,15 @@
ElemParam(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
// These methods are inherited from ElemVariable ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.6 +10 -3 xml-xalan/c/src/XSLT/ElemSort.cpp
Index: ElemSort.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemSort.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemSort.cpp 2000/11/02 01:46:25 1.5
+++ ElemSort.cpp 2001/02/12 02:34:53 1.6
@@ -74,13 +74,11 @@
ElemSort::ElemSort(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_SORT),
@@ -121,7 +119,7 @@
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_SORT_WITH_PREFIX_STRING + " has
an illegal attribute: " + aname);
}
}
@@ -130,3 +128,12 @@
m_selectPattern =
constructionContext.createXPath(StaticStringToDOMString(XALAN_STATIC_UCODE_STRING(".")),
*this);
}
}
+
+
+
+const XalanDOMString&
+ElemSort::getElementName() const
+{
+ return Constants::ELEMNAME_SORT_WITH_PREFIX_STRING;
+}
+
1.6 +3 -2 xml-xalan/c/src/XSLT/ElemSort.hpp
Index: ElemSort.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemSort.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemSort.hpp 2000/11/02 01:46:25 1.5
+++ ElemSort.hpp 2001/02/12 02:34:53 1.6
@@ -86,7 +86,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -94,7 +93,6 @@
ElemSort(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -142,6 +140,9 @@
{
return m_selectPattern;
}
+
+ virtual const XalanDOMString&
+ getElementName() const;
private:
1.11 +10 -4 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemTemplate.cpp 2000/11/27 21:44:24 1.10
+++ ElemTemplate.cpp 2001/02/12 02:34:53 1.11
@@ -80,13 +80,11 @@
ElemTemplate::ElemTemplate(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_TEMPLATE),
@@ -133,14 +131,14 @@
default:
if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
}
if(0 == m_matchPattern && m_name.isEmpty() == true)
{
- constructionContext.error(XalanDOMString(name) + " requires
either a name or a match attribute.");
+
constructionContext.error(Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING + "
requires either a name or a match attribute.");
}
}
@@ -148,6 +146,14 @@
ElemTemplate::~ElemTemplate()
{
+}
+
+
+
+const XalanDOMString&
+ElemTemplate::getElementName() const
+{
+ return Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING;
}
1.8 +3 -2 xml-xalan/c/src/XSLT/ElemTemplate.hpp
Index: ElemTemplate.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplate.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemTemplate.hpp 2000/11/27 21:44:26 1.7
+++ ElemTemplate.hpp 2001/02/12 02:34:53 1.8
@@ -88,7 +88,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -96,7 +95,6 @@
ElemTemplate(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -147,6 +145,9 @@
{
return m_priority;
}
+
+ virtual const XalanDOMString&
+ getElementName() const;
// These methods are inherited from ElemTemplateElement ...
virtual void
1.44 +2 -4 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.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ElemTemplateElement.cpp 2000/12/21 04:46:23 1.43
+++ ElemTemplateElement.cpp 2001/02/12 02:34:53 1.44
@@ -113,7 +113,6 @@
ElemTemplateElement::ElemTemplateElement(
StylesheetConstructionContext& /* constructionContext
*/,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
int
lineNumber,
int
columnNumber,
int
xslToken) :
@@ -124,7 +123,6 @@
m_lineNumber(lineNumber),
m_columnNumber(columnNumber),
m_defaultSpace(true),
- m_elemName(XalanDOMString(name)),
m_xslToken(xslToken),
m_parentNode(0),
m_nextSibling(0),
@@ -1028,7 +1026,7 @@
const XalanDOMString&
ElemTemplateElement::getNodeName() const
{
- return m_elemName;
+ return getElementName();
}
@@ -1313,7 +1311,7 @@
const XalanDOMString&
ElemTemplateElement::getTagName() const
{
- return m_elemName;
+ return getElementName();
}
1.22 +4 -10 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElemTemplateElement.hpp 2001/01/31 01:42:19 1.21
+++ ElemTemplateElement.hpp 2001/02/12 02:34:53 1.22
@@ -108,7 +108,6 @@
*
* @param constructionContext context when object constructed
* @param stylesheetTree owning stylesheet
- * @param name name of the element
* @param lineNumber line in the XSLT file where the element
occurs
* @param columnNumber column index in the XSLT file where the
* element occurs
@@ -117,7 +116,6 @@
ElemTemplateElement(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
int
lineNumber,
int
columnNumber,
int
xslToken);
@@ -306,11 +304,8 @@
return m_columnNumber;
}
- const XalanDOMString&
- getElementName() const
- {
- return m_elemName;
- }
+ virtual const XalanDOMString&
+ getElementName() const = 0;
#if defined(XALAN_NO_NAMESPACES)
typedef map<XalanDOMString,
@@ -804,6 +799,8 @@
bool m_finishedConstruction;
+ static const XalanDOMString s_emptyString;
+
private:
Stylesheet& m_stylesheet;
@@ -812,7 +809,6 @@
const int m_columnNumber;
bool m_defaultSpace;
- const XalanDOMString m_elemName;
const int m_xslToken;
@@ -826,8 +822,6 @@
XalanEmptyNamedNodeMap m_fakeAttributes;
const XalanDOMString m_baseIndentifier;
-
- static const XalanDOMString s_emptyString;
};
1.5 +9 -3 xml-xalan/c/src/XSLT/ElemText.cpp
Index: ElemText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemText.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemText.cpp 2000/11/02 01:46:26 1.4
+++ ElemText.cpp 2001/02/12 02:34:53 1.5
@@ -79,13 +79,11 @@
ElemText::ElemText(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_TEXT),
@@ -106,7 +104,7 @@
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_TEXT_WITH_PREFIX_STRING + " has
an illegal attribute: " + aname);
}
}
}
@@ -115,6 +113,14 @@
ElemText::~ElemText()
{
+}
+
+
+
+const XalanDOMString&
+ElemText::getElementName() const
+{
+ return Constants::ELEMNAME_TEXT_WITH_PREFIX_STRING;
}
1.6 +4 -3 xml-xalan/c/src/XSLT/ElemText.hpp
Index: ElemText.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemText.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemText.hpp 2000/11/02 01:46:26 1.5
+++ ElemText.hpp 2001/02/12 02:34:53 1.6
@@ -58,7 +58,7 @@
#define XALAN_ELEMTEXT_HEADER_GUARD
/**
- * $Id: ElemText.hpp,v 1.5 2000/11/02 01:46:26 dbertoni Exp $
+ * $Id: ElemText.hpp,v 1.6 2001/02/12 02:34:53 dbertoni Exp $
*
* $State: Exp $
*
@@ -90,7 +90,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -98,7 +97,6 @@
ElemText(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -116,6 +114,9 @@
{
return m_disableOutputEscaping;
}
+
+ virtual const XalanDOMString&
+ getElementName() const;
protected:
1.9 +8 -1 xml-xalan/c/src/XSLT/ElemTextLiteral.cpp
Index: ElemTextLiteral.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemTextLiteral.cpp 2000/12/01 22:04:25 1.8
+++ ElemTextLiteral.cpp 2001/02/12 02:34:53 1.9
@@ -84,7 +84,6 @@
bool
disableOutputEscaping) :
ElemTemplateElement(constructionContext,
stylesheetTree,
-
c_wstr(Constants::PSEUDONAME_TEXT),
lineNumber,
columnNumber,
Constants::ELEMNAME_TEXTLITERALRESULT),
@@ -100,6 +99,14 @@
ElemTextLiteral::~ElemTextLiteral()
{
+}
+
+
+
+const XalanDOMString&
+ElemTextLiteral::getElementName() const
+{
+ return Constants::PSEUDONAME_TEXT;
}
1.7 +3 -0 xml-xalan/c/src/XSLT/ElemTextLiteral.hpp
Index: ElemTextLiteral.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTextLiteral.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemTextLiteral.hpp 2000/05/24 19:38:48 1.6
+++ ElemTextLiteral.hpp 2001/02/12 02:34:53 1.7
@@ -130,6 +130,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.8 +8 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemUse.cpp 2000/11/27 21:44:30 1.7
+++ ElemUse.cpp 2001/02/12 02:34:53 1.8
@@ -83,13 +83,11 @@
ElemUse::ElemUse(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
int
lineNumber,
int
columnNumber,
int
xslToken) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
xslToken),
@@ -101,6 +99,14 @@
ElemUse::~ElemUse()
{
+}
+
+
+
+const XalanDOMString&
+ElemUse::getElementName() const
+{
+ return Constants::ELEMNAME_USE_WITH_PREFIX_STRING;
}
1.8 +3 -2 xml-xalan/c/src/XSLT/ElemUse.hpp
Index: ElemUse.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemUse.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemUse.hpp 2000/11/27 21:44:32 1.7
+++ ElemUse.hpp 2001/02/12 02:34:53 1.8
@@ -88,7 +88,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -96,7 +95,6 @@
ElemUse(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
int
lineNumber,
int
columnNumber,
int
xslToken = Constants::ELEMNAME_USE);
@@ -122,6 +120,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.17 +10 -4 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ElemValueOf.cpp 2000/12/21 04:46:54 1.16
+++ ElemValueOf.cpp 2001/02/12 02:34:53 1.17
@@ -87,13 +87,11 @@
ElemValueOf::ElemValueOf(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_VALUEOF),
@@ -139,14 +137,14 @@
default:
if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
}
if(0 == m_selectPattern)
{
- constructionContext.error(XalanDOMString(name) + " requires a
select attribute.");
+
constructionContext.error(Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING + "
requires a select attribute.");
}
}
@@ -154,6 +152,14 @@
ElemValueOf::~ElemValueOf()
{
+}
+
+
+
+const XalanDOMString&
+ElemValueOf::getElementName() const
+{
+ return Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING;
}
1.9 +3 -8 xml-xalan/c/src/XSLT/ElemValueOf.hpp
Index: ElemValueOf.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemValueOf.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemValueOf.hpp 2000/11/21 21:10:01 1.8
+++ ElemValueOf.hpp 2001/02/12 02:34:53 1.9
@@ -83,7 +83,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -91,7 +90,6 @@
ElemValueOf(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -101,6 +99,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
@@ -110,12 +111,6 @@
private:
- /**
- * Construct an object corresponding to an "xsl:value-of" element
- *
- * @param executionContext The current execution context
- * @param theValue The value to output
- */
void
outputValue(
StylesheetExecutionContext&
executionContext,
1.12 +10 -4 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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemVariable.cpp 2000/12/04 20:48:33 1.11
+++ ElemVariable.cpp 2001/02/12 02:34:53 1.12
@@ -83,14 +83,12 @@
ElemVariable::ElemVariable(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber,
int
xslToken) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
xslToken),
@@ -127,14 +125,14 @@
default:
if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_VARIABLE_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
}
if(m_qname.isEmpty())
{
- constructionContext.error(XalanDOMString(name) + " must have a
'name' attribute.");
+
constructionContext.error(Constants::ELEMNAME_VARIABLE_WITH_PREFIX_STRING + "
must have a 'name' attribute.");
}
}
@@ -142,6 +140,14 @@
ElemVariable::~ElemVariable()
{
+}
+
+
+
+const XalanDOMString&
+ElemVariable::getElementName() const
+{
+ return Constants::ELEMNAME_VARIABLE_WITH_PREFIX_STRING;
}
1.11 +4 -3 xml-xalan/c/src/XSLT/ElemVariable.hpp
Index: ElemVariable.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemVariable.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemVariable.hpp 2000/12/04 20:48:33 1.10
+++ ElemVariable.hpp 2001/02/12 02:34:53 1.11
@@ -58,7 +58,7 @@
#define XALAN_ELEMVARIABLE_HEADER_GUARD
/**
- * $Id: ElemVariable.hpp,v 1.10 2000/12/04 20:48:33 dbertoni Exp $
+ * $Id: ElemVariable.hpp,v 1.11 2001/02/12 02:34:53 dbertoni Exp $
*
* $State: Exp $
*
@@ -92,7 +92,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -100,7 +99,6 @@
ElemVariable(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber,
@@ -144,6 +142,9 @@
// These methods are inherited from ElemTemplateElement ...
+ virtual const XalanDOMString&
+ getElementName() const;
+
virtual void
execute(
StylesheetExecutionContext&
executionContext,
1.6 +9 -3 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemWhen.cpp 2000/11/02 01:46:26 1.5
+++ ElemWhen.cpp 2001/02/12 02:34:53 1.6
@@ -74,13 +74,11 @@
ElemWhen::ElemWhen(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_WHEN),
@@ -108,7 +106,7 @@
default:
if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name)
+ " has an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_WHEN_WITH_PREFIX_STRING + " has
an illegal attribute: " + aname);
}
}
}
@@ -117,4 +115,12 @@
{
constructionContext.error("xsl:when must have a 'test'
attribute.");
}
+}
+
+
+
+const XalanDOMString&
+ElemWhen::getElementName() const
+{
+ return Constants::ELEMNAME_WHEN_WITH_PREFIX_STRING;
}
1.6 +3 -2 xml-xalan/c/src/XSLT/ElemWhen.hpp
Index: ElemWhen.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWhen.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemWhen.hpp 2000/11/02 01:46:26 1.5
+++ ElemWhen.hpp 2001/02/12 02:34:53 1.6
@@ -82,7 +82,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -90,7 +89,6 @@
ElemWhen (
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -105,6 +103,9 @@
{
return m_pTest;
}
+
+ virtual const XalanDOMString&
+ getElementName() const;
private:
1.7 +9 -3 xml-xalan/c/src/XSLT/ElemWithParam.cpp
Index: ElemWithParam.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWithParam.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemWithParam.cpp 2000/11/27 21:44:42 1.6
+++ ElemWithParam.cpp 2001/02/12 02:34:54 1.7
@@ -75,13 +75,11 @@
ElemWithParam::ElemWithParam(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber) :
ElemTemplateElement(constructionContext,
stylesheetTree,
- name,
lineNumber,
columnNumber,
Constants::ELEMNAME_WITHPARAM),
@@ -104,7 +102,7 @@
}
else if(!isAttrOK(aname, atts, i, constructionContext))
{
- constructionContext.error(XalanDOMString(name) + " has
an illegal attribute: " + aname);
+
constructionContext.error(Constants::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING + "
has an illegal attribute: " + aname);
}
}
@@ -118,4 +116,12 @@
ElemWithParam::~ElemWithParam()
{
+}
+
+
+
+const XalanDOMString&
+ElemWithParam::getElementName() const
+{
+ return Constants::ELEMNAME_WITHPARAM_WITH_PREFIX_STRING;
}
1.7 +3 -2 xml-xalan/c/src/XSLT/ElemWithParam.hpp
Index: ElemWithParam.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemWithParam.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElemWithParam.hpp 2000/11/27 21:44:44 1.6
+++ ElemWithParam.hpp 2001/02/12 02:34:54 1.7
@@ -82,7 +82,6 @@
*
* @param constructionContext context for construction of object
* @param stylesheetTree stylesheet containing element
- * @param name name of element
* @param atts list of attributes for element
* @param lineNumber line number in document
* @param columnNumber column number in document
@@ -90,7 +89,6 @@
ElemWithParam(
StylesheetConstructionContext& constructionContext,
Stylesheet&
stylesheetTree,
- const XalanDOMChar* name,
const AttributeList& atts,
int
lineNumber,
int
columnNumber);
@@ -119,6 +117,9 @@
{
return m_selectPattern;
}
+
+ virtual const XalanDOMString&
+ getElementName() const;
private:
1.57 +29 -33 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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- StylesheetHandler.cpp 2001/02/08 21:48:00 1.56
+++ StylesheetHandler.cpp 2001/02/12 02:34:54 1.57
@@ -391,7 +391,7 @@
case Constants::ELEMNAME_TEMPLATE:
m_pTemplate = new
ElemTemplate(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
m_elemStack.push_back(m_pTemplate);
m_elemStackParentedElements.insert(m_pTemplate);
m_inTemplate = true;
@@ -411,11 +411,11 @@
ElemVariable* varelem =
(Constants::ELEMNAME_PARAMVARIABLE == xslToken)
?
new ElemParam(m_constructionContext,
m_stylesheet,
-
name, atts,
+
atts,
lineNumber, columnNumber)
: new ElemVariable(m_constructionContext,
m_stylesheet,
-
name, atts,
+
atts,
lineNumber, columnNumber);
m_elemStack.push_back(varelem);
@@ -434,7 +434,7 @@
case Constants::ELEMNAME_STRIPSPACE:
{
// $$$ ToDo: We should move this code
into a separate function.
- ElemEmpty nsNode(m_constructionContext,
m_stylesheet, name, lineNumber, columnNumber);
+ ElemEmpty nsNode(m_constructionContext,
m_stylesheet, lineNumber, columnNumber);
const unsigned int nAttrs =
atts.getLength();
@@ -492,7 +492,7 @@
case Constants::ELEMNAME_KEY:
{
- ElemEmpty
nsContext(m_constructionContext, m_stylesheet, name, lineNumber, columnNumber);
+ ElemEmpty
nsContext(m_constructionContext, m_stylesheet, lineNumber, columnNumber);
m_stylesheet.processKeyElement(&nsContext, atts, m_constructionContext);
}
@@ -504,7 +504,6 @@
ElemAttributeSet* attrSet = new
ElemAttributeSet(m_constructionContext,
m_stylesheet,
-
name,
atts,
lineNumber,
columnNumber);
@@ -529,7 +528,6 @@
ElemDecimalFormat* const
edf =
new
ElemDecimalFormat(m_constructionContext,
m_stylesheet,
-
name,
atts,
lineNumber,
columnNumber);
@@ -701,25 +699,25 @@
case Constants::ELEMNAME_APPLY_TEMPLATES:
elem = new
ElemApplyTemplates(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
break;
case Constants::ELEMNAME_CALLTEMPLATE:
elem = new
ElemCallTemplate(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
break;
case Constants::ELEMNAME_WITHPARAM:
elem = new ElemWithParam(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
break;
case Constants::ELEMNAME_FOREACH:
elem = new ElemForEach(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_SORT:
@@ -733,7 +731,7 @@
ElemSort* sortElem = new
ElemSort(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
// Note: deleted in ElemForEach
destructor
foreach->getSortElems().push_back(sortElem);
@@ -747,44 +745,43 @@
case Constants::ELEMNAME_APPLY_IMPORTS:
elem = new
ElemApplyImport(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
break;
case Constants::ELEMNAME_VALUEOF:
elem = new ElemValueOf(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_NUMBER:
elem = new ElemNumber(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_VARIABLE:
elem = new ElemVariable(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_PARAMVARIABLE:
elem = new ElemParam(m_constructionContext,
m_stylesheet,
- name, atts,
lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_IF:
elem = new ElemIf(m_constructionContext,
m_stylesheet,
- name, atts,
lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_FALLBACK:
elem = new ElemFallback(
m_constructionContext,
m_stylesheet,
- name,
atts,
lineNumber,
columnNumber);
@@ -793,7 +790,7 @@
case Constants::ELEMNAME_CHOOSE:
elem = new ElemChoose(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_WHEN:
@@ -809,7 +806,7 @@
{
elem = new
ElemWhen(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
}
else
{
@@ -836,7 +833,7 @@
{
elem = new
ElemOtherwise(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
}
else
{
@@ -853,13 +850,13 @@
case Constants::ELEMNAME_COPY_OF:
elem = new ElemCopyOf(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_COPY:
elem = new ElemCopy(m_constructionContext,
m_stylesheet,
- name, atts,
lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_TEXT:
@@ -867,43 +864,43 @@
// that space should be preserved.
m_elemStack.push_back(new
ElemText(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber));
+
atts, lineNumber, columnNumber));
break;
case Constants::ELEMNAME_USE:
elem = new ElemUse(m_constructionContext,
m_stylesheet,
- name,
lineNumber, columnNumber);
+ lineNumber,
columnNumber);
break;
case Constants::ELEMNAME_ATTRIBUTE:
elem = new ElemAttribute(m_constructionContext,
m_stylesheet,
-
name, atts, lineNumber, columnNumber);
+
atts, lineNumber, columnNumber);
break;
case Constants::ELEMNAME_ELEMENT:
elem = new ElemElement(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_PI:
elem = new ElemPI(m_constructionContext,
m_stylesheet,
- name, atts,
lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_COMMENT:
elem = new ElemComment(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
case Constants::ELEMNAME_MESSAGE:
elem = new ElemMessage(m_constructionContext,
m_stylesheet,
- name,
atts, lineNumber, columnNumber);
+ atts,
lineNumber, columnNumber);
break;
@@ -1147,7 +1144,7 @@
{
m_elemStack.push_back(new
ElemEmpty(m_constructionContext,
m_stylesheet,
- name,
lineNumber, columnNumber));
+
lineNumber, columnNumber));
if (elem != 0)
{
@@ -1211,7 +1208,6 @@
m_pTemplate = new ElemTemplate(m_constructionContext,
m_stylesheet,
-
c_wstr(Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING),
templateAttrs,
lineNumber,
columnNumber);
1.35 +0 -6 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- StylesheetRoot.cpp 2001/01/29 02:30:31 1.34
+++ StylesheetRoot.cpp 2001/02/12 02:34:54 1.35
@@ -524,7 +524,6 @@
m_defaultRule = new ElemTemplate(constructionContext,
*this,
-
c_wstr(Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING),
attrs,
lineNumber,
columnNumber);
@@ -534,7 +533,6 @@
ElemApplyTemplates* childrenElement
= new ElemApplyTemplates(constructionContext,
*this,
-
c_wstr(Constants::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING),
attrs,
lineNumber,
columnNumber);
@@ -551,7 +549,6 @@
m_defaultTextRule = new ElemTemplate(constructionContext,
*this,
-
c_wstr(Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING),
attrs,
lineNumber,
columnNumber);
@@ -564,7 +561,6 @@
ElemValueOf* elemValueOf =
new ElemValueOf(constructionContext,
*this,
-
c_wstr(Constants::ELEMNAME_VALUEOF_WITH_PREFIX_STRING),
attrs,
lineNumber,
columnNumber);
@@ -581,7 +577,6 @@
m_defaultRootRule =
new ElemTemplate(constructionContext,
*this,
-
c_wstr(Constants::ELEMNAME_TEMPLATE_WITH_PREFIX_STRING),
attrs,
lineNumber,
columnNumber);
@@ -591,7 +586,6 @@
childrenElement =
new ElemApplyTemplates(constructionContext,
*this,
-
c_wstr(Constants::ELEMNAME_APPLY_TEMPLATES_WITH_PREFIX_STRING),
attrs,
lineNumber,
columnNumber);
