Clean

benchmarks/main.c

@@ -123,7 +123,7 @@ void main(int argc, char* argv[]) {
         endTimer(i, 0);
         startTimer();
 
-        struct LexerResult result = runLexer(buff, size);
+        LEXER_RESULT result = runLexer(buff, size);
 
 	free(buff);
 

examples/assembly.qf

@@ -0,0 +1,7 @@
+func main() {
+    myAssemblyFunction()
+}
+
+asmf myAssemblyFunction() {
+    0xB8 0x4C 0x00 0x00 0x00 0xC3
+}

src/cli/main.c

@@ -25,10 +25,6 @@
 // Version
 #define VERSION "0.1.0"
 
-uint8_t code_section[6] = {
-	0xB8, 0x4C, 0x00, 0x00, 0x00, 0xC3
-};
-
 void showCommandEntry(char* commandName, char* description, int argumentCount, char* argumentNames[], char* argumentDescriptions[]) {
 	printf("\n    >  %s\n\n       %s%sDescription%s: %s\n", commandName, STYLE_BOLD, STYLE_UNDERLINE, RESET, description);
 
@@ -117,8 +113,8 @@ int main(int argc, char* argv[]) {
 			buff[size] = '\0';
 			fclose(fptr);
 
-			struct LexerResult result = runLexer(buff, size);
-			struct ASTNode* root = parseNodes(result, 0, AST_ROOT);
+			LEXER_RESULT result = runLexer(buff, size);
+			AST_NODE* root = parseNodes(result, 0, AST_ROOT);
 
 			IR_CTX* ctx = makeContext(root);
 
@@ -129,9 +125,7 @@ int main(int argc, char* argv[]) {
 
 			fptr = fopen(outputFile, "w");
 			compile(ctx, fptr);
-
-			//compilePE(fptr, code_section, sizeof(code_section));
-
+
 			break;
 		case 'v':
 			if(strlen(argv[1]) > 1 && strcmp(argv[1], "version") != 0) {

src/compiler/compiler.c

@@ -135,7 +135,7 @@ IR_CTX* makeContext(AST_NODE* tree) {
 /**
  * Compiles the Context tree to an executable named the provided file name.
  * @param ctx the IR context.
- * @param char the output file name.
+ * @param out the output file.
  */
 void compile(IR_CTX* ctx, FILE* out) {
 

src/compiler/ir.h

@@ -9,19 +9,20 @@
 #ifndef IR_H
 #define IR_H
 
-enum IRNodeType {
+typedef enum {
 	IR_FUNCTION,
 
 	IR_ASM_FUNCTION,
 
 	IR_VARIABLE,
 	IR_FUNCTION_ARGUMENT,
 	IR_FUNCTION_BODY_VARIABLE
-};
+} IR_TYPE;
 
-typedef enum IRNodeType IR_TYPE;
-
-struct IRNode {
+/**
+ * An IR Node.
+ */
+typedef struct IR_NODE {
 
 	IR_TYPE nodeType;
 
@@ -35,27 +36,26 @@ struct IRNode {
 	int valueSize;
 
 	// Function Properties
-	struct IRNode** variables;
+	struct IR_NODE** variables;
 	int variableIndex;
 
 	struct Hashmap* variableMap;
 
 	AST_NODE* tree;
-};
-
-typedef struct IRNode IR_NODE;
+} IR_NODE;
 
-struct IRContext {
+/**
+ * The overall IR context.
+ */
+typedef struct {
 	IR_NODE** nodes;
 	int nodeIndex;
 
 	struct Hashmap* nodeMap;
 
 	IR_NODE* mainFunc;
 
-};
-
-typedef struct IRContext IR_CTX;
+} IR_CTX;
 
 /**
  * Creates an IR node based on the type and the name given.

src/compiler/pe/format.h

@@ -2,8 +2,6 @@
  * Quickfall PE Format Defintion.
  */
 
-#include "../units.h"
-
 #ifndef PE_FORMAT
 #define PE_FORMAT
 

src/lexer/lexer.c

@@ -15,16 +15,16 @@
 /**
  * Sets the token type of the currently selected token in the LexerResult with the provided token type.
  */
-void pushToken(struct LexerResult* result, enum TokenType type) {
+void pushToken(LEXER_RESULT* result, TOKEN_TYPE type) {
     result->tokens[result->size].type = type;
     result->size++;
 }
 
-struct LexerResult runLexer(char* string, int size) {
-	struct LexerResult result;
+LEXER_RESULT runLexer(char* string, int size) {
+	LEXER_RESULT result;
 	result.size = 0;
 
-	result.tokens = malloc(sizeof(struct Token) * 1024);
+	result.tokens = malloc(sizeof(TOKEN) * 1024);
 
 	char c;
 

src/lexer/lexer.h

@@ -7,22 +7,22 @@
 /**
  * Contains the results of lexical analysis
  */
-struct LexerResult {
+typedef struct {
     int size;
-    struct Token* tokens;
-};
+    TOKEN* tokens;
+} LEXER_RESULT;
 
 /**
  * Performs lexical analysis on an input string
  * Returns a LexerResult containing the tokens
  */
-struct LexerResult runLexer(char* input, int size);
+LEXER_RESULT runLexer(char* input, int size);
 
 /**
  * Adds a token to the LexerResult
  * @param result The LexerResult to add the token to
  * @param type The type of the token to add
  */
-void pushToken(struct LexerResult* result, enum TokenType type);
+void pushToken(LEXER_RESULT* result, TOKEN_TYPE type);
 
 #endif

src/lexer/tokens.h

@@ -1,7 +1,7 @@
 #ifndef TOKENS_H
 #define TOKENS_H
 
-enum TokenType {
+typedef enum {
     ASM_FUNCTION,
     FUNCTION,
     RETURN,
@@ -23,15 +23,15 @@ enum TokenType {
     USE,
     NONE,
     MATH_OP
-};
+} TOKEN_TYPE;
 
 /**
  * An lexer token generated by the Lexer.
  */
-struct Token {
-	enum TokenType type;
+typedef struct {
+	TOKEN_TYPE type;
 	char* value;
-};
+} TOKEN;
 
 
 #endif

src/parser/ast.c

@@ -10,7 +10,7 @@
  * Creates a new AST Node.
  * @param type the AST type of the node.
  */
-AST_NODE* createASTNode(enum ASTNodeType type) {
+AST_NODE* createASTNode(AST_NODE_TYPE type) {
 	AST_NODE* node = malloc(sizeof(AST_NODE));
 
 	node->valueSize = 0;

src/parser/ast.h

@@ -2,13 +2,13 @@
  * The header file of AST nodes in Quickfall.
  */
 
-#ifndef AST_2_H
-#define AST_2_H
+#ifndef AST_H
+#define AST_H
 
 /**
  * The type of AST Node(s).
  */
-enum ASTNodeType {
+typedef enum {
 
 	AST_ROOT, // A root of an AST tree, can either represent the first node of the tree or a function body.
 
@@ -33,31 +33,29 @@ enum ASTNodeType {
 	AST_MATH_OP_HEADER,
 
 	AST_PARAMETER // A function parameter AST Node, used in function declaration.
-};
+} AST_NODE_TYPE;
 
 /**
  * An AST Node. Has a tree-ish structure.
  */
-struct ASTNode {
+typedef struct AST_NODE {
 
-	struct ASTNode* left;
-	struct ASTNode* right;
-	struct ASTNode* next;
+	struct AST_NODE* left;
+	struct AST_NODE* right;
+	struct AST_NODE* next;
 
-	enum ASTNodeType type;
+	AST_NODE_TYPE type;
 
 	int valueSize;
 	char* value;
 	int endingIndex; // The index which the parsing ended
 
-};
-
-typedef struct ASTNode AST_NODE;
+} AST_NODE;
 
 /**
  * Creates a new AST Node.
  * @param type the AST type of the node.
  */
-AST_NODE* createASTNode(enum ASTNodeType type);
+AST_NODE* createASTNode(AST_NODE_TYPE type);
 
 #endif