marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #85 from isilkor/better-warning-pragma-parsing 

Better warning pragma parsing
master
isilkor 2019-02-17 14:04:00 +01:00 committed by GitHub
parent 918c4139e8 a0c9bfd931
commit a00566ca9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/script/C4AulParse.cpp
View File

@ -778,12 +778,9 @@ void C4AulParse::UnexpectedToken(const char * Expected)
void C4AulParse::Parse_WarningPragma()
{
assert(SEqual2(TokenSPos, C4AUL_Warning));
assert(std::isspace(TokenSPos[sizeof(C4AUL_Warning) - 1]));
// Read parameters in to string buffer. The sizeof() includes the terminating \0, but
// that's okay because we need to skip (at least) one whitespace character anyway.
std::string line(TokenSPos + sizeof(C4AUL_Warning), SPos);
// Read parameters in to string buffer.
std::string line(TokenSPos + sizeof(C4AUL_Warning) - 1, SPos);
auto end = line.end();
auto cursor = std::find_if_not(begin(line), end, IsWhiteSpace);
@ -794,11 +791,11 @@ void C4AulParse::Parse_WarningPragma()
auto start = cursor;
cursor = std::find_if(start, end, IsWhiteSpace);
bool enable_warning = false;
if (std::equal(start, cursor, C4Aul_Warning_enable))
if (cursor - start == sizeof(C4Aul_Warning_enable) - 1 && std::equal(start, cursor, C4Aul_Warning_enable))
{
enable_warning = true;
}
else if (std::equal(start, cursor, C4Aul_Warning_disable))
else if (cursor - start == sizeof(C4Aul_Warning_disable) - 1 && std::equal(start, cursor, C4Aul_Warning_disable))
{
enable_warning = false;
}

12
tests/aul/AulSyntaxTest.cpp
View File

@ -88,6 +88,18 @@ TEST(AulSyntaxTest, ParseSyntaxErrors)
EXPECT_THROW(ParseStatement("func Main() {}"), C4AulParseError);
}
TEST(AulSyntaxTest, PragmaWarningWithInsufficientData)
{
EXPECT_THROW(ParseScript("#warning"), C4AulParseError);
EXPECT_THROW(ParseScript("#warning\n"), C4AulParseError);
EXPECT_THROW(ParseScript("#warning "), C4AulParseError);
EXPECT_THROW(ParseScript("#warning \n"), C4AulParseError);
EXPECT_THROW(ParseScript("#warning e"), C4AulParseError);
EXPECT_THROW(ParseScript("#warning enabl"), C4AulParseError);
EXPECT_THROW(ParseScript("#warning d"), C4AulParseError);
EXPECT_THROW(ParseScript("#warning disabl"), C4AulParseError);
}
using namespace ::aul::ast;
TEST(AulSyntaxTest, ParseLiterals)
{