simplifying stuff
This commit is contained in:
+11
-44
@@ -42,12 +42,12 @@ static void print_error(const char *type, Error *error)
|
||||
fprintf(stderr, "\n");
|
||||
}
|
||||
|
||||
static _Bool interpret(Source *src)
|
||||
static Executable *build(Source *src)
|
||||
{
|
||||
// Compile the code. This section transforms
|
||||
// a [Source] into an [Executable].
|
||||
Executable *exe;
|
||||
{
|
||||
|
||||
// Create a bump-pointer allocator to hold the AST.
|
||||
BPAlloc *alloc = BPAlloc_Init(-1);
|
||||
|
||||
@@ -86,10 +86,17 @@ static _Bool interpret(Source *src)
|
||||
Error_Free(&error);
|
||||
return 0;
|
||||
}
|
||||
|
||||
return exe;
|
||||
}
|
||||
|
||||
// Now execute it.
|
||||
static _Bool interpret(Source *src)
|
||||
{
|
||||
Executable *exe = build(src);
|
||||
|
||||
if(exe == NULL)
|
||||
return 0;
|
||||
|
||||
Runtime *runt = Runtime_New(-1, -1, NULL, NULL);
|
||||
|
||||
if(runt == NULL)
|
||||
@@ -148,53 +155,13 @@ static _Bool interpret(Source *src)
|
||||
|
||||
return o != NULL;
|
||||
}
|
||||
}
|
||||
|
||||
static _Bool disassemble(Source *src)
|
||||
{
|
||||
// Compile the code. This section transforms
|
||||
// a [Source] into an [Executable].
|
||||
Executable *exe;
|
||||
{
|
||||
// Create a bump-pointer allocator to hold the AST.
|
||||
BPAlloc *alloc = BPAlloc_Init(-1);
|
||||
|
||||
if(alloc == NULL)
|
||||
{
|
||||
fprintf(stderr, "Internal Error: Couldn't allocate bump-pointer allocator to hold the AST.\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
Error error;
|
||||
Error_Init(&error);
|
||||
|
||||
// NOTE: The AST is stored in the BPAlloc. It's
|
||||
// lifetime is the same as the pool.
|
||||
AST *ast = parse(src, alloc, &error);
|
||||
|
||||
if(ast == NULL)
|
||||
{
|
||||
assert(error.occurred);
|
||||
print_error("Parsing", &error);
|
||||
Error_Free(&error);
|
||||
BPAlloc_Free(alloc);
|
||||
return 0;
|
||||
}
|
||||
|
||||
exe = compile(ast, alloc, &error);
|
||||
|
||||
// We're done with the AST, independently from
|
||||
// the compilation result.
|
||||
BPAlloc_Free(alloc);
|
||||
Executable *exe = build(src);
|
||||
|
||||
if(exe == NULL)
|
||||
{
|
||||
assert(error.occurred);
|
||||
print_error("Compilation", &error);
|
||||
Error_Free(&error);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
Executable_Dump(exe);
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user