Chapter 24.7

This commit is contained in:
Tom Willemse 2022-03-22 17:15:17 -07:00
parent baedf99f63
commit 3da4016d57
4 changed files with 45 additions and 0 deletions

View file

@ -23,6 +23,9 @@ static void freeObject(Obj *object) {
FREE(ObjFunction, object); FREE(ObjFunction, object);
break; break;
} }
case OBJ_NATIVE:
FREE(ObjNative, object);
break;
case OBJ_STRING: { case OBJ_STRING: {
ObjString *string = (ObjString *)object; ObjString *string = (ObjString *)object;
FREE_ARRAY(char, string->chars, string->length + 1); FREE_ARRAY(char, string->chars, string->length + 1);

View file

@ -27,6 +27,12 @@ ObjFunction *newFunction() {
return function; return function;
} }
ObjNative *newNative(NativeFn function) {
ObjNative *native = ALLOCATE_OBJ(ObjNative, OBJ_NATIVE);
native->function = function;
return native;
}
static ObjString *allocateString(char *chars, int length, uint32_t hash) { static ObjString *allocateString(char *chars, int length, uint32_t hash) {
ObjString *string = ALLOCATE_OBJ(ObjString, OBJ_STRING); ObjString *string = ALLOCATE_OBJ(ObjString, OBJ_STRING);
string->length = length; string->length = length;
@ -81,6 +87,9 @@ void printObject(Value value) {
case OBJ_FUNCTION: case OBJ_FUNCTION:
printFunction(AS_FUNCTION(value)); printFunction(AS_FUNCTION(value));
break; break;
case OBJ_NATIVE:
printf("<native fn>");
break;
case OBJ_STRING: case OBJ_STRING:
printf("%s", AS_CSTRING(value)); printf("%s", AS_CSTRING(value));
break; break;

View file

@ -8,14 +8,17 @@
#define OBJ_TYPE(value) (AS_OBJ(value)->type) #define OBJ_TYPE(value) (AS_OBJ(value)->type)
#define IS_FUNCTION(value) isObjType(value, OBJ_FUNCTION) #define IS_FUNCTION(value) isObjType(value, OBJ_FUNCTION)
#define IS_NATIVE(value) isObjType(value, OBJ_NATIVE)
#define IS_STRING(value) isObjType(value, OBJ_STRING) #define IS_STRING(value) isObjType(value, OBJ_STRING)
#define AS_FUNCTION(value) ((ObjFunction *)AS_OBJ(value)) #define AS_FUNCTION(value) ((ObjFunction *)AS_OBJ(value))
#define AS_NATIVE(value) (((ObjNative *)AS_OBJ(value))->function)
#define AS_STRING(value) ((ObjString *)AS_OBJ(value)) #define AS_STRING(value) ((ObjString *)AS_OBJ(value))
#define AS_CSTRING(value) (((ObjString *)AS_OBJ(value))->chars) #define AS_CSTRING(value) (((ObjString *)AS_OBJ(value))->chars)
typedef enum { typedef enum {
OBJ_FUNCTION, OBJ_FUNCTION,
OBJ_NATIVE,
OBJ_STRING, OBJ_STRING,
} ObjType; } ObjType;
@ -31,6 +34,13 @@ typedef struct {
ObjString *name; ObjString *name;
} ObjFunction; } ObjFunction;
typedef Value (*NativeFn)(int argCount, Value *args);
typedef struct {
Obj obj;
NativeFn function;
} ObjNative;
struct ObjString { struct ObjString {
Obj obj; Obj obj;
int length; int length;
@ -39,6 +49,7 @@ struct ObjString {
}; };
ObjFunction *newFunction(); ObjFunction *newFunction();
ObjNative *newNative(NativeFn function);
ObjString *takeString(char *chars, int length); ObjString *takeString(char *chars, int length);
ObjString *copyString(const char *chars, int length); ObjString *copyString(const char *chars, int length);
void printObject(Value value); void printObject(Value value);

View file

@ -1,6 +1,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <time.h>
#include "common.h" #include "common.h"
#include "compiler.h" #include "compiler.h"
@ -11,6 +12,10 @@
VM vm; VM vm;
static Value clockNative(int argCount, Value *args) {
return NUMBER_VAL((double)clock() / CLOCKS_PER_SEC);
}
static void resetStack() { static void resetStack() {
vm.stackTop = vm.stack; vm.stackTop = vm.stack;
vm.frameCount = 0; vm.frameCount = 0;
@ -38,12 +43,22 @@ static void runtimeError(const char *format, ...) {
resetStack(); resetStack();
} }
static void defineNative(const char *name, NativeFn function) {
push(OBJ_VAL(copyString(name, (int)strlen(name))));
push(OBJ_VAL(newNative(function)));
tableSet(&vm.globals, AS_STRING(vm.stack[0]), vm.stack[1]);
pop();
pop();
}
void initVM() { void initVM() {
resetStack(); resetStack();
vm.objects = NULL; vm.objects = NULL;
initTable(&vm.globals); initTable(&vm.globals);
initTable(&vm.strings); initTable(&vm.strings);
defineNative("clock", clockNative);
} }
void freeVM() { void freeVM() {
@ -88,6 +103,13 @@ static bool callValue(Value callee, int argCount) {
switch (OBJ_TYPE(callee)) { switch (OBJ_TYPE(callee)) {
case OBJ_FUNCTION: case OBJ_FUNCTION:
return call(AS_FUNCTION(callee), argCount); return call(AS_FUNCTION(callee), argCount);
case OBJ_NATIVE: {
NativeFn native = AS_NATIVE(callee);
Value result = native(argCount, vm.stackTop - argCount);
vm.stackTop -= argCount + 1;
push(result);
return true;
}
default: default:
break; break;
} }