added a load of stuff, and fixed a git conflict

1 files changed, 0 insertions, 61 deletions

diff --git a/comp/lucas-standen-NEA/code/parser/readfile.c b/comp/lucas-standen-NEA/code/parser/readfile.c
deleted file mode 100644
index 391d5a5..0000000
--- a/comp/lucas-standen-NEA/code/parser/readfile.c
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
-
-bool instring = false;
-
-char *readfile(char *filepath){
-	FILE *fptr;
-	fptr = fopen(filepath, "r");
-
-	if (fptr == NULL)
-		return NULL;
-	int size = 10;
-	char *buf = malloc(size);
-	char c;
-
-	int i = 0;
-
-	buf = buf+i;
-	buf[0] = '{';
-	buf = buf-i;
-	
-	i++;
-
-	while ((c = getc(fptr)) != EOF){
-		if (i > size + 1){
-			size = size + 10;
-			buf = realloc(buf, size);
-		}
-		if (c == '"'){
-			if (instring == false)
-				instring = true;
-			else
-				instring = false;
-		}
-
-		if (c == '!' && instring == false){
-			while ((c = getc(fptr)) != EOF && c != '\n'){}
-		}
-		buf = buf+i;
-		buf[0] = c;
-		buf = buf-i;
-		i++;
-
-	}
-
-	buf = buf+i;
-	buf[0] = '}';
-	buf = buf-i;
-	
-	i++;
-
-	buf = buf+i;
-	buf[0] = '\0';
-	buf = buf-i;
-
-	fclose(fptr);
-
-	return buf;
-}