From eac88a340de625fa8febb28e07535a4260a3b33e Mon Sep 17 00:00:00 2001 From: Kelvin Lee Date: Sat, 26 Mar 2022 07:11:33 +1100 Subject: [PATCH] Fix spelling: "seperator" -> "separator" (PR #1071) --- docs/Debugger_Changelog.txt | 2 +- source/Debugger/Debug.cpp | 60 +++++++++++------------ source/Debugger/Debugger_Disassembler.cpp | 2 +- source/Debugger/Debugger_Display.cpp | 4 +- source/Debugger/Debugger_Help.cpp | 4 +- source/Debugger/Debugger_Parser.cpp | 2 +- source/Debugger/Debugger_Types.h | 2 +- 7 files changed, 38 insertions(+), 38 deletions(-) diff --git a/docs/Debugger_Changelog.txt b/docs/Debugger_Changelog.txt index 3e1db1aa..0930a155 100644 --- a/docs/Debugger_Changelog.txt +++ b/docs/Debugger_Changelog.txt @@ -35,7 +35,7 @@ X 2002:2003 Released post 1.30.7.0 -2.9.1.0 Added: Bookmarks now have their own indicator (a number with a box around it) and replace the ":" seperator. Updated Debug_Font.bmp +2.9.1.0 Added: Bookmarks now have their own indicator (a number with a box around it) and replace the ":" separator. Updated Debug_Font.bmp .18 Fixed: Resetting bookmarks wasn't setting the total bookmarks back to zero. .17 Fixed: If all bookmarks were used then setting a new one wouldn't update an existing one to the new address. diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index cf1af179..0dd2de9e 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -3798,16 +3798,16 @@ Update_t CmdConfigSetDebugDir (int nArgs) if ((nSubDirLen == 3) && (sSubDir == UP_DIR)) // Up directory "..\" in the subpath? { size_t nCurrentLen = g_sCurrentDir.size(); - size_t nLastSeperator = g_sCurrentDir.rfind( '\\', nCurrentLen - 2 ); + size_t nLastSeparator = g_sCurrentDir.rfind( '\\', nCurrentLen - 2 ); - if (nLastSeperator != std::string::npos) + if (nLastSeparator != std::string::npos) { #if _DEBUG - LogOutput( "Last: %" SIZE_T_FMT "\n", nLastSeperator ); + LogOutput( "Last: %" SIZE_T_FMT "\n", nLastSeparator ); LogOutput( "%s\n", g_sCurrentDir.c_str() ); - LogOutput( "%*s%s\n", int(nLastSeperator), "", "^" ); + LogOutput( "%*s%s\n", int(nLastSeparator), "", "^" ); #endif - std::string sCurrentDir = g_sCurrentDir.substr( 0, nLastSeperator + 1 ); // Path always has trailing slash so include it + std::string sCurrentDir = g_sCurrentDir.substr( 0, nLastSeparator + 1 ); // Path always has trailing slash so include it g_sCurrentDir = sCurrentDir; } } @@ -5509,7 +5509,7 @@ Update_t _CmdMemorySearch (int nArgs, bool bTextIsAscii = true ) // if (eRange == RANGE_MISSING_ARG_2) if (! Range_CalcEndLen( eRange, nAddressStart, nAddress2, nAddressEnd, nAddressLen)) - return ConsoleDisplayError( "Error: Missing address seperator (comma or colon)" ); + return ConsoleDisplayError( "Error: Missing address separator (comma or colon)" ); int iArgFirstByte = 4; int iArg; @@ -7812,7 +7812,7 @@ int ParseInput ( LPTSTR pConsoleInput, bool bCook ) { int nArg = 0; - // TODO: need to check for non-quoted command seperator ';', and buffer input + // TODO: need to check for non-quoted command separator ';', and buffer input RemoveWhiteSpaceReverse( pConsoleInput ); ArgsClear(); @@ -7871,24 +7871,24 @@ void ProfileLineReset() //=========================================================================== void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) { - char sSeperator7[ 32 ] = "\t"; - char sSeperator2[ 32 ] = "\t"; - char sSeperator1[ 32 ] = "\t"; + char sSeparator7[ 32 ] = "\t"; + char sSeparator2[ 32 ] = "\t"; + char sSeparator1[ 32 ] = "\t"; char sOpcode [ 8 ]; // 2 chars for opcode in hex, plus quotes on either side char sAddress[MAX_OPMODE_NAME]; if (eFormatMode == PROFILE_FORMAT_COMMA) { - sSeperator7[0] = ','; - sSeperator2[0] = ','; - sSeperator1[0] = ','; + sSeparator7[0] = ','; + sSeparator2[0] = ','; + sSeparator1[0] = ','; } else if (eFormatMode == PROFILE_FORMAT_SPACE) { - sprintf( sSeperator7, " " ); // 7 - sprintf( sSeperator2, " " ); // 2 - sprintf( sSeperator1, " " ); // 1 + sprintf( sSeparator7, " " ); // 7 + sprintf( sSeparator2, " " ); // 2 + sprintf( sSeparator1, " " ); // 1 } ProfileLineReset(); @@ -7946,11 +7946,11 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) if (bExport) // Export = SeperateColumns sprintf( pText , "\"Percent\"" DELIM "\"Count\"" DELIM "\"Opcode\"" DELIM "\"Mnemonic\"" DELIM "\"Addressing Mode\"\n" - , sSeperator7, sSeperator2, sSeperator1, sSeperator1 ); + , sSeparator7, sSeparator2, sSeparator1, sSeparator1 ); else sprintf( pText , "Percent" DELIM "Count" DELIM "Mnemonic" DELIM "Addressing Mode\n" - , sSeperator7, sSeperator2, sSeperator1 ); + , sSeparator7, sSeparator2, sSeparator1 ); pText = ProfileLinePush(); @@ -7998,13 +7998,13 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) , pColorNumber , nPercent , pColorOperator - , sSeperator2 + , sSeparator2 , pColorNumber - , static_cast(nCount), sSeperator2 + , static_cast(nCount), sSeparator2 , pColorOpcode - , sOpcode, sSeperator2 + , sOpcode, sSeparator2 , pColorMnemonic - , g_aOpcodes[ nOpcode ].sMnemonic, sSeperator2 + , g_aOpcodes[ nOpcode ].sMnemonic, sSeparator2 , pColorOpmode , sAddress ); @@ -8016,7 +8016,7 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) sprintf( pText , "Total: " DELIM "%s%9u\n" - , sSeperator2 + , sSeparator2 , pColorTotal , static_cast(nOpcodeTotal) ); pText = ProfileLinePush(); @@ -8030,12 +8030,12 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) // Note: 2 extra dummy columns are inserted to keep Addressing Mode in same column sprintf( pText , "\"Percent\"" DELIM "\"Count\"" DELIM DELIM DELIM "\"Addressing Mode\"\n" - , sSeperator7, sSeperator2, sSeperator2, sSeperator2 ); + , sSeparator7, sSeparator2, sSeparator2, sSeparator2 ); else { sprintf( pText , "Percent" DELIM "Count" DELIM "Addressing Mode\n" - , sSeperator7, sSeperator2 ); + , sSeparator7, sSeparator2 ); } pText = ProfileLinePush(); @@ -8060,7 +8060,7 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) if (bExport) { // Note: 2 extra dummy columns are inserted to keep Addressing Mode in same column - sprintf( sAddress, "%s%s\"%s\"", sSeperator1, sSeperator1, g_aOpmodes[ nOpmode ].m_sName ); + sprintf( sAddress, "%s%s\"%s\"", sSeparator1, sSeparator1, g_aOpmodes[ nOpmode ].m_sName ); } else // not qouted if dumping to console { @@ -8073,9 +8073,9 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) , pColorNumber , nPercent , pColorOperator - , sSeperator2 + , sSeparator2 , pColorNumber - , static_cast(nCount), sSeperator2 + , static_cast(nCount), sSeparator2 , pColorOpmode , sAddress ); @@ -8087,7 +8087,7 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) sprintf( pText , "Total: " DELIM "%s%9u\n" - , sSeperator2 + , sSeparator2 , pColorTotal , static_cast(nOpmodeTotal) ); pText = ProfileLinePush(); @@ -8098,7 +8098,7 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode ) unsigned int cycles = static_cast(g_nCumulativeCycles - g_nProfileBeginCycles); sprintf( pText , "Cycles: " DELIM "%s%9u\n" - , sSeperator2 + , sSeparator2 , pColorNumber , cycles ); pText = ProfileLinePush(); diff --git a/source/Debugger/Debugger_Disassembler.cpp b/source/Debugger/Debugger_Disassembler.cpp index d0e0c0ee..c453110d 100644 --- a/source/Debugger/Debugger_Disassembler.cpp +++ b/source/Debugger/Debugger_Disassembler.cpp @@ -617,7 +617,7 @@ void FormatNopcodeBytes(WORD nBaseAddress, DisasmLine_t& line_) //=========================================================================== void FormatDisassemblyLine(const DisasmLine_t& line, char* sDisassembly, const int nBufferSize) { - //> Address Seperator Opcodes Label Mnemonic Target [Immediate] [Branch] + //> Address Separator Opcodes Label Mnemonic Target [Immediate] [Branch] // // Data Disassembler // Label Directive [Immediate] diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp index 768e6ac1..24dd973b 100644 --- a/source/Debugger/Debugger_Display.cpp +++ b/source/Debugger/Debugger_Display.cpp @@ -1344,7 +1344,7 @@ WORD DrawDisassemblyLine ( int iLine, const WORD nBaseAddress ) nOpbyte = line.nOpbyte; // sAddress, sOpcodes, sTarget, sTargetOffset, nTargetOffset, sTargetPointer, sTargetValue, sImmediate, nImmediate, sBranch ); - //> Address Seperator Opcodes Label Mnemonic Target [Immediate] [Branch] + //> Address Separator Opcodes Label Mnemonic Target [Immediate] [Branch] // //> xxxx: xx xx xx LABEL MNEMONIC 'E' = //> ^ ^ ^ ^ ^ @@ -1515,7 +1515,7 @@ WORD DrawDisassemblyLine ( int iLine, const WORD nBaseAddress ) } - // Address Seperator + // Address Separator if (! bCursorLine) DebuggerSetColorFG( DebuggerGetColor( FG_DISASM_OPERATOR ) ); diff --git a/source/Debugger/Debugger_Help.cpp b/source/Debugger/Debugger_Help.cpp index 66faedd2..474c62a3 100644 --- a/source/Debugger/Debugger_Help.cpp +++ b/source/Debugger/Debugger_Help.cpp @@ -249,8 +249,8 @@ void Help_Operators() ConsolePrintFormat( " %s#%s Designate number in hex" , CHC_USAGE, CHC_DEFAULT ); // ConsoleBufferPush( " Operators: (Range)" ); ConsolePrintFormat( " Operators: (%sRange%s)" , CHC_USAGE, CHC_DEFAULT ); - ConsolePrintFormat( " %s,%s range seperator (2nd address is relative)", CHC_USAGE, CHC_DEFAULT ); - ConsolePrintFormat( " %s:%s range seperator (2nd address is absolute)", CHC_USAGE, CHC_DEFAULT ); + ConsolePrintFormat( " %s,%s range separator (2nd address is relative)", CHC_USAGE, CHC_DEFAULT ); + ConsolePrintFormat( " %s:%s range separator (2nd address is absolute)", CHC_USAGE, CHC_DEFAULT ); // ConsolePrintFormat( " Operators: (Misc)" ); ConsolePrintFormat( " Operators: (%sMisc%s)" , CHC_USAGE, CHC_DEFAULT ); ConsolePrintFormat( " %s//%s comment until end of line" , CHC_USAGE, CHC_DEFAULT ); diff --git a/source/Debugger/Debugger_Parser.cpp b/source/Debugger/Debugger_Parser.cpp index 002399ca..9ce07a4b 100644 --- a/source/Debugger/Debugger_Parser.cpp +++ b/source/Debugger/Debugger_Parser.cpp @@ -286,7 +286,7 @@ int ArgsGet ( TCHAR * pInput ) if (iTokenSrc == TOKEN_SEMI) { - // TODO - command seperator, must handle non-quoted though! + // TODO - command separator, must handle non-quoted though! } if (iTokenSrc == TOKEN_QUOTE_DOUBLE) diff --git a/source/Debugger/Debugger_Types.h b/source/Debugger/Debugger_Types.h index 3e79fc6e..b52110ed 100644 --- a/source/Debugger/Debugger_Types.h +++ b/source/Debugger/Debugger_Types.h @@ -1271,7 +1271,7 @@ const DisasmData_t* pDisasmData; // If != NULL then bytes are marked up as data , TOKEN_PLUS // + Delta Argument1 += Argument2 , TOKEN_QUOTE_SINGLE // ' , TOKEN_QUOTE_DOUBLE // " - , TOKEN_SEMI // ; Command Seperator + , TOKEN_SEMI // ; Command Separator , TOKEN_SPACE // Token Delimiter , TOKEN_STAR // * // , TOKEN_TAB // '\t'