@@ -146,7 +146,12 @@ namespace rubinius { ++level; for(size_t i = 0; i < stop; i++) { indent(level); - ary->get(state, i)->show(state, level); + OBJECT obj = ary->get(state, i); + if(obj == ary) { + class_info(obj, true); + } else { + obj->show(state, level); + } } if(ary->size() > stop) { indent(level); vm/builtin/array.cpp @@ -39,7 +39,7 @@ namespace rubinius { class Info : public TypeInfo { public: BASIC_TYPEINFO(TypeInfo) - void show(STATE, OBJECT self, int level); + virtual void show(STATE, OBJECT self, int level); }; }; }; vm/builtin/array.hpp @@ -4,6 +4,7 @@ #include "builtin/fixnum.hpp" #include <cstdarg> +#include <iostream> namespace rubinius { OBJECT Tuple::at(size_t index) { @@ -127,4 +128,27 @@ namespace rubinius { } } + void Tuple::Info::show(STATE, OBJECT self, int level) { + Tuple* tup = as<Tuple>(self); + size_t size = tup->field_count; + size_t stop = size < 5 ? size : 5; + + class_info(self); + std::cout << ": " << size << "\n"; + ++level; + for(size_t i = 0; i < stop; i++) { + indent(level); + OBJECT obj = tup->at(i); + if(obj == tup) { + class_info(self, true); + } else { + obj->show(state, level); + } + } + if(tup->field_count > stop) { + indent(level); + std::cout << "...\n"; + } + indent(--level); std::cout << ">\n"; + } } vm/builtin/tuple.cpp @@ -44,6 +44,7 @@ namespace rubinius { public: Info(object_type type) : TypeInfo(type) { } virtual void mark(OBJECT t, ObjectMark& mark); + virtual void show(STATE, OBJECT self, int level); }; }; }; vm/builtin/tuple.hpp b78e807dbc432e81503603c25cb0180d82f57f1d Brian Ford bford@engineyard.com http://github.com/evanphx/rubinius/commit/7f8af1531125850bc75b8315269a7e0528e98c50 7f8af1531125850bc75b8315269a7e0528e98c50 2008-09-03T12:56:59-07:00 2008-09-03T12:56:59-07:00 Added show for Tuple and recursion guard for Array. 7a6a5ad26178f8f9b5eb590f0908ee17b688602c Brian Ford bford@engineyard.com