diff options
| author | David Crocker <dcrocker@eschertech.com> | 2021-07-30 10:18:13 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-07-31 10:01:19 +0300 |
| commit | 84b2d4a1a6c8d97e5dc4844411c2e93af8218b8e (patch) | |
| tree | 17b6c76d160cbeee83eaabbbbc14b65302b0bee6 | |
| parent | 96f1f67d0bca48b267f4351fd863e4c9f72841cc (diff) | |
Reverted ExpressionParser files
| -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: |