Mirror/wren
1
0
Fork 1
mirror of https://github.com/wren-lang/wren.git synced 2026-01-11 22:28:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into libuv

Browse Source
This commit is contained in:
Bob Nystrom
2015-08-07 07:57:32 -07:00
parent 07615ed1f2 56d4d3e671
commit 254729d067
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/wren.h
View File

@ -174,6 +174,8 @@ WrenMethod* wrenGetMethod(WrenVM* vm, const char* module, const char* variable,
// will allocate its own string and copy the characters from this, so
// you don't have to worry about the lifetime of the string you pass to
// Wren.
// - "v" - A previously acquired WrenValue*. Passing this in does not implicitly
// release the value.
void wrenCall(WrenVM* vm, WrenMethod* method, const char* argTypes, ...);
// Releases memory associated with [method]. After calling this, [method] can

16
src/vm/wren_vm.c
View File

@ -1170,9 +1170,13 @@ static ObjFn* makeCallStub(WrenVM* vm, ObjModule* module, const char* signature)
// Count the number parameters the method expects.
int numParams = 0;
for (const char* s = signature; *s != '\0'; s++)
if (signature[signatureLength - 1] == ')')
{
if (*s == '_') numParams++;
for (const char* s = signature + signatureLength - 2;
s > signature && *s != '('; s--)
{
if (*s == '_') numParams++;
}
}
int method = wrenSymbolTableEnsure(vm, &vm->methodNames,
@ -1255,6 +1259,8 @@ void wrenCall(WrenVM* vm, WrenMethod* method, const char* argTypes, ...)
value = wrenStringFormat(vm, "$", va_arg(argList, const char*));
break;
}
case 'v': value = va_arg(argList, WrenValue*)->value; break;
default:
ASSERT(false, "Unknown argument type.");
@ -1266,15 +1272,15 @@ void wrenCall(WrenVM* vm, WrenMethod* method, const char* argTypes, ...)
va_end(argList);
Value receiver = method->fiber->stack[0];
Value receiver = method->fiber->stack[0];
Obj* fn = method->fiber->frames[0].fn;
// TODO: How does this handle a runtime error occurring?
runInterpreter(vm, method->fiber);
// Reset the fiber to get ready for the next call.
wrenResetFiber(vm, method->fiber, fn);
// Push the receiver back on the stack.
*method->fiber->stackTop++ = receiver;
}