roland/xo-reader
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-interpreter2 stack: wrap TokenizerError as DRuntimeError

Browse source 
Also fix _read_eval_print() to report them!
This commit is contained in:
Roland Conybeare 2026-03-27 11:16:28 -04:00
commit 822fef7de3
3 changed files with 47 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp
View file

@ -27,17 +27,15 @@ namespace xo {
VsmResult() = default;
explicit VsmResult(obj<AGCObject> value) : result_{value} {}
explicit VsmResult(TokenizerError err) : result_{err} {}
bool is_value() const { return std::holds_alternative<obj<AGCObject>>(result_); }
bool is_tk_error() const { return std::holds_alternative<TokenizerError>(result_); }
bool is_eval_error() const;
bool is_value() const { return result_; }
bool is_error() const;
const obj<AGCObject> * value() const { return std::get_if<obj<AGCObject>>(&result_); }
obj<AGCObject> & value_ref() { return std::get<obj<AGCObject>>(result_); }
const obj<AGCObject> * value() const { return &result_; }
obj<AGCObject> & value_ref() { return result_; }
/** result of evaluating first expression encountered in input **/
std::variant<obj<AGCObject>, TokenizerError> result_;
obj<AGCObject> result_;
};
/** vsm result + reamining span **/
@ -270,7 +268,9 @@ namespace xo {
obj<AAllocator> aux_mm_;
/** allocator (likely DX1Collector or similar) for
* expressions and values. Schemaatika reader will use this also
* expressions and values. Schemaatika reader will use this also.
*
* Allocations must represent a type that supports GCObject.
**/
abox<AAllocator> mm_;