From 4da38f686fbb2a72cbeda38c4cbcc341fa128d3d Mon Sep 17 00:00:00 2001 From: ValKmjolnir Date: Mon, 8 Jul 2024 22:47:30 +0800 Subject: [PATCH] :art: improve report format of ghost type --- src/nasal_type.cpp | 5 ++--- src/nasal_vm.cpp | 7 +------ src/nasal_vm.h | 1 - 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/nasal_type.cpp b/src/nasal_type.cpp index 2380ae3..0df7ff3 100644 --- a/src/nasal_type.cpp +++ b/src/nasal_type.cpp @@ -168,9 +168,8 @@ void nas_ghost::clear() { } std::ostream& operator<<(std::ostream& out, const nas_ghost& ghost) { - out << "() << std::dec << ">"; + out << "<" << ghost.get_ghost_name(); + out << "@0x" << std::hex << ghost.convert() << std::dec << ">"; return out; } diff --git a/src/nasal_vm.cpp b/src/nasal_vm.cpp index c3bd940..1ff0808 100644 --- a/src/nasal_vm.cpp +++ b/src/nasal_vm.cpp @@ -110,11 +110,6 @@ void vm::hash_value_info(var& val, const usize max_show_elems) { std::clog << "}"; } -void vm::ghost_type_info(var& val) { - std::clog << "" << std::dec; -} - void vm::coroutine_value_info(var& val) { std::clog << "[ "; switch(val.co().status) { @@ -183,7 +178,7 @@ void vm::value_info(var& val) { case vm_type::vm_upval: upvalue_info(val); break; case vm_type::vm_vec: vector_value_info(val); break; case vm_type::vm_hash: hash_value_info(val, 4); break; - case vm_type::vm_ghost: ghost_type_info(val); break; + case vm_type::vm_ghost: std::clog << val.ghost(); break; case vm_type::vm_co: coroutine_value_info(val); break; case vm_type::vm_map: namespace_value_info(val, 4); break; default: std::clog << "unknown"; break; diff --git a/src/nasal_vm.h b/src/nasal_vm.h index 478f0d9..830b58d 100644 --- a/src/nasal_vm.h +++ b/src/nasal_vm.h @@ -71,7 +71,6 @@ protected: void upvalue_info(var&); void vector_value_info(var&); void hash_value_info(var&, const usize); - void ghost_type_info(var&); void coroutine_value_info(var&); void namespace_value_info(var&, const usize); void value_name_form(const var&);