diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-07-30 10:18:13 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-07-30 10:18:13 +0300 |
| commit | 87466bfbbb8ed851519bb9f2ccb1cbbc7cc696c4 (patch) | |
| tree | 8ebfbc7123a5887e175d25c555be81ef391bfb96 /src/GCodes/GCodeBuffer | |
| parent | 7c5ef6000bdeebfa8d51c0ead656ea554f1eb882 (diff) | |
Reverted ExpressionParser files
Diffstat (limited to 'src/GCodes/GCodeBuffer')
| -rw-r--r-- | src/GCodes/GCodeBuffer/ExpressionParser.cpp | 6 | ||||
| -rw-r--r-- | src/GCodes/GCodeBuffer/ExpressionParser.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/GCodes/GCodeBuffer/ExpressionParser.cpp b/src/GCodes/GCodeBuffer/ExpressionParser.cpp index 0c65a39c..60d5db79 100644 --- a/src/GCodes/GCodeBuffer/ExpressionParser.cpp +++ b/src/GCodes/GCodeBuffer/ExpressionParser.cpp @@ -812,12 +812,10 @@ void ExpressionParser::SkipWhiteSpace() noexcept } } -void ExpressionParser::CheckForExtraCharacters(bool isArrayExpression) THROWS(GCodeException) +void ExpressionParser::CheckForExtraCharacters() THROWS(GCodeException) { SkipWhiteSpace(); - - char c = CurrentCharacter(); - if (c != 0 && (!isArrayExpression || (c != EXPRESSION_LIST_SEPARATOR && c != LIST_SEPARATOR))) + if (CurrentCharacter() != 0) { ThrowParseException("Unexpected characters after expression"); } diff --git a/src/GCodes/GCodeBuffer/ExpressionParser.h b/src/GCodes/GCodeBuffer/ExpressionParser.h index adfff7c7..25ad7470 100644 --- a/src/GCodes/GCodeBuffer/ExpressionParser.h +++ b/src/GCodes/GCodeBuffer/ExpressionParser.h @@ -33,7 +33,7 @@ public: void ParseDriverIdArray(DriverId arr[], size_t& length) THROWS(GCodeException); void SkipWhiteSpace() noexcept; - void CheckForExtraCharacters(bool isArrayExpression = false) THROWS(GCodeException); + void CheckForExtraCharacters() THROWS(GCodeException); const char *GetEndptr() const noexcept { return currentp; } private: |