summaryrefslogtreecommitdiffstats
path: root/Source/cmExprParserHelper.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-07-16 17:06:29 (GMT)
committerBrad King <brad.king@kitware.com>2018-07-16 18:46:43 (GMT)
commit406f397e8b5524107457cc2d70bd22878350e9e1 (patch)
tree9ff09e0750b1b7e98c690f50da265869643afc43 /Source/cmExprParserHelper.h
parentdd5c54600b6f651898925bfd9ec4406ccfc7be95 (diff)
downloadCMake-406f397e8b5524107457cc2d70bd22878350e9e1.zip
CMake-406f397e8b5524107457cc2d70bd22878350e9e1.tar.gz
CMake-406f397e8b5524107457cc2d70bd22878350e9e1.tar.bz2
math: Restore toleration of unexpected characters in an expression
Prior to commit 7c4c13ffef (math: Reject unexpected expression input explicitly, 2018-05-18) we ignored unexpected characters in an expression that otherwise can be parsed. In order to preserve compatibility with projects that accidentally used this, convert the error to a warning.
Diffstat (limited to 'Source/cmExprParserHelper.h')
-rw-r--r--Source/cmExprParserHelper.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmExprParserHelper.h b/Source/cmExprParserHelper.h
index 15e8f3e..42c460a 100644
--- a/Source/cmExprParserHelper.h
+++ b/Source/cmExprParserHelper.h
@@ -32,6 +32,10 @@ public:
const char* GetError() { return this->ErrorString.c_str(); }
+ void UnexpectedChar(char c);
+
+ std::string const& GetWarning() const { return this->WarningString; }
+
private:
std::string::size_type InputBufferPos;
std::string InputBuffer;
@@ -47,6 +51,7 @@ private:
const char* FileName;
long FileLine;
std::string ErrorString;
+ std::string WarningString;
};
#define YYSTYPE cmExprParserHelper::ParserType