src/extstring.c

@@ -14,9 +14,9 @@ void es_addsymbol(struct Extstring* string, char symbol) {
 }
 
 int es_size(struct Extstring* string) {
-	int size = 0;
+	int size;
 	struct Extstring* ptr = string;
-	for (; ptr != NULL; size++) {
+	for (size = 0; ptr != NULL; size++) {
 		ptr = ptr->next;
 	}
 	return size;
@@ -37,17 +37,19 @@ void es_free(struct Extstring* string) {
 	free(ptr);
 }
 
-char* es_tostring(struct Extstring* string) {
+struct SString* es_tostring(struct Extstring* string) {
 	struct Extstring* ptr = string;
 	int size = es_size(string) + 1;
-	char* cstring = malloc(size);
+	struct SString* sstring = malloc(sizeof(struct SString));
+	sstring->string = malloc(size);
+	sstring->size = size;
 	for (int i = 0; i != size; i++) {
 		if (ptr != NULL) {
-			cstring[i] = ptr->symbol;
+			sstring->string[i] = ptr->symbol;
 			ptr = ptr->next;
 		}
 		else
-			cstring[i] = 0;
+			sstring->string[i] = 0;
 	}
-	return cstring;
+	return sstring;
 }

src/extstring.h

@@ -3,7 +3,12 @@ struct Extstring {
 	struct Extstring* next;
 };
 
+struct SString {
+	int size;
+	char* string;
+};
+
 void es_addsymbol(struct Extstring* string, char symbol);
 int es_size(struct Extstring* string);
 void es_free(struct Extstring* string);
-char* es_tostring(struct Extstring* string);
+struct SString* es_tostring(struct Extstring* string);

src/main.c

@@ -15,13 +15,10 @@ int main(int argc, char *argv[]) {
 	}
 	file = fopen(argv[1],"r");
 	struct SyntaxElement* code = parse(file);
-	fclose(file);
 	if (code == NULL) {
 		fprintf(stderr, "Error during parsing.\n");
 		return 1;
 	}
 	printtree(code,0);
-	se_free(code);
-	code = NULL;
 	return 0;
 }

src/parser.c

@@ -28,27 +28,6 @@ struct SyntaxElement* se_next(struct SyntaxElement* syntaxelement) {
 	return syntaxelement->next;
 }
 
-void se_free(struct SyntaxElement* syntaxtree) {
-	switch (syntaxtree->type) {
-		case NONE:
-			free(syntaxtree);
-			return;
-		case TREE:
-		case TOPTREE:
-			if (syntaxtree->content != NULL) {
-				se_free((struct SyntaxElement*)syntaxtree->content);
-			}
-			break;
-		default:
-			free(syntaxtree->content);
-			break;
-	}
-	if (syntaxtree->next != NULL) {
-		se_free(syntaxtree->next);
-	}
-	free(syntaxtree);
-}
-
 void se_clean(struct SyntaxElement* syntaxtree) {
 	if (syntaxtree->next != NULL) {
 		switch (syntaxtree->next->type) {
@@ -98,11 +77,10 @@ struct SyntaxElement* parse(FILE* file) {
 			if (symbol == '"') {
 				if (string == NULL) {
 					string = malloc(sizeof(struct Extstring));
-					string->next = NULL;
 				}
 				instring = false;
 				syntaxtree->type = STRING;
-				char* sstring = es_tostring(string);
+				char* sstring = es_tostring(string)->string;
 				syntaxtree->content = sstring;
 				es_free(string);
 				string = NULL;
@@ -111,7 +89,6 @@ struct SyntaxElement* parse(FILE* file) {
 				if (string == NULL) {
 					string = malloc(sizeof(struct Extstring));
 					string->symbol = symbol;
-					string->next = NULL;
 					continue;
 				}
 				es_addsymbol(string, symbol);
@@ -122,7 +99,7 @@ struct SyntaxElement* parse(FILE* file) {
 			if (isspace(symbol) || symbol == '(' || symbol == ')') {
 				intoken = false;
 				syntaxtree->type = TOKEN;
-				char* sstring = es_tostring(token);
+				char* sstring = es_tostring(token)->string;
 				syntaxtree->content = sstring;
 				es_free(token);
 				token = NULL;
@@ -160,7 +137,6 @@ struct SyntaxElement* parse(FILE* file) {
 				default:
 					token = malloc(sizeof(struct Extstring));
 					token->symbol = symbol;
-					token->next = NULL;
 					intoken = true;
 					break;
 			}

src/parser.h

@@ -2,11 +2,6 @@
 
 #ifndef PARSER_H
 #define PARSER_H
-struct SyntaxElement* se_init(void);
-struct SyntaxElement* se_bottom(struct SyntaxElement* syntaxelement);
-struct SyntaxElement* se_next(struct SyntaxElement* syntaxelement);
-void se_free(struct SyntaxElement* syntaxtree);
-
 enum SyntaxElementType {
 	TOPTREE,
 	TREE,