diff --git a/AppleWinExpress2012.vcxproj b/AppleWinExpress2012.vcxproj
index 93e52718..31b90d45 100644
--- a/AppleWinExpress2012.vcxproj
+++ b/AppleWinExpress2012.vcxproj
@@ -91,7 +91,7 @@
-
+
@@ -184,7 +184,7 @@
NotUsing
NotUsing
-
+
diff --git a/AppleWinExpress2012.vcxproj.filters b/AppleWinExpress2012.vcxproj.filters
index 861c9f51..4c2d46cc 100644
--- a/AppleWinExpress2012.vcxproj.filters
+++ b/AppleWinExpress2012.vcxproj.filters
@@ -162,7 +162,7 @@
Source Files\Debugger
-
+
Source Files\Debugger
@@ -376,7 +376,7 @@
Source Files\Debugger
-
+
Source Files\Debugger
diff --git a/ApplewinExpress10.00.vcxproj b/ApplewinExpress10.00.vcxproj
index d9e333b7..e6fadecf 100644
--- a/ApplewinExpress10.00.vcxproj
+++ b/ApplewinExpress10.00.vcxproj
@@ -271,7 +271,7 @@
Create
Create
-
+
@@ -391,7 +391,7 @@
-
+
diff --git a/ApplewinExpress10.00.vcxproj.filters b/ApplewinExpress10.00.vcxproj.filters
index a4702a7f..29487593 100644
--- a/ApplewinExpress10.00.vcxproj.filters
+++ b/ApplewinExpress10.00.vcxproj.filters
@@ -80,7 +80,7 @@
Source\Debugger
-
+
Source\Debugger
@@ -250,7 +250,7 @@
Source\Debugger
-
+
Source\Debugger
diff --git a/ApplewinExpress2005.vcproj b/ApplewinExpress2005.vcproj
index 69edd675..10e6908f 100644
--- a/ApplewinExpress2005.vcproj
+++ b/ApplewinExpress2005.vcproj
@@ -401,11 +401,11 @@
>
diff --git a/source/Debugger/Debug.h b/source/Debugger/Debug.h
index b1808783..81ece75c 100644
--- a/source/Debugger/Debug.h
+++ b/source/Debugger/Debug.h
@@ -16,7 +16,7 @@ using namespace std;
#include "Debugger_Help.h"
#include "Debugger_Display.h"
#include "Debugger_Symbols.h"
-#include "..\Util_MemoryTextFile.h"
+#include "Util_MemoryTextFile.h"
// Globals __________________________________________________________________
diff --git a/source/Debugger/Debugger_Parser.cpp b/source/Debugger/Debugger_Parser.cpp
index 76dc8d85..4fcd9d7a 100644
--- a/source/Debugger/Debugger_Parser.cpp
+++ b/source/Debugger/Debugger_Parser.cpp
@@ -958,155 +958,3 @@ int RemoveWhiteSpaceReverse ( TCHAR *pSrc )
}
return nLen;
}
-
-
-//===========================================================================
-/*
-inline
-const TCHAR* SkipEOL ( const TCHAR *pSrc )
-{
- while (pSrc && ((*pSrc == CHAR_LF) || (*pSrc == CHAR_CR)))
- {
- pSrc++;
- }
- return pSrc;
-}
-*/
-
-//===========================================================================
-/*
-inline
-const TCHAR* SkipUntilChar ( const TCHAR *pSrc, const TCHAR nDelim )
-{
- while (pSrc && (*pSrc))
- {
- if (*pSrc == nDelim)
- break;
- pSrc++;
- }
- return pSrc;
-}
-*/
-
-
-//===========================================================================
-/*
-inline
-const TCHAR* SkipUntilEOL ( const TCHAR *pSrc )
-{
- while (pSrc && (*pSrc))
- {
- if ((*pSrc == CHAR_LF) || (*pSrc == CHAR_CR))
- {
- break;
- }
- pSrc++;
- }
- return pSrc;
-}
-*/
-
-
-//===========================================================================
-/*
-inline
-const TCHAR* SkipUntilTab ( const TCHAR *pSrc )
-{
- while (pSrc && (*pSrc))
- {
- if (*pSrc == CHAR_TAB)
- {
- break;
- }
- pSrc++;
- }
- return pSrc;
-}
-*/
-
-
-//===========================================================================
-/*
-const TCHAR* SkipUntilToken ( const TCHAR *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e *pToken_ )
-{
- if ( pToken_)
- *pToken_ = NO_TOKEN;
-
- while (pSrc && (*pSrc))
- {
- // Common case is TOKEN_ALPHANUMERIC, so continue until we don't have one
- if (ParserFindToken( pSrc, aTokens, pToken_ ))
- return pSrc;
-
- pSrc++;
- }
- return pSrc;
-}
-*/
-
-//===========================================================================
-/*
-inline
-const TCHAR* SkipUntilWhiteSpace ( const TCHAR *pSrc )
-{
- while (pSrc && (*pSrc))
- {
- if ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB))
- {
- break;
- }
- pSrc++;
- }
- return pSrc;
-}
-*/
-
-
-// @param pStart Start of line.
-//===========================================================================
-/*
-inline
-const TCHAR *SkipUntilWhiteSpaceReverse ( const TCHAR *pSrc, const TCHAR *pStart )
-{
- while (pSrc && (pSrc > pStart))
- {
- if ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB))
- {
- break;
- }
- pSrc--;
- }
- return pSrc;
-}
-*/
-
-
-//===========================================================================
-/*
-inline
-const TCHAR* SkipWhiteSpace ( const TCHAR *pSrc )
-{
- while (pSrc && ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB)))
- {
- pSrc++;
- }
- return pSrc;
-}
-*/
-
-
-// @param pStart Start of line.
-//===========================================================================
-/*
-inline
-const TCHAR *SkipWhiteSpaceReverse ( const TCHAR *pSrc, const TCHAR *pStart )
-{
- while (pSrc && ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB)) && (pSrc > pStart))
- {
- pSrc--;
- }
- return pSrc;
-}
-*/
-
-// EOF
diff --git a/source/Debugger/Debugger_Parser.h b/source/Debugger/Debugger_Parser.h
index f1d10892..ba8a668e 100644
--- a/source/Debugger/Debugger_Parser.h
+++ b/source/Debugger/Debugger_Parser.h
@@ -1,14 +1,14 @@
#ifndef DEBUGGER_PARSER_H
#define DEBUGGER_PARSER_H
-#include "..\Util_Text.h"
+#include "Util_Text.h"
const char * ParserFindToken( const char *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e * pToken_ );
const TCHAR * FindTokenOrAlphaNumeric ( const TCHAR *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e * pToken_ );
int RemoveWhiteSpaceReverse( char *pSrc );
void TextConvertTabsToSpaces( TCHAR *pDeTabified_, LPCTSTR pText, const int nDstSize, int nTabStop = 0 );
-inline const char* SkipUntilToken( const char *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e *pToken_ )
+inline const char* SkipUntilToken( const char *pSrc, const TokenTable_t *aTokens, const int nTokens, ArgToken_e *pToken_ )
{
if ( pToken_)
*pToken_ = NO_TOKEN;
diff --git a/source/Util_MemoryTextFile.cpp b/source/Debugger/Util_MemoryTextFile.cpp
similarity index 100%
rename from source/Util_MemoryTextFile.cpp
rename to source/Debugger/Util_MemoryTextFile.cpp
diff --git a/source/Util_MemoryTextFile.h b/source/Debugger/Util_MemoryTextFile.h
similarity index 99%
rename from source/Util_MemoryTextFile.h
rename to source/Debugger/Util_MemoryTextFile.h
index 118718ee..a5445d05 100644
--- a/source/Util_MemoryTextFile.h
+++ b/source/Debugger/Util_MemoryTextFile.h
@@ -1,6 +1,5 @@
#pragma once
-
// Memory Text File _________________________________________________________
class MemoryTextFile_t
diff --git a/source/Util_Text.h b/source/Debugger/Util_Text.h
similarity index 93%
rename from source/Util_Text.h
rename to source/Debugger/Util_Text.h
index dab267d4..d925b995 100644
--- a/source/Util_Text.h
+++ b/source/Debugger/Util_Text.h
@@ -1,3 +1,4 @@
+#pragma once
#define CHAR_LF '\x0D'
#define CHAR_CR '\x0A'
@@ -8,17 +9,6 @@
#define CHAR_ESCAPE '\x1B'
// Text Util
-/*
-inline const char* SkipEOL ( const char *pSrc )
- {
- while (pSrc && ((*pSrc == CHAR_LF) || (*pSrc == CHAR_CR)))
- if (pSrc)
- {
- pSrc++;
- }
- return pSrc;
- }
-*/
inline const char* EatEOL ( const char *pSrc )
{
@@ -26,7 +16,7 @@ inline const char* EatEOL ( const char *pSrc )
{
if (*pSrc == CHAR_LF)
pSrc++;
-
+
if (*pSrc == CHAR_CR)
pSrc++;
}
@@ -108,7 +98,7 @@ inline const char* SkipUntilWhiteSpaceReverse ( const char *pSrc, const char *pS
{
if ((*pSrc == CHAR_SPACE) || (*pSrc == CHAR_TAB))
{
- break;
+ break;
}
pSrc--;
}
@@ -131,13 +121,13 @@ inline bool TextIsHexChar( char nChar )
{
if ((nChar >= '0') && (nChar <= '9'))
return true;
-
+
if ((nChar >= 'A') && (nChar <= 'F'))
return true;
-
+
if ((nChar >= 'a') && (nChar <= 'f'))
return true;
-
+
return false;
}