Ir

src/cli/main.c

@@ -18,7 +18,8 @@
 
 #include "../compiler/compiler.h"
 #include "../compiler/pe/pe.h"
-#include "../compiler/ir.h"
+
+#include "../ir/ir.h"
 
 #include "../utils/logging.c"
 
@@ -40,8 +41,8 @@ void showCommandEntry(char* commandName, char* description, int argumentCount, c
 void showHelpMessage() {
 	printf("\n%sQuickfall%s - The programming language.\n\nCommands:\n", TEXT_CYAN, RESET);
 
-	char** arguments = malloc(5 * 24);
-	char** argumentDescriptions = malloc(5 * 256);
+	char** arguments = malloc(4);
+	char** argumentDescriptions = malloc(125);
 
 	arguments[0] = "-p";
 	argumentDescriptions[0] = "Determines the targeted platform. Defaults to the current platform.";
@@ -114,17 +115,7 @@ int main(int argc, char* argv[]) {
 			fclose(fptr);
 
 			LEXER_RESULT result = runLexer(buff, size);
-			AST_NODE* root = parseNodes(result, 0, AST_ROOT);
-
-			IR_CTX* ctx = makeContext(root);
-
-			if(ctx == NULL) {
-				printf("Error: the IR context is null! Something went wrong during compiling! Please check any logs for errors\n");
-				return -1;
-			}
-
-			fptr = fopen(outputFile, "w");
-			compile(ctx, fptr);
+			void* root = parseRoot(result, 0, AST_TYPE_ROOT);
 
 			break;
 		case 'v':

src/compiler/compiler.c

@@ -7,182 +7,13 @@
 #include <stdlib.h>
 
 #include "./compiler.h"
-#include "./ir.h"
-
-#include "../parser/ast.h"
-
-#include "../utils/hash.h"
-#include "../utils/hashmap.h"
 
 #include "./pe/pe.h"
 
-/**
- * Parses the AST tree into a context.
- * @param tree the AST tree.
- */
-IR_CTX* makeContext(AST_NODE* tree) {
-	IR_CTX* ctx = malloc(sizeof(IR_CTX));
-
-	int buffSize = 32;
-	ctx->nodes = malloc(sizeof(IR_NODE) * 32);
-
-	ctx->nodeIndex = 0;
-	ctx->nodeMap = createHashmap(512,200);
-
-	while(tree != NULL) {
-		switch(tree->type) {
-			case AST_VARIABLE_DECLARATION:
-
-				int hash = hashstr(tree->left->value);
-
-				if(hashGet(ctx->nodeMap, hash) != NULL) {
-					printf("Variable %s is already declared!\n", tree->left->value);
-					return NULL;
-				}
-
-				IR_NODE* node = createIRNode(IR_VARIABLE, tree->left->value);
-
-				node->type = tree->value;
-
-				if(tree->right != NULL && tree->right->value) node->value = tree->right->value;
-
-				ctx->nodes[ctx->nodeIndex] = node;
-				ctx->nodeIndex++;
-
-				hashPut(ctx->nodeMap, hash, node);
-
-				if(ctx->nodeIndex > buffSize) {
-					buffSize = buffSize * 1.5;
-					ctx->nodes = realloc(ctx->nodes, buffSize);
-				}
-
-				break;
-
-			case AST_FUNCTION_DECLARATION:
-
-				hash = hashstr(tree->left->right->value);
-
-				if(hashGet(ctx->nodeMap, hash) != NULL) {
-					printf("Function %s was already declared!\n", tree->left->right->value);
-					return NULL;
-				}
-
-				node = createIRNode(IR_FUNCTION, tree->left->right->value);
-
-				node->type = tree->left->value;
-
-				while(tree->left->left->next != NULL) {
-
-					IR_NODE* var = createIRNode(IR_FUNCTION_ARGUMENT, tree->right->value);
-
-					node->variables[node->variableIndex] = var;
-					node->variableIndex++;
-
-					hashPut(node->variableMap, hashstr(tree->left->left->right->value), var);
-
-					tree->left->left = tree->left->left->next;
-				}
-
-				node->tree = tree->right;
-
-				ctx->nodes[ctx->nodeIndex] = node;
-				ctx->nodeIndex++;
-
-				hashPut(ctx->nodeMap, hash, node);
-				break;
-
-			case AST_ASM_FUNCTION_DECLARATION:
-				hash = hashstr(tree->left->right->value);
-
-				if(hashGet(ctx->nodeMap, hash) != NULL) {
-					printf("Assembly function %s is already defined!\n");
-					return NULL;
-				}
-
-				node = createIRNode(IR_ASM_FUNCTION, tree->left->right->value);
-
-				node->value = tree->value;
-				node->valueSize = tree->valueSize;
-
-				while(tree->left->left->next != NULL) {
-
-					IR_NODE* var = createIRNode(IR_FUNCTION_ARGUMENT, tree->left->left->right->value);
-
-					node->variables[node->variableIndex] = var;
-					node->variableIndex++;
-
-					hashPut(node->variableMap, hashstr(tree->left->left->right->value), var);
-
-
-					tree->left->left = tree->left->left->next;
-				}
-
-				ctx->nodes[ctx->nodeIndex] = node;
-				ctx->nodeIndex++;
-
-				hashPut(ctx->nodeMap, hash, node);
-
-				break;
-
-		}
-
-		tree = tree->next;
-	}
-
-	return ctx;
-}
-
 /**
  * Compiles the Context tree to an executable named the provided file name.
  * @param ctx the IR context.
  * @param out the output file.
  */
-void compile(IR_CTX* ctx, FILE* out) {
-
-	uint8_t* buff = malloc(sizeof(uint8_t) * 512);
-	int i = 0;
-
-	int h = hashstr("main");
-
-	if(hashGet(ctx->nodeMap, h) == NULL) {
-		printf("Error: the main function wasn't defined!\n");
-		return;
-	}
-
-	IR_NODE* node = hashGet(ctx->nodeMap, h);
-
-	if(node->nodeType != IR_FUNCTION) {
-		printf("Error: main must be a function!\n");
-		return;
-	}
-
-	while(node->tree != NULL) {
-
-		if(node->tree->type == AST_FUNCTION_INVOKE) {
-
-			int hash = hashstr(node->tree->value);
-
-			IR_NODE* wa = hashGet(ctx->nodeMap, hash);
-
-			if(wa == NULL) {
-				printf("Error: The %s function doesn't exist!\n", node->tree->value);
-				return;
-			}
-
-			if(wa->nodeType == IR_ASM_FUNCTION) {
-				unsigned char b;
-				unsigned char* ptr = (unsigned char*) wa->value;
-
-				for(int ii = 0; ii < wa->valueSize; ++ii) {
-					buff[i] = ptr[ii];
-					++i;
-				}
-			}
-		}
-
-		node->tree = node->tree->next;
-	}
-
-	//todo: change format based on user
-	compilePE(out, buff, i);
+void compile(FILE* out) {
 }

src/compiler/compiler.h

@@ -5,22 +5,11 @@
 #ifndef COMPILER_H
 #define COMPILER_H
 
-#include "../utils/hashmap.h"
-#include "../parser/ast.h"
-
-#include "./ir.h"
-
-/**
- * Parses the AST tree into a context.
- * @param tree the AST tree.
- */
-IR_CTX* makeContext(AST_NODE* tree);
-
 /**
  * Compiles the Context tree to an executable named the provided name.
  * @param ctx the IR context.
  * @param char the output file.
  */
-void compile(IR_CTX* ctx, FILE* outputFileName);
+void compile(FILE* outputFileName);
 
 #endif