Meson/wren
1
0
Fork 0
forked from Mirror/wren
Code Pull Requests Activity

"native" -> "foreign".

Browse Source
This commit is contained in:
Bob Nystrom
2013-12-29 10:14:38 -08:00
parent 63d1255566
commit a9323376ec
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/wren_vm.c
View File

@ -64,8 +64,8 @@ WrenVM* wrenNewVM(WrenConfiguration* configuration)
vm->globals[i] = NULL_VAL; vm->globals[i] = NULL_VAL;
} }
vm->nativeCallSlot = NULL; vm->foreignCallSlot = NULL;
vm->nativeCallNumArgs = 0; vm->foreignCallNumArgs = 0;
wrenInitializeCore(vm); wrenInitializeCore(vm);
return vm; return vm;
@ -572,10 +572,10 @@ static void bindMethod(int methodType, int symbol, ObjClass* classObj,
static void callForeign(WrenVM* vm, ObjFiber* fiber, Method* method, int numArgs) static void callForeign(WrenVM* vm, ObjFiber* fiber, Method* method, int numArgs)
{ {
vm->nativeCallSlot = &fiber->stack[fiber->stackSize - numArgs]; vm->foreignCallSlot = &fiber->stack[fiber->stackSize - numArgs];
// Don't include the receiver. // Don't include the receiver.
vm->nativeCallNumArgs = numArgs - 1; vm->foreignCallNumArgs = numArgs - 1;
method->native(vm); method->native(vm);
@ -584,10 +584,10 @@ static void callForeign(WrenVM* vm, ObjFiber* fiber, Method* method, int numArgs
fiber->stackSize -= numArgs - 1; fiber->stackSize -= numArgs - 1;
// If nothing was returned, implicitly return null. // If nothing was returned, implicitly return null.
if (vm->nativeCallSlot != NULL) if (vm->foreignCallSlot != NULL)
{ {
*vm->nativeCallSlot = NULL_VAL; *vm->foreignCallSlot = NULL_VAL;
vm->nativeCallSlot = NULL; vm->foreignCallSlot = NULL;
} }
} }
@ -1294,13 +1294,13 @@ double wrenGetArgumentDouble(WrenVM* vm, int index)
// + 1 to shift past the receiver. // + 1 to shift past the receiver.
// TODO: Check actual value type first. // TODO: Check actual value type first.
return AS_NUM(*(vm->nativeCallSlot + index + 1)); return AS_NUM(*(vm->foreignCallSlot + index + 1));
} }
void wrenReturnDouble(WrenVM* vm, double value) void wrenReturnDouble(WrenVM* vm, double value)
{ {
ASSERT(vm->nativeCallSlot != NULL, "Must be in foreign call."); ASSERT(vm->foreignCallSlot != NULL, "Must be in foreign call.");
*vm->nativeCallSlot = NUM_VAL(value); *vm->foreignCallSlot = NUM_VAL(value);
vm->nativeCallSlot = NULL; vm->foreignCallSlot = NULL;
} }

4
src/wren_vm.h
View File

@ -247,11 +247,11 @@ struct WrenVM
// During a foreign function call, this will point to the first argument (the // During a foreign function call, this will point to the first argument (the
// receiver) of the call on the fiber's stack. // receiver) of the call on the fiber's stack.
Value* nativeCallSlot; Value* foreignCallSlot;
// During a foreign function call, this will contain the number of arguments // During a foreign function call, this will contain the number of arguments
// to the function. // to the function.
int nativeCallNumArgs; int foreignCallNumArgs;
}; };
// A generic allocation function that handles all explicit memory management. // A generic allocation function that handles all explicit memory management.