enum Type {
BOOLEAN,
BUILTIN,
+ CLOSURE,
INTEGER,
STRING
};
PRINT
};
+struct Object;
+typedef struct Object Object;
+struct Environment;
+typedef struct Environment Environment;
+struct Thread;
+typedef struct Thread Thread;
+
+struct Closure;
+typedef struct Closure Closure;
+struct Closure {
+ Environment* environment;
+ size_t entry;
+};
+
union Value;
typedef union Value Value;
union Value {
Builtin builtin;
+ Closure closure;
bool boolean;
char* string;
int32_t integer;
};
-struct Object;
-typedef struct Object Object;
struct Object {
Type type;
Value value;
{% include "environment.c" %}
{% include "stack.c" %}
+{% include "frame.c" %}
-struct Thread;
-typedef struct Thread Thread;
struct Thread {
- Environment* environment;
+ Frame frame;
Stack stack;
- size_t program_counter;
};
-void Thread_initialize(Thread* self, size_t program_counter) {
- self->environment = Environment_construct();
+void Thread_initialize(Thread* self, size_t programCounter) {
+ Frame_initialize(&(self->frame), Environment_construct(NULL), NULL, programCounter);
Stack_initialize(&(self->stack));
- self->program_counter = program_counter;
}
void Thread_deinitialize(Thread* self) {
- Environment_destruct(self->environment);
+ Frame_deinitialize(&(self->frame));
Stack_deinitialize(&(self->stack));
}
+Environment* Thread_getEnvironment(Thread* self) {
+ return self->frame.environment;
+}
+
+void Thread_setProgramCounter(Thread* self, size_t programCounter) {
+ self->frame.programCounter = programCounter;
+}
+
+void Thread_incrementProgramCounter(Thread* self) {
+ self->frame.programCounter++;
+}
+
+size_t Thread_getProgramCounter(Thread* self) {
+ return self->frame.programCounter;
+}
+
union Argument;
typedef const union Argument Argument;
union Argument {
int32_t integer;
};
-void call(struct Thread* thread, Argument argument) {
+void callBuiltinPow(Thread* thread, size_t argumentCount) {
+ assert(argumentCount == 2);
+ assert(!Stack_isEmpty(&(thread->stack)));
+ Object exponent = Stack_pop(&(thread->stack));
+ assert(exponent.type == INTEGER);
+ assert(exponent.value.integer >= 0);
+
+ assert(!Stack_isEmpty(&(thread->stack)));
+ Object base = Stack_pop(&(thread->stack));
+ assert(base.type == INTEGER);
+
+ Object result;
+ result.type = INTEGER;
+ result.value.integer = 1;
+
+ while(exponent.value.integer > 0) {
+ result.value.integer *= base.value.integer;
+ exponent.value.integer--;
+ }
+
+ Stack_push(&(thread->stack), result);
+}
+
+void callBuiltinPrint(Thread* thread, size_t argumentCount) {
+ assert(argumentCount > 0);
+
+ Object arguments[argumentCount];
+ size_t count;
+
+ for(count = 0; count < argumentCount; count++) {
+ assert(!Stack_isEmpty(&(thread->stack)));
+ arguments[argumentCount - count - 1] = Stack_pop(&(thread->stack));
+ }
+
+ for(count = 0; count < argumentCount; count ++) {
+ Object arg = arguments[count];
+
+ switch(arg.type) {
+ case BOOLEAN:
+ if(arg.value.boolean) printf("true");
+ else printf("false");
+ break;
+
+ case INTEGER:
+ printf("%i", arg.value.integer);
+ break;
+
+ case STRING:
+ printf("%s", arg.value.string);
+ break;
+
+ default:
+ assert(false);
+ }
+ }
+
+ Stack_push(&(thread->stack), BUILTIN_NIL);
+}
+
+void callBuiltin(Thread* thread, Builtin b, size_t argumentCount) {
+ switch(b) {
+ case POW:
+ callBuiltinPow(thread, argumentCount);
+ break;
+ case PRINT:
+ callBuiltinPrint(thread, argumentCount);
+ break;
+
+ default:
+ assert(false);
+ }
+}
+
+void callClosure(Thread* thread, Closure closure, size_t argumentCount) {
+ assert(argumentCount == 0);
+
+ Frame* returnFrame = malloc(sizeof(Frame));
+ *returnFrame = thread->frame;
+ Frame_initialize(
+ &(thread->frame),
+ Environment_construct(Environment_reference(closure.environment)),
+ returnFrame,
+ closure.entry - 1 // We will increment the frame immediately after this
+ );
+}
+
+void inst_call(Thread* thread, Argument argument) {
assert(!Stack_isEmpty(&(thread->stack)));
Object f = Stack_pop(&(thread->stack));
size_t argumentCount = argument.label;
switch(f.type) {
case BUILTIN:
- switch(f.value.builtin) {
- case POW:
- {
- assert(argumentCount == 2);
- assert(!Stack_isEmpty(&(thread->stack)));
- Object exponent = Stack_pop(&(thread->stack));
- assert(exponent.type == INTEGER);
- assert(exponent.value.integer >= 0);
-
- assert(!Stack_isEmpty(&(thread->stack)));
- Object base = Stack_pop(&(thread->stack));
- assert(base.type == INTEGER);
-
- Object result;
- result.type = INTEGER;
- result.value.integer = 1;
-
- while(exponent.value.integer > 0) {
- result.value.integer *= base.value.integer;
- exponent.value.integer--;
- }
-
- Stack_push(&(thread->stack), result);
- }
- break;
- case PRINT:
- {
- // TODO Handle multiple arguments
- assert(!Stack_isEmpty(&(thread->stack)));
- Object arg = Stack_pop(&(thread->stack));
-
- switch(arg.type) {
- case BOOLEAN:
- if(arg.value.boolean) printf("true");
- else printf("false");
- break;
-
- case INTEGER:
- printf("%i", arg.value.integer);
- break;
-
- case STRING:
- printf("%s", arg.value.string);
- break;
-
- default:
- assert(0);
- }
-
- Stack_push(&(thread->stack), BUILTIN_NIL);
- }
- break;
-
- default:
- assert(false);
- }
+ callBuiltin(thread, f.value.builtin, argumentCount);
+ break;
+
+ case CLOSURE:
+ callClosure(thread, f.value.closure, argumentCount);
break;
default:
{% include "arithmetic_instruction.c" %}
{% endwith %}
+void inst_close(Thread* thread, Argument argument) {
+ Object result;
+ result.type = CLOSURE;
+ result.value.closure.environment = Thread_getEnvironment(thread);
+ result.value.closure.entry = argument.label;
-void drop(struct Thread* thread, Argument argument) {
+ Stack_push(&(thread->stack), result);
+}
+
+void inst_drop(Thread* thread, Argument argument) {
assert(!Stack_isEmpty(&(thread->stack)));
Object result = Stack_pop(&(thread->stack));
Object_deinitialize(&result);
}
-void end(struct Thread* thread, Argument argument) {
+void inst_end(Thread* thread, Argument argument) {
}
{% with name='eq', operation='==' %}
{% include "arithmetic_instruction.c" %}
{% endwith %}
-void jump(Thread* thread, Argument argument) {
- thread->program_counter = argument.label - 1; // We will increment before running
+void inst_jump(Thread* thread, Argument argument) {
+ Thread_setProgramCounter(thread, argument.label - 1); // We will increment before running
}
-void jump_if_false(Thread* thread, Argument argument) {
+void inst_jump_if_false(Thread* thread, Argument argument) {
assert(!Stack_isEmpty(&(thread->stack)));
Object result = Stack_pop(&(thread->stack));
assert(result.type == BOOLEAN);
if(!(result.value.boolean)) {
- jump(thread, argument);
+ inst_jump(thread, argument);
}
}
{% include "comparison_instruction.c" %}
{% endwith %}
-void neg(Thread* thread, Argument argument) {
+void inst_neg(Thread* thread, Argument argument) {
assert(!Stack_isEmpty(&(thread->stack)));
Object result = Stack_pop(&(thread->stack));
assert(result.type == INTEGER);
Stack_push(&(thread->stack), result);
}
-void pop(struct Thread* thread, Argument argument) {
+void inst_pop(Thread* thread, Argument argument) {
char* argumentString = argument.string;
assert(!Stack_isEmpty(&(thread->stack)));
}
- Environment_set(thread->environment, argumentString, result);
+ Environment_set(Thread_getEnvironment(thread), argumentString, result);
}
-void push(struct Thread* thread, Argument argument) {
+void inst_push(Thread* thread, Argument argument) {
char* argumentString = argument.string;
if(strcmp(argumentString, "false") == 0) {
} else if(strcmp(argumentString, "true") == 0) {
Stack_push(&(thread->stack), (Object){ BOOLEAN, true });
} else {
- Environment_get_Result result = Environment_get(thread->environment, argumentString);
+ Environment_get_Result result = Environment_get(
+ Thread_getEnvironment(thread),
+ argumentString
+ );
if(!result.found) {
fprintf(stderr, "Variable `%s` not found", argumentString);
assert(false);
}
}
-void push_integer(struct Thread* thread, Argument argument) {
+void inst_push_integer(Thread* thread, Argument argument) {
Object result;
result.type = INTEGER;
result.value.integer = argument.integer;
Stack_push(&(thread->stack), result);
}
-void push_string(struct Thread* thread, Argument argument) {
+void inst_push_string(Thread* thread, Argument argument) {
Object result;
result.type = STRING;
result.value.string = argument.string;
{% include "arithmetic_instruction.c" %}
{% endwith %}
+void inst_return(Thread* thread, Argument argument) {
+ Frame* returnFrame = thread->frame.returnFrame;
+
+ Frame_deinitialize(&(thread->frame));
+
+ Frame_initialize(
+ &(thread->frame),
+ returnFrame->environment,
+ returnFrame->returnFrame,
+ returnFrame->programCounter
+ );
+
+ free(returnFrame);
+}
+
struct Instruction;
typedef const struct Instruction Instruction;
struct Instruction {
- void (*instruction)(struct Thread*,Argument);
+ void (*instruction)(Thread*,Argument);
Argument argument;
};
const Instruction program[] = {
{% for instruction in instruction_list %}
- (Instruction){ {{ instruction.instruction }}, (Argument){{ generate_argument(instruction) }} },
+ (Instruction){ inst_{{ instruction.instruction }}, (Argument){{ generate_argument(instruction) }} },
{% endfor %}
};
Thread thread;
Thread_initialize(&thread, LABEL___main__);
- for(; program[thread.program_counter].instruction != end; thread.program_counter++) {
- program[thread.program_counter].instruction(
+ for(; program[Thread_getProgramCounter(&thread)].instruction != inst_end; Thread_incrementProgramCounter(&thread)) {
+ program[Thread_getProgramCounter(&thread)].instruction(
&thread,
- program[thread.program_counter].argument
+ program[Thread_getProgramCounter(&thread)].argument
);
}
projects / fur / blobdiff