diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-02-22 19:09:12 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2021-02-22 19:09:12 +0300 |
| commit | 5baa6d2ecab3f2fe7861495f7a2daf0c3a74443f (patch) | |
| tree | 930e4384b8f27b3a03e78bae78a53a8f5fbe4181 /src/GCodes/GCodeBuffer/ExpressionParser.h | |
| parent | 12c8c1a8747f07cbe14600208d216ab75bc6b78c (diff) | |
Work towards v3.3
Introduced new "obsolete" attribute for object model fields
Marked some fields in the object model obsolete
Warnings are now shown when obsolete fields are used
Reduced object model size a bit of grid definitions
Added back some grid properties for backwards-compatibility
Added new o-flag to M409 and rr_model
Diffstat (limited to 'src/GCodes/GCodeBuffer/ExpressionParser.h')
| -rw-r--r-- | src/GCodes/GCodeBuffer/ExpressionParser.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/GCodes/GCodeBuffer/ExpressionParser.h b/src/GCodes/GCodeBuffer/ExpressionParser.h index 2a16286f..4c70393a 100644 --- a/src/GCodes/GCodeBuffer/ExpressionParser.h +++ b/src/GCodes/GCodeBuffer/ExpressionParser.h @@ -18,7 +18,7 @@ class ExpressionParser public: ExpressionParser(const GCodeBuffer& p_gb, const char *text, const char *textLimit, int p_column = -1) noexcept; - ExpressionValue Parse(bool evaluate = true, uint8_t priority = 0) THROWS(GCodeException); + ExpressionValue Parse(bool evaluate = true) THROWS(GCodeException); bool ParseBoolean() THROWS(GCodeException); float ParseFloat() THROWS(GCodeException); int32_t ParseInteger() THROWS(GCodeException); @@ -33,6 +33,7 @@ private: GCodeException ConstructParseException(const char *str, const char *param) const noexcept; GCodeException ConstructParseException(const char *str, uint32_t param) const noexcept; + ExpressionValue ParseInternal(bool evaluate = true, uint8_t priority = 0) THROWS(GCodeException); ExpressionValue ParseExpectKet(bool evaluate, char expectedKet) THROWS(GCodeException); ExpressionValue ParseNumber() noexcept pre(readPointer >= 0; isdigit(gb.buffer[readPointer])); @@ -61,6 +62,7 @@ private: int column; char stringBufferStorage[StringBufferLength]; StringBuffer stringBuffer; + String<MaxVariableNameLength> obsoleteField; }; #endif /* SRC_GCODES_GCODEBUFFER_EXPRESSIONPARSER_H_ */ |