Przeglądaj źródła

fixed error in tokenizer class that caused ditto to not run from last checkin

Scott Brogden 8 miesięcy temu
rodzic
commit
d4bcc57cbf
3 zmienionych plików z 51 dodań i 56 usunięć
  1. 1 0
      CP_Main.vcxproj
  2. 0 6
      CP_Main.vcxproj.filters
  3. 50 50
      Shared/Tokenizer.h

+ 1 - 0
CP_Main.vcxproj

@@ -656,6 +656,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="src\StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

+ 0 - 6
CP_Main.vcxproj.filters

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="SymbolEdit.cpp">
-      <Filter>source</Filter>
-    </ClCompile>
     <ClCompile Include="src\About.cpp">
       <Filter>src</Filter>
     </ClCompile>
@@ -417,9 +414,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="SymbolEdit.h">
-      <Filter>header</Filter>
-    </ClInclude>
     <ClInclude Include="src\About.h">
       <Filter>src</Filter>
     </ClInclude>

+ 50 - 50
Shared/Tokenizer.h

@@ -4,68 +4,68 @@
 class CTokenizer
 {
 public:
-    CString m_cs;
-    CArrayEx < TCHAR > m_delim;
-    int m_nCurPos;
+	CString m_cs;
+	CArrayEx < TCHAR > m_delim;
+	int m_nCurPos;
 
-    CTokenizer(const CString &cs, const CString &csDelim)
-    {
-        SetDelimiters(csDelim);
-    }
+	CTokenizer(const CString& cs, const CString& csDelim) : m_cs(cs), m_nCurPos(0)
+	{
+		SetDelimiters(csDelim);
+	}
 
-    void SetDelimiters(const CString &csDelim)
-    {
-        for (int i = 0; i < csDelim.GetLength(); ++i)
-        {
-            m_delim.Add(csDelim[i]);
-        }
+	void SetDelimiters(const CString& csDelim)
+	{
+		for (int i = 0; i < csDelim.GetLength(); ++i)
+		{
+			m_delim.Add(csDelim[i]);
+		}
 
-        m_delim.SortAscending();
-    }
+		m_delim.SortAscending();
+	}
 
-    bool Next(CString &cs)
-    {
-        cs.Empty();
-        int len = m_cs.GetLength();
+	bool Next(CString& cs)
+	{
+		cs.Empty();
+		int len = m_cs.GetLength();
 
-        while (m_nCurPos < len && m_delim.Find(m_cs[m_nCurPos]))
-        {
-            ++m_nCurPos;
-        }
+		while (m_nCurPos < len && m_delim.Find(m_cs[m_nCurPos]))
+		{
+			++m_nCurPos;
+		}
 
-        if (m_nCurPos >= len)
-        {
-            return false;
-        }
+		if (m_nCurPos >= len)
+		{
+			return false;
+		}
 
-        int nStartPos = m_nCurPos;
+		int nStartPos = m_nCurPos;
 
-        while (m_nCurPos < len && !m_delim.Find(m_cs[m_nCurPos]))
-        {
-            ++m_nCurPos;
-        }
+		while (m_nCurPos < len && !m_delim.Find(m_cs[m_nCurPos]))
+		{
+			++m_nCurPos;
+		}
 
-        cs = m_cs.Mid(nStartPos, m_nCurPos - nStartPos);
+		cs = m_cs.Mid(nStartPos, m_nCurPos - nStartPos);
 
-        return true;
-    }
+		return true;
+	}
 
-    CString Tail()
-    {
-        int len = m_cs.GetLength();
-        int nCurPos = m_nCurPos;
+	CString Tail()
+	{
+		int len = m_cs.GetLength();
+		int nCurPos = m_nCurPos;
 
-        while (nCurPos < len && m_delim.Find(m_cs[nCurPos]))
-        {
-            ++nCurPos;
-        }
+		while (nCurPos < len && m_delim.Find(m_cs[nCurPos]))
+		{
+			++nCurPos;
+		}
 
-        CString csResult;
-        if (nCurPos < len)
-        {
-            csResult = m_cs.Mid(nCurPos);
-        }
+		CString csResult;
+		if (nCurPos < len)
+		{
+			csResult = m_cs.Mid(nCurPos);
+		}
 
-        return csResult;
-    }
+		return csResult;
+	}
 };