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

xo-interpreter2 stack: work on runtime error representation [WIP]

Browse source
This commit is contained in:
Roland Conybeare 2026-02-12 18:46:43 -05:00
commit 497dc8a626
5 changed files with 86 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/xo/interpreter2/VirtualSchematikaMachine.hpp
View file

@ -10,6 +10,7 @@
#include "VsmFrame.hpp"
#include "DLocalEnv.hpp"
#include "DGlobalEnv.hpp"
#include <xo/object2/RuntimeError.hpp>
#include <xo/reader2/SchematikaReader.hpp>
#include <xo/expression2/Expression.hpp>
#include <xo/gc/GCObject.hpp>
@ -17,6 +18,10 @@
namespace xo {
namespace scm {
#ifdef OBSOLETE // see DVsmError
// TODO: move error to collected space?
// or special arena?
//
struct EvaluationError {
/** source location (in vsm implementation) at which error identified **/
std::string_view src_function_;
@ -24,6 +29,7 @@ namespace xo {
std::string_view error_description_;
// TODO: info about location in schematika source
};
#endif
/** similar to @ref xo::scm::ReaderResult **/
struct VsmResult {
@ -31,17 +37,17 @@ namespace xo {
using span_type = xo::mm::span<const char>;
VsmResult() = default;
VsmResult(obj<AGCObject> value) : result_{value} {}
VsmResult(TokenizerError err) : result_{err} {}
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 { return std::holds_alternative<EvaluationError>(result_); }
bool is_eval_error() const;
const obj<AGCObject> * value() const { return std::get_if<obj<AGCObject>>(&result_); }
/** result of evaluating first expression encountered in input **/
std::variant<obj<AGCObject>, TokenizerError, EvaluationError> result_;
std::variant<obj<AGCObject>, TokenizerError> result_;
};
/** vsm result + reamining span **/
@ -72,6 +78,8 @@ namespace xo {
/** allocator for schematika data **/
obj<AAllocator> allocator() const noexcept;
/** allocator for runtime errors **/
obj<AAllocator> error_allocator() const noexcept;
/** visit vsm-owned memory pools; call visitor(info) for each **/
void visit_pools(const MemorySizeVisitor & visitor) const;
@ -185,11 +193,19 @@ namespace xo {
/** configuration **/
VsmConfig config_;
/** allocator (likely collector) for
/** allocator (likely DX1Collector or similar) for
* expressions and values
**/
box<AAllocator> mm_;
/** Sidecar allocator for error reporting.
* Separate to mitigate interference with @ref mm_
* (separate memory so we can for example report
* an out-of-memory error).
* Likely DArena or similar
**/
box<AAllocator> error_mm_;
/** runtime context for this vsm.
* For example, provides allocator to primitives
**/

6
include/xo/interpreter2/VsmConfig.hpp
View file

@ -7,6 +7,7 @@
#include <xo/reader2/ReaderConfig.hpp>
#include <xo/gc/X1CollectorConfig.hpp>
#include <xo/arena/ArenaConfig.hpp>
namespace xo {
namespace scm {
@ -14,6 +15,7 @@ namespace xo {
**/
struct VsmConfig {
using X1CollectorConfig = xo::mm::X1CollectorConfig;
using ArenaConfig = xo::mm::ArenaConfig;
VsmConfig() = default;
@ -26,6 +28,10 @@ namespace xo {
* TODO: may want to make CollectorConfig polymorphic
**/
X1CollectorConfig x1_config_ = X1CollectorConfig().with_size(4*1024*1024);
/** Configuration for error allocator
* TODO: may want to make ArenaConfig polymorphic
**/
ArenaConfig error_config_ = ArenaConfig().with_size(64*1024);
};
} /*namespace scm*/
} /*namespace xo*/