diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-15 12:22:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-08-15 13:00:34 (GMT) |
| commit | 9040ec91173824b27dd946d7bd36cc9c07268d74 (patch) | |
| tree | 51ccc551976d89c7b4a9deff22308ce8afec388a | |
| parent | c50f7ede200e2a7cd02d59117ac93543b602885c (diff) | |
| download | CMake-9040ec91173824b27dd946d7bd36cc9c07268d74.zip CMake-9040ec91173824b27dd946d7bd36cc9c07268d74.tar.gz CMake-9040ec91173824b27dd946d7bd36cc9c07268d74.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmListFileCache.cxx | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/ParenNoSpace.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/RunCMakeTest.cmake | 1 |
5 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index c02866c..898f379 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -287,8 +287,8 @@ bool cmListFileParser::ParseFunction(const char* name, long line) if(token->type == cmListFileLexer_Token_ParenLeft) { parenDepth++; - this->AddArgument(token, cmListFileArgument::Unquoted); this->Separation = SeparationOkay; + this->AddArgument(token, cmListFileArgument::Unquoted); } else if(token->type == cmListFileLexer_Token_ParenRight) { diff --git a/Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt b/Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt new file mode 100644 index 0000000..10f3293 --- /dev/null +++ b/Tests/RunCMake/Syntax/ParenNoSpace-stderr.txt @@ -0,0 +1 @@ +^$ diff --git a/Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt b/Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt new file mode 100644 index 0000000..72addd7 --- /dev/null +++ b/Tests/RunCMake/Syntax/ParenNoSpace-stdout.txt @@ -0,0 +1,2 @@ +-- unquoted\(unquoted\) +-- quoted\(quoted\) diff --git a/Tests/RunCMake/Syntax/ParenNoSpace.cmake b/Tests/RunCMake/Syntax/ParenNoSpace.cmake new file mode 100644 index 0000000..c690d96 --- /dev/null +++ b/Tests/RunCMake/Syntax/ParenNoSpace.cmake @@ -0,0 +1,2 @@ +message(STATUS unquoted(unquoted)) +message(STATUS "quoted"("quoted")) diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake index 8975b25..94963f3 100644 --- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake +++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake @@ -11,6 +11,7 @@ run_cmake(String1) run_cmake(StringNoSpace) run_cmake(Unquoted0) run_cmake(Unquoted1) +run_cmake(ParenNoSpace) run_cmake(UnterminatedCall1) run_cmake(UnterminatedCall2) run_cmake(UnterminatedString) |