|
From: <jt...@us...> - 2008-08-28 16:25:13
|
Revision: 5861
http://winmerge.svn.sourceforge.net/winmerge/?rev=5861&view=rev
Author: jtuc
Date: 2008-08-28 16:25:10 +0000 (Thu, 28 Aug 2008)
Log Message:
-----------
Replace MFC CMap by STL std::map
Modified Paths:
--------------
trunk/Src/markdown.cpp
trunk/Src/markdown.h
Modified: trunk/Src/markdown.cpp
===================================================================
--- trunk/Src/markdown.cpp 2008-08-26 17:05:46 UTC (rev 5860)
+++ trunk/Src/markdown.cpp 2008-08-28 16:25:10 UTC (rev 5861)
@@ -15,7 +15,7 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * OS/Libs: Win32/MFC/shlwapi/iconv
+ * OS/Libs: Win32/STL/shlwapi/iconv
* iconv.dll is loaded on demand, and is not required as long as
* program doesn't call iconv based methods.
*
@@ -63,9 +63,9 @@
DATE: BY: DESCRIPTION:
========== ================== ================================================
-2005/01/15 Jochen Tucht Created
-2005/02/26 Jochen Tucht Load iconv.dll through DLLPSTUB
-2005/03/20 Jochen Tucht Add IgnoreCase option for ASCII-7 tag/attr names.
+2005-01-15 Jochen Tucht Created
+2005-02-26 Jochen Tucht Load iconv.dll through DLLPSTUB
+2005-03-20 Jochen Tucht Add IgnoreCase option for ASCII-7 tag/attr names.
Add HtmlUTags option to check for (potentially)
unbalanced HTML tags. Html option is combination
of the above. Using these options imposes
@@ -73,17 +73,17 @@
New flag CMarkdown::FileImage::Handle makes
CMarkdown::FileImage::FileImage() accept a
handle rather than a filename.
-2005/06/22 Jochen Tucht New method CMarkdown::_HSTR::Entities().
-2005/07/29 Jochen Tucht ByteOrder detection for 16/32 bit encodings
-2005/09/09 Jochen Tucht Patch by Takashi Sawanaka fixes crash due to
+2005-06-22 Jochen Tucht New method CMarkdown::_HSTR::Entities().
+2005-07-29 Jochen Tucht ByteOrder detection for 16/32 bit encodings
+2005-09-09 Jochen Tucht Patch by Takashi Sawanaka fixes crash due to
reading beyond end of text with HtmlUTags option
-2005/12/04 Jochen Tucht Fix UTF-8 signature detection
+2005-12-04 Jochen Tucht Fix UTF-8 signature detection
Strip bogus trailing slash in name of empty tag
+2008-08-27 Jochen Neubeck Replace MFC CMap by STL std::map
*/
#include "stdafx.h"
-#include <afxinet.h>
-#include <shlwapi.h> // StrToIntEx
+#include <shlwapi.h> // StrToIntExW
#include "markdown.h"
ICONV::Proxy ICONV =
@@ -158,23 +158,25 @@
return MAKELONG(B[0], lstrlenW(B));
}
-void CMarkdown::EntityMap::Load()
+void CMarkdown::Load(EntityMap &entityMap)
{
- SetAt(SysAllocString(L"amp"), SysAllocString(L"&"));
- SetAt(SysAllocString(L"quot"), SysAllocString(L"\""));
- SetAt(SysAllocString(L"apos"), SysAllocString(L"'"));
- SetAt(SysAllocString(L"lt"), SysAllocString(L"<"));
- SetAt(SysAllocString(L"gt"), SysAllocString(L">"));
+ entityMap[L"amp"] = L"&";
+ entityMap[L"quot"] = L"\"";
+ entityMap[L"apos"] = L"'";
+ entityMap[L"lt"] = L"<";
+ entityMap[L"gt"] = L">";
}
-void CMarkdown::EntityMap::Load(CMarkdown &markup, const CMarkdown::Converter &converter)
+void CMarkdown::Load(EntityMap &entityMap, const Converter &converter)
{
- while (markup.Move("!ENTITY"))
+ while (Move("!ENTITY"))
{
- HSTR hstrValue = 0, hstrKey = markup.GetAttribute(0, &hstrValue);
- if (hstrKey)
+ HSTR hstrValue = 0;
+ if (HSTR hstrKey = GetAttribute(0, &hstrValue))
{
- SetAt(hstrKey->Convert(converter)->B, hstrValue->Convert(converter)->B);
+ String strKey = hstrKey->Convert(converter);
+ String strValue = hstrValue->Convert(converter);
+ entityMap[strKey.B] = strValue.B;
}
}
}
@@ -207,7 +209,7 @@
return H;
}
-CMarkdown::HSTR CMarkdown::_HSTR::Convert(const CMarkdown::Converter &converter)
+CMarkdown::HSTR CMarkdown::_HSTR::Convert(const Converter &converter)
{
HSTR H = this;
size_t s = SysStringByteLen(B);
@@ -220,7 +222,7 @@
return H;
}
-CMarkdown::HSTR CMarkdown::_HSTR::Resolve(const CMarkdown::EntityMap &map)
+CMarkdown::HSTR CMarkdown::_HSTR::Resolve(const EntityMap &map)
{
HSTR H = this;
BSTR p, q = H->B;
@@ -228,28 +230,24 @@
{
*q = '\0';
OLECHAR *key = p + 1;
- BOOL found = FALSE;
- EntityString value;
- int cchValue = 1;
- OLECHAR chValue[2];
+ std::wstring value;
if (*key == '#')
{
int ordinal = '?';
*key = '0';
- found = StrToIntExW(key, STIF_SUPPORT_HEX, &ordinal);
+ if (StrToIntExW(key, STIF_SUPPORT_HEX, &ordinal))
+ value.assign(1, (OLECHAR)ordinal);
*key = '#';
- chValue[0] = (OLECHAR)ordinal;
- chValue[1] = '\0';
- value.B = chValue;
}
else
{
- found = map.Lookup(key, value);
- cchValue = SysStringLen(value.B);
+ EntityMap::const_iterator p = map.find(key);
+ if (p != map.end())
+ value = p->second;
}
*q = ';';
++q;
- if (found)
+ if (int cchValue = value.length())
{
int i = p - H->B;
int j = q - H->B;
@@ -275,7 +273,7 @@
memmove(q + cchGrow, q, cbMove);
}
}
- memcpy(p, value.B, cchValue * sizeof(OLECHAR));
+ memcpy(p, value.c_str(), cchValue * sizeof(OLECHAR));
q = p + cchValue;
}
}
@@ -981,7 +979,7 @@
pchImage += 4;
cchImage -= 4;
}
- CMarkdown::Converter converter("utf-8", nByteOrder & 2 ? "ucs-4be" : "ucs-4le");
+ Converter converter("utf-8", nByteOrder & 2 ? "ucs-4be" : "ucs-4le");
cbImage = converter.Convert(pchImage, cchImage, 0, 0);
pCopy = MapFile(INVALID_HANDLE_VALUE, cbImage);
if (pCopy)
Modified: trunk/Src/markdown.h
===================================================================
--- trunk/Src/markdown.h 2008-08-26 17:05:46 UTC (rev 5860)
+++ trunk/Src/markdown.h 2008-08-28 16:25:10 UTC (rev 5861)
@@ -1,6 +1,8 @@
#include <oleauto.h>
-#include <afxtempl.h>
+#include <map>
+#include <string>
+
#include "dllpstub.h"
// C++ interface to GNU libiconv functions
@@ -56,60 +58,9 @@
size_t iconv(const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) const;
size_t Convert(const char *, size_t, char *, size_t) const;
};
- class EntityString
- {
- // Helper class to represent an EntityMap's KEYs and VALUEs. No orthogonal
- // string class interface, just the methods required to make the CMap
- // template happy. class EntityMap takes care of freeing the BSTRs.
- private:
- EntityString(const EntityString &);
- public:
- BSTR B;
- operator BSTR()
- {
- return B;
- }
- EntityString(BSTR B = 0):B(B)
- {
- }
- void operator=(BSTR B)
- {
- EntityString::B = B;
- }
- void operator=(const EntityString &r)
- {
- B = r.B;
- }
- bool operator==(BSTR B) const
- {
- return lstrcmpW(EntityString::B, B) == 0;
- }
- };
- class EntityMap : public CMap<EntityString, BSTR, EntityString, BSTR>
- {
- // Lookup table for entity substitution
- public:
- void Load();
- void Load(CMarkdown &, const Converter &);
- ~EntityMap()
- {
- EntityString key;
- EntityString val;
- POSITION pos = GetStartPosition();
- while (pos != NULL)
- {
- GetNextAssoc(pos, key, val);
- SysFreeString(key.B);
- SysFreeString(val.B);
- }
- }
- void SetAt(BSTR key, BSTR value)
- {
- EntityString &val = (*this)[key];
- SysFreeString(val.B);
- val.B = value;
- }
- };
+ typedef std::map<std::wstring, std::wstring> EntityMap;
+ static void Load(EntityMap &entityMap);
+ void Load(EntityMap &entityMap, const Converter &);
class FileImage;
class File;
// An _HSTR is a handle to a string
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
