Backout to fix bustage.

extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp

@@ -2624,13 +2624,9 @@ txFnEndUnknownInstruction(txStylesheetCompilerState& aState)
  * Table Datas
  */
 
-struct txHandlerTableData {
-    const txElementHandler mOtherHandler;
-    const txElementHandler mLREHandler;
-    const HandleTextFn mTextHandler;
-};
-
-const txHandlerTableData gTxIgnoreTableData = {
+txHandlerTableData gTxIgnoreTableData = {
+  // Handlers
+  { { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementIgnore, txFnEndElementIgnore },
   // LRE
@@ -2639,12 +2635,11 @@ const txHandlerTableData gTxIgnoreTableData = {
   txFnTextIgnore
 };
 
-const txElementHandler gTxRootElementHandlers[] = {
-  { kNameSpaceID_XSLT, "stylesheet", txFnStartStylesheet, txFnEndStylesheet },
-  { kNameSpaceID_XSLT, "transform", txFnStartStylesheet, txFnEndStylesheet }
-};
-
-const txHandlerTableData gTxRootTableData = {
+txHandlerTableData gTxRootTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "stylesheet", txFnStartStylesheet, txFnEndStylesheet },
+    { kNameSpaceID_XSLT, "transform", txFnStartStylesheet, txFnEndStylesheet },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementError, txFnEndElementError },
   // LRE
@@ -2653,7 +2648,9 @@ const txHandlerTableData gTxRootTableData = {
   txFnTextError
 };
 
-const txHandlerTableData gTxEmbedTableData = {
+txHandlerTableData gTxEmbedTableData = {
+  // Handlers
+  { { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartEmbed, txFnEndEmbed },
   // LRE
@@ -2662,20 +2659,19 @@ const txHandlerTableData gTxEmbedTableData = {
   txFnTextIgnore
 };
 
-const txElementHandler gTxTopElementHandlers[] = {
-  { kNameSpaceID_XSLT, "attribute-set", txFnStartAttributeSet, txFnEndAttributeSet },
-  { kNameSpaceID_XSLT, "decimal-format", txFnStartDecimalFormat, txFnEndDecimalFormat },
-  { kNameSpaceID_XSLT, "include", txFnStartInclude, txFnEndInclude },
-  { kNameSpaceID_XSLT, "key", txFnStartKey, txFnEndKey },
-  { kNameSpaceID_XSLT, "output", txFnStartOutput, txFnEndOutput },
-  { kNameSpaceID_XSLT, "param", txFnStartTopVariable, txFnEndTopVariable },
-  { kNameSpaceID_XSLT, "preserve-space", txFnStartStripSpace, txFnEndStripSpace },
-  { kNameSpaceID_XSLT, "strip-space", txFnStartStripSpace, txFnEndStripSpace },
-  { kNameSpaceID_XSLT, "template", txFnStartTemplate, txFnEndTemplate },
-  { kNameSpaceID_XSLT, "variable", txFnStartTopVariable, txFnEndTopVariable }
-};
-
-const txHandlerTableData gTxTopTableData = {
+txHandlerTableData gTxTopTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "attribute-set", txFnStartAttributeSet, txFnEndAttributeSet },
+    { kNameSpaceID_XSLT, "decimal-format", txFnStartDecimalFormat, txFnEndDecimalFormat },
+    { kNameSpaceID_XSLT, "include", txFnStartInclude, txFnEndInclude },
+    { kNameSpaceID_XSLT, "key", txFnStartKey, txFnEndKey },
+    { kNameSpaceID_XSLT, "output", txFnStartOutput, txFnEndOutput },
+    { kNameSpaceID_XSLT, "param", txFnStartTopVariable, txFnEndTopVariable },
+    { kNameSpaceID_XSLT, "preserve-space", txFnStartStripSpace, txFnEndStripSpace },
+    { kNameSpaceID_XSLT, "strip-space", txFnStartStripSpace, txFnEndStripSpace },
+    { kNameSpaceID_XSLT, "template", txFnStartTemplate, txFnEndTemplate },
+    { kNameSpaceID_XSLT, "variable", txFnStartTopVariable, txFnEndTopVariable },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartOtherTop, txFnEndOtherTop },
   // LRE
@@ -2684,28 +2680,27 @@ const txHandlerTableData gTxTopTableData = {
   txFnTextIgnore
 };
 
-const txElementHandler gTxTemplateElementHandlers[] = {
-  { kNameSpaceID_XSLT, "apply-imports", txFnStartApplyImports, txFnEndApplyImports },
-  { kNameSpaceID_XSLT, "apply-templates", txFnStartApplyTemplates, txFnEndApplyTemplates },
-  { kNameSpaceID_XSLT, "attribute", txFnStartAttribute, txFnEndAttribute },
-  { kNameSpaceID_XSLT, "call-template", txFnStartCallTemplate, txFnEndCallTemplate },
-  { kNameSpaceID_XSLT, "choose", txFnStartChoose, txFnEndChoose },
-  { kNameSpaceID_XSLT, "comment", txFnStartComment, txFnEndComment },
-  { kNameSpaceID_XSLT, "copy", txFnStartCopy, txFnEndCopy },
-  { kNameSpaceID_XSLT, "copy-of", txFnStartCopyOf, txFnEndCopyOf },
-  { kNameSpaceID_XSLT, "element", txFnStartElement, txFnEndElement },
-  { kNameSpaceID_XSLT, "fallback", txFnStartElementSetIgnore, txFnEndElementSetIgnore },
-  { kNameSpaceID_XSLT, "for-each", txFnStartForEach, txFnEndForEach },
-  { kNameSpaceID_XSLT, "if", txFnStartIf, txFnEndIf },
-  { kNameSpaceID_XSLT, "message", txFnStartMessage, txFnEndMessage },
-  { kNameSpaceID_XSLT, "number", txFnStartNumber, txFnEndNumber },
-  { kNameSpaceID_XSLT, "processing-instruction", txFnStartPI, txFnEndPI },
-  { kNameSpaceID_XSLT, "text", txFnStartText, txFnEndText },
-  { kNameSpaceID_XSLT, "value-of", txFnStartValueOf, txFnEndValueOf },
-  { kNameSpaceID_XSLT, "variable", txFnStartVariable, txFnEndVariable }
-};
-
-const txHandlerTableData gTxTemplateTableData = {
+txHandlerTableData gTxTemplateTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "apply-imports", txFnStartApplyImports, txFnEndApplyImports },
+    { kNameSpaceID_XSLT, "apply-templates", txFnStartApplyTemplates, txFnEndApplyTemplates },
+    { kNameSpaceID_XSLT, "attribute", txFnStartAttribute, txFnEndAttribute },
+    { kNameSpaceID_XSLT, "call-template", txFnStartCallTemplate, txFnEndCallTemplate },
+    { kNameSpaceID_XSLT, "choose", txFnStartChoose, txFnEndChoose },
+    { kNameSpaceID_XSLT, "comment", txFnStartComment, txFnEndComment },
+    { kNameSpaceID_XSLT, "copy", txFnStartCopy, txFnEndCopy },
+    { kNameSpaceID_XSLT, "copy-of", txFnStartCopyOf, txFnEndCopyOf },
+    { kNameSpaceID_XSLT, "element", txFnStartElement, txFnEndElement },
+    { kNameSpaceID_XSLT, "fallback", txFnStartElementSetIgnore, txFnEndElementSetIgnore },
+    { kNameSpaceID_XSLT, "for-each", txFnStartForEach, txFnEndForEach },
+    { kNameSpaceID_XSLT, "if", txFnStartIf, txFnEndIf },
+    { kNameSpaceID_XSLT, "message", txFnStartMessage, txFnEndMessage },
+    { kNameSpaceID_XSLT, "number", txFnStartNumber, txFnEndNumber },
+    { kNameSpaceID_XSLT, "processing-instruction", txFnStartPI, txFnEndPI },
+    { kNameSpaceID_XSLT, "text", txFnStartText, txFnEndText },
+    { kNameSpaceID_XSLT, "value-of", txFnStartValueOf, txFnEndValueOf },
+    { kNameSpaceID_XSLT, "variable", txFnStartVariable, txFnEndVariable },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartUnknownInstruction, txFnEndUnknownInstruction },
   // LRE
@@ -2714,7 +2709,9 @@ const txHandlerTableData gTxTemplateTableData = {
   txFnText
 };
 
-const txHandlerTableData gTxTextTableData = {
+txHandlerTableData gTxTextTableData = {
+  // Handlers
+  { { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementError, txFnEndElementError },
   // LRE
@@ -2723,12 +2720,11 @@ const txHandlerTableData gTxTextTableData = {
   txFnTextText
 };
 
-const txElementHandler gTxApplyTemplatesElementHandlers[] = {
-  { kNameSpaceID_XSLT, "sort", txFnStartSort, txFnEndSort },
-  { kNameSpaceID_XSLT, "with-param", txFnStartWithParam, txFnEndWithParam }
-};
-
-const txHandlerTableData gTxApplyTemplatesTableData = {
+txHandlerTableData gTxApplyTemplatesTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "sort", txFnStartSort, txFnEndSort },
+    { kNameSpaceID_XSLT, "with-param", txFnStartWithParam, txFnEndWithParam },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementSetIgnore, txFnEndElementSetIgnore }, // should this be error?
   // LRE
@@ -2737,11 +2733,10 @@ const txHandlerTableData gTxApplyTemplatesTableData = {
   txFnTextIgnore
 };
 
-const txElementHandler gTxCallTemplateElementHandlers[] = {
-  { kNameSpaceID_XSLT, "with-param", txFnStartWithParam, txFnEndWithParam }
-};
-
-const txHandlerTableData gTxCallTemplateTableData = {
+txHandlerTableData gTxCallTemplateTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "with-param", txFnStartWithParam, txFnEndWithParam },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementSetIgnore, txFnEndElementSetIgnore }, // should this be error?
   // LRE
@@ -2750,7 +2745,9 @@ const txHandlerTableData gTxCallTemplateTableData = {
   txFnTextIgnore
 };
 
-const txHandlerTableData gTxVariableTableData = {
+txHandlerTableData gTxVariableTableData = {
+  // Handlers
+  { { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementStartRTF, 0 },
   // LRE
@@ -2759,11 +2756,10 @@ const txHandlerTableData gTxVariableTableData = {
   txFnTextStartRTF
 };
 
-const txElementHandler gTxForEachElementHandlers[] = {
-  { kNameSpaceID_XSLT, "sort", txFnStartSort, txFnEndSort }
-};
-
-const txHandlerTableData gTxForEachTableData = {
+txHandlerTableData gTxForEachTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "sort", txFnStartSort, txFnEndSort },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementContinueTemplate, 0 },
   // LRE
@@ -2772,7 +2768,9 @@ const txHandlerTableData gTxForEachTableData = {
   txFnTextContinueTemplate
 };
 
-const txHandlerTableData gTxTopVariableTableData = {
+txHandlerTableData gTxTopVariableTableData = {
+  // Handlers
+  { { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementStartTopVar, 0 },
   // LRE
@@ -2781,12 +2779,11 @@ const txHandlerTableData gTxTopVariableTableData = {
   txFnTextStartTopVar
 };
 
-const txElementHandler gTxChooseElementHandlers[] = {
-  { kNameSpaceID_XSLT, "otherwise", txFnStartOtherwise, txFnEndOtherwise },
-  { kNameSpaceID_XSLT, "when", txFnStartWhen, txFnEndWhen }
-};
-
-const txHandlerTableData gTxChooseTableData = {
+txHandlerTableData gTxChooseTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "otherwise", txFnStartOtherwise, txFnEndOtherwise },
+    { kNameSpaceID_XSLT, "when", txFnStartWhen, txFnEndWhen },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementError, 0 },
   // LRE
@@ -2795,11 +2792,10 @@ const txHandlerTableData gTxChooseTableData = {
   txFnTextError
 };
 
-const txElementHandler gTxParamElementHandlers[] = {
-  { kNameSpaceID_XSLT, "param", txFnStartParam, txFnEndParam }
-};
-
-const txHandlerTableData gTxParamTableData = {
+txHandlerTableData gTxParamTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "param", txFnStartParam, txFnEndParam },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementContinueTemplate, 0 },
   // LRE
@@ -2808,11 +2804,10 @@ const txHandlerTableData gTxParamTableData = {
   txFnTextContinueTemplate
 };
 
-const txElementHandler gTxImportElementHandlers[] = {
-  { kNameSpaceID_XSLT, "import", txFnStartImport, txFnEndImport }
-};
-
-const txHandlerTableData gTxImportTableData = {
+txHandlerTableData gTxImportTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "import", txFnStartImport, txFnEndImport },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementContinueTopLevel, 0 },
   // LRE
@@ -2821,11 +2816,10 @@ const txHandlerTableData gTxImportTableData = {
   txFnTextIgnore  // XXX what should we do here?
 };
 
-const txElementHandler gTxAttributeSetElementHandlers[] = {
-  { kNameSpaceID_XSLT, "attribute", txFnStartAttribute, txFnEndAttribute }
-};
-
-const txHandlerTableData gTxAttributeSetTableData = {
+txHandlerTableData gTxAttributeSetTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "attribute", txFnStartAttribute, txFnEndAttribute },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementError, 0 },
   // LRE
@@ -2834,11 +2828,10 @@ const txHandlerTableData gTxAttributeSetTableData = {
   txFnTextError
 };
 
-const txElementHandler gTxFallbackElementHandlers[] = {
-  { kNameSpaceID_XSLT, "fallback", txFnStartFallback, txFnEndFallback }
-};
-
-const txHandlerTableData gTxFallbackTableData = {
+txHandlerTableData gTxFallbackTableData = {
+  // Handlers
+  { { kNameSpaceID_XSLT, "fallback", txFnStartFallback, txFnEndFallback },
+    { 0, 0, 0, 0 } },
   // Other
   { 0, 0, txFnStartElementSetIgnore, txFnEndElementSetIgnore },
   // LRE
@@ -2852,65 +2845,55 @@ const txHandlerTableData gTxFallbackTableData = {
 /**
  * txHandlerTable
  */
-txHandlerTable::txHandlerTable(const HandleTextFn aTextHandler,
-                               const txElementHandler* aLREHandler,
-                               const txElementHandler* aOtherHandler)
-  : mTextHandler(aTextHandler),
-    mLREHandler(aLREHandler),
-    mOtherHandler(aOtherHandler),
-    mHandlers(PR_FALSE)
+txHandlerTable::txHandlerTable() : mHandlers(MB_FALSE)
 {
 }
 
 nsresult
-txHandlerTable::init(const txElementHandler* aHandlers, PRUint32 aCount)
+txHandlerTable::init(txHandlerTableData* aTableData)
 {
     nsresult rv = NS_OK;
 
-    PRUint32 i;
-    for (i = 0; i < aCount; ++i) {
-        nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(aHandlers->mLocalName);
-        txExpandedName name(aHandlers->mNamespaceID, nameAtom);
+    mTextHandler = aTableData->mTextHandler;
+    mLREHandler = &aTableData->mLREHandler;
+    mOtherHandler = &aTableData->mOtherHandler;
+
+    txElementHandler* handler = aTableData->mHandlers;
+    while (handler->mLocalName) {
+        nsCOMPtr<nsIAtom> nameAtom = do_GetAtom(handler->mLocalName);
+        txExpandedName name(handler->mNamespaceID, nameAtom);
         // XXX this cast is a reinterpret_cast, which is sad
-        rv = mHandlers.add(name, (TxObject*)aHandlers);
+        rv = mHandlers.add(name, (TxObject*)handler);
         NS_ENSURE_SUCCESS(rv, rv);
 
-        ++aHandlers;
+        handler++;
     }
     return NS_OK;
 }
 
-const txElementHandler*
+txElementHandler*
 txHandlerTable::find(PRInt32 aNamespaceID, nsIAtom* aLocalName)
 {
     txExpandedName name(aNamespaceID, aLocalName);
     // XXX this cast is a reinterpret_cast, same sad story as in ::init
-    const txElementHandler* handler =
-        (const txElementHandler*)mHandlers.get(name);
+    txElementHandler* handler = (txElementHandler*)mHandlers.get(name);
     if (!handler) {
         handler = mOtherHandler;
     }
     return handler;
 }
 
-#define INIT_HANDLER(_name)                                          \
-    gTx##_name##Handler =                                            \
-        new txHandlerTable(gTx##_name##TableData.mTextHandler,       \
-                           &gTx##_name##TableData.mLREHandler,       \
-                           &gTx##_name##TableData.mOtherHandler);    \
-    if (!gTx##_name##Handler)                                        \
-        return PR_FALSE
+#define INIT_HANDLER(_name)                                 \
+    gTx##_name##Handler = new txHandlerTable();             \
+    if (!gTx##_name##Handler)                               \
+        return MB_FALSE;                                    \
+                                                            \
+    rv = gTx##_name##Handler->init(&gTx##_name##TableData); \
+    if (NS_FAILED(rv))                                      \
+        return MB_FALSE
 
-#define INIT_HANDLER_WITH_ELEMENT_HANDLERS(_name)                    \
-    INIT_HANDLER(_name);                                             \
-                                                                     \
-    rv = gTx##_name##Handler->init(gTx##_name##ElementHandlers,      \
-                                   NS_ARRAY_LENGTH(gTx##_name##ElementHandlers)); \
-    if (NS_FAILED(rv))                                               \
-        return PR_FALSE
-
-#define SHUTDOWN_HANDLER(_name)                                      \
-    delete gTx##_name##Handler;                                      \
+#define SHUTDOWN_HANDLER(_name)                             \
+    delete gTx##_name##Handler;                             \
     gTx##_name##Handler = nsnull
 
 // static
@@ -2919,22 +2902,22 @@ txHandlerTable::init()
 {
     nsresult rv = NS_OK;
 
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(Root);
+    INIT_HANDLER(Root);
     INIT_HANDLER(Embed);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(Top);
+    INIT_HANDLER(Top);
     INIT_HANDLER(Ignore);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(Template);
+    INIT_HANDLER(Template);
     INIT_HANDLER(Text);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(ApplyTemplates);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(CallTemplate);
+    INIT_HANDLER(ApplyTemplates);
+    INIT_HANDLER(CallTemplate);
     INIT_HANDLER(Variable);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(ForEach);
+    INIT_HANDLER(ForEach);
     INIT_HANDLER(TopVariable);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(Choose);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(Param);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(Import);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(AttributeSet);
-    INIT_HANDLER_WITH_ELEMENT_HANDLERS(Fallback);
+    INIT_HANDLER(Choose);
+    INIT_HANDLER(Param);
+    INIT_HANDLER(Import);
+    INIT_HANDLER(AttributeSet);
+    INIT_HANDLER(Fallback);
 
     return MB_TRUE;
 }

extensions/transformiix/source/xslt/txStylesheetCompileHandlers.h

@@ -57,29 +57,34 @@ typedef nsresult (*HandleTextFn)  (const nsAString& aStr,
                                    txStylesheetCompilerState& aState);
 
 struct txElementHandler {
-    const PRInt32 mNamespaceID;
-    const char* const mLocalName;
-    const HandleStartFn mStartFunction;
-    const HandleEndFn mEndFunction;
+    PRInt32 mNamespaceID;
+    char* mLocalName;
+    HandleStartFn mStartFunction;
+    HandleEndFn mEndFunction;
+};
+
+struct txHandlerTableData {
+    txElementHandler mHandlers[20]; // XXX find a better solution for this
+    txElementHandler mOtherHandler;
+    txElementHandler mLREHandler;
+    HandleTextFn mTextHandler;
 };
 
 class txHandlerTable
 {
 public:
-    txHandlerTable(const HandleTextFn aTextHandler,
-                   const txElementHandler* aLREHandler,
-                   const txElementHandler* aOtherHandler);
-    nsresult init(const txElementHandler* aHandlers, PRUint32 aCount);
-    const txElementHandler* find(PRInt32 aNamespaceID, nsIAtom* aLocalName);
+    txHandlerTable();
+    nsresult init(txHandlerTableData* aTableData);
+    txElementHandler* find(PRInt32 aNamespaceID, nsIAtom* aLocalName);
     
-    const HandleTextFn mTextHandler;
-    const txElementHandler* const mLREHandler;
+    HandleTextFn mTextHandler;
+    txElementHandler* mLREHandler;
 
     static MBool init();
     static void shutdown();
 
 private:
-    const txElementHandler* const mOtherHandler;
+    txElementHandler* mOtherHandler;
     txExpandedNameMap mHandlers;
 };
 

extensions/transformiix/source/xslt/txStylesheetCompiler.cpp

@@ -328,7 +328,7 @@ txStylesheetCompiler::startElementInternal(PRInt32 aNamespaceID,
             mEmbedStatus = eInEmbed;
         }
     }
-    const txElementHandler* handler;
+    txElementHandler* handler;
     do {
         handler = isInstruction ?
                   mHandlerTable->find(aNamespaceID, aLocalName) :
@@ -340,7 +340,7 @@ txStylesheetCompiler::startElementInternal(PRInt32 aNamespaceID,
 
     NS_ENSURE_SUCCESS(rv, rv);
 
-    rv = pushPtr(NS_CONST_CAST(txElementHandler*, handler));
+    rv = pushPtr(handler);
     NS_ENSURE_SUCCESS(rv, rv);
 
     mElementContext->mDepth++;
@@ -374,8 +374,7 @@ txStylesheetCompiler::endElement()
         }
     }
 
-    const txElementHandler* handler =
-        NS_STATIC_CAST(const txElementHandler*, popPtr());
+    txElementHandler* handler = NS_STATIC_CAST(txElementHandler*, popPtr());
     rv = (handler->mEndFunction)(*this);
     NS_ENSURE_SUCCESS(rv, rv);