kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not warn about left paren not separated by a space 

Since commit 58e52416 (Warn about arguments not separated by whitespace,
2013-02-16) we warn about arguments not separated by spaces.  Loosen the
warning to not complain about left parens not separated by spaces from
the preceding token.  This is common in code like "if(NOT(X))".

Teach the RunCMake.Syntax test to cover cases of left parens not
separated by spaces and check that no warning appears.
This commit is contained in:
Brad King 2013-08-15 08:22:15 -04:00
parent c50f7ede20
commit 9040ec9117
5 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmListFileCache.cxx
View File

@ -287,8 +287,8 @@ bool cmListFileParser::ParseFunction(const char* name, long line)
if(token->type == cmListFileLexer_Token_ParenLeft) if(token->type == cmListFileLexer_Token_ParenLeft)
{ {
parenDepth++; parenDepth++;
this->AddArgument(token, cmListFileArgument::Unquoted);
this->Separation = SeparationOkay; this->Separation = SeparationOkay;
this->AddArgument(token, cmListFileArgument::Unquoted);
} }
else if(token->type == cmListFileLexer_Token_ParenRight) else if(token->type == cmListFileLexer_Token_ParenRight)
{ {

1
Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt Normal file
View File

@ -0,0 +1 @@
^$

2
Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt Normal file
View File

@ -0,0 +1,2 @@
-- unquoted\(unquoted\)
-- quoted\(quoted\)

2
Tests/RunCMake/Syntax/ParenNoSpace.cmake Normal file
View File

@ -0,0 +1,2 @@
message(STATUS unquoted(unquoted))
message(STATUS "quoted"("quoted"))

1
Tests/RunCMake/Syntax/RunCMakeTest.cmake
View File

@ -11,6 +11,7 @@ run_cmake(String1)
run_cmake(StringNoSpace) run_cmake(StringNoSpace)
run_cmake(Unquoted0) run_cmake(Unquoted0)
run_cmake(Unquoted1) run_cmake(Unquoted1)
run_cmake(ParenNoSpace)
run_cmake(UnterminatedCall1) run_cmake(UnterminatedCall1)
run_cmake(UnterminatedCall2) run_cmake(UnterminatedCall2)
run_cmake(UnterminatedString) run_cmake(UnterminatedString)