ryuslash/crafting-interpreters
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Chapter 27.1

Browse source
This commit is contained in:
Tom Willemse 2022-08-12 20:13:25 -07:00
parent ad6a98f6ad
commit 63527558a7
3 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
clox/src/memory.c
View file

@ -76,6 +76,11 @@ static void blackenObject(Obj *object) {
printf("\n"); printf("\n");
#endif #endif
switch (object->type) { switch (object->type) {
case OBJ_CLASS: {
ObjClass *klass = (ObjClass *)object;
markObject((Obj *)klass->name);
break;
}
case OBJ_CLOSURE: { case OBJ_CLOSURE: {
ObjClosure *closure = (ObjClosure *)object; ObjClosure *closure = (ObjClosure *)object;
markObject((Obj *)closure->function); markObject((Obj *)closure->function);
@ -105,6 +110,10 @@ static void freeObject(Obj *object) {
#endif // DEBUG_LOG_GC #endif // DEBUG_LOG_GC
switch (object->type) { switch (object->type) {
case OBJ_CLASS: {
FREE(ObjClass, object);
break;
}
case OBJ_CLOSURE: { case OBJ_CLOSURE: {
ObjClosure *closure = (ObjClosure *)object; ObjClosure *closure = (ObjClosure *)object;
FREE_ARRAY(ObjUpvalue *, closure->upvalues, closure->upvalueCount); FREE_ARRAY(ObjUpvalue *, closure->upvalues, closure->upvalueCount);

9
clox/src/object.c
View file

@ -25,6 +25,12 @@ static Obj *allocateObject(size_t size, ObjType type) {
return object; return object;
} }
ObjClass *newClass(ObjString *name) {
ObjClass *klass = ALLOCATE_OBJ(ObjClass, OBJ_CLASS);
klass->name = name;
return klass;
}
ObjClosure *newClosure(ObjFunction *function) { ObjClosure *newClosure(ObjFunction *function) {
ObjUpvalue **upvalues = ALLOCATE(ObjUpvalue *, function->upvalueCount); ObjUpvalue **upvalues = ALLOCATE(ObjUpvalue *, function->upvalueCount);
for (int i = 0; i < function->upvalueCount; i++) { for (int i = 0; i < function->upvalueCount; i++) {
@ -116,6 +122,9 @@ static void printFunction(ObjFunction *function) {
void printObject(Value value) { void printObject(Value value) {
switch (OBJ_TYPE(value)) { switch (OBJ_TYPE(value)) {
case OBJ_CLASS:
printf("%s", AS_CLASS(value)->name->chars);
break;
case OBJ_CLOSURE: case OBJ_CLOSURE:
printFunction(AS_CLOSURE(value)->function); printFunction(AS_CLOSURE(value)->function);
break; break;

9
clox/src/object.h
View file

@ -7,11 +7,13 @@
#define OBJ_TYPE(value) (AS_OBJ(value)->type) #define OBJ_TYPE(value) (AS_OBJ(value)->type)
#define IS_CLASS(value) isObjType(value, OBJ_CLASS)
#define IS_CLOSURE(value) isObjType(value, OBJ_CLOSURE) #define IS_CLOSURE(value) isObjType(value, OBJ_CLOSURE)
#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_NATIVE(value) isObjType(value, OBJ_NATIVE)
#define IS_STRING(value) isObjType(value, OBJ_STRING) #define IS_STRING(value) isObjType(value, OBJ_STRING)
#define AS_CLASS(value) ((ObjClass *)AS_OBJ(value))
#define AS_CLOSURE(value) ((ObjClosure *)AS_OBJ(value)) #define AS_CLOSURE(value) ((ObjClosure *)AS_OBJ(value))
#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_NATIVE(value) (((ObjNative *)AS_OBJ(value))->function)
@ -19,6 +21,7 @@
#define AS_CSTRING(value) (((ObjString *)AS_OBJ(value))->chars) #define AS_CSTRING(value) (((ObjString *)AS_OBJ(value))->chars)
typedef enum { typedef enum {
OBJ_CLASS,
OBJ_CLOSURE, OBJ_CLOSURE,
OBJ_FUNCTION, OBJ_FUNCTION,
OBJ_NATIVE, OBJ_NATIVE,
@ -68,6 +71,12 @@ typedef struct {
int upvalueCount; int upvalueCount;
} ObjClosure; } ObjClosure;
typedef struct {
Obj obj;
ObjString *name;
} ObjClass;
ObjClass *newClass(ObjString *name);
ObjClosure *newClosure(ObjFunction *function); ObjClosure *newClosure(ObjFunction *function);
ObjFunction *newFunction(); ObjFunction *newFunction();
ObjNative *newNative(NativeFn function); ObjNative *newNative(NativeFn function);