cozis/Noja
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new curly bracket coding convention

Browse Source
This commit is contained in:
cozis
2022-04-04 00:07:33 +02:00
parent 29e80c6319
commit 07137b50c6
28 changed files with 4036 additions and 4059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/objects/heap.c
+156 -154
View File
@@ -137,10 +137,10 @@ Heap *Heap_New(int size)
heap->collecting = 0;
if(heap->body == NULL)
{
free(heap);
return NULL;
}
{
free(heap);
return NULL;
}
#if USING_VALGRIND
VALGRIND_CREATE_MEMPOOL(heap, 0, 0);
@@ -160,23 +160,23 @@ void Heap_Free(Heap *heap)
Error_Init(&error);
for(int i = 0; i < heap->pend_used; i += 1)
{
heap->pend[i].destructor(heap->pend[i].object, &error);
if(error.occurred)
{
heap->pend[i].destructor(heap->pend[i].object, &error);
if(error.occurred)
{
// Errors occurred! We can't do anything about
// it now though.
Error_Free(&error);
Error_Init(&error);
}
// Errors occurred! We can't do anything about
// it now though.
Error_Free(&error);
Error_Init(&error);
}
}
while(heap->oflow)
{
OflowAlloc *prev = heap->oflow->prev;
free(heap->oflow);
heap->oflow = prev;
}
{
OflowAlloc *prev = heap->oflow->prev;
free(heap->oflow);
heap->oflow = prev;
}
free(heap->pend);
free(heap->body);
@@ -208,42 +208,42 @@ void *Heap_Malloc(Heap *heap, TypeObject *type, Error *err)
_Bool requires_destruct = type->free != NULL;
if(requires_destruct)
{
// This type of object requires
// a destructor to be called.
if(heap->pend == NULL)
{
// This type of object requires
// a destructor to be called.
if(heap->pend == NULL)
{
int n = 8;
int n = 8;
heap->pend = malloc(n * sizeof(PendingDestruct));
heap->pend = malloc(n * sizeof(PendingDestruct));
if(heap->pend == NULL)
{
Error_Report(err, 1, "No memory");
return NULL;
}
if(heap->pend == NULL)
{
Error_Report(err, 1, "No memory");
return NULL;
}
heap->pend_used = 0;
heap->pend_size = n;
}
else if(heap->pend_size == heap->pend_used)
{
int factor = 2;
void *new_pend = realloc(heap->pend, factor * heap->pend_size * sizeof(PendingDestruct));
if(new_pend == NULL)
{
Error_Report(err, 1, "No memory");
return NULL;
}
heap->pend = new_pend;
heap->pend_size *= factor;
}
assert(heap->pend_size > heap->pend_used);
heap->pend_used = 0;
heap->pend_size = n;
}
else if(heap->pend_size == heap->pend_used)
{
int factor = 2;
void *new_pend = realloc(heap->pend, factor * heap->pend_size * sizeof(PendingDestruct));
if(new_pend == NULL)
{
Error_Report(err, 1, "No memory");
return NULL;
}
heap->pend = new_pend;
heap->pend_size *= factor;
}
assert(heap->pend_size > heap->pend_used);
}
int size = type->size;
@@ -290,23 +290,23 @@ void *Heap_RawMalloc(Heap *heap, int size, Error *err)
padding = heap->used - padding;
if(heap->used + size > heap->size)
{
OflowAlloc *oflow = malloc(sizeof(OflowAlloc) + size);
{
OflowAlloc *oflow = malloc(sizeof(OflowAlloc) + size);
if(oflow == 0)
return 0;
if(oflow == 0)
return 0;
oflow->prev = heap->oflow;
heap->oflow = oflow;
oflow->prev = heap->oflow;
heap->oflow = oflow;
addr = oflow->body;
}
addr = oflow->body;
}
else
{
assert(heap->used + size <= heap->size);
addr = heap->body + heap->used;
heap->used += size;
}
{
assert(heap->used + size <= heap->size);
addr = heap->body + heap->used;
heap->used += size;
}
heap->total += size + padding;
@@ -326,10 +326,10 @@ _Bool Heap_StartCollection(Heap *heap, Error *error)
void *new_body = malloc(heap->size);
if(new_body == NULL)
{
Error_Report(error, 1, "No memory");
return 0;
}
{
Error_Report(error, 1, "No memory");
return 0;
}
heap->old_body = heap->body;
heap->old_used = heap->used;
@@ -351,57 +351,57 @@ _Bool Heap_StopCollection(Heap *heap)
assert(heap->collecting == 1);
if(heap->collection_failed)
{
free(heap->old_body);
return 0;
}
{
free(heap->old_body);
return 0;
}
/* Call destructors here */
{
int i = 0;
while(i < heap->pend_used)
{
Object *obj = heap->pend[i].object;
if(obj->flags & Object_MOVED)
{
Object *obj = heap->pend[i].object;
if(obj->flags & Object_MOVED)
{
heap->pend[i].object = ((MovedObject*) heap->pend[i].object)->new_location;
i += 1;
}
else
{
// We need to call the destructor.
heap->pend[i].destructor(obj, heap->error);
if(heap->error->occurred)
return 0; // There will be leaks.
heap->pend[i] = heap->pend[heap->pend_used-1];
heap->pend_used -= 1;
}
heap->pend[i].object = ((MovedObject*) heap->pend[i].object)->new_location;
i += 1;
}
else
{
// We need to call the destructor.
heap->pend[i].destructor(obj, heap->error);
if(heap->error->occurred)
return 0; // There will be leaks.
heap->pend[i] = heap->pend[heap->pend_used-1];
heap->pend_used -= 1;
}
}
if(heap->pend_size / 2 > heap->pend_used)
{
// Downsize
void *temp = realloc(heap->pend, heap->pend_size / 2 * sizeof(PendingDestruct));
{
// Downsize
void *temp = realloc(heap->pend, heap->pend_size / 2 * sizeof(PendingDestruct));
if(temp != NULL)
{
heap->pend = temp;
heap->pend_size /= 2;
}
if(temp != NULL)
{
heap->pend = temp;
heap->pend_size /= 2;
}
}
}
while(heap->old_oflow)
{
OflowAlloc *prev = heap->old_oflow->prev;
free(heap->old_oflow);
heap->old_oflow = prev;
}
{
OflowAlloc *prev = heap->old_oflow->prev;
free(heap->old_oflow);
heap->old_oflow = prev;
}
free(heap->old_body);
@@ -425,10 +425,10 @@ void Heap_CollectExtension(void **referer, unsigned int size, void *userp)
void *new_location = Heap_RawMalloc(heap, size, heap->error);
if(new_location == NULL)
{
heap->collection_failed = 1;
return;
}
{
heap->collection_failed = 1;
return;
}
memcpy(new_location, old_location, size);
@@ -453,62 +453,64 @@ void Heap_CollectReference(Object **referer, void *userp)
*referer = ((MovedObject*) old_location)->new_location;
else
{
Object *new_location;
{
Object *new_location;
// This object wasn't moved to
// the new heap yet.
// This object wasn't moved to
// the new heap yet.
if(old_location->flags & Object_STATIC)
if(old_location->flags & Object_STATIC)
// The object doesn't need to be moved
// since it was statically allocated.
new_location = old_location;
else
// The object doesn't need to be moved
// since it was statically allocated.
new_location = old_location;
else
{
// Get some information.
TypeObject *type = old_location->type;
int size = type->size;
// Copy the object to a new location.
{
new_location = Heap_RawMalloc(heap, size, heap->error);
if(new_location == NULL)
{
// Get some information.
TypeObject *type = old_location->type;
int size = type->size;
// Copy the object to a new location.
{
new_location = Heap_RawMalloc(heap, size, heap->error);
if(new_location == NULL)
{
heap->collection_failed = 1;
return;
}
memcpy(new_location, old_location, size);
}
// Set the old location as moved and
// leave the reference to the new
// location.
{
old_location->flags |= Object_MOVED;
assert((int) sizeof(MovedObject) <= size);
((MovedObject*) old_location)->new_location = new_location;
}
heap->movedcount += 1;
heap->collection_failed = 1;
return;
}
// Collect the reference to the type.
if((Object*) new_location->type != new_location)
Heap_CollectReference((Object**) &new_location->type, heap);
memcpy(new_location, old_location, size);
}
// Collect all of the references to
// extensions allocate using the GC'd
// heap.
Object_WalkExtensions(new_location, Heap_CollectExtension, heap);
// Set the old location as moved and
// leave the reference to the new
// location.
{
old_location->flags |= Object_MOVED;
// Now collect all of the children.
Object_WalkReferences(new_location, Heap_CollectReference, heap);
// Update the referer
*referer = new_location;
assert((int) sizeof(MovedObject) <= size);
((MovedObject*) old_location)->new_location = new_location;
}
heap->movedcount += 1;
}
// Collect the reference to the type.
if((Object*) new_location->type != new_location)
Heap_CollectReference((Object**) &new_location->type, heap);
// Collect all of the references to
// extensions allocate using the GC'd
// heap.
Object_WalkExtensions(new_location,
Heap_CollectExtension, heap);
// Now collect all of the children.
Object_WalkReferences(new_location,
Heap_CollectReference, heap);
// Update the referer
*referer = new_location;
}
}
src/objects/o_buffer.c
+149 -149
View File
@@ -102,22 +102,22 @@ Object *Object_NewBuffer(int size, Heap *heap, Error *error)
unsigned char *body;
if(size > THRESHOLD)
{
body = malloc(sizeof(unsigned char) * size);
{
body = malloc(sizeof(unsigned char) * size);
if(body == NULL)
{
Error_Report(error, 1, "No memory");
return NULL;
}
}
else
if(body == NULL)
{
body = Heap_RawMalloc(heap, sizeof(unsigned char) * size, error);
if(body == NULL)
return NULL;
Error_Report(error, 1, "No memory");
return NULL;
}
}
else
{
body = Heap_RawMalloc(heap, sizeof(unsigned char) * size, error);
if(body == NULL)
return NULL;
}
obj->size = size;
obj->body = body;
@@ -141,112 +141,112 @@ static _Bool buffer_free(Object *self, Error *error)
Object *Object_SliceBuffer(Object *buffer, int offset, int length, Heap *heap, Error *error)
{
if(buffer->type != &t_buffer && buffer->type != &t_buffer_slice)
{
Error_Report(error, 0, "Not a buffer or a buffer slice");
return NULL;
}
{
Error_Report(error, 0, "Not a buffer or a buffer slice");
return NULL;
}
BufferSliceObject *slice;
if(buffer->type == &t_buffer)
{
BufferObject *original = (BufferObject*) buffer;
if(offset == 0 && length == original->size)
return buffer;
slice = (BufferSliceObject*) Heap_Malloc(heap, &t_buffer_slice, error);
if(slice == NULL)
return NULL;
if(offset < 0 || offset >= original->size)
{
BufferObject *original = (BufferObject*) buffer;
if(offset == 0 && length == original->size)
return buffer;
slice = (BufferSliceObject*) Heap_Malloc(heap, &t_buffer_slice, error);
if(slice == NULL)
return NULL;
if(offset < 0 || offset >= original->size)
{
Error_Report(error, 0, "offset out of range");
return NULL;
}
if(length < 0 || length >= original->size)
{
Error_Report(error, 0, "length out of range");
return NULL;
}
if(offset + length > original->size)
{
Error_Report(error, 0, "slice out of range");
return NULL;
}
slice->sliced = original;
slice->offset = offset;
slice->length = length;
Error_Report(error, 0, "offset out of range");
return NULL;
}
if(length < 0 || length >= original->size)
{
Error_Report(error, 0, "length out of range");
return NULL;
}
if(offset + length > original->size)
{
Error_Report(error, 0, "slice out of range");
return NULL;
}
slice->sliced = original;
slice->offset = offset;
slice->length = length;
}
else
{
assert(buffer->type == &t_buffer_slice);
slice = (BufferSliceObject*) Heap_Malloc(heap, &t_buffer_slice, error);
if(slice == NULL)
return NULL;
BufferSliceObject *original = (BufferSliceObject*) buffer;
if(offset < 0 || offset >= original->length)
{
assert(buffer->type == &t_buffer_slice);
slice = (BufferSliceObject*) Heap_Malloc(heap, &t_buffer_slice, error);
if(slice == NULL)
return NULL;
BufferSliceObject *original = (BufferSliceObject*) buffer;
if(offset < 0 || offset >= original->length)
{
Error_Report(error, 0, "offset out of range");
return NULL;
}
if(length < 0 || length >= original->length)
{
Error_Report(error, 0, "length out of range");
return NULL;
}
if(offset + length > original->length)
{
Error_Report(error, 0, "slice out of range");
return NULL;
}
slice->sliced = original->sliced;
slice->offset = original->offset + offset;
slice->length = length;
Error_Report(error, 0, "offset out of range");
return NULL;
}
if(length < 0 || length >= original->length)
{
Error_Report(error, 0, "length out of range");
return NULL;
}
if(offset + length > original->length)
{
Error_Report(error, 0, "slice out of range");
return NULL;
}
slice->sliced = original->sliced;
slice->offset = original->offset + offset;
slice->length = length;
}
return (Object*) slice;
}
void *Object_GetBufferAddrAndSize(Object *obj, int *size, Error *error)
{
if(obj->type != &t_buffer && obj->type != &t_buffer_slice)
{
Error_Report(error, 0, "Not a buffer or a buffer slice");
return NULL;
}
{
Error_Report(error, 0, "Not a buffer or a buffer slice");
return NULL;
}
if(obj->type == &t_buffer)
{
BufferObject *buffer = (BufferObject*) obj;
{
BufferObject *buffer = (BufferObject*) obj;
if(size)
*size = buffer->size;
if(size)
*size = buffer->size;
return buffer->body;
}
return buffer->body;
}
else
{
assert(obj->type == &t_buffer_slice);
{
assert(obj->type == &t_buffer_slice);
BufferSliceObject *slice = (BufferSliceObject*) obj;
BufferSliceObject *slice = (BufferSliceObject*) obj;
if(size)
*size = slice->length;
if(size)
*size = slice->length;
return slice->sliced->body + slice->offset;
}
return slice->sliced->body + slice->offset;
}
}
static Object *buffer_select(Object *self, Object *key, Heap *heap, Error *error)
@@ -258,10 +258,10 @@ static Object *buffer_select(Object *self, Object *key, Heap *heap, Error *error
assert(error != NULL);
if(!Object_IsInt(key))
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
int idx = Object_ToInt(key, error);
assert(error->occurred == 0);
@@ -269,10 +269,10 @@ static Object *buffer_select(Object *self, Object *key, Heap *heap, Error *error
BufferObject *buffer = (BufferObject*) self;
if(idx < 0 || idx >= buffer->size)
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
unsigned char byte = buffer->body[idx];
@@ -288,10 +288,10 @@ static Object *slice_select(Object *self, Object *key, Heap *heap, Error *error)
assert(error != NULL);
if(!Object_IsInt(key))
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
int idx = Object_ToInt(key, error);
assert(error->occurred == 0);
@@ -299,10 +299,10 @@ static Object *slice_select(Object *self, Object *key, Heap *heap, Error *error)
BufferSliceObject *slice = (BufferSliceObject*) self;
if(idx < 0 || idx >= slice->length)
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
unsigned char byte = slice->sliced->body[slice->offset + idx];
@@ -321,27 +321,27 @@ static _Bool buffer_insert(Object *self, Object *key, Object *val, Heap *heap, E
BufferObject *buffer = (BufferObject*) self;
if(!Object_IsInt(key))
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
int idx = Object_ToInt(key, error);
assert(error->occurred == 0);
if(idx < 0 || idx >= buffer->size)
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
long long int qword = Object_ToInt(val, error);
if(qword > 255 || qword < 0)
{
Error_Report(error, 0, "Not in range [0, 255]");
return NULL;
}
{
Error_Report(error, 0, "Not in range [0, 255]");
return NULL;
}
unsigned char byte = qword & 0xff;
@@ -364,27 +364,27 @@ static _Bool slice_insert(Object *self, Object *key, Object *val, Heap *heap, Er
BufferSliceObject *slice = (BufferSliceObject*) self;
if(!Object_IsInt(key))
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
int idx = Object_ToInt(key, error);
assert(error->occurred == 0);
if(idx < 0 || idx >= slice->length)
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
long long int qword = Object_ToInt(val, error);
if(qword > 255 || qword < 0)
{
Error_Report(error, 0, "Not in range [0, 255]");
return NULL;
}
{
Error_Report(error, 0, "Not in range [0, 255]");
return NULL;
}
unsigned char byte = qword & 0xff;
@@ -414,26 +414,26 @@ static void print_bytes(FILE *fp, unsigned char *addr, int size)
fprintf(fp, "[");
for(int i = 0; i < size; i += 1)
{
unsigned char byte, low, high;
{
unsigned char byte, low, high;
byte = addr[i];
low = byte & 0xf;
high = byte >> 4;
byte = addr[i];
low = byte & 0xf;
high = byte >> 4;
assert(low < 16);
assert(high < 16);
assert(low < 16);
assert(high < 16);
char c1, c2;
char c1, c2;
c1 = low < 10 ? low + '0' : low - 10 + 'A';
c2 = high < 10 ? high + '0' : high - 10 + 'A';
c1 = low < 10 ? low + '0' : low - 10 + 'A';
c2 = high < 10 ? high + '0' : high - 10 + 'A';
fprintf(fp, "%c%c", c2, c1);
fprintf(fp, "%c%c", c2, c1);
if(i+1 < size)
fprintf(fp, ", ");
}
if(i+1 < size)
fprintf(fp, ", ");
}
fprintf(fp, "]");
}
src/objects/o_closure.c
+10 -10
View File
@@ -58,10 +58,10 @@ Object *Object_NewClosure(Object *parent, Object *new_map, Heap *heap, Error *er
return NULL;
if(parent != NULL && parent->type != &t_closure)
{
Error_Report(error, 0, "Object is not a closure");
return NULL;
}
{
Error_Report(error, 0, "Object is not a closure");
return NULL;
}
obj->prev = (ClosureObject*) parent;
obj->vars = new_map;
@@ -76,14 +76,14 @@ static Object *select(Object *self, Object *key, Heap *heap, Error *err)
Object *selected = NULL;
while(closure != NULL && selected == NULL)
{
selected = Object_Select(closure->vars, key, heap, err);
{
selected = Object_Select(closure->vars, key, heap, err);
if(err->occurred)
return NULL;
if(err->occurred)
return NULL;
closure = closure->prev;
}
closure = closure->prev;
}
return selected;
}
src/objects/o_dir.c
+4 -4
View File
@@ -64,10 +64,10 @@ Object *Object_FromDIR(DIR *handle, Heap *heap, Error *error)
DIR *Object_ToDIR(Object *obj, Error *error)
{
if(!Object_IsDir(obj))
{
Error_Report(error, 0, "Object is not a directory");
return NULL;
}
{
Error_Report(error, 0, "Object is not a directory");
return NULL;
}
return ((DirObject*) obj)->dir;
}
src/objects/o_file.c
+4 -4
View File
@@ -52,10 +52,10 @@ _Bool Object_IsFile(Object *obj)
FILE *Object_ToStream(Object *obj, Error *error)
{
if(!Object_IsFile(obj))
{
Error_Report(error, 0, "Object is not a file");
return NULL;
}
{
Error_Report(error, 0, "Object is not a file");
return NULL;
}
return ((FileObject*) obj)->fp;
}
src/objects/o_list.c
+35 -35
View File
@@ -89,10 +89,10 @@ static Object *copy(Object *self, Heap *heap, Error *err)
if(ls2 == NULL) return NULL;
for(int i = 0; i < ls->count; i += 1)
{
ls2->vals[i] = Object_Copy(ls->vals[i], heap, err);
if(err->occurred) return NULL;
}
{
ls2->vals[i] = Object_Copy(ls->vals[i], heap, err);
if(err->occurred) return NULL;
}
ls2->count = ls->count;
@@ -168,10 +168,10 @@ static Object *select(Object *self, Object *key, Heap *heap, Error *error)
assert(error != NULL);
if(!Object_IsInt(key))
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
int idx = Object_ToInt(key, error);
assert(error->occurred == 0);
@@ -179,10 +179,10 @@ static Object *select(Object *self, Object *key, Heap *heap, Error *error)
ListObject *list = (ListObject*) self;
if(idx < 0 || idx >= list->count)
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
return list->vals[idx];
}
@@ -223,33 +223,33 @@ static _Bool insert(Object *self, Object *key, Object *val, Heap *heap, Error *e
ListObject *list = (ListObject*) self;
if(!Object_IsInt(key))
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
int idx = Object_ToInt(key, error);
assert(error->occurred == 0);
if(idx < 0 || idx > list->count)
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
if(idx == list->count)
{
if(list->count == list->capacity)
if(!grow(list, heap, error))
return 0;
{
if(list->count == list->capacity)
if(!grow(list, heap, error))
return 0;
list->vals[list->count] = val;
list->count += 1;
}
list->vals[list->count] = val;
list->count += 1;
}
else
{
list->vals[idx] = val;
}
{
list->vals[idx] = val;
}
return 1;
}
@@ -267,11 +267,11 @@ static void print(Object *self, FILE *fp)
fprintf(fp, "[");
for(int i = 0; i < list->count; i += 1)
{
Object_Print(list->vals[i], fp);
{
Object_Print(list->vals[i], fp);
if(i+1 < list->count)
fprintf(fp, ", ");
}
if(i+1 < list->count)
fprintf(fp, ", ");
}
fprintf(fp, "]");
}
src/objects/o_map.c
+113 -113
View File
@@ -75,22 +75,22 @@ static Object *copy(Object *self, Heap *heap, Error *err)
if(m2 == NULL) return NULL;
for(int i = 0; i < m1->count; i += 1)
{
Object *key, *key_cpy;
Object *val, *val_cpy;
{
Object *key, *key_cpy;
Object *val, *val_cpy;
key = m1->keys[i];
val = m1->vals[i];
key = m1->keys[i];
val = m1->vals[i];
key_cpy = Object_Copy(key, heap, err);
if(key_cpy == NULL) return NULL;
key_cpy = Object_Copy(key, heap, err);
if(key_cpy == NULL) return NULL;
val_cpy = Object_Copy(val, heap, err);
if(val_cpy == NULL) return NULL;
val_cpy = Object_Copy(val, heap, err);
if(val_cpy == NULL) return NULL;
if(!Object_Insert(m2, key_cpy, val_cpy, heap, err))
return NULL;
}
if(!Object_Insert(m2, key_cpy, val_cpy, heap, err))
return NULL;
}
return (Object*) m2;
}
@@ -103,8 +103,8 @@ static int hash(Object *self)
// The hash of the map is the sum of the
// hashes of each key and each item.
for(int i = 0; i < m->count; i += 1)
h += Object_Hash(m->keys[i])
+ Object_Hash(m->vals[i]);
h += Object_Hash(m->keys[i])
+ Object_Hash(m->vals[i]);
return h;
}
@@ -151,10 +151,10 @@ static void walk(Object *self, void (*callback)(Object **referer, void *userp),
MapObject *map = (MapObject*) self;
for(int i = 0; i < map->count; i += 1)
{
callback(&map->keys[i], userp);
callback(&map->vals[i], userp);
}
{
callback(&map->keys[i], userp);
callback(&map->vals[i], userp);
}
}
static void walkexts(Object *self, void (*callback)(void **referer, unsigned int size, void *userp), void *userp)
@@ -187,36 +187,36 @@ static Object *select(Object *self, Object *key, Heap *heap, Error *error)
int i = hash & mask;
while(1)
{
int k = map->mapper[i];
if(k == -1)
{
int k = map->mapper[i];
if(k == -1)
{
// Empty slot.
// This key is not present.
return NULL;
}
else
{
// Found an item.
// Is it the right one?
assert(k >= 0);
if(Object_Compare(key, map->keys[k], error))
// Found it!
return map->vals[k];
if(error->occurred)
// Key doesn't implement compare.
return 0;
// Not the one we wanted.
}
pert >>= 5;
i = (i * 5 + pert + 1) & mask;
// Empty slot.
// This key is not present.
return NULL;
}
else
{
// Found an item.
// Is it the right one?
assert(k >= 0);
if(Object_Compare(key, map->keys[k], error))
// Found it!
return map->vals[k];
if(error->occurred)
// Key doesn't implement compare.
return 0;
// Not the one we wanted.
}
pert >>= 5;
i = (i * 5 + pert + 1) & mask;
}
UNREACHABLE;
return NULL;
@@ -237,42 +237,42 @@ static _Bool grow(MapObject *map, Heap *heap, Error *error)
return 0;
for(int i = 0; i < map->count; i += 1)
{
keys[i] = map->keys[i];
vals[i] = map->vals[i];
}
{
keys[i] = map->keys[i];
vals[i] = map->vals[i];
}
for(int i = 0; i < new_mapper_size; i += 1)
mapper[i] = -1;
// Rehash everything.
for(int i = 0; i < map->count; i += 1)
{
// This won't trigger an error because the key
// surely has a hash method since we already
// hashed it once.
int hash = Object_Hash(keys[i]);
{
// This won't trigger an error because the key
// surely has a hash method since we already
// hashed it once.
int hash = Object_Hash(keys[i]);
int mask = new_mapper_size - 1;
int pert = hash;
int mask = new_mapper_size - 1;
int pert = hash;
int j = hash & mask;
int j = hash & mask;
while(1)
{
if(mapper[j] == -1)
{
// No collision.
// Insert here.
mapper[j] = i;
break;
}
while(1)
{
if(mapper[j] == -1)
{
// No collision.
// Insert here.
mapper[j] = i;
break;
}
// Collided. Find a new place.
pert >>= 5;
j = (j * 5 + pert + 1) & mask;
}
// Collided. Find a new place.
pert >>= 5;
j = (j * 5 + pert + 1) & mask;
}
}
// Done.
map->mapper = mapper;
@@ -304,45 +304,45 @@ static _Bool insert(Object *self, Object *key, Object *val, Heap *heap, Error *e
int i = hash & mask;
while(1)
{
int k = map->mapper[i];
if(k == -1)
{
int k = map->mapper[i];
// Empty slot. We can insert it here.
Object *key_copy = Object_Copy(key, heap, error);
if(k == -1)
{
// Empty slot. We can insert it here.
Object *key_copy = Object_Copy(key, heap, error);
if(key_copy == NULL)
return NULL;
if(key_copy == NULL)
return NULL;
map->mapper[i] = map->count;
map->keys[map->count] = key_copy;
map->vals[map->count] = val;
map->count += 1;
return 1;
}
else
{
assert(k >= 0);
if(Object_Compare(key, map->keys[k], error))
{
// Already inserted.
// Overwrite the value.
map->vals[k] = val;
return 1;
}
if(error->occurred)
// Key doesn't implement compare.
return 0;
// Collision.
}
pert >>= 5;
i = (i * 5 + pert + 1) & mask;
map->mapper[i] = map->count;
map->keys[map->count] = key_copy;
map->vals[map->count] = val;
map->count += 1;
return 1;
}
else
{
assert(k >= 0);
if(Object_Compare(key, map->keys[k], error))
{
// Already inserted.
// Overwrite the value.
map->vals[k] = val;
return 1;
}
if(error->occurred)
// Key doesn't implement compare.
return 0;
// Collision.
}
pert >>= 5;
i = (i * 5 + pert + 1) & mask;
}
UNREACHABLE;
return 0;
@@ -361,13 +361,13 @@ static void print(Object *self, FILE *fp)
fprintf(fp, "{");
for(int i = 0; i < map->count; i += 1)
{
Object_Print(map->keys[i], fp);
fprintf(fp, ": ");
Object_Print(map->vals[i], fp);
{
Object_Print(map->keys[i], fp);
fprintf(fp, ": ");
Object_Print(map->vals[i], fp);
if(i+1 < map->count)
fprintf(fp, ", ");
}
if(i+1 < map->count)
fprintf(fp, ", ");
}
fprintf(fp, "}");
}
src/objects/o_string.c
+21 -18
View File
@@ -68,6 +68,9 @@ static TypeObject t_string = {
static int char_index_to_offset(StringObject *str, int idx)
{
if(str->count == str->bytes)
return idx;
// Iterate over a string to find the first byte of
// the utf-8 character number [idx].
@@ -75,13 +78,13 @@ static int char_index_to_offset(StringObject *str, int idx)
last_code_len = 0;
while(idx > 0)
{
last_code_len = utf8_sequence_to_utf32_codepoint(str->body + scanned_bytes, str->bytes - scanned_bytes, NULL);
scanned_bytes += last_code_len;
idx -= 1;
{
last_code_len = utf8_sequence_to_utf32_codepoint(str->body + scanned_bytes, str->bytes - scanned_bytes, NULL);
scanned_bytes += last_code_len;
idx -= 1;
assert(scanned_bytes <= str->bytes);
}
assert(scanned_bytes <= str->bytes);
}
assert(idx == 0);
return scanned_bytes;
@@ -93,10 +96,10 @@ static Object *select(Object *self, Object *key, Heap *heap, Error *error)
assert(key != NULL && heap != NULL && error != NULL);
if(!Object_IsInt(key))
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
{
Error_Report(error, 0, "Non integer key");
return NULL;
}
int idx = Object_ToInt(key, error);
assert(error->occurred == 0);
@@ -104,10 +107,10 @@ static Object *select(Object *self, Object *key, Heap *heap, Error *error)
StringObject *str = (StringObject*) self;
if(idx < 0 || idx >= str->count)
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
{
Error_Report(error, 0, "Out of range index");
return NULL;
}
int byteoffset = char_index_to_offset(str, idx);
int codelength = utf8_sequence_to_utf32_codepoint(str->body + byteoffset, str->bytes - byteoffset, NULL);
@@ -143,10 +146,10 @@ Object *Object_FromString(const char *str, int len, Heap *heap, Error *error)
int count = utf8_strlen(str, len);
if(count < 0)
{
Error_Report(error, 0, "Invalid UTF-8 sequence");
return NULL;
}
{
Error_Report(error, 0, "Invalid UTF-8 sequence");
return NULL;
}
StringObject *strobj = Heap_Malloc(heap, &t_string, error);
src/objects/objects.c
+72 -72
View File
@@ -86,10 +86,10 @@ unsigned int Object_GetDeepSize(const Object *obj, Error *err)
assert(type);
if(type->deepsize == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
return type->deepsize(obj);
}
@@ -112,10 +112,10 @@ Object *Object_Copy(Object *obj, Heap *heap, Error *err)
assert(type != NULL);
if(type->copy == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return NULL;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return NULL;
}
return type->copy(obj, heap, err);
}
@@ -129,10 +129,10 @@ Object *Object_Call(Object *obj, Object **argv, unsigned int argc, Heap *heap, E
assert(type);
if(type->call == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return NULL;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return NULL;
}
return type->call(obj, argv, argc, heap, err);
}
@@ -160,10 +160,10 @@ Object *Object_Select(Object *coll, Object *key, Heap *heap, Error *err)
assert(type);
if(type->select == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return NULL;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return NULL;
}
return type->select(coll, key, heap, err);
}
@@ -178,10 +178,10 @@ Object *Object_Delete(Object *coll, Object *key, Heap *heap, Error *err)
assert(type);
if(type->delete == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return NULL;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return NULL;
}
return type->delete(coll, key, heap, err);
}
@@ -196,10 +196,10 @@ _Bool Object_Insert(Object *coll, Object *key, Object *val, Heap *heap, Error *e
assert(type);
if(type->insert == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return 0;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return 0;
}
return type->insert(coll, key, val, heap, err);
}
@@ -213,10 +213,10 @@ int Object_Count(Object *coll, Error *err)
assert(type);
if(type->count == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return -1;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(coll), __func__);
return -1;
}
return type->count(coll);
}
@@ -230,10 +230,10 @@ Object *Object_Next(Object *iter, Heap *heap, Error *err)
assert(type);
if(type->next == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(iter), __func__);
return NULL;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(iter), __func__);
return NULL;
}
return type->next(iter, heap, err);
}
@@ -247,10 +247,10 @@ Object *Object_Prev(Object *iter, Heap *heap, Error *err)
assert(type);
if(type->prev == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(iter), __func__);
return NULL;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(iter), __func__);
return NULL;
}
return type->prev(iter, heap, err);
}
@@ -289,19 +289,19 @@ long long int Object_ToInt(Object *obj, Error *err)
assert(obj);
if(!Object_IsInt(obj))
{
Error_Report(err, 0, "Object is not an integer");
return 0;
}
{
Error_Report(err, 0, "Object is not an integer");
return 0;
}
const TypeObject *type = Object_GetType(obj);
assert(type);
if(type->to_int == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
return type->to_int(obj, err);
}
@@ -312,19 +312,19 @@ _Bool Object_ToBool(Object *obj, Error *err)
assert(obj);
if(!Object_IsBool(obj))
{
Error_Report(err, 0, "Object is not a boolean");
return 0;
}
{
Error_Report(err, 0, "Object is not a boolean");
return 0;
}
const TypeObject *type = Object_GetType(obj);
assert(type);
if(type->to_bool == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
return type->to_bool(obj, err);
}
@@ -335,19 +335,19 @@ double Object_ToFloat(Object *obj, Error *err)
assert(obj);
if(!Object_IsFloat(obj))
{
Error_Report(err, 0, "Object is not a floating");
return 0;
}
{
Error_Report(err, 0, "Object is not a floating");
return 0;
}
const TypeObject *type = Object_GetType(obj);
assert(type);
if(type->to_float == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return 0;
}
return type->to_float(obj, err);
}
@@ -358,19 +358,19 @@ const char *Object_ToString(Object *obj, int *size, Heap *heap, Error *err)
assert(obj != NULL);
if(!Object_IsString(obj))
{
Error_Report(err, 0, "Object is not a string");
return NULL;
}
{
Error_Report(err, 0, "Object is not a string");
return NULL;
}
const TypeObject *type = Object_GetType(obj);
assert(type);
if(type->to_string == NULL)
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return NULL;
}
{
Error_Report(err, 0, "Object %s doesn't implement %s", Object_GetName(obj), __func__);
return NULL;
}
return type->to_string(obj, size, heap, err);
}
@@ -385,10 +385,10 @@ _Bool Object_Compare(Object *obj1, Object *obj2, Error *error)
return 0;
if(obj1->type->op_eql == NULL)
{
Error_Report(error, 0, "Object %s doesn't implement %s", Object_GetName(obj1), __func__);
return 0;
}
{
Error_Report(error, 0, "Object %s doesn't implement %s", Object_GetName(obj1), __func__);
return 0;
}
return obj1->type->op_eql(obj1, obj2);
}