writerfilter: Kill TokenToIdsMap's, and use switches instead.

This seems to save another nearly 300k; and I guess the compiler will optimize
it better than using the unordered_map.

Change-Id: I5df5cd2afe3f4bedad69e1e3477211842c40a90c

writerfilter/source/ooxml/OOXMLFactory.cxx

@@ -72,14 +72,6 @@ CreateElementMapPointer OOXMLFactory_ns::getCreateElementMap(Id nId)
     return m_CreateElementsMap[nId];
 }
 
-TokenToIdMapPointer OOXMLFactory_ns::getTokenToIdMap(Id nId)
-{
-    if (m_TokenToIdsMap.find(nId) == m_TokenToIdsMap.end())
-        m_TokenToIdsMap[nId] = createTokenToIdMap(nId);
-
-    return m_TokenToIdsMap[nId];
-}
-
 #ifdef DEBUG_DOMAINMAPPER
 std::string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
 {
@@ -120,7 +112,6 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler,
 
     if (pFactory.get() != NULL)
     {
-        TokenToIdMapPointer pTokenToIdMap = pFactory->getTokenToIdMap(nDefine);
         AttributeToResourceMapPointer pMap = pFactory->getAttributeToResourceMap(nDefine);
 
         AttributeToResourceMap::const_iterator aIt;
@@ -135,7 +126,7 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * pHandler,
             sal_Int32 nToken = aIt->first;
             if (pAttribs->hasAttribute(nToken))
             {
-                Id nId = (*pTokenToIdMap)[nToken];
+                Id nId = pFactory->getResourceId(nDefine, nToken);
 
                 switch (aIt->second.m_nResource)
                 {

writerfilter/source/ooxml/OOXMLFactory.hxx

@@ -85,10 +85,6 @@ typedef boost::unordered_map<Id, CreateElementMapPointer> CreateElementsMap;
 typedef boost::unordered_map<Id, std::string> IdToStringMap;
 typedef boost::shared_ptr<IdToStringMap> IdToStringMapPointer;
 
-typedef boost::unordered_map<Id, Token_t> TokenToIdMap;
-typedef boost::shared_ptr<TokenToIdMap> TokenToIdMapPointer;
-typedef boost::unordered_map<Id, TokenToIdMapPointer> TokenToIdsMap;
-
 class OOXMLFactory_ns {
 public:
     typedef boost::shared_ptr<OOXMLFactory_ns> Pointer_t;
@@ -103,21 +99,19 @@ public:
 
     AttributeToResourceMapPointer getAttributeToResourceMap(Id nId);
     CreateElementMapPointer getCreateElementMap(Id nId);
-    TokenToIdMapPointer getTokenToIdMap(Id nId);
 
 protected:
     virtual ~OOXMLFactory_ns();
 
     AttributesMap m_AttributesMap;
     CreateElementsMap m_CreateElementsMap;
-    TokenToIdsMap m_TokenToIdsMap;
 
     virtual AttributeToResourceMapPointer createAttributeToResourceMap(Id nId) = 0;
     virtual CreateElementMapPointer createCreateElementMap(Id nId) = 0;
-    virtual TokenToIdMapPointer createTokenToIdMap(Id nId) = 0;
 
 public:
     virtual bool getListValue(Id nId, const OUString& rValue, sal_uInt32& rOutValue) = 0;
+    virtual Id getResourceId(Id nDefine, sal_Int32 nToken) = 0;
 };
 
 class OOXMLFactory

writerfilter/source/ooxml/factory_ns.py

@@ -36,9 +36,9 @@ public:
     static Pointer_t getInstance();
 
     virtual AttributeToResourceMapPointer createAttributeToResourceMap(Id nId);
-    virtual bool getListValue(Id nId, const OUString& rValue, sal_uInt32& rOutValue);
     virtual CreateElementMapPointer createCreateElementMap(Id nId);
-    virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
+    virtual bool getListValue(Id nId, const OUString& rValue, sal_uInt32& rOutValue);
+    virtual Id getResourceId(Id nDefine, sal_Int32 nToken);
 #ifdef DEBUG_DOMAINMAPPER
     virtual string getDefineName(Id nId) const;
 #endif

writerfilter/source/ooxml/factoryimpl.py

@@ -30,11 +30,10 @@ def createFastChildContextFromFactory(model):
     if (pFactory.get() != NULL)
     {
         CreateElementMapPointer pMap = pFactory->getCreateElementMap(nDefine);
-        TokenToIdMapPointer pTokenMap = pFactory->getTokenToIdMap(nDefine);
 
         if (pMap.get() != NULL)
         {
-            Id nId = (*pTokenMap)[Element];
+            Id nId = pFactory->getResourceId(nDefine, Element);
             CreateElement aCreateElement = (*pMap)[Element];
 
             switch (aCreateElement.m_nResource)

writerfilter/source/ooxml/factoryimpl_ns.py

@@ -532,64 +532,72 @@ string OOXMLFactory_%s::getDefineName(Id nId) const
 """)
 
 
-# factoryTokenToIdMap
+# factoryGetResourceId
 
 
-def factoryTokenToIdMapInner(nsNode, defineNode):
-    ret = []
+def collectTokenToId(nsNode, defineNode):
+    ret = {}
     for refNode in defineNode.getElementsByTagName("ref"):
         refName = refNode.getAttribute("name")
         parent = refNode.parentNode
         if parent.localName in ("element", "attribute"):
             continue
-        refblock1 = []
+        refblock1 = {}
         for define in [i for i in getChildrenByName(getChildByName(nsNode, "grammar"), "define") if i.getAttribute("name") == refName]:
-            refblock1.extend(factoryTokenToIdMapInner(nsNode, define))
+            refblock1.update(collectTokenToId(nsNode, define))
         if not len(refblock1):
             for namespaceNode in getChildrenByName(nsNode.parentNode, "namespace"):
                 for define in [i for i in getChildrenByName(getChildByName(namespaceNode, "grammar"), "define") if i.getAttribute("name") == refName]:
-                    ret.extend(factoryTokenToIdMapInner(namespaceNode, define))
+                    ret.update(collectTokenToId(namespaceNode, define))
         else:
-            ret.extend(refblock1)
+            ret.update(refblock1)
 
-    body = []
     defineName = defineNode.getAttribute("name")
     for resourceNode in [i for i in getChildrenByName(nsNode, "resource") if i.getAttribute("name") == defineName]:
         for node in [i for i in resourceNode.childNodes if i.localName in ("element", "attribute")]:
             if node.hasAttribute("tokenid"):
-                body.append("(*pMap)[%s] = %s;" % (fastToken(node), idToLabel(node.getAttribute("tokenid"))))
-    if len(body):
-        ret.append("// %s" % defineName)
-        ret.extend(body)
+                ret[fastToken(node)] = idToLabel(node.getAttribute("tokenid"))
 
     return ret
 
+def factoryTokenToIdMapInner(nsNode, defineNode):
+    ids = collectTokenToId(nsNode, defineNode)
+    ret = []
+    for i in ids.keys():
+        ret.append("        case %s: return %s;" % (i, ids[i]))
+
+    return ret
 
-def factoryTokenToIdMap(nsNode):
-    print("""TokenToIdMapPointer OOXMLFactory_%s::createTokenToIdMap(Id nId)
+def factoryGetResourceId(nsNode):
+    print("""Id OOXMLFactory_%s::getResourceId(Id nDefine, sal_Int32 nToken)
 {
-    TokenToIdMapPointer pMap(new TokenToIdMap());
+    (void) nDefine;
+    (void) nToken;
 
-    switch (nId)
+    switch (nDefine)
     {""" % nsToLabel(nsNode))
     for defineNode in getChildrenByName(getChildByName(nsNode, "grammar"), "define"):
         inner = "\n".join(factoryTokenToIdMapInner(nsNode, defineNode))
         if len(inner):
             print("    case %s:" % idForDefine(nsNode, defineNode))
+            print("        switch (nToken)")
+            print("        {")
             print(inner)
+            print("        }")
             print("        break;")
     print("    default:")
+    print("        switch (nToken)")
+    print("        {")
     for startNode in getChildrenByName(nsNode, "start"):
         startName = startNode.getAttribute("name")
-        print("    // %s" % startName)
         for defineNode in [i for i in getChildrenByName(getChildByName(nsNode, "grammar"), "define") if i.getAttribute("name") == startName]:
             inner = factoryTokenToIdMapInner(nsNode, defineNode)
             if len(inner):
                 print("\n".join(inner))
-    print("""        break;
+    print("""        }
+        break;
     }
-
-    return pMap;
+    return 0;
 }
 """)
 
@@ -697,7 +705,7 @@ namespace ooxml {
         factoryCreateElementMap(files, nsNode)
         factoryActions(nsNode)
         factoryGetDefineName(nsNode)
-        factoryTokenToIdMap(nsNode)
+        factoryGetResourceId(nsNode)
         factoryAttributeAction(nsNode)
 
     print("""/// @endcond