Mirror/wren
1
0
Fork 1
mirror of https://github.com/wren-lang/wren.git synced 2026-01-18 13:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimize string methods for stored length

Browse Source 
wrenStringConcat could still make use of this info, but that's a more involved
change.
This commit is contained in:
Evan Shaw
2015-01-08 10:05:33 +13:00
parent 3fd348e6c1
commit 5261ef498f
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/wren_core.c
View File

@ -915,18 +915,18 @@ DEF_NATIVE(string_contains)
{ {
if (!validateString(vm, args, 1, "Argument")) return PRIM_ERROR; if (!validateString(vm, args, 1, "Argument")) return PRIM_ERROR;
const char* string = AS_CSTRING(args[0]); ObjString* string = AS_STRING(args[0]);
const char* search = AS_CSTRING(args[1]); ObjString* search = AS_STRING(args[1]);
// Corner case, the empty string contains the empty string. // Corner case, the empty string contains the empty string.
if (strlen(string) == 0 && strlen(search) == 0) RETURN_TRUE; if (string->length == 0 && search->length == 0) RETURN_TRUE;
RETURN_BOOL(strstr(string, search) != NULL); RETURN_BOOL(strstr(string->value, search->value) != NULL);
} }
DEF_NATIVE(string_count) DEF_NATIVE(string_count)
{ {
double count = strlen(AS_CSTRING(args[0])); double count = AS_STRING(args[0])->length;
RETURN_NUM(count); RETURN_NUM(count);
} }
@ -944,26 +944,26 @@ DEF_NATIVE(string_plus)
DEF_NATIVE(string_eqeq) DEF_NATIVE(string_eqeq)
{ {
if (!IS_STRING(args[1])) RETURN_FALSE; if (!IS_STRING(args[1])) RETURN_FALSE;
const char* a = AS_CSTRING(args[0]); ObjString* a = AS_STRING(args[0]);
const char* b = AS_CSTRING(args[1]); ObjString* b = AS_STRING(args[1]);
RETURN_BOOL(strcmp(a, b) == 0); RETURN_BOOL(a->length == b->length &&
memcmp(a->value, b->value, a->length) == 0);
} }
DEF_NATIVE(string_bangeq) DEF_NATIVE(string_bangeq)
{ {
if (!IS_STRING(args[1])) RETURN_TRUE; if (!IS_STRING(args[1])) RETURN_TRUE;
const char* a = AS_CSTRING(args[0]); ObjString* a = AS_STRING(args[0]);
const char* b = AS_CSTRING(args[1]); ObjString* b = AS_STRING(args[1]);
RETURN_BOOL(strcmp(a, b) != 0); RETURN_BOOL(a->length != b->length ||
memcmp(a->value, b->value, a->length) != 0);
} }
DEF_NATIVE(string_subscript) DEF_NATIVE(string_subscript)
{ {
ObjString* string = AS_STRING(args[0]); ObjString* string = AS_STRING(args[0]);
// TODO: Strings should cache their length.
int length = (int)strlen(string->value);
int index = validateIndex(vm, args, length, 1, "Subscript"); int index = validateIndex(vm, args, string->length, 1, "Subscript");
if (index == -1) return PRIM_ERROR; if (index == -1) return PRIM_ERROR;
// The result is a one-character string. // The result is a one-character string.

4
src/wren_value.c
View File

@ -388,9 +388,7 @@ static void markString(WrenVM* vm, ObjString* string)
if (setMarkedFlag(&string->obj)) return; if (setMarkedFlag(&string->obj)) return;
// Keep track of how much memory is still in use. // Keep track of how much memory is still in use.
vm->bytesAllocated += sizeof(ObjString); vm->bytesAllocated += sizeof(ObjString) + string->length + 1;
// TODO: O(n) calculation here is lame!
vm->bytesAllocated += strlen(string->value);
} }
static void markClass(WrenVM* vm, ObjClass* classObj) static void markClass(WrenVM* vm, ObjClass* classObj)