retoor/wren
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement Map.keys, Map.values iterators and proper toString with key-value formatting

Browse Source 
Add MapKeySequence and MapValueSequence classes in core.wren to expose iterable key and value views on Map instances. Implement native iterate_, keyIteratorValue_, and valueIteratorValue_ primitives in wren_core.c to support these sequences. Replace the stub Map.toString with a full implementation that iterates keys and formats each entry as "key: value", handling empty maps and nested maps correctly. Include comprehensive test suites for key iteration, value iteration, iterator type validation, and toString output across multiple orderings.
This commit is contained in:
Bob Nystrom
2015-01-25 18:27:38 +00:00
parent 56123c71e3
commit f093d0a42a
9 changed files with 250 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wren_core.c
+92 -2
View File
@@ -132,8 +132,39 @@ static const char* libSource =
"}\n"
"\n"
"class Map {\n"
" // TODO: Implement this.\n"
" toString { \"{}\" }\n"
" keys { new MapKeySequence(this) }\n"
" values { new MapValueSequence(this) }\n"
"\n"
" toString {\n"
" var first = true\n"
" var result = \"{\"\n"
"\n"
" for (key in keys) {\n"
" if (!first) result = result + \", \"\n"
" first = false\n"
" result = result + key.toString + \": \" + this[key].toString\n"
" }\n"
"\n"
" return result + \"}\"\n"
" }\n"
"}\n"
"\n"
"class MapKeySequence is Sequence {\n"
" new(map) {\n"
" _map = map\n"
" }\n"
"\n"
" iterate(n) { _map.iterate_(n) }\n"
" iteratorValue(iterator) { _map.keyIteratorValue_(iterator) }\n"
"}\n"
"\n"
"class MapValueSequence is Sequence {\n"
" new(map) {\n"
" _map = map\n"
" }\n"
"\n"
" iterate(n) { _map.iterate_(n) }\n"
" iteratorValue(iterator) { _map.valueIteratorValue_(iterator) }\n"
"}\n"
"\n"
"class Range is Sequence {}\n";
@@ -714,6 +745,62 @@ DEF_NATIVE(map_count)
RETURN_NUM(AS_MAP(args[0])->count);
}
DEF_NATIVE(map_iterate)
{
ObjMap* map = AS_MAP(args[0]);
if (map->count == 0) RETURN_FALSE;
// If we're starting the iteration, return the first entry.
int index = -1;
if (!IS_NULL(args[1]))
{
if (!validateInt(vm, args, 1, "Iterator")) return PRIM_ERROR;
index = (int)AS_NUM(args[1]);
if (index < 0 || index >= map->capacity) RETURN_FALSE;
}
// Find the next used entry, if any.
for (index++; index < map->capacity; index++)
{
if (!IS_UNDEFINED(map->entries[index].key)) RETURN_NUM(index);
}
// If we get here, walked all of the entries.
RETURN_FALSE;
}
DEF_NATIVE(map_keyIteratorValue)
{
ObjMap* map = AS_MAP(args[0]);
int index = validateIndex(vm, args, map->capacity, 1, "Iterator");
if (index == -1) return PRIM_ERROR;
MapEntry* entry = &map->entries[index];
if (IS_UNDEFINED(entry->key))
{
RETURN_ERROR("Invalid map iterator value.");
}
RETURN_VAL(entry->key);
}
DEF_NATIVE(map_valueIteratorValue)
{
ObjMap* map = AS_MAP(args[0]);
int index = validateIndex(vm, args, map->capacity, 1, "Iterator");
if (index == -1) return PRIM_ERROR;
MapEntry* entry = &map->entries[index];
if (IS_UNDEFINED(entry->key))
{
RETURN_ERROR("Invalid map iterator value.");
}
RETURN_VAL(entry->value);
}
DEF_NATIVE(null_not)
{
RETURN_VAL(TRUE_VAL);
@@ -1382,6 +1469,9 @@ void wrenInitializeCore(WrenVM* vm)
NATIVE(vm->mapClass, "[ ]=", map_subscriptSetter);
NATIVE(vm->mapClass, "clear", map_clear);
NATIVE(vm->mapClass, "count", map_count);
NATIVE(vm->mapClass, "iterate_ ", map_iterate);
NATIVE(vm->mapClass, "keyIteratorValue_ ", map_keyIteratorValue);
NATIVE(vm->mapClass, "valueIteratorValue_ ", map_valueIteratorValue);
// TODO: More map methods.
vm->rangeClass = AS_CLASS(findGlobal(vm, "Range"));