X-Git-Url: https://code.kerkeslager.com/?p=fur;a=blobdiff_plain;f=templates%2Fprogram.c;h=3602921d7dd99cc6d0b091862b291e0db095624a;hp=d6df73289dd8bf5028d58861a1d5fca03646ce53;hb=8d6f07b43d8b41473fb7d8779bbc7a5843adcd7b;hpb=cfb4e75abc7682119ab133e0d1e5a8cfb4068ee9 diff --git a/templates/program.c b/templates/program.c index d6df732..3602921 100644 --- a/templates/program.c +++ b/templates/program.c @@ -34,6 +34,8 @@ struct Environment; typedef struct Environment Environment; struct EnvironmentPool; typedef struct EnvironmentPool EnvironmentPool; +struct Stack; +typedef struct Stack Stack; const char* const STRING_LITERAL_LIST[] = { {% for string_literal in string_literal_list %} @@ -64,7 +66,7 @@ typedef struct Closure Closure; struct Closure { Environment* closed; - Object (*call)(EnvironmentPool*, Environment*, size_t, Object*); + Object (*call)(EnvironmentPool*, Environment*, size_t, Stack*); }; struct List; @@ -149,6 +151,31 @@ Object List_get(Object* list, Object index) return list->instance.list.items[index.instance.integer]; } +struct Stack +{ + uint16_t length; + Object items[256]; +}; + +void Stack_initialize(Stack* self) +{ + self->length = 0; +} + +void Stack_push(Stack* self, Object item) +{ + assert(self->length < 256); + self->items[self->length] = item; + self->length++; +} + +Object Stack_pop(Stack* self) +{ + assert(self->length > 0); + self->length--; + return self->items[self->length]; +} + Object Object_rereference(Object self) { switch(self.type) @@ -560,12 +587,11 @@ Object operator${{ id.name }}(Object left, Object right) {% endfor %} {% if 'pow' in builtins %} -Object builtin$pow$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Object* args) +Object builtin$pow$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Stack* stack) { - assert(argc == 2); - - Object base = args[0]; - Object exponent = args[1]; + // Must unload items in reverse order + Object exponent = Stack_pop(stack); + Object base = Stack_pop(stack); assert(base.type == INTEGER); assert(exponent.type == INTEGER); @@ -580,11 +606,19 @@ Object builtin$pow = { CLOSURE, (Instance)(Closure){ NULL, builtin$pow$implement {% endif %} {% if 'print' in builtins %} -Object builtin$print$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Object* args) +Object builtin$print$implementation(EnvironmentPool* environmentPool, Environment* parent, size_t argc, Stack* stack) { + Stack reverse_stack; + Stack_initialize(&reverse_stack); + for(size_t i = 0; i < argc; i++) { - Object output = args[i]; + Stack_push(&reverse_stack, Stack_pop(stack)); + } + + while(reverse_stack.length > 0) + { + Object output = Stack_pop(&reverse_stack); switch(output.type) { case BOOLEAN: @@ -601,8 +635,10 @@ Object builtin$print$implementation(EnvironmentPool* environmentPool, Environmen break; case STRING_CONCATENATION: - builtin$print$implementation(NULL, NULL, 1, &(output.instance.string_concatenation->left)); - builtin$print$implementation(NULL, NULL, 1, &(output.instance.string_concatenation->right)); + Stack_push(stack, output.instance.string_concatenation->left); + builtin$print$implementation(NULL, NULL, 1, stack); + Stack_push(stack, output.instance.string_concatenation->right); + builtin$print$implementation(NULL, NULL, 1, stack); break; case STRING_LITERAL: @@ -636,6 +672,10 @@ int main(int argc, char** argv) Environment* environment = EnvironmentPool_allocate(environmentPool); Environment_initialize(environment, NULL); + Stack stackMemory; + Stack* stack = &stackMemory; + Stack_initialize(stack); + // TODO Use the symbol from SYMBOL_LIST {% for builtin in builtins %} Environment_set(environment, "{{ builtin }}", builtin${{ builtin }});