Make ProcessorState a NameSpaceResolver. Clean up source. Not part of default build. a=leaf.

extensions/transformiix/source/xslt/ProcessorState.cpp

@@ -25,13 +25,13 @@
  *   -- added code in ::resolveFunctionCall to support the
  *      document() function.
  *
- * $Id: ProcessorState.cpp,v 1.5 2000-06-22 07:30:03 Peter.VanderBeken%pandora.be Exp $
+ * $Id: ProcessorState.cpp,v 1.6 2000-08-26 04:28:27 Peter.VanderBeken%pandora.be Exp $
  */
 
 /**
  * Implementation of ProcessorState
  * Much of this code was ported from XSL:P
- * @version $Revision: 1.5 $ $Date: 2000-06-22 07:30:03 $
+ * @version $Revision: 1.6 $ $Date: 2000-08-26 04:28:27 $
 **/
 
 #include "ProcessorState.h"
@@ -178,7 +178,13 @@ MBool ProcessorState::addToResultTree(Node* node) {
             if (current->getNodeType() != Node::ELEMENT_NODE) return MB_FALSE;
             Element* element = (Element*)current;
             Attr* attr = (Attr*)node;
+#ifdef MOZ_XSL
+            String nameSpaceURI;
+            getNameSpaceURI(attr->getName(), nameSpaceURI);
+            element->setAttributeNS(nameSpaceURI, attr->getName(), attr->getValue());
+#else
             element->setAttribute(attr->getName(),attr->getValue());
+#endif
             delete node;
             break;
         }
@@ -289,7 +295,13 @@ Element* ProcessorState::findTemplate(Node* node, Node* context, String* mode) {
             currentPriority = tmpPriority;
         }
     }
-    //cout << "findTemplate:end"<<endl;
+    // cout << "findTemplate:end"<<endl;
+    // if (matchTemplate) {
+    //     String nodeName = node->getNodeName();
+    //     cout << "node " << nodeName;
+    //     String match = matchTemplate->getAttribute(MATCH_ATTR);
+    //     cout << " matched template: " << match << endl;
+    // }
 
     return matchTemplate;
 } //-- findTemplate
@@ -761,97 +773,86 @@ void ProcessorState::initialize() {
 
     //-- determine xsl properties
     Element* element = xslDocument->getDocumentElement();
-    if ( element )
+    if ( element ) {
-        initialize(element);
+	    //-- process namespace nodes
+	    NamedNodeMap* atts = element->getAttributes();
+	    if ( atts ) {
+	        for (int i = 0; i < atts->getLength(); i++) {
+	            Attr* attr = (Attr*)atts->item(i);
+	            String attName = attr->getName();
+	            String attValue = attr->getValue();
+	            if ( attName.indexOf(XMLUtils::XMLNS) == 0) {
+	                String ns;
+	                XMLUtils::getLocalPart(attName, ns);
+	                // default namespace
+	                if ( attName.isEqual(XMLUtils::XMLNS) ) {
+	                    setDefaultNameSpaceURI(attValue);
+	                }
+	                // namespace declaration
+	                else {
+	                    String ns;
+	                    XMLUtils::getLocalPart(attName, ns);
+	                    nameSpaceMap.put(ns, new String(attValue));
+	                }
+	                // check for XSL namespace
+	                if ( attValue.indexOf(XSLT_NS) == 0) {
+	                    xsltNameSpace = ns;
+	                }
+	            }
+	            else if ( attName.isEqual(DEFAULT_SPACE_ATTR) ) {
+	                if ( attValue.isEqual(STRIP_VALUE) ) {
+	                    defaultSpace = STRIP;
+	                }
+	            }
+	            else if ( attName.isEqual(RESULT_NS_ATTR) ) {
+	                if (attValue.length() > 0) {
+	                    if ( attValue.indexOf(HTML_NS) == 0 ) {
+	                        setOutputMethod("html");
+	                    }
+	                    else setOutputMethod(attValue);
+	                }
+	            }
+	            else if ( attName.isEqual(INDENT_RESULT_ATTR) ) {
+	                if ( attValue.length() > 0 ) {
+	                    format.setIndent(attValue.isEqual(YES_VALUE));
+	                }
+	            }
+
+	        } //-- end for each att
+	    } //-- end if atts are not null
+
+	    /* Create default (built-in) templates */
+
+	    //-- create default template for elements
+	    String templateName = xsltNameSpace;
+	    if (templateName.length() > 0) templateName.append(':');
+	    templateName.append(TEMPLATE);
+
+	    String actionName = xsltNameSpace;
+	    if ( actionName.length()>0) actionName.append(':');
+	    actionName.append(APPLY_TEMPLATES);
+
+	    dfWildCardTemplate = xslDocument->createElement(templateName);
+	    dfWildCardTemplate->setAttribute(MATCH_ATTR, "* | /");
+	    dfWildCardTemplate->appendChild(xslDocument->createElement(actionName));
+	    templates.add(dfWildCardTemplate);
+
+	    //-- create default "built-in" templates for text nodes
+	    dfTextTemplate = xslDocument->createElement(templateName);
+	    dfTextTemplate->setAttribute(MATCH_ATTR, "text()|@*");
+	    actionName = xsltNameSpace;
+	    if ( actionName.length()>0) actionName.append(':');
+	    actionName.append(VALUE_OF);
+	    Element* value_of = xslDocument->createElement(actionName);
+	    value_of->setAttribute(SELECT_ATTR, IDENTITY_OP);
+	    dfTextTemplate->appendChild(value_of);
+	    templates.add(dfTextTemplate);
+
+	    //-- add PatternExpr hash for default templates
+	    patternExprHash.put("*",      new WildCardExpr());
+	    patternExprHash.put("/",      new RootExpr());
+	    patternExprHash.put("text()", new TextExpr());
+
+	    //cout << "XSLT namespace: " << xsltNameSpace << endl;
+	}
 }
-
-/**
- * Initializes this ProcessorState (second stage)
-**/
-void ProcessorState::initialize(Element* element) {
-
-    //-- process namespace nodes
-    NamedNodeMap* atts = element->getAttributes();
-    if ( atts ) {
-        for (int i = 0; i < atts->getLength(); i++) {
-            Attr* attr = (Attr*)atts->item(i);
-            String attName = attr->getName();
-            String attValue = attr->getValue();
-            if ( attName.indexOf(XMLUtils::XMLNS) == 0) {
-                String ns;
-                XMLUtils::getLocalPart(attName, ns);
-                // default namespace
-                if ( attName.isEqual(XMLUtils::XMLNS) ) {
-                    setDefaultNameSpaceURI(attValue);
-                }
-                // namespace declaration
-                else {
-                    String ns;
-                    XMLUtils::getNameSpace(attName, ns);
-                    nameSpaceMap.put(ns, new String(attValue));
-                }
-                // check for XSL namespace
-                if ( attValue.indexOf(XSLT_NS) == 0) {
-                    xsltNameSpace = ns;
-                }
-            }
-            else if ( attName.isEqual(DEFAULT_SPACE_ATTR) ) {
-                if ( attValue.isEqual(STRIP_VALUE) ) {
-                    defaultSpace = STRIP;
-                }
-            }
-            else if ( attName.isEqual(RESULT_NS_ATTR) ) {
-                if (attValue.length() > 0) {
-                    if ( attValue.indexOf(HTML_NS) == 0 ) {
-                        setOutputMethod("html");
-                    }
-                    else setOutputMethod(attValue);
-                }
-            }
-            else if ( attName.isEqual(INDENT_RESULT_ATTR) ) {
-                if ( attValue.length() > 0 ) {
-                    format.setIndent(attValue.isEqual(YES_VALUE));
-                }
-            }
-
-        } //-- end for each att
-    } //-- end if atts are not null
-
-    /* Create default (built-in) templates */
-
-    //-- create default template for elements
-
-
-    String templateName = xsltNameSpace;
-    if (templateName.length() > 0) templateName.append(':');
-    templateName.append(TEMPLATE);
-
-    String actionName = xsltNameSpace;
-    if ( actionName.length()>0) actionName.append(':');
-    actionName.append(APPLY_TEMPLATES);
-
-    dfWildCardTemplate = xslDocument->createElement(templateName);
-    dfWildCardTemplate->setAttribute(MATCH_ATTR, "* | /");
-    dfWildCardTemplate->appendChild(xslDocument->createElement(actionName));
-    templates.add(dfWildCardTemplate);
-
-    //-- create default "built-in" templates for text nodes
-    dfTextTemplate = xslDocument->createElement(templateName);
-    dfTextTemplate->setAttribute(MATCH_ATTR, "text()|@*");
-    actionName = xsltNameSpace;
-    if ( actionName.length()>0) actionName.append(':');
-    actionName.append(VALUE_OF);
-    Element* value_of = xslDocument->createElement(actionName);
-    value_of->setAttribute(SELECT_ATTR, IDENTITY_OP);
-    dfTextTemplate->appendChild(value_of);
-    templates.add(dfTextTemplate);
-
-    //-- add PatternExpr hash for default templates
-    patternExprHash.put("*",      new WildCardExpr());
-    patternExprHash.put("/",      new RootExpr());
-    patternExprHash.put("text()", new TextExpr());
-
-    //cout << "XSLT namespace: " << xsltNameSpace << endl;
-} //-- initialize
-
-

extensions/transformiix/source/xslt/ProcessorState.h

@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: ProcessorState.h,v 1.4 2000-06-22 07:30:07 Peter.VanderBeken%pandora.be Exp $
+ * $Id: ProcessorState.h,v 1.5 2000-08-26 04:28:28 Peter.VanderBeken%pandora.be Exp $
  */
 
 
@@ -50,9 +50,10 @@
 /**
  * Class used for keeping the current state of the XSL Processor
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.4 $ $Date: 2000-06-22 07:30:07 $
+ * @version $Revision: 1.5 $ $Date: 2000-08-26 04:28:28 $
 **/
-class ProcessorState : public ContextState
+class ProcessorState : public ContextState,
+                       public NamespaceResolver
 {
 
 public:
@@ -148,11 +149,6 @@ public:
     **/
     Element* getNamedTemplate(String& name);
 
-    /**
-     * Returns the namespace URI for the given name
-    **/ 
-    void getNameSpaceURI(String& name, String& nameSpaceURI);
-
     /**
      * Returns the NodeStack which keeps track of where we are in the
      * result tree
@@ -175,29 +171,29 @@ public:
     Expr*        getExpr(const String& pattern);
     PatternExpr* getPatternExpr(const String& pattern);
 
-     /**
+    /**
-      * Returns a pointer to the result document
+     * Returns a pointer to the result document
-     **/
+    **/
-     Document* getResultDocument();
+    Document* getResultDocument();
 
-     /**
+    /**
-      * Returns a pointer to a list of available templates
+     * Returns a pointer to a list of available templates
-     **/
+    **/
-     NodeSet* getTemplates();
+    NodeSet* getTemplates();
 
     String& getXSLNamespace();
 
-     /**
+    /**
-      * Finds a template for the given Node. Only templates without
+     * Finds a template for the given Node. Only templates without
-      * a mode attribute will be searched.
+     * a mode attribute will be searched.
-     **/
+    **/
-     Element* findTemplate(Node* node, Node* context);
+    Element* findTemplate(Node* node, Node* context);
 
-     /**
+    /**
-      * Finds a template for the given Node. Only templates with
+     * Finds a template for the given Node. Only templates with
-      * a mode attribute equal to the given mode will be searched.
+     * a mode attribute equal to the given mode will be searched.
-     **/
+    **/
-     Element* findTemplate(Node* node, Node* context, String* mode);
+    Element* findTemplate(Node* node, Node* context, String* mode);
 
     /**
      * Determines if the given XSL node allows Whitespace stripping
@@ -231,9 +227,9 @@ public:
     void stripSpace(String& names);
 
 
-     //-------------------------------------/
+    //-------------------------------------/
-     //- Virtual Methods from ContextState -/
+    //- Virtual Methods from ContextState -/
-     //-------------------------------------/
+    //-------------------------------------/
 
     /**
      * Returns the parent of the given Node. This method is needed 
@@ -243,19 +239,19 @@ public:
     **/
     virtual Node* getParentNode(Node* node);
 
-     /**
+    /**
-      * Returns the value of a given variable binding within the current scope
+     * Returns the value of a given variable binding within the current scope
-      * @param the name to which the desired variable value has been bound
+     * @param the name to which the desired variable value has been bound
-      * @return the ExprResult which has been bound to the variable with
+     * @return the ExprResult which has been bound to the variable with
-      *  the given name
+     *  the given name
-     **/
+    **/
-     virtual ExprResult* getVariable(String& name);
+    virtual ExprResult* getVariable(String& name);
 
     /**
      * Returns the Stack of context NodeSets
      * @return the Stack of context NodeSets
     **/
-     virtual Stack* getNodeSetStack();
+    virtual Stack* getNodeSetStack();
 
     /**
      * Determines if the given XML node allows Whitespace stripping
@@ -288,6 +284,15 @@ public:
     **/
     virtual void sortByDocumentOrder(NodeSet* nodes);
 
+    //------------------------------------------/
+    //- Virtual Methods from NamespaceResolver -/
+    //------------------------------------------/
+
+    /**
+     * Returns the namespace URI for the given name
+    **/ 
+    void getNameSpaceURI(String& name, String& nameSpaceURI);
+
 private:
 
     enum XMLSpaceMode {STRIP = 0, DEFAULT, PRESERVE};
@@ -379,10 +384,6 @@ private:
     **/
     void initialize();
 
-public:
-
-    void initialize(Element* element);
-
 }; //-- ProcessorState