Skip to content
Browse files

Spelling fixes.

  • Loading branch information...
1 parent 9352e12 commit 7ab2f6a9fa9b88b3132587fa9d54294b91683781 @scop scop committed with PKEuS Jul 21, 2012
Showing with 13 additions and 13 deletions.
  1. +1 −1 lib/checkclass.cpp
  2. +2 −2 lib/checkinternal.cpp
  3. +1 −1 lib/checkinternal.h
  4. +2 −2 lib/checkio.cpp
  5. +2 −2 lib/tokenize.cpp
  6. +2 −2 test/testinternal.cpp
  7. +3 −3 test/testio.cpp
View
2 lib/checkclass.cpp
@@ -516,7 +516,7 @@ void CheckClass::initializationListUsage()
Scope* owner = scope->functionOf;
for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {
- if (Token::Match(tok, "%var% (")) // Assignments might depend on this function call or if/for/while/switch statment from now on.
+ if (Token::Match(tok, "%var% (")) // Assignments might depend on this function call or if/for/while/switch statement from now on.
break;
if (Token::Match(tok, "try|do {"))
break;
View
4 lib/checkinternal.cpp
@@ -237,8 +237,8 @@ void CheckInternal::missingPercentCharacterError(const Token* tok, const std::st
void CheckInternal::unknownPatternError(const Token* tok, const std::string& pattern)
{
- reportError(tok, Severity::error, "unkownPattern",
- "Unkown pattern used: \"" + pattern + "\"");
+ reportError(tok, Severity::error, "unknownPattern",
+ "Unknown pattern used: \"" + pattern + "\"");
}
#endif // #ifndef NDEBUG
View
2 lib/checkinternal.h
@@ -65,7 +65,7 @@ class CPPCHECKLIB CheckInternal : public Check {
/** @brief %Check for missing % end character in Token::Match pattern */
void checkMissingPercentCharacter();
- /** @brief %Check for for unkown (invalid) complex patterns like "%typ%" */
+ /** @brief %Check for for unknown (invalid) complex patterns like "%typ%" */
void checkUnknownPattern();
private:
View
4 lib/checkio.cpp
@@ -63,7 +63,7 @@ void CheckIO::coutCerrMisusageError(const Token* tok, const std::string& streamN
//---------------------------------------------------------------------------
// fflush(stdin) <- fflush only applies to output streams in ANSI C
-// fread(); fwrite(); <- consecutive read/write statements require repositioning inbetween
+// fread(); fwrite(); <- consecutive read/write statements require repositioning in between
// fopen("","r"); fwrite(); <- write to read-only file (or vice versa)
// fclose(); fread(); <- Use closed file
//---------------------------------------------------------------------------
@@ -258,7 +258,7 @@ void CheckIO::fflushOnInputStreamError(const Token *tok, const std::string &varn
void CheckIO::ioWithoutPositioningError(const Token *tok)
{
reportError(tok, Severity::error,
- "IOWithoutPositioning", "Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush inbetween result in undefined behaviour.");
+ "IOWithoutPositioning", "Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.");
}
void CheckIO::readWriteOnlyFileError(const Token *tok)
View
4 lib/tokenize.cpp
@@ -4059,9 +4059,9 @@ void Tokenizer::simplifyCompoundAssignment()
while (tok->next()->str() != ";")
tok->deleteNext();
} else {
- // Enclose the rhs in parantheses..
+ // Enclose the rhs in parenthesis..
if (!Token::Match(tok->tokAt(2), "[;)]")) {
- // Only enclose rhs in parantheses if there is some operator
+ // Only enclose rhs in parenthesis if there is some operator
bool someOperator = false;
for (Token *tok2 = tok->next(); tok2; tok2 = tok2->next()) {
if (tok2->str() == "(")
View
4 test/testinternal.cpp
@@ -214,7 +214,7 @@ class TestInternal : public TestFixture {
" Token::Match(tok, \"foo % %type % bar\");\n"
"}");
ASSERT_EQUALS("[test.cpp:3]: (error) Missing percent end character in Token::Match() pattern: \"foo % %type % bar\"\n"
- "[test.cpp:3]: (error) Unkown pattern used: \"%type %\"\n", errout.str());
+ "[test.cpp:3]: (error) Unknown pattern used: \"%type %\"\n", errout.str());
// Find missing % also in 'alternatives' pattern
check("void f() {\n"
@@ -235,7 +235,7 @@ class TestInternal : public TestFixture {
check("void f() {\n"
" Token::Match(tok, \"%typ%\");\n"
"}");
- ASSERT_EQUALS("[test.cpp:2]: (error) Unkown pattern used: \"%typ%\"\n", errout.str());
+ ASSERT_EQUALS("[test.cpp:2]: (error) Unknown pattern used: \"%typ%\"\n", errout.str());
// Make sure we don't take %or% for a broken %oror%
check("void f() {\n"
View
6 test/testio.cpp
@@ -286,13 +286,13 @@ class TestIO : public TestFixture {
" fwrite(buffer, 5, 6, f);\n"
" fread(buffer, 5, 6, f);\n"
"}");
- ASSERT_EQUALS("[test.cpp:3]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush inbetween result in undefined behaviour.\n", errout.str());
+ ASSERT_EQUALS("[test.cpp:3]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout.str());
check("void foo(FILE* f) {\n"
" fread(buffer, 5, 6, f);\n"
" fwrite(buffer, 5, 6, f);\n"
"}");
- ASSERT_EQUALS("[test.cpp:3]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush inbetween result in undefined behaviour.\n", errout.str());
+ ASSERT_EQUALS("[test.cpp:3]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout.str());
check("void foo(FILE* f, bool read) {\n"
" if(read)\n"
@@ -335,7 +335,7 @@ class TestIO : public TestFixture {
" long pos = ftell(f);\n"
" fwrite(buffer, 5, 6, f);\n"
"}");
- ASSERT_EQUALS("[test.cpp:4]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush inbetween result in undefined behaviour.\n", errout.str());
+ ASSERT_EQUALS("[test.cpp:4]: (error) Read and write operations without a call to a positioning function (fseek, fsetpos or rewind) or fflush in between result in undefined behaviour.\n", errout.str());
}
void fflushOnInputStream() {

0 comments on commit 7ab2f6a

Please sign in to comment.
Something went wrong with that request. Please try again.