diff options
| author | Brad King <brad.king@kitware.com> | 2016-08-31 09:19:34 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-31 09:19:34 -0400 |
| commit | 5b1f9cd12703eca0505ee0b6d9d2a0e53ed86f67 (patch) | |
| tree | 111087c59034f9f65bde0c3103ac5a2850da0a68 | |
| parent | 6f8b93983a3bfb4a9262cae8e9b989edb61e8a4b (diff) | |
| parent | 1dda2ec55a07f2a51d09f7b1604707e690e884b5 (diff) | |
| download | cmake-5b1f9cd12703eca0505ee0b6d9d2a0e53ed86f67.tar.gz | |
Merge topic 'syntax-unexpected-eof'
1dda2ec5 Improve error message on unexpected end of file
| -rw-r--r-- | Source/cmListFileCache.cxx | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/CommandEOF-result.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/CommandEOF-stderr.txt | 6 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/CommandEOF.cmake | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/Syntax/RunCMakeTest.cmake | 1 |
5 files changed, 10 insertions, 2 deletions
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx index 3c5e33328c..aad538ca6c 100644 --- a/Source/cmListFileCache.cxx +++ b/Source/cmListFileCache.cxx @@ -163,8 +163,7 @@ bool cmListFileParser::ParseFunction(const char* name, long line) if (!token) { std::ostringstream error; /* clang-format off */ - error << "Error in cmake code at\n" << this->FileName << ":" - << cmListFileLexer_GetCurrentLine(this->Lexer) << ":\n" + error << "Unexpected end of file.\n" << "Parse error. Function missing opening \"(\"."; /* clang-format on */ this->IssueError(error.str()); diff --git a/Tests/RunCMake/Syntax/CommandEOF-result.txt b/Tests/RunCMake/Syntax/CommandEOF-result.txt new file mode 100644 index 0000000000..d00491fd7e --- /dev/null +++ b/Tests/RunCMake/Syntax/CommandEOF-result.txt @@ -0,0 +1 @@ +1 diff --git a/Tests/RunCMake/Syntax/CommandEOF-stderr.txt b/Tests/RunCMake/Syntax/CommandEOF-stderr.txt new file mode 100644 index 0000000000..31cbc08d71 --- /dev/null +++ b/Tests/RunCMake/Syntax/CommandEOF-stderr.txt @@ -0,0 +1,6 @@ +^CMake Error in CommandEOF.cmake: + Unexpected end of file. + + Parse error. Function missing opening "\(". +Call Stack \(most recent call first\): + CMakeLists.txt:3 \(include\)$ diff --git a/Tests/RunCMake/Syntax/CommandEOF.cmake b/Tests/RunCMake/Syntax/CommandEOF.cmake new file mode 100644 index 0000000000..36ebb02949 --- /dev/null +++ b/Tests/RunCMake/Syntax/CommandEOF.cmake @@ -0,0 +1 @@ +message
\ No newline at end of file diff --git a/Tests/RunCMake/Syntax/RunCMakeTest.cmake b/Tests/RunCMake/Syntax/RunCMakeTest.cmake index fd012b9c46..d1fbb16aa5 100644 --- a/Tests/RunCMake/Syntax/RunCMakeTest.cmake +++ b/Tests/RunCMake/Syntax/RunCMakeTest.cmake @@ -17,6 +17,7 @@ run_cmake(CommandSpaces) run_cmake(CommandTabs) run_cmake(CommandNewlines) run_cmake(CommandComments) +run_cmake(CommandEOF) run_cmake(CommandError0) run_cmake(CommandError1) run_cmake(CommandError2) |