wip: refactor fromCString to use size_t for length

vegerot · Oct 25, 2024 · 4888de8 · 4888de8
1 parent 781b264
commit 4888de8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/bytecode-vm-compiler/src/compiler.c b/bytecode-vm-compiler/src/compiler.c
@@ -79,7 +79,7 @@ static void error(char const* message) {
 	parser.had_error = true;
 }
 
-LoxString* fromCString(char const* cString, int length) {
+LoxString* fromCString(char const* cString, size_t length) {
 	LoxString* str = malloc(sizeof(LoxString) + (length + 1) * sizeof(char));
 	str->obj.type = OBJ_STRING;
 	str->obj.next = currentChunk()->allocatorStart;

diff --git a/bytecode-vm-compiler/src/compiler.h b/bytecode-vm-compiler/src/compiler.h
@@ -5,4 +5,4 @@
 #include <stdbool.h>
 bool compile(char const* source, Chunk* chunk);
 void setCompilingChunk(Chunk* chunk);
-LoxString* fromCString(char const* cString, int length);
+LoxString* fromCString(char const* cString, size_t length);
diff --git a/bytecode-vm-compiler/src/object.c b/bytecode-vm-compiler/src/object.c
@@ -9,7 +9,7 @@
 void printObject(Value value) {
 	switch (OBJ_TYPE(value)) {
 	case OBJ_STRING:
-		printf("%.*s", AS_STRING(value)->length, AS_CSTRING(value));
+		printf("%.*s", (int)AS_STRING(value)->length, AS_CSTRING(value));
 		break;
 	default:
 		printf("\n obj type: %u\n", OBJ_TYPE(value));
@@ -28,7 +28,8 @@ static LoxObj* allocateObj(VM* vm, size_t size, ObjType type) {
 	return object;
 }
 
-LoxString* allocateString(VM* vm, char const* cString, int length) {
+// TODO: refactor to use `allocateEmptyString`
+LoxString* allocateString(VM* vm, char const* cString, size_t length) {
 	LoxString* str = (LoxString*)allocateObj(
 		vm, sizeof(LoxString) + (length + 1) * sizeof(char), OBJ_STRING);
 

diff --git a/bytecode-vm-compiler/src/object.h b/bytecode-vm-compiler/src/object.h
@@ -22,7 +22,8 @@ struct LoxObj {
 
 typedef struct {
 	LoxObj obj;
-	int length;
+	/** same as return value of strlen */
+	size_t length;
 	char chars[];
 } LoxString;
 
@@ -31,3 +32,4 @@ void printObject(Value value);
 static inline bool isObjType(Value value, ObjType type) {
 	return IS_OBJ(value) && AS_OBJ(value)->type == type;
 }
+
diff --git a/bytecode-vm-compiler/test/test-compiler.c b/bytecode-vm-compiler/test/test-compiler.c
@@ -95,7 +95,7 @@ void testStringAppend(void) {
 static void appendObjectToString(char* buf, size_t maxsize, Value value) {
 	switch (OBJ_TYPE(value)) {
 	case OBJ_STRING:
-		snprintf(buf, maxsize, "%.*s", AS_STRING(value)->length,
+		snprintf(buf, maxsize, "%.*s", (int)AS_STRING(value)->length,
 				 AS_CSTRING(value));
 		break;
 	default: