auriemma 00/11/09 12:38:15
Modified: c/src/XSLT ElemNumber.cpp ElemNumber.hpp
Log:
Explicit initialization of static strings.
Revision Changes Path
1.29 +62 -7 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ElemNumber.cpp 2000/11/02 01:46:24 1.28
+++ ElemNumber.cpp 2000/11/09 20:38:15 1.29
@@ -330,31 +330,31 @@
case XalanNode::ATTRIBUTE_NODE:
countMatchPattern = executionContext.createMatchPattern(
-
XalanDOMString(XALAN_STATIC_UCODE_STRING("@")) + contextNode->getNodeName(),
+ s_atString +
contextNode->getNodeName(),
*this);
break;
case XalanNode::CDATA_SECTION_NODE:
case XalanNode::TEXT_NODE:
countMatchPattern = executionContext.createMatchPattern(
-
XalanDOMString(XALAN_STATIC_UCODE_STRING("text()")), *this);
+ s_textString, *this);
break;
case XalanNode::COMMENT_NODE:
countMatchPattern = executionContext.createMatchPattern(
-
XalanDOMString(XALAN_STATIC_UCODE_STRING("comment()")), *this);
+ s_commentString, *this);
break;
case XalanNode::DOCUMENT_NODE:
countMatchPattern = executionContext.createMatchPattern(
-
XalanDOMString(XALAN_STATIC_UCODE_STRING("/")), *this);
+ s_slashString, *this);
break;
case XalanNode::PROCESSING_INSTRUCTION_NODE:
countMatchPattern = executionContext.createMatchPattern(
-
XalanDOMString(XALAN_STATIC_UCODE_STRING("pi(")) +
+ s_piString +
contextNode->getNodeName() +
- XalanDOMString(XALAN_STATIC_UCODE_STRING(")")),
*this);
+ s_leftParenString, *this);
break;
default:
@@ -1556,8 +1556,22 @@
0
};
+static XalanDOMString
s_atString;
+static XalanDOMString
s_textString;
+static XalanDOMString
s_commentString;
+
+static XalanDOMString
s_slashString;
+
+static XalanDOMString
s_piString;
+
+static XalanDOMString
s_leftParenString;
+
+static XalanDOMString
s_dotString;
+
+static XalanDOMString
s_oneString;
+
static XalanDOMString
s_elalphaCountTable;
static XalanDOMString
s_alphaCountTable;
@@ -1566,6 +1580,22 @@
static ElemNumber::NumberingResourceBundleMapType s_resourceBundles;
+const XalanDOMString& ElemNumber::s_atString = ::s_atString;
+
+const XalanDOMString& ElemNumber::s_textString = ::s_textString;
+
+const XalanDOMString& ElemNumber::s_commentString = ::s_commentString;
+
+const XalanDOMString& ElemNumber::s_slashString = ::s_slashString;
+
+const XalanDOMString& ElemNumber::s_piString = ::s_piString;
+
+const XalanDOMString& ElemNumber::s_leftParenString =
::s_leftParenString;
+
+const XalanDOMString& ElemNumber::s_dotString = ::s_dotString;
+
+const XalanDOMString& ElemNumber::s_oneString = ::s_oneString;
+
const XalanDOMString& ElemNumber::s_elalphaCountTable =
::s_elalphaCountTable;
const XalanDOMString& ElemNumber::s_alphaCountTable =
::s_alphaCountTable;
@@ -1579,6 +1609,22 @@
void
ElemNumber::initialize()
{
+ ::s_atString = XALAN_STATIC_UCODE_STRING("@");
+
+ ::s_textString = XALAN_STATIC_UCODE_STRING("text()");
+
+ ::s_commentString = XALAN_STATIC_UCODE_STRING("comment()");
+
+ ::s_slashString = XALAN_STATIC_UCODE_STRING("/");
+
+ ::s_piString = XALAN_STATIC_UCODE_STRING("pi(");
+
+ ::s_leftParenString = XALAN_STATIC_UCODE_STRING(")");
+
+ ::s_dotString = XALAN_STATIC_UCODE_STRING(".");
+
+ ::s_oneString = XALAN_STATIC_UCODE_STRING("1");
+
::s_alphaCountTable = alphaCountTable;
::s_elalphaCountTable = elalphaCountTable;
@@ -1640,8 +1686,17 @@
void
ElemNumber::terminate()
{
+ clear(::s_atString);
+ clear(::s_textString);
+ clear(::s_commentString);
+ clear(::s_slashString);
+ clear(::s_piString);
+ clear(::s_leftParenString);
+ clear(::s_dotString);
+ clear(::s_oneString);
+
clear(::s_alphaCountTable);
- clear(::s_elalphaCountTable);;
+ clear(::s_elalphaCountTable);
DecimalToRomanVectorType().swap(::s_romanConvertTable);
1.21 +41 -1 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ElemNumber.hpp 2000/11/02 01:46:24 1.20
+++ ElemNumber.hpp 2000/11/09 20:38:15 1.21
@@ -58,7 +58,7 @@
#define XALAN_ELEMNUMBER_HEADER_GUARD
/**
- * $Id: ElemNumber.hpp,v 1.20 2000/11/02 01:46:24 dbertoni Exp $
+ * $Id: ElemNumber.hpp,v 1.21 2000/11/09 20:38:15 auriemma Exp $
*
* $State: Exp $
*
@@ -364,6 +364,46 @@
const AVT* m_lettervalue_avt;
const AVT* m_groupingSeparator_avt;
const AVT* m_groupingSize_avt;
+
+ /**
+ * The string "@".
+ */
+ static const XalanDOMString& s_atString;
+
+ /**
+ * The string "text()".
+ */
+ static const XalanDOMString& s_textString;
+
+ /**
+ * The string "comment()".
+ */
+ static const XalanDOMString& s_commentString;
+
+ /**
+ * The string "/".
+ */
+ static const XalanDOMString& s_slashString;
+
+ /**
+ * The string "pi(".
+ */
+ static const XalanDOMString& s_piString;
+
+ /**
+ * The string ")".
+ */
+ static const XalanDOMString& s_leftParenString;
+
+ /**
+ * The string ".".
+ */
+ static const XalanDOMString& s_dotString;
+
+ /**
+ * The string "1".
+ */
+ static const XalanDOMString& s_oneString;
/**
* Chars for converting integers into alpha counts.
