Merge branch 'Voxellius:main' into patch-4

Voxellius · Jun 29, 2024 · c23970d · c23970d
2 parents b45f18a + c8640dc
commit c23970d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/dist/libvoxel.h b/dist/libvoxel.h
@@ -213,7 +213,7 @@ typedef enum {
 typedef struct voxel_Context {
     voxel_Bool isInitialised;
     char* code;
-    voxel_Count codeLength;
+    voxel_Count codeSize;
     voxel_Builtin* builtins;
     voxel_Count builtinCount;
     struct voxel_Scope* globalScope;
@@ -2212,7 +2212,7 @@ voxel_Context* voxel_newContext() {
 
     context->isInitialised = VOXEL_FALSE;
     context->code = VOXEL_NULL;
-    context->codeLength = 0;
+    context->codeSize = 0;
     context->builtins = (voxel_Builtin*)VOXEL_MALLOC(0); VOXEL_TAG_MALLOC_SIZE("voxel_Context->builtins", 0);
     context->builtinCount = 0;
     context->firstTrackedThing = VOXEL_NULL;
@@ -2238,7 +2238,7 @@ VOXEL_ERRORABLE voxel_initContext(voxel_Context* context) {
     }
 
     #ifdef VOXEL_MAGIC
-        if (context->codeLength < VOXEL_MAGIC_SIZE) {
+        if (context->codeSize < VOXEL_MAGIC_SIZE) {
             VOXEL_THROW(VOXEL_ERROR_INVALID_MAGIC);
         }
 
@@ -4285,7 +4285,7 @@ VOXEL_ERRORABLE voxel_greaterThanOperation(voxel_Context* context, voxel_Thing*
 // src/parser.h
 
 VOXEL_ERRORABLE voxel_safeToRead(voxel_Context* context, voxel_Position* position, voxel_Count bytesToRead) {
-    if ((*position) + bytesToRead > context->codeLength) {
+    if ((*position) + bytesToRead > context->codeSize) {
         VOXEL_THROW(VOXEL_ERROR_TOKENISATION_END);
     }
 

diff --git a/examples/hello.c b/examples/hello.c
@@ -120,7 +120,7 @@ int main(int argc, char* argv[]) {
     voxel_defineBuiltin(context, "add", &builtin_add);
 
     context->code = code;
-    context->codeLength = 1024;
+    context->codeSize = 1024;
 
     VOXEL_MUST_CODE(voxel_initContext(context));
 

diff --git a/runtime/voxel.c b/runtime/voxel.c
@@ -34,7 +34,7 @@ int main(int argc, char* argv[]) {
     }
 
     context->code = data;
-    context->codeLength = size;
+    context->codeSize = size;
 
     VOXEL_MUST_CODE(voxel_initContext(context));
 

diff --git a/src/contexts.h b/src/contexts.h
@@ -3,7 +3,7 @@ voxel_Context* voxel_newContext() {
 
     context->isInitialised = VOXEL_FALSE;
     context->code = VOXEL_NULL;
-    context->codeLength = 0;
+    context->codeSize = 0;
     context->builtins = (voxel_Builtin*)VOXEL_MALLOC(0); VOXEL_TAG_MALLOC_SIZE("voxel_Context->builtins", 0);
     context->builtinCount = 0;
     context->firstTrackedThing = VOXEL_NULL;
@@ -29,7 +29,7 @@ VOXEL_ERRORABLE voxel_initContext(voxel_Context* context) {
     }
 
     #ifdef VOXEL_MAGIC
-        if (context->codeLength < VOXEL_MAGIC_SIZE) {
+        if (context->codeSize < VOXEL_MAGIC_SIZE) {
             VOXEL_THROW(VOXEL_ERROR_INVALID_MAGIC);
         }
 

diff --git a/src/declarations.h b/src/declarations.h
@@ -18,7 +18,7 @@ typedef enum {
 typedef struct voxel_Context {
     voxel_Bool isInitialised;
     char* code;
-    voxel_Count codeLength;
+    voxel_Count codeSize;
     voxel_Builtin* builtins;
     voxel_Count builtinCount;
     struct voxel_Scope* globalScope;

diff --git a/src/parser.h b/src/parser.h
@@ -1,5 +1,5 @@
 VOXEL_ERRORABLE voxel_safeToRead(voxel_Context* context, voxel_Position* position, voxel_Count bytesToRead) {
-    if ((*position) + bytesToRead > context->codeLength) {
+    if ((*position) + bytesToRead > context->codeSize) {
         VOXEL_THROW(VOXEL_ERROR_TOKENISATION_END);
     }