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

feat: remove List.new(_) constructor and consolidate into List.filled(_,_)

Browse Source 
Remove the List.new(_) primitive that initialized a list with null elements, merging its functionality into List.filled(_,_) which now accepts both size and default value. Add validation for negative size with a clear error message, and introduce comprehensive test coverage for filled list creation including edge cases for negative size, non-integer size, and non-numeric size arguments.
This commit is contained in:
Bob Nystrom
2016-08-04 05:42:31 +00:00
parent 85ab5d2aec
commit bfb109473e
6 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm/wren_core.c
+18 -37
View File
@@ -234,46 +234,28 @@ DEF_PRIMITIVE(fn_toString)
RETURN_VAL(CONST_STRING(vm, "<fn>"));
}
// Creates a new list of size args[1], with all elements initialized to args[2].
DEF_PRIMITIVE(list_filled)
{
if (!validateInt(vm, args[1], "Size")) return false;
if (AS_NUM(args[1]) < 0) RETURN_ERROR("Size cannot be negative.");
uint32_t size = (uint32_t)AS_NUM(args[1]);
ObjList* list = wrenNewList(vm, size);
for (uint32_t i = 0; i < size; i++)
{
list->elements.data[i] = args[2];
}
RETURN_OBJ(list);
}
DEF_PRIMITIVE(list_new)
{
RETURN_OBJ(wrenNewList(vm, 0));
}
//creates a new list of size args[1], with all elements initilized to null
DEF_PRIMITIVE(list_newWithSize)
{
if(!validateInt(vm, args[1], "Size")) return false;
uint32_t size = (uint32_t)AS_NUM(args[1]);
ObjList* list = wrenNewList(vm, size);
for(uint32_t i=0; i < size; i++)
{
list->elements.data[i] = NULL_VAL;
}
RETURN_OBJ(list);
}
//creates a new list of size args[1], with all elements initilized to args[2]
DEF_PRIMITIVE(list_newWithSizeDefault)
{
if(!validateInt(vm, args[1], "Size")) return false;
uint32_t size = (uint32_t)AS_NUM(args[1]);
ObjList* list = wrenNewList(vm, size);
for(uint32_t i=0; i < size; i++)
{
list->elements.data[i] = args[2];
}
RETURN_OBJ(list);
}
DEF_PRIMITIVE(list_add)
{
wrenValueBufferWrite(vm, &AS_LIST(args[0])->elements, args[1]);
@@ -1308,9 +1290,8 @@ void wrenInitializeCore(WrenVM* vm)
PRIMITIVE(vm->stringClass, "toString", string_toString);
vm->listClass = AS_CLASS(wrenFindVariable(vm, coreModule, "List"));
PRIMITIVE(vm->listClass->obj.classObj, "filled(_,_)", list_filled);
PRIMITIVE(vm->listClass->obj.classObj, "new()", list_new);
PRIMITIVE(vm->listClass->obj.classObj, "new(_)", list_newWithSize);
PRIMITIVE(vm->listClass->obj.classObj, "filled(_,_)", list_newWithSizeDefault);
PRIMITIVE(vm->listClass, "[_]", list_subscript);
PRIMITIVE(vm->listClass, "[_]=(_)", list_subscriptSetter);
PRIMITIVE(vm->listClass, "add(_)", list_add);