diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-02-08 14:48:44 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-02-08 14:48:44 +0300 |
| commit | 19079d7aff4773ae21b52ca141d0687cd9dfefc8 (patch) | |
| tree | 2d8f5f3a5438f0d070498993c0bfc57190c0f678 /src/ObjectModel | |
| parent | db74a64ede6daee2b79ff78be3b0301dbda0b03e (diff) | |
Various changes for 3.01-RC1
Fixed Abort command so that it resets the state to not printing
Introduced null literal and allow objects to be compared to null
Diffstat (limited to 'src/ObjectModel')
| -rw-r--r-- | src/ObjectModel/ObjectModel.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/ObjectModel/ObjectModel.cpp b/src/ObjectModel/ObjectModel.cpp index b2d4fc43..daefbf6e 100644 --- a/src/ObjectModel/ObjectModel.cpp +++ b/src/ObjectModel/ObjectModel.cpp @@ -657,7 +657,11 @@ ExpressionValue ObjectModel::GetObjectValue(ObjectExplorationContext& context, E { return val.omVal->GetObjectValue(context, idString + 1, val.param); } - throw context.ConstructParseException((*idString == 0) ? "selected value has non-primitive type" : "syntax error in value selector string"); + if (*idString == 0) + { + return val; // an object value can be compared to null + } + throw context.ConstructParseException("syntax error in value selector string"); case TYPE_OF(Bitmap<uint16_t>): case TYPE_OF(Bitmap<uint32_t>): |