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

feat: add user_data API test and reorder WrenErrorFn vm parameter to first position

Browse Source 
Add a new test suite for user data get/set operations on WrenVM, including
a Wren script that validates default NULL userData, retrieval after VM
creation, and mutation via wrenSetUserData. Also reorder the vm parameter
in WrenErrorFn callback signature and all its call sites to match the
convention used by other callback types, updating the typedef, the
reportError implementation, and all invocations in the compiler and
debug modules. Include the new source and header files in the Xcode
project build configuration.
This commit is contained in:
Bob Nystrom
2017-03-22 14:26:19 +00:00
parent 6c756c0c67
commit 9b0d2aefb6
9 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cli/vm.c
+2 -2
View File
@@ -154,8 +154,8 @@ static void write(WrenVM* vm, const char* text)
fflush(stdout);
}
static void reportError(WrenErrorType type,
const char* module, int line, const char* message, WrenVM* vm)
static void reportError(WrenVM* vm, WrenErrorType type,
const char* module, int line, const char* message)
{
switch (type)
{
src/include/wren.h
+3 -2
View File
@@ -96,7 +96,8 @@ typedef enum
// Each of those has the module and line where the method or function is
// defined and [message] is the name of the method or function.
typedef void (*WrenErrorFn)(
WrenErrorType type, const char* module, int line, const char* message, WrenVM* vm);
WrenVM* vm, WrenErrorType type, const char* module, int line,
const char* message);
typedef struct
{
@@ -207,7 +208,7 @@ typedef struct
// If zero, defaults to 50.
int heapGrowthPercent;
// User defined state data associated with the WrenVM.
// User-defined data associated with the VM.
void* userData;
} WrenConfiguration;
src/vm/wren_compiler.c
+2 -2
View File
@@ -403,8 +403,8 @@ static void printError(Parser* parser, int line, const char* label,
length += vsprintf(message + length, format, args);
ASSERT(length < ERROR_MESSAGE_SIZE, "Error should not exceed buffer.");
parser->vm->config.errorFn(WREN_ERROR_COMPILE,
parser->module->name->value, line, message, parser->vm);
parser->vm->config.errorFn(parser->vm, WREN_ERROR_COMPILE,
parser->module->name->value, line, message);
}
// Outputs a compile or syntax error. This also marks the compilation as having
src/vm/wren_debug.c
+7 -4
View File
@@ -10,13 +10,15 @@ void wrenDebugPrintStackTrace(WrenVM* vm)
ObjFiber* fiber = vm->fiber;
if (IS_STRING(fiber->error))
{
vm->config.errorFn(WREN_ERROR_RUNTIME, NULL, -1, AS_CSTRING(fiber->error), vm);
vm->config.errorFn(vm, WREN_ERROR_RUNTIME,
NULL, -1, AS_CSTRING(fiber->error));
}
else
{
// TODO: Print something a little useful here. Maybe the name of the error's
// class?
vm->config.errorFn(WREN_ERROR_RUNTIME, NULL, -1, "[error object]", vm);
vm->config.errorFn(vm, WREN_ERROR_RUNTIME,
NULL, -1, "[error object]");
}
for (int i = fiber->numFrames - 1; i >= 0; i--)
@@ -34,8 +36,9 @@ void wrenDebugPrintStackTrace(WrenVM* vm)
// -1 because IP has advanced past the instruction that it just executed.
int line = fn->debug->sourceLines.data[frame->ip - fn->code.data - 1];
vm->config.errorFn(WREN_ERROR_STACK_TRACE, fn->module->name->value, line,
fn->debug->name, vm);
vm->config.errorFn(vm, WREN_ERROR_STACK_TRACE,
fn->module->name->value, line,
fn->debug->name);
}
}
test/api/main.c
+4
View File
@@ -15,6 +15,7 @@
#include "reset_stack_after_call_abort.h"
#include "reset_stack_after_foreign_construct.h"
#include "slots.h"
#include "user_data.h"
// The name of the currently executing API test.
const char* testName;
@@ -59,6 +60,9 @@ static WrenForeignMethodFn bindForeignMethod(
method = slotsBindMethod(fullName);
if (method != NULL) return method;
method = userDataBindMethod(fullName);
if (method != NULL) return method;
fprintf(stderr,
"Unknown foreign method '%s' for test '%s'\n", fullName, testName);
test/api/user_data.c
+51
View File
@@ -0,0 +1,51 @@
#include <string.h>
#include "user_data.h"
static const char* data = "my user data";
static const char* otherData = "other user data";
static void test(WrenVM* vm)
{
WrenConfiguration configuration;
wrenInitConfiguration(&configuration);
// Should default to NULL.
if (configuration.userData != NULL)
{
wrenSetSlotBool(vm, 0, false);
return;
}
configuration.userData = (void*)data;
WrenVM* otherVM = wrenNewVM(&configuration);
// Should be able to get it.
if (wrenGetUserData(otherVM) != data)
{
wrenSetSlotBool(vm, 0, false);
wrenFreeVM(otherVM);
return;
}
// Should be able to set it.
wrenSetUserData(otherVM, (void*)otherData);
if (wrenGetUserData(otherVM) != otherData)
{
wrenSetSlotBool(vm, 0, false);
wrenFreeVM(otherVM);
return;
}
wrenSetSlotBool(vm, 0, true);
wrenFreeVM(otherVM);
}
WrenForeignMethodFn userDataBindMethod(const char* signature)
{
if (strcmp(signature, "static UserData.test") == 0) return test;
return NULL;
}
test/api/user_data.h
+3
View File
@@ -0,0 +1,3 @@
#include "wren.h"
WrenForeignMethodFn userDataBindMethod(const char* signature);
test/api/user_data.wren
+5
View File
@@ -0,0 +1,5 @@
class UserData {
foreign static test
}
System.print(UserData.test) // expect: true
util/xcode/wren.xcodeproj/project.pbxproj
+6
View File
@@ -48,6 +48,7 @@
29D025E41C19CD1000A3BB28 /* os.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D025E01C19CD1000A3BB28 /* os.c */; };
29D025E51C19CD1000A3BB28 /* os.wren.inc in Sources */ = {isa = PBXBuildFile; fileRef = 29D025E21C19CD1000A3BB28 /* os.wren.inc */; };
29D025E61C19CD1000A3BB28 /* os.wren.inc in Sources */ = {isa = PBXBuildFile; fileRef = 29D025E21C19CD1000A3BB28 /* os.wren.inc */; };
29D24DB21E82C0A2006618CC /* user_data.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D24DB01E82C0A2006618CC /* user_data.c */; };
29D880661DC8ECF600025364 /* reset_stack_after_call_abort.c in Sources */ = {isa = PBXBuildFile; fileRef = 29D880641DC8ECF600025364 /* reset_stack_after_call_abort.c */; };
29DC149F1BBA2FCC008A8274 /* vm.c in Sources */ = {isa = PBXBuildFile; fileRef = 29C8A9311AB71FFF00DEC81D /* vm.c */; };
29DC14A01BBA2FD6008A8274 /* timer.c in Sources */ = {isa = PBXBuildFile; fileRef = 2901D7621B74F4050083A2C8 /* timer.c */; };
@@ -152,6 +153,8 @@
29D025E01C19CD1000A3BB28 /* os.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = os.c; path = ../../src/module/os.c; sourceTree = "<group>"; };
29D025E11C19CD1000A3BB28 /* os.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = os.h; path = ../../src/module/os.h; sourceTree = "<group>"; };
29D025E21C19CD1000A3BB28 /* os.wren.inc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = os.wren.inc; path = ../../src/module/os.wren.inc; sourceTree = "<group>"; };
29D24DB01E82C0A2006618CC /* user_data.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = user_data.c; path = ../../test/api/user_data.c; sourceTree = "<group>"; };
29D24DB11E82C0A2006618CC /* user_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = user_data.h; path = ../../test/api/user_data.h; sourceTree = "<group>"; };
29D880641DC8ECF600025364 /* reset_stack_after_call_abort.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = reset_stack_after_call_abort.c; path = ../../test/api/reset_stack_after_call_abort.c; sourceTree = "<group>"; };
29D880651DC8ECF600025364 /* reset_stack_after_call_abort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = reset_stack_after_call_abort.h; path = ../../test/api/reset_stack_after_call_abort.h; sourceTree = "<group>"; };
29F384111BD19706002F84E0 /* io.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = io.h; path = ../../src/module/io.h; sourceTree = "<group>"; };
@@ -303,6 +306,8 @@
29C80D591D73332A00493837 /* reset_stack_after_foreign_construct.h */,
29D009AA1B7E39A8000CE58C /* slots.c */,
29D009AB1B7E39A8000CE58C /* slots.h */,
29D24DB01E82C0A2006618CC /* user_data.c */,
29D24DB11E82C0A2006618CC /* user_data.h */,
);
name = api_test;
sourceTree = "<group>";
@@ -427,6 +432,7 @@
29DC14A21BBA300A008A8274 /* wren_compiler.c in Sources */,
29DC14A31BBA300D008A8274 /* wren_core.c in Sources */,
29DC14A41BBA3010008A8274 /* wren_debug.c in Sources */,
29D24DB21E82C0A2006618CC /* user_data.c in Sources */,
29DC14A61BBA3017008A8274 /* wren_primitive.c in Sources */,
29DC14A71BBA301A008A8274 /* wren_utils.c in Sources */,
29DC14A81BBA301D008A8274 /* wren_value.c in Sources */,