From f80b3ce2b52f568bb04005c24ad11c3a05cf7a15 Mon Sep 17 00:00:00 2001 From: olpc user Date: Sun, 24 Nov 2019 14:09:27 -0800 Subject: level0 few more checks --- starts/meaning-vm/level-0/memorystore.cpp | 5 +++++ starts/meaning-vm/level-0/memorystore.hpp | 1 + starts/meaning-vm/level-0/vref.hpp | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'starts/meaning-vm/level-0') diff --git a/starts/meaning-vm/level-0/memorystore.cpp b/starts/meaning-vm/level-0/memorystore.cpp index 6cf71df..0a4f0cc 100644 --- a/starts/meaning-vm/level-0/memorystore.cpp +++ b/starts/meaning-vm/level-0/memorystore.cpp @@ -55,5 +55,10 @@ void dealloc(ref r) { throw no_such_concept(r); } +std::size_t allocated() +{ + return concepts().size(); +} + } } diff --git a/starts/meaning-vm/level-0/memorystore.hpp b/starts/meaning-vm/level-0/memorystore.hpp index 4e0a2bd..a86ccea 100644 --- a/starts/meaning-vm/level-0/memorystore.hpp +++ b/starts/meaning-vm/level-0/memorystore.hpp @@ -8,6 +8,7 @@ namespace level0 { ref alloc(concept * moved = 0); void dealloc(ref); +std::size_t allocated(); } } diff --git a/starts/meaning-vm/level-0/vref.hpp b/starts/meaning-vm/level-0/vref.hpp index 7fe2045..cffc8f5 100644 --- a/starts/meaning-vm/level-0/vref.hpp +++ b/starts/meaning-vm/level-0/vref.hpp @@ -15,10 +15,11 @@ struct vref value* operator->() { return ptr; } operator T const &() const { return *ptr; } - vref(T const & val) : ptr(alloc(new value(val))) { } + vref(T const & val) : vref(alloc(new value(val))) { } vref(ref const & other) : ptr(static_cast*>(other.ptr)) { } operator ref() { return ptr; } + T const & val() { return *ptr; } // for use by containers bool operator<(vref const & other) const { return self.ptr < other.ptr; } -- cgit v1.2.3