Skip to content

improved test coverage of throwing code #666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
firewave wants to merge 1 commit into
base: master
Choose a base branch
from
Open

improved test coverage of throwing code #666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 101 additions & 2 deletions test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ static std::string readfile(const char code[], std::size_t size, simplecpp::Outp
return makeTokenList(code,size,files,std::string(),outputList).stringify();
}

static std::string preprocess(const char code[], const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage = nullptr, std::list<simplecpp::IfCond> *ifCond = nullptr, const std::string &file = std::string())
static std::string preprocess(const char code[], std::size_t size, const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage = nullptr, std::list<simplecpp::IfCond> *ifCond = nullptr, const std::string &file = std::string())
{
std::vector<std::string> files;
simplecpp::FileDataCache cache;
simplecpp::TokenList tokens = makeTokenList(code,files, file);
simplecpp::TokenList tokens = makeTokenList(code, size, files, file);
if (dui.removeComments)
tokens.removeComments();
simplecpp::TokenList tokens2(files);
Expand All @@ -145,6 +145,11 @@ static std::string preprocess(const char code[], const simplecpp::DUI &dui, simp
return tokens2.stringify();
}

static std::string preprocess(const char code[], const simplecpp::DUI &dui, simplecpp::OutputList *outputList, std::list<simplecpp::MacroUsage> *macroUsage = nullptr, std::list<simplecpp::IfCond> *ifCond = nullptr, const std::string &file = std::string())
{
return preprocess(code, strlen(code), dui, outputList, macroUsage, ifCond, file);
}

static std::string preprocess(const char code[])
{
return preprocess(code, simplecpp::DUI(), nullptr);
Expand All @@ -165,6 +170,11 @@ static std::string preprocess(const char code[], simplecpp::OutputList *outputLi
return preprocess(code, simplecpp::DUI(), outputList);
}

static std::string preprocess(const char code[], std::size_t size, simplecpp::OutputList *outputList)
{
return preprocess(code, size, simplecpp::DUI(), outputList);
}

static std::string preprocess(const char code[], std::list<simplecpp::IfCond> *ifCond)
{
return preprocess(code, simplecpp::DUI(), nullptr, nullptr, ifCond);
Expand Down Expand Up @@ -913,6 +923,24 @@ static void define_invalid_2()
ASSERT_EQUALS("file0,1,syntax_error,Failed to parse #define, bad macro syntax\n", toString(outputList));
}

static void define_invalid_3()
{
const char code[] = "#define R()\n"
"R";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, &outputList));
ASSERT_EQUALS("file0,2,syntax_error,failed to expand 'R', Wrong number of parameters for macro 'R'.\n", toString(outputList));
}

static void define_invalid_4()
{
const char code[] = "#define X(...)\n"
"X";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, &outputList));
ASSERT_EQUALS("file0,2,syntax_error,failed to expand 'X', Wrong number of parameters for macro 'X'.\n", toString(outputList));
}

static void define_define_1()
{
const char code[] = "#define A(x) (x+1)\n"
Expand Down Expand Up @@ -1342,6 +1370,30 @@ static void define_ifdef()

}

static void if_invalid_1()
{
const char code[] = "#if'\\u'";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, &outputList));
ASSERT_EQUALS("file0,1,syntax_error,failed to evaluate #if condition, expected digit\n", toString(outputList));
}

static void if_invalid_2()
{
const char code[] = "#if-0xBBB4444444444444%~B";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, &outputList));
ASSERT_EQUALS("file0,1,syntax_error,failed to evaluate #if condition, division overflow\n", toString(outputList));
}

static void if_invalid_3()
{
const char code[] = "#if@u'\\udefa'";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, &outputList));
ASSERT_EQUALS("file0,1,syntax_error,failed to evaluate #if condition, surrogate code points not allowed in universal character names\n", toString(outputList));
}

static void pragma_backslash()
{
const char code[] = "#pragma comment (longstring, \\\n"
Expand Down Expand Up @@ -2033,6 +2085,42 @@ static void has_include_6()
ASSERT_EQUALS("\n\nA", preprocess(code, dui));
}

static void define_has_include_invalid_1()
{
const char code[] = "#define A)__has_include\n"
"#if\u000BA";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, &outputList));
ASSERT_EQUALS("file0,2,syntax_error,failed to evaluate #if condition, missing __has_include argument\n", toString(outputList));
}

static void define_has_include_invalid_2()
{
const char code[] = "#define f __has_include\n"
"#if#f<";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, &outputList));
ASSERT_EQUALS("file0,2,syntax_error,failed to evaluate #if condition, missing __has_include argument\n", toString(outputList));
}

static void define_has_include_invalid_3()
{
const char code[] = "#define\u0000X\u0007__has_include(\n"
"#if%X&";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, sizeof(code), &outputList));
ASSERT_EQUALS("file0,2,syntax_error,failed to evaluate #if condition, invalid __has_include expression\n", toString(outputList));
}

static void define_has_include_invalid_4()
{
const char code[] = "#define\u0000X\u0000__has_include<2\n"
"#if*X";
simplecpp::OutputList outputList;
ASSERT_EQUALS("", preprocess(code, sizeof(code), &outputList));
ASSERT_EQUALS("file0,2,syntax_error,failed to evaluate #if condition, invalid __has_include expression\n", toString(outputList));
}

static void strict_ansi_1()
{
const char code[] = "#if __STRICT_ANSI__\n"
Expand Down Expand Up @@ -4007,6 +4095,8 @@ static void runTests(int argc, char **argv, Input input)
TEST_CASE(define23); // #40
TEST_CASE(define_invalid_1);
TEST_CASE(define_invalid_2);
TEST_CASE(define_invalid_3);
TEST_CASE(define_invalid_4);
TEST_CASE(define_define_1);
TEST_CASE(define_define_2);
TEST_CASE(define_define_3);
Expand Down Expand Up @@ -4052,6 +4142,10 @@ static void runTests(int argc, char **argv, Input input)
// UB: #ifdef as macro parameter
TEST_CASE(define_ifdef);

TEST_CASE(if_invalid_1);
TEST_CASE(if_invalid_2);
TEST_CASE(if_invalid_3);

TEST_CASE(dollar);

TEST_CASE(error1);
Expand Down Expand Up @@ -4114,6 +4208,11 @@ static void runTests(int argc, char **argv, Input input)
TEST_CASE(has_include_5);
TEST_CASE(has_include_6);

TEST_CASE(define_has_include_invalid_1);
TEST_CASE(define_has_include_invalid_2);
TEST_CASE(define_has_include_invalid_3);
TEST_CASE(define_has_include_invalid_4);

TEST_CASE(strict_ansi_1);
TEST_CASE(strict_ansi_2);
TEST_CASE(strict_ansi_3);
Expand Down
Loading