Started refactoring code

Added a src/ and build/ directory
Added a include/ directory
Included file is smaller

8 files changed, 2133 insertions, 0 deletions

diff --git a/src/ctemplates.c b/src/ctemplates.c
new file mode 100644
index 0000000..c154dcb
--- /dev/null
+++ b/src/ctemplates.c
@@ -0,0 +1,1224 @@
+/*
+ * C TemplateS : template expander
+ * Based on the original libctemplate by Stephen C. Losen
+ * 
+ * Version 0.1
+ *
+ * Copyright (c) 2017-2018 Alexander M. Pickering (alex@cogarr.net)
+ *
+ * Distributed under GPL V3, see COPYING for more information.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as publish by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public Liscense for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <stdarg.h>
+#include <ctemplates.h>
+
+struct TMPL_token*           TMPL_alloc_token(void);
+void                         TMPL_free_token(struct TMPL_token* token);
+enum TMPL_tagtype            starts_with_token(char* str, size_t strlen);
+size_t                       tagtype_len(enum TMPL_tagtype t);
+struct TMPL_token*           scan_text(
+                                       char* start,
+                                       size_t strlen,
+                                       size_t* consumed
+                                      );
+struct TMPL_token*           scan_tag(
+                                      char* start,
+                                      size_t strlen,
+                                      size_t* consumed
+                                     );
+void                         print_tokens(struct TMPL_token* head);
+struct TMPL_varitem*         TMPL_alloc_varitem(void);
+void                         TMPL_free_varitem(struct TMPL_varitem* vi);
+void                         TMPL_add_var_to_varlist(
+                                                     struct TMPL_varlist* t,
+                                                     char* varname,
+                                                     char* var
+                                                    );
+void                         print_ast_helper(
+                                              struct TMPL_tagnode* cursor,
+                                              int level
+                                             );
+void                         print_ast(struct TMPL_templates* root);
+struct TMPL_token*           TMPL_tokenize(char* tmplstr, size_t strlen);
+struct TMPL_tagnode*         alloc_tagnode(void);
+size_t                       get_quoted_string(char* start, size_t len);
+int                          is_whitespace(char c);
+struct TMPL_tagnode*         parse_text(
+                                        struct TMPL_token* head,
+                                        struct TMPL_buf* errbuf
+                                       );
+struct TMPL_tagnode*         parse_else(
+                                        struct TMPL_token* head,
+                                        struct TMPL_buf* errbuf
+                                       );
+struct TMPL_tagnode*         parse_elseif(
+                                          struct TMPL_token* head,
+                                          struct TMPL_buf* errbuf
+                                         );
+struct TMPL_tagnode*         parse_if(
+                                      struct TMPL_token* head,
+                                      struct TMPL_buf* errbuf
+                                     );
+struct TMPL_tagnode*         parse_loop(
+                                        struct TMPL_token* head,
+                                        struct TMPL_buf* errbuf
+                                       );
+struct TMPL_tagnode*         parse_variable(
+                                            struct TMPL_token* head,
+                                            struct TMPL_buf* errbuf
+                                           );
+struct TMPL_varlist*         TMPL_alloc_varlist(void);
+int                          TMPL_free_hashmapitems(any_t a, any_t b);
+void                         TMPL_free_varlist(struct TMPL_varlist* vl);
+struct TMPL_loop*            TMPL_alloc_loop(void);
+void                         TMPL_free_loop(struct TMPL_loop* tl);
+void                         TMPL_add_varlist_to_loop(
+                                                      struct TMPL_loop* tl,
+                                                      struct TMPL_varlist* vl
+                                                     );
+void                         TMPL_add_loop_to_varlist(
+                                                      struct TMPL_varlist* vl,
+                                                      char* name,
+                                                      struct TMPL_loop* l
+                                                     );
+struct TMPL_tagnode*         parse(
+                                   struct TMPL_token* head,
+                                   struct TMPL_buf* errbuf
+                                  );
+struct TMPL_templates*       alloc_templates(void);
+struct TMPL_templates*       compile(char* tmplstr);
+int                          render_variable(
+                                             struct TMPL_templates* t,
+                                             struct TMPL_tagnode* node,
+                                             struct TMPL_varlist* varlist
+                                            );
+int                          render_text(
+                                         struct TMPL_templates* t,
+                                         struct TMPL_tagnode* node,
+                                         struct TMPL_varlist* varlist
+                                        );
+int                          print_pair(any_t indent, any_t b);
+int                          render_if(
+                                       struct TMPL_templates* t,
+                                       struct TMPL_tagnode* node,
+                                       struct TMPL_varlist* varlist
+                                      );
+int                          render_elseif(
+                                           struct TMPL_templates* t,
+                                           struct TMPL_tagnode* node,
+                                           struct TMPL_varlist* varlist
+                                          );
+int                          render_loop(
+                                         struct TMPL_templates* t,
+                                         struct TMPL_tagnode* node,
+                                         struct TMPL_varlist* varlist
+                                        );
+int                          render_any(
+                                        struct TMPL_templates* t,
+                                        struct TMPL_tagnode* node,
+                                        struct TMPL_varlist* varlist
+                                       );
+void                         TMPL_render_helper(
+                                                struct TMPL_templates* t,
+                                                struct TMPL_varlist* varlist
+                                               );
+char*                        TMPL_render(
+                                         struct TMPL_templates* t,
+                                         struct TMPL_varlist* varlist,
+					 size_t* size_p
+                                        );
+struct TMPL_templates*       TMPL_alloc_template(char* tmplstr);
+void                         TMPL_free_template(struct TMPL_templates* t);
+void                         TMPL_free_tagnode(struct TMPL_tagnode* tn);
+char*                        TMPL_get_error(struct TMPL_templates* t);
+void                         print_varlist_helper(
+                                                  struct TMPL_varlist* vl,
+                                                  int indent
+                                                 );
+
+
+/*Allocates a token*/
+struct TMPL_token*
+TMPL_alloc_token(){
+	struct TMPL_token* ret = (struct TMPL_token*)malloc(sizeof(struct TMPL_token));
+	ret->next = NULL;
+	return ret;
+}
+
+/*Frees an allocated token*/
+void
+TMPL_free_token(struct TMPL_token* token){
+	struct TMPL_token* cursor = token;
+	while(cursor != NULL){
+		struct TMPL_token* this = cursor;
+		cursor = cursor->next;
+		free(this);
+	}
+}
+
+/*Check if it starts with the names of any of our tokens*/
+enum TMPL_tagtype
+starts_with_token(char* str, size_t strlen){
+	/*Make sure we get TMPL_ first*/
+	if(strlen < 5){
+		return tag_null;
+	}
+	if(*str != 'T'
+	|| *(str + 1) != 'M'
+	|| *(str + 2) != 'P'
+	|| *(str + 3) != 'L'
+	|| *(str + 4) != '_'){
+		return tag_null;
+	}
+	if(strlen > TAG_VAR_LENGTH
+	&& *(str + 5) == 'V'
+	&& *(str + 6) == 'A'
+	&& *(str + 7) == 'R'
+	&& *(str + 8) == ' '){
+		return tag_var;
+	}else if(strlen > TAG_IF_LENGTH
+	&& *(str + 5) == 'I'
+	&& *(str + 6) == 'F'
+	&& *(str + 7) == ' '){
+		return tag_if;
+	}else if(strlen > TAG_END_LENGTH
+	&& *(str + 5) == 'E'
+	&& *(str + 6) == 'N'
+	&& *(str + 7) == 'D'){
+		return tag_end;
+	}else if(strlen > TAG_ELSE_LENGTH
+	&& *(str + 5) == 'E'/*Check for both else and elseif*/
+	&& *(str + 6) == 'L'
+	&& *(str + 7) == 'S'
+	&& *(str + 8) == 'E'){
+		if(*(str + 9) != 'I'){
+			return tag_else;
+		}else if(strlen > TAG_ELSEIF_LENGTH
+		&& *(str + 9) == 'I'
+		&& *(str + 10) == 'F'
+		&& *(str + 11) == ' '){
+			return tag_elseif;
+		}else{
+			return tag_null;
+		}
+	}else if(strlen > TAG_LOOP_LENGTH
+	&& *(str + 5) == 'L'
+	&& *(str + 6) == 'O'
+	&& *(str + 7) == 'O'
+	&& *(str + 8) == 'P'
+	&& *(str + 9) == ' '){
+		return tag_loop;
+	}else if(strlen > TAG_BREAK_LENGTH
+	&& *(str + 5) == 'B'
+	&& *(str + 6) == 'R'
+	&& *(str + 7) == 'E'
+	&& *(str + 8) == 'A'
+	&& *(str + 9) == 'K'
+	&& *(str + 10) == ' '){
+		return tag_break;
+	}else if(strlen > TAG_CONTINUE_LENGTH
+	&& *(str + 5) == 'C'
+	&& *(str + 6) == 'O'
+	&& *(str + 7) == 'N'
+	&& *(str + 8) == 'T'
+	&& *(str + 9) == 'I'
+	&& *(str + 10) == 'N'
+	&& *(str + 11) == 'U'
+	&& *(str + 12) == 'E'
+	&& *(str + 13) == ' '){
+		return tag_continue;
+	}else{
+		return tag_null;
+	}
+}
+
+/*Find the lenth of a tag*/
+size_t
+tagtype_len(enum TMPL_tagtype t){
+	switch(t){
+		case tag_null:
+			return TAG_NULL_LENGTH;
+		case tag_text:
+			return TAG_TEXT_LENGTH;
+		case tag_var:
+			return TAG_VAR_LENGTH;
+		case tag_if:
+			return TAG_IF_LENGTH;
+		case tag_end:
+			return TAG_END_LENGTH;
+		case tag_elseif:
+			return TAG_ELSEIF_LENGTH;
+		case tag_else:
+			return TAG_ELSE_LENGTH;
+		case tag_loop:
+			return TAG_LOOP_LENGTH;
+		case tag_break:
+			return TAG_BREAK_LENGTH;
+		case tag_continue:
+			return TAG_CONTINUE_LENGTH;
+	}
+	return 0;
+}
+
+/*Quickly find the token*/
+struct TMPL_token*
+scan_text(char* start, size_t strlen, size_t* consumed){
+	struct TMPL_token* t = TMPL_alloc_token();
+	t->start = start;
+	enum TMPL_tagtype type = tag_null;
+	char* cursor = start;
+	while(type == tag_null){
+		int left = strlen - (cursor - start);
+		cursor = (char*)memchr(cursor,'<',left);
+		if(cursor == NULL){
+			cursor = start + (strlen > 0 ? strlen : 1);
+			break;
+		}
+		type = starts_with_token(cursor+1,strlen);
+		if(type == tag_null){
+			cursor++;
+		}
+	}
+	t->end = cursor;
+	t->length = t->end - t->start;
+	*consumed = t->length;
+	char* c;
+	for(c = start; c < cursor; c++){
+	}
+	return t;
+}
+
+struct TMPL_token*
+scan_tag(char* start, size_t strlen, size_t* consumed){
+	struct TMPL_token* t = TMPL_alloc_token();
+	t->start = start;
+	char* cursor = (char*)memchr(start,'>',strlen);
+	t->end = cursor+1;/*Include the '>'*/
+	t->length = t->end - t->start;
+	*consumed = t->length;
+	return t;
+}
+
+void
+print_tokens(struct TMPL_token* head){
+	struct TMPL_token* cursor = head;
+	while(cursor != NULL){
+		printf("char start is %p char end is %p cursor is %p type is %d\n",cursor->start, cursor->end,(void*)cursor,(int)cursor->type);
+		char* i;
+		for(i = cursor->start; i != cursor->end; i++){
+			printf("%c",*i);
+		}
+		printf("\n----\n");
+		cursor = cursor->next;
+	}
+	printf("Finished printing tokens\n");
+}
+
+struct TMPL_varitem*
+TMPL_alloc_varitem(){
+	struct TMPL_varitem* ret = (struct TMPL_varitem*)malloc(sizeof(struct TMPL_varitem));
+	return ret;
+}
+
+void
+TMPL_free_varitem(struct TMPL_varitem* vi){
+	if(vi->type == vartype_var){
+		free(vi->item.s);
+	}else{
+		TMPL_free_loop(vi->item.l);
+	}
+	free(vi);
+}
+
+void
+TMPL_add_var_to_varlist(struct TMPL_varlist* t, char* varname, char* var){
+	struct TMPL_varitem* vi = TMPL_alloc_varitem();
+	vi->type = vartype_var;
+	size_t slen = strlen(var);/*strlen dosn't count \0*/
+	vi->item.s = (char*)malloc(sizeof(char)*(slen + 1));
+	vi->item.s[slen] = '\0';
+	memcpy(vi->item.s,var,slen);
+	int succ = hashmap_put(t->map,varname,vi);
+	if(succ != MAP_OK){
+		exit(-1);
+	}
+}
+
+void
+print_ast_helper(struct TMPL_tagnode* cursor, int level){
+	int i;
+	for(i = 0; i < level; i++){
+		printf("|");
+	}
+	printf("} %d ->",(int)cursor->type);
+	switch(cursor->type){
+		case tag_null:
+			printf("TAG NULL");
+			break;
+		case tag_text:
+			printf("TAG Text %d\n", (int)cursor->TMPL_tag.text.len);
+			break;
+		case tag_var:
+			printf("TAG var(%s)",cursor->TMPL_tag.var.varname);
+			if(cursor->TMPL_tag.var.default_len > 0){
+				printf(" +default:%d",(int)cursor->TMPL_tag.var.default_len);
+			}
+			printf("\n");
+			break;
+		case tag_if:
+		case tag_elseif:
+			printf("TAG If/elseif,(%s) == (%s)\n",cursor->TMPL_tag.ifelse.varname,cursor->TMPL_tag.ifelse.testval);
+			level++;
+			for(i=0;i<level;i++){
+				printf("|");
+			}
+			printf("True:\n");
+			print_ast_helper(cursor->TMPL_tag.ifelse.tbranch,level);
+			if(cursor->TMPL_tag.ifelse.fbranch != NULL){
+				for(i=0;i<level;i++){
+					printf("|");
+				}
+				printf("False:\n");
+				print_ast_helper(cursor->TMPL_tag.ifelse.fbranch,level);
+			}
+			level--;
+			break;
+		case tag_else:
+			printf("TAG Else\n");
+			break;
+		case tag_end:
+			printf("TAG End\n");
+			break;
+		case tag_loop:
+			printf("TAG Loop (%s), body:\n",cursor->TMPL_tag.loop.loopname);
+			print_ast_helper(cursor->TMPL_tag.loop.body,level+1);
+			break;
+		case tag_break:
+			printf("TAG Break\n");
+			break;
+		case tag_continue:
+			printf("TAG Continue\n");
+			break;
+	}
+	if(cursor->next != NULL){
+		print_ast_helper(cursor->next,level);
+	}
+}
+void
+print_ast(struct TMPL_templates* t){
+	print_ast_helper(t->roottag,0);
+}
+
+struct TMPL_token*
+TMPL_tokenize(char* tmplstr, size_t m_strlen){
+	if(m_strlen == 0) return NULL;
+	struct TMPL_token* first;
+	char* textcursor = tmplstr;
+	size_t newlength;
+	enum TMPL_tagtype ttype;
+	ttype = starts_with_token(tmplstr+1,m_strlen);
+	if(*tmplstr == '<' && ttype != tag_null){
+		first = scan_tag(textcursor,m_strlen,&newlength);
+		first->type = ttype;
+	}else{
+		first = scan_text(textcursor,m_strlen,&newlength);
+		first->type = tag_text;
+	}
+	textcursor += newlength;
+	first->end = textcursor;
+	first->length = newlength;
+	m_strlen -= newlength;
+	struct TMPL_token* tokencursor = first;
+	struct TMPL_token* newnode;
+	while(*textcursor != '\0'){
+		ttype = starts_with_token(textcursor+1,m_strlen);
+		if(ttype == tag_null){
+			newnode = scan_text(textcursor,m_strlen,&newlength);
+			newnode->type = tag_text;
+		}else{
+			newnode = scan_tag(textcursor,m_strlen,&newlength);
+			newnode->type = ttype;
+		}
+		tokencursor->next = newnode;
+		textcursor += newlength;
+		m_strlen -= newlength;
+		tokencursor = newnode;
+	}
+	return first;
+}
+
+struct TMPL_tagnode*
+alloc_tagnode(){
+	struct TMPL_tagnode* t = malloc(sizeof(struct TMPL_tagnode));
+	return t;
+}
+
+/*Finds a quoted string, allows for \"*/
+size_t
+get_quoted_string(char* start, size_t len){
+	size_t i;
+	int setup = 0;
+	for(i = 0; i < len; i++){
+		if(*(start+i) == '\\'){
+			setup = 1;
+		}else if(*(start+i) == '"'){
+			if(setup == 1){
+				/*Do nothing, this is \"*/
+			}else{
+				return i;
+			}
+		}else{
+			setup = 0;
+		}
+	}
+	return i;
+}
+
+int
+is_whitespace(char c){
+	return (c == ' ' || c == '\t' || c == '\n') ? 1 : 0;
+}
+
+struct TMPL_tagnode*
+parse_text(struct TMPL_token* head, struct TMPL_buf* errbuf){
+	struct TMPL_tagnode* t = alloc_tagnode();
+	t->TMPL_tag.text.start = head->start;
+	t->TMPL_tag.text.len = head->length;
+	t->type = head->type;
+	struct TMPL_tagnode* n = parse(head->next, errbuf);
+	t->next = n;
+	return t;
+}
+
+struct TMPL_tagnode*
+parse_else(struct TMPL_token* head, struct TMPL_buf* errbuf){
+	struct TMPL_tagnode* branch = parse(head->next,errbuf);
+	return branch;
+}
+
+struct TMPL_tagnode*
+parse_elseif(struct TMPL_token* head, struct TMPL_buf* errbuf){
+	struct TMPL_tagnode* t = alloc_tagnode();
+	char* start_of_attribs = head->start + TAG_ELSEIF_LENGTH;
+	int name_offset = kmp(start_of_attribs,head->length, ATTRIBUTE_VARNAME,ATTRIBUTE_VARNAME_LENGTH);
+	char* start_of_name = start_of_attribs + name_offset + ATTRIBUTE_VARNAME_LENGTH;
+	while(is_whitespace(*start_of_name))
+		start_of_name++;
+	if(*start_of_name != '='){
+		bputs(errbuf,"Parsing error: Expected \"=\" in <TMPL_ELSEIF ...> after name near ");
+		bputsn(errbuf,head->start, ERR_MSG_LEN);
+		bputs(errbuf,"\n");
+	}else{
+		start_of_name++;
+	}
+	while(is_whitespace(*start_of_name))
+		start_of_name++;
+	start_of_name++;//consume "
+	size_t name_length = get_quoted_string(start_of_name,head->length);
+	char* name = (char*)malloc(sizeof(char)*name_length);
+	memcpy(name,start_of_name,name_length);
+	name[name_length] = '\0';
+	t->TMPL_tag.ifelse.varname = name;
+
+	int testval_offset = kmp(start_of_attribs,head->length, ATTRIBUTE_VALUE,ATTRIBUTE_VALUE_LENGTH);
+	if(testval_offset == -1){
+		t->TMPL_tag.ifelse.testval = NULL;
+	}else{
+		char* start_of_value = start_of_attribs + testval_offset + ATTRIBUTE_VALUE_LENGTH;
+		while(is_whitespace(*start_of_value))
+			start_of_value++;
+		if(*start_of_value != '='){
+			bputs(errbuf,"Parsing error: Expected \"=\" in <TMPL_ELSEIF ...> after value near ");
+			bputsn(errbuf,head->start,ERR_MSG_LEN);
+			bputs(errbuf,"\n");
+		}else{
+			start_of_value++;//consume =
+		}
+		while(is_whitespace(*start_of_value))
+			start_of_value++;
+		start_of_value++;//consume "
+		size_t value_length = get_quoted_string(start_of_value,head->length);
+		char* value = (char*)malloc(sizeof(char)*value_length);
+		memcpy(value,start_of_value,value_length);
+		value[value_length] = '\0';
+		t->TMPL_tag.ifelse.testval = value;
+	}
+	struct TMPL_token* cursor = head->next;
+	int nest_level = 0;
+	struct TMPL_token* fstart = NULL;
+	while(nest_level > 0 || cursor->type != tag_end){
+		if(fstart == NULL){
+			if(cursor->type == tag_elseif){
+				fstart = cursor;
+			}else if(cursor->type == tag_else){
+				fstart = cursor;
+			}
+		}
+		if(cursor->type == tag_if || cursor->type == tag_loop){
+			nest_level++;
+		}else if(cursor->type == tag_end){
+			nest_level--;
+		}
+		cursor = cursor->next;
+	}
+	if(fstart != NULL){
+		if(fstart->type == tag_elseif){
+			t->TMPL_tag.ifelse.fbranch = parse_elseif(fstart,errbuf);
+		}else if(fstart->type == tag_else){
+			t->TMPL_tag.ifelse.fbranch = parse_else(fstart,errbuf);
+		}else{
+			t->TMPL_tag.ifelse.fbranch = parse(fstart,errbuf);
+		}
+	}else{
+		t->TMPL_tag.ifelse.fbranch = NULL;
+	}
+
+	t->TMPL_tag.ifelse.tbranch = parse(head->next,errbuf);
+	t->next = parse(cursor->next,errbuf);
+
+	t->type = tag_elseif;
+	return t;
+
+}
+
+struct TMPL_tagnode*
+parse_if(struct TMPL_token* head, struct TMPL_buf* errbuf){
+	struct TMPL_tagnode* t = alloc_tagnode();
+	char* start_of_attribs = head->start + TAG_IF_LENGTH;
+	/*Find the name of the varialbe*/	
+	int name_offset = kmp(start_of_attribs,head->length,ATTRIBUTE_VARNAME,ATTRIBUTE_VARNAME_LENGTH);
+	char* start_of_name = start_of_attribs + name_offset + ATTRIBUTE_VARNAME_LENGTH;
+	while(is_whitespace(*start_of_name))
+		start_of_name++;
+	if(*start_of_name != '='){
+		bputs(errbuf,"Parsing error: Expected \"=\" in <TMPL_IF ...> after name near ");
+		bputsn(errbuf, head->start, ERR_MSG_LEN);
+		bputs(errbuf,"\n");
+	}else{
+		start_of_name++;
+	}
+	while(is_whitespace(*start_of_name))
+		start_of_name++;
+	start_of_name++;//consume "
+	size_t name_length = get_quoted_string(start_of_name,head->length);
+	char* name = (char*)malloc(sizeof(char)*name_length);
+	memcpy(name,start_of_name,name_length);
+	name[name_length] = '\0';
+	t->TMPL_tag.ifelse.varname = name;
+	/*Find the name to check against*/
+	int testval_offset = kmp(start_of_attribs,head->length, ATTRIBUTE_VALUE,ATTRIBUTE_VALUE_LENGTH);
+	if(testval_offset == -1){
+		t->TMPL_tag.ifelse.testval = NULL;
+	}else{
+		char* start_of_value = start_of_attribs + testval_offset + ATTRIBUTE_VALUE_LENGTH;
+		while(is_whitespace(*start_of_value))
+			start_of_value++;
+		if(*start_of_value != '='){
+			bputs(errbuf,"Parsing error: Expected \"=\" in <TMPL_IF/TMPL_ELSEIF ...> after value near ");
+			bputsn(errbuf,head->start,ERR_MSG_LEN);
+			bputs(errbuf,"\n");
+		}else{
+			start_of_value++;
+		}
+		while(is_whitespace(*start_of_value))
+			start_of_value++;
+		start_of_value++;//consume "
+		size_t value_length = get_quoted_string(start_of_value,head->length);
+		char* value = (char*)malloc(sizeof(char)*value_length);
+		memcpy(value,start_of_value,value_length);
+		value[value_length] = '\0';
+		t->TMPL_tag.ifelse.testval = value;
+	}
+	/*Find the true branch*/
+	struct TMPL_token* cursor = head->next;
+	int nest_level = 0;
+	struct TMPL_token* fstart = NULL;
+	while(nest_level > 0 || cursor->type != tag_end){
+		if(fstart == NULL){
+			if(cursor->type == tag_elseif){
+				fstart = cursor;
+			}else if(cursor->type == tag_else){
+				fstart = cursor;
+			}
+		}
+		if(cursor->type == tag_if || cursor->type == tag_loop){
+			nest_level++;
+		}else if(cursor->type == tag_end){
+			nest_level--;
+		}
+		cursor = cursor->next;
+	}
+	if(fstart != NULL){
+		if(fstart->type == tag_elseif){
+			t->TMPL_tag.ifelse.fbranch = parse_elseif(fstart,errbuf);
+		}else if(fstart->type == tag_else){
+			t->TMPL_tag.ifelse.fbranch = parse_else(fstart,errbuf);
+		}else{
+			t->TMPL_tag.ifelse.fbranch = parse(fstart,errbuf);
+		}
+	}else{
+		t->TMPL_tag.ifelse.fbranch = NULL;
+	}
+
+	t->TMPL_tag.ifelse.tbranch = parse(head->next,errbuf);
+	/*Walk the tbranch and try to find if we have elseifs*/
+	t->next = parse(cursor->next,errbuf);
+	
+	t->type = tag_if;
+	return t;
+}
+
+
+struct TMPL_tagnode*
+parse_loop(struct TMPL_token* head, struct TMPL_buf* errbuf){
+	struct TMPL_tagnode* t = alloc_tagnode();
+	char* loop_start = head->start + TAG_LOOP_LENGTH;
+	int loop_length = head->length - TAG_LOOP_LENGTH;
+	int name_offset = kmp(loop_start,loop_length, ATTRIBUTE_VARNAME, ATTRIBUTE_VARNAME_LENGTH);
+	if(name_offset == -1 && DEBUGGING){
+		bputs(errbuf,"Parsing error: Could not find name attribute for loop near\n");
+		bputsn(errbuf,head->start, ERRBUF_HINTLEN);
+		return NULL;
+	}
+	if(name_offset >= 0){
+		char* start_of_name = loop_start + name_offset + ATTRIBUTE_VARNAME_LENGTH;
+		while(is_whitespace(*start_of_name))
+			start_of_name++;
+		if(*start_of_name != '='){
+			bputs(errbuf,"Parsing error: Expected \"=\" in <TMPL_LOOP ...> after name near ");
+			bputsn(errbuf, head->start, ERR_MSG_LEN);
+			bputs(errbuf,"\n");
+		}else{
+			start_of_name++;//consume '='
+		}
+		while(is_whitespace(*start_of_name))
+			start_of_name++;
+		start_of_name++;//consume "
+		size_t name_size = get_quoted_string(start_of_name,head->length);
+		char* loopname = (char*)malloc(sizeof(char)*name_size);
+		memcpy(loopname,start_of_name,name_size);
+		loopname[name_size] = '\0';
+		t->TMPL_tag.loop.loopname = loopname;
+
+	}
+	t->type = tag_loop;
+	int nest_level = 0;
+	struct TMPL_token* cursor = head->next;
+	while(cursor != NULL && (nest_level > 0 || cursor->type != tag_end)){
+		if(cursor == NULL){
+			bputs(errbuf,"Parse error : tried parsing loop and hit end of stream near\n");
+			bputsn(errbuf,head->start,ERRBUF_HINTLEN);
+			return NULL;
+		}
+		if(cursor->type == tag_if ||
+		   cursor->type == tag_loop){
+			nest_level++;
+		}else if(cursor->type == tag_end){
+			nest_level--;
+		}
+		cursor = cursor->next;
+	}
+	if(cursor == NULL){
+		bputs(errbuf,"Parse error: Tried parsing loop and hit end of stream near\n");
+		bputsn(errbuf,head->start,ERRBUF_HINTLEN);
+		return NULL;
+	}
+	t->TMPL_tag.loop.body = parse(head->next,errbuf);
+	t->next = parse(cursor->next,errbuf);
+	return t;
+}
+
+/*Parses the <TMPL_VAR ...> tokens*/
+struct TMPL_tagnode*
+parse_variable(struct TMPL_token* head, struct TMPL_buf* errbuf){
+	struct TMPL_tagnode* t = alloc_tagnode();
+	/*<TMPL_VAR name="..." default="...">
+	           ^*/
+	char* start_of_attribs = head->start + TAG_VAR_LENGTH;
+	/*Find the length of attributes*/
+	int attribs_length = head->length - TAG_VAR_LENGTH;
+	/*Find where the "name" attribute is*/
+	int in_name = kmp(start_of_attribs,attribs_length,ATTRIBUTE_VARNAME,ATTRIBUTE_VARNAME_LENGTH);
+	/*Find where the "default" attribute is*/
+	int in_default = kmp(start_of_attribs,attribs_length,ATTRIBUTE_DEFAULT,ATTRIBUTE_DEFAULT_LENGTH);
+	if(in_name == -1){
+		bputs(errbuf,"Parsing error: Could not find \"name\" field in <TMPL_VAR ...> near ");
+		bputsn(errbuf,head->start,ERR_MSG_LEN);
+		bputs(errbuf,"\n");
+	}
+	if(in_name >= 0){
+		char* start_of_name = start_of_attribs + in_name + ATTRIBUTE_VARNAME_LENGTH;
+		while(is_whitespace(*start_of_name))
+			start_of_name++;
+		if(*start_of_name != '='){
+			bputs(errbuf,"Parsing error: Expected \"=\" in <TMPL_VAR ...> after name near ");
+			bputsn(errbuf,head->start, ERR_MSG_LEN);
+			bputs(errbuf,"\n");
+		}else{
+			start_of_name++;//consume =
+		}
+		while(is_whitespace(*start_of_name))
+			start_of_name++;
+		start_of_name++; //consume "
+		size_t name_size = get_quoted_string(start_of_name,head->length);
+		char* name = (char*)malloc(sizeof(char)*name_size);
+		memcpy(name,start_of_name,name_size);
+		name[name_size] = '\0';
+		t->TMPL_tag.var.varname = name;
+		t->TMPL_tag.var.name_len = name_size;
+	}
+	if(in_default >= 0){
+		char* start_of_default = start_of_attribs + in_default + ATTRIBUTE_DEFAULT_LENGTH;
+		while(is_whitespace(*start_of_default))
+			start_of_default++;
+		if(*start_of_default != '='){
+			bputs(errbuf,"Parsing error: Expected \"=\" in <TMPL_VAR ...> after default near ");
+			bputsn(errbuf,head->start, ERR_MSG_LEN);
+			bputs(errbuf,"\n");
+		}else{
+			start_of_default++;//consume =
+		}
+		while(is_whitespace(*start_of_default))
+			start_of_default++;
+		start_of_default++; //consume "
+		size_t default_size = get_quoted_string(start_of_default,head->length);
+		char* def = (char*) malloc(sizeof(char)*default_size);
+		def[default_size] = '\0';
+		memcpy(def,start_of_default,default_size);
+		t->TMPL_tag.var.defaultval = def;
+		t->TMPL_tag.var.default_len = default_size;
+	}else{
+		t->TMPL_tag.var.default_len = 0;
+	}
+	t->type = tag_var;
+	t->next = parse(head->next,errbuf);
+	return t;
+}
+
+struct TMPL_varlist*
+TMPL_alloc_varlist(){
+	struct TMPL_varlist* ret = (struct TMPL_varlist*)malloc(sizeof(struct TMPL_varlist));
+	ret->map = hashmap_new();
+	return ret;
+}
+
+
+int
+TMPL_free_hashmapitems(any_t a, any_t b){
+	struct TMPL_varitem* vi = (struct TMPL_varitem*)b;
+	TMPL_free_varitem(vi);
+	return MAP_OK;
+}
+
+void
+TMPL_free_varlist(struct TMPL_varlist* vl){
+	hashmap_iterate(vl->map,TMPL_free_hashmapitems,NULL);
+	hashmap_free(vl->map);
+	free(vl);
+}
+
+struct TMPL_loop*
+TMPL_alloc_loop(){
+	struct TMPL_loop* ret = (struct TMPL_loop*)malloc(sizeof(struct TMPL_loop));
+	ret->loop_len = 0;
+	ret->varlist = NULL;
+	ret->next = NULL;
+	ret->tail = NULL;
+	return ret;
+}
+
+void
+TMPL_free_loop(struct TMPL_loop* tl){
+	if(tl->next != NULL){
+		TMPL_free_loop(tl->next);
+	}
+	if(tl->varlist != NULL)
+		TMPL_free_varlist(tl->varlist);
+	free(tl);
+}
+
+void TMPL_add_varlist_to_loop(struct TMPL_loop* tl,struct TMPL_varlist* vl){
+	if(tl->loop_len == 0){/*Add the first node*/
+		tl->varlist = vl;
+		tl->tail = tl;
+		tl->loop_len++;
+	}else{
+		struct TMPL_loop* new = TMPL_alloc_loop();
+		new->varlist = vl;
+		tl->tail->next = new;
+		tl->tail = new;
+	}
+}
+
+void
+TMPL_add_loop_to_varlist(struct TMPL_varlist* vl, char* name, struct TMPL_loop* l){
+	struct TMPL_varitem* vi = TMPL_alloc_varitem();
+	vi->type = vartype_loop;
+	vi->item.l = l;
+	int err = hashmap_put(vl->map,name,vi);
+	if(err != MAP_OK){
+	}
+	struct TMPL_varitem* back;
+	hashmap_get(vl->map,name,(void**)&back);
+}
+
+
+
+/*Parses tokens into a syntax tree*/
+struct TMPL_tagnode*
+parse(struct TMPL_token* head, struct TMPL_buf* errbuf){
+	struct TMPL_tagnode* root;
+	if(head == NULL){
+		return NULL;
+	}
+	switch(head->type){
+		case tag_text:
+			root = parse_text(head,errbuf);
+			break;
+		case tag_var:
+			root = parse_variable(head,errbuf);
+			break;
+		case tag_loop:
+			root = parse_loop(head,errbuf);
+			break;
+		case tag_end:
+			root = NULL;
+			break;
+		case tag_if:
+			root = parse_if(head,errbuf);
+			break;
+		case tag_elseif:
+			root = NULL;
+			break;
+		case tag_else:
+			root = NULL;
+			break;
+		default:
+			exit(-1);
+			break;
+	}
+	if(errbuf->total_len > 0){
+		return NULL;
+	}
+	return root;
+}
+
+struct TMPL_templates*
+alloc_templates(){
+	struct TMPL_templates* t = malloc(sizeof(struct TMPL_templates));
+	return t;
+}
+
+struct TMPL_templates*
+compile(char* tmplstr){
+	size_t slen = strlen(tmplstr);
+	struct TMPL_templates* ret = alloc_templates();
+	ret->out = alloc_tmpl_buf();
+	ret->errout = alloc_tmpl_buf();
+	struct TMPL_token* tokens = TMPL_tokenize(tmplstr,slen);
+	struct TMPL_tagnode* ast = parse(tokens,ret->errout);
+	if(ast == NULL){
+		//size_t dummy;
+		//printf("error: %s\n",bstringify(ret->errout,&dummy));
+	}else{
+		ret->roottag = ast;
+	}
+	return ret;
+}
+
+
+int
+render_variable(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+	struct TMPL_varitem* vi;
+	char* varname = node->TMPL_tag.var.varname;
+	int err = hashmap_get(varlist->map,varname,(void**)&vi);
+	if(err == MAP_OK){
+		bputs(t->out,vi->item.s);
+	}else if(err == MAP_MISSING){
+		size_t has_default = node->TMPL_tag.var.default_len;
+		if(has_default){
+			bputs(t->out,node->TMPL_tag.var.defaultval);
+		}else{
+			/*Error, not bound and no default*/
+			return -1;
+		}
+	}else{
+		return -1;
+	}
+	return 0;
+}
+
+int
+render_text(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+	struct TMPL_buf* buf = t->out;
+	char* text = (char*)node->TMPL_tag.text.start;
+	size_t length = node->TMPL_tag.text.len;
+	bputsn(buf,text,length);
+	return 0;
+}
+
+int
+print_pair(any_t indent, any_t b){
+	struct TMPL_varitem* vi = (struct TMPL_varitem*)b;
+	char *varstring;
+	switch(vi->type){
+	case 0:
+		varstring = "Null";
+		break;
+	case 1:
+		varstring = "Loop";
+		break;
+	case 2:
+		varstring = "Var";
+		break;
+	default:
+		varstring = "Error";
+	}
+	printf("Print pair, varitem is %p, type is %d (%s)\n",(void*)vi,(int)vi->type, varstring);
+	int* ip = (int*)indent;
+	int ind = *ip;
+	if(vi->type == vartype_var){
+		int i;
+		for(i = 0; i < ind; i++)
+			printf("\t");
+		printf("%s\n",vi->item.s);
+	}else{
+		struct TMPL_loop* cursor;
+		printf("{\n");
+		ind++;
+		/*If the loop doesn't have any varlists added, the cursor's varlist will be null*/
+		for(cursor = vi->item.l; cursor != NULL && cursor->varlist != NULL; cursor = cursor->next){
+			printf("First iteration though, cursor was %p\n",(void*)cursor);
+			print_varlist_helper(cursor->varlist,ind);
+		}
+		printf("}\n");
+	}
+	return MAP_OK;
+}
+
+void
+print_varlist_helper(struct TMPL_varlist* vl, int indent){
+	hashmap_iterate(vl->map, print_pair,&indent);
+}
+
+
+void
+print_varlist(struct TMPL_varlist* vl){
+	print_varlist_helper(vl,0);
+}
+
+int
+render_if(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+	char* varname = node->TMPL_tag.ifelse.varname;
+	char* testval = node->TMPL_tag.ifelse.testval;
+	struct TMPL_varitem* vi;
+	int err = hashmap_get(varlist->map,varname,(void**)&vi);
+	struct TMPL_tagnode* cursor;
+	if(err == MAP_OK){
+		if(testval == NULL || strcmp(vi->item.s, testval) == 0){
+			cursor = node->TMPL_tag.ifelse.tbranch;
+			while(cursor != NULL){
+				render_any(t,cursor,varlist);
+				cursor = cursor->next;
+			}
+
+		}else{
+
+		}
+
+	}else if(node->TMPL_tag.ifelse.fbranch != NULL){
+		cursor = node->TMPL_tag.ifelse.fbranch;
+		while(cursor != NULL){
+			render_any(t,cursor,varlist);
+			cursor = cursor->next;
+		}
+	}
+	return 0;
+}
+
+/*Exactly the same thing as if*/
+int
+render_elseif(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+	return render_if(t,node,varlist);
+}
+
+int
+resolve_name(struct TMPL_varlist* varlist, char* name,struct TMPL_varitem** item){
+	return hashmap_get(varlist->map,name,(void*)item);
+	/*
+	struct TMPL_varlist* cursor = varlist;
+	int err;
+	do{
+		err = hashmap_get(cursor->map,name,(void*)item);
+		cursor = cursor->parent;
+	}while(cursor != NULL && err == MAP_MISSING);
+	if(err == MAP_MISSING){
+		return MAP_MISSING;
+	}
+	return MAP_OK;
+	*/
+}
+
+int
+render_loop(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+	char* loopname = node->TMPL_tag.loop.loopname;
+	struct TMPL_varitem* loop;
+	int err = resolve_name(varlist,loopname,&loop);
+	if(err != MAP_OK){
+		return -1;
+	}
+	struct TMPL_templates* nt = (struct TMPL_templates*)malloc(sizeof(struct TMPL_templates));
+	nt->out = t->out;
+	nt->errout = t->errout;
+	nt->roottag = node->TMPL_tag.loop.body;
+	struct TMPL_loop* cursor;
+	/*If the loop has no items, it's varlist will be null*/
+	for(cursor = loop->item.l; cursor != NULL && cursor->varlist != NULL; cursor = cursor->next){
+		if(err != 0){
+		}
+		TMPL_render_helper(nt,cursor->varlist);
+	}
+	free(nt);
+	return 0;
+}
+
+int
+render_any(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+	/*Interpret the template*/
+	int err;
+	switch(node->type){
+		case tag_text:
+			err = render_text(t,node,varlist);
+			if(err < 0){
+			}
+			break;
+		case tag_var:
+			err = render_variable(t,node,varlist);
+			if(err < 0){
+			}
+			break;
+		case tag_loop:
+			err = render_loop(t,node,varlist);
+			if(err < 0){
+			}
+			break;
+		case tag_if:
+			err = render_if(t,node,varlist);
+			if(err < 0){
+			}
+			break;
+		case tag_elseif:
+			err = render_elseif(t,node,varlist);
+			if(err < 0){
+			}
+			break;
+		default:
+			exit(-1);
+			break;
+	}
+	return err;
+}
+
+void
+TMPL_render_helper(struct TMPL_templates* t, struct TMPL_varlist* varlist){
+	struct TMPL_tagnode* cursor = t->roottag;
+	while(cursor != NULL){
+		render_any(t,cursor,varlist);
+		cursor = cursor->next;
+	}
+
+}
+
+char*
+TMPL_render(struct TMPL_templates* t, struct TMPL_varlist* varlist, size_t* size_p){
+	if(t->out != NULL){
+		free_tmpl_buf(t->out);
+	}
+	t->out = alloc_tmpl_buf();
+	TMPL_render_helper(t,varlist);
+	char* ret  = bstringify(t->out,size_p);
+	return ret;
+}
+
+struct TMPL_templates*
+TMPL_alloc_template(char* tmplstr){
+	struct TMPL_templates* n = compile(tmplstr);
+
+	if(n != NULL){
+		return n;
+	}else{
+		TMPL_free_template(n);
+		return NULL;
+	}
+}
+
+void
+TMPL_free_template(struct TMPL_templates* t){
+	free_tmpl_buf(t->out);
+	free_tmpl_buf(t->errout);
+	TMPL_free_tagnode(t->roottag);
+	free(t);
+}
+
+void
+TMPL_free_tagnode(struct TMPL_tagnode* tn){
+	switch(tn->type){
+		case tag_text:
+			break;
+		case tag_var:
+			free(tn->TMPL_tag.var.varname);
+			if(tn->TMPL_tag.var.default_len > 0){
+				free(tn->TMPL_tag.var.defaultval);
+			}
+			break;
+		case tag_if:
+		case tag_elseif:
+		case tag_else:
+			free(tn->TMPL_tag.ifelse.varname);
+			if(tn->TMPL_tag.ifelse.testval != NULL)
+				free(tn->TMPL_tag.ifelse.testval);
+			TMPL_free_tagnode(tn->TMPL_tag.ifelse.tbranch);
+			if(tn->TMPL_tag.ifelse.fbranch){
+				TMPL_free_tagnode(tn->TMPL_tag.ifelse.fbranch);
+			}
+			break;
+		case tag_loop:
+			free(tn->TMPL_tag.loop.loopname);
+			TMPL_free_tagnode(tn->TMPL_tag.loop.body);
+			break;
+		case tag_null:
+		case tag_break:
+		case tag_continue:
+		case tag_end:
+			break;
+	}
+	if(tn->next != NULL)
+		TMPL_free_tagnode(tn->next);
+	free(tn);
+}
+
+char*
+TMPL_get_error(struct TMPL_templates* t){
+	size_t dummy;
+	return bstringify(t->errout,&dummy);
+}
diff --git a/src/ctemplates.h b/src/ctemplates.h
new file mode 100644
index 0000000..658a9f3
--- /dev/null
+++ b/src/ctemplates.h
@@ -0,0 +1,208 @@
+/*
+ * C TemplateS Library 0.1 -
+ * Forked from C Template Library 1.0 by Stephen C. Losen.
+ *
+ * Copyright 2017 Alexander M. Pickering  Distributed under the terms
+ * of the GNU General Public License (GPL)
+ */
+
+#ifndef _CTEMPLATE_H
+#define _CTEMPLATE_H
+
+#include "fbuf.h"
+#include "kmp.h"
+#include "hashmap.h"
+
+#define MAX_TEMPLATE_LENGTH 2147384647
+
+/*
+typedef struct TMPL_varlist TMPL_varlist;
+typedef struct TMPL_loop  TMPL_loop;
+typedef struct TMPL_fmtlist TMPL_fmtlist;
+typedef struct TMPL_fmtlists TMPL_fmtlists;
+*/
+#define TAG_NULL_TEXT ""
+#define TAG_TEXT_TEXT ""
+#define TAG_VAR_TEXT "TMPL_VAR"
+#define TAG_IF_TEXT "TMPL_IF"
+#define TAG_ELSEIF_TEXT "TMPL_ELSEIF"
+#define TAG_ELSE_TEXT "TMPL_ELSE"
+#define TAG_LOOP_TEXT "TMPL_LOOP"
+#define TAG_BREAK_TEXT "TMPL_BREAK"
+#define TAG_CONTINUE_TEXT "TMPL_CONTINUE"
+#define TAG_END_TEXT "TMPL_END"
+
+#define ATTRIBUTE_VARNAME "name"
+#define ATTRIBUTE_DEFAULT "default"
+#define ATTRIBUTE_VALUE "value"
+
+#define ERRBUF_HINTLEN 50
+
+#define SIZEOF(x) (sizeof(x) / sizeof(x[0]))
+
+#define TAG_NULL_LENGTH 0
+#define TAG_TEXT_LENGTH 0
+#define TAG_VAR_LENGTH SIZEOF(TAG_VAR_TEXT)
+#define TAG_IF_LENGTH SIZEOF(TAG_IF_TEXT)
+#define TAG_ELSEIF_LENGTH SIZEOF(TAG_ELSEIF_TEXT)
+#define TAG_ELSE_LENGTH SIZEOF(TAG_ELSE_TEXT)
+#define TAG_LOOP_LENGTH SIZEOF(TAG_LOOP_TEXT)
+#define TAG_BREAK_LENGTH SIZEOF(TAG_BREAK_TEXT)
+#define TAG_CONTINUE_LENGTH SIZEOF(TAG_CONTINUE_TEXT)
+#define TAG_END_LENGTH SIZEOF(TAG_END_TEXT)
+
+//I guess it counts the backslash?
+#define ATTRIBUTE_VARNAME_LENGTH SIZEOF(ATTRIBUTE_VARNAME) - 1
+#define ATTRIBUTE_DEFAULT_LENGTH SIZEOF(ATTRIBUTE_DEFAULT) - 1
+#define ATTRIBUTE_VALUE_LENGTH SIZEOF(ATTRIBUTE_VALUE) - 1
+
+//Define to 0 for slight speedup improvements, no errors
+#define DEBUGGING 1
+//Length of error messages
+#define ERR_MSG_LEN 500
+
+/*The different kind of nodes we can have*/
+enum TMPL_tagtype{
+	tag_null 	=  0,/*Should never show up*/
+	tag_text 	=  1,/*A text sequence*/
+	tag_var 	=  2,/*A variable to replace*/
+	tag_if 		=  3,/*If*/
+	tag_elseif 	=  4,/*Else if*/
+	tag_else 	=  5,/*Else*/
+	tag_end 	=  6,/*end if, end loop*/
+	tag_loop 	=  7,/*Loop*/
+	tag_break 	=  9,/*Break*/
+	tag_continue 	= 10,/*Skip the rest of the loop and go again*/
+};
+
+struct TMPL_light_string{
+	const char* start;
+	size_t len;
+};
+
+enum TMPL_vartype{
+	vartype_null = 0,
+	vartype_loop,
+	vartype_var
+};
+
+
+struct TMPL_varlist{
+	map_t map;
+}TMPL_varlist;
+
+struct TMPL_loop{
+	struct TMPL_varlist* varlist;
+	size_t loop_len;
+	struct TMPL_loop* next;
+	struct TMPL_loop* tail;
+};
+
+struct TMPL_varitem{
+	enum TMPL_vartype type;
+	union {
+		struct TMPL_loop* l;
+		char* s;
+	}item;
+};
+
+/*Holds all the data needed for a single node in a template*/
+struct TMPL_tagnode{
+	enum TMPL_tagtype type;
+	struct TMPL_tagnode* next;
+	unsigned int line;
+	unsigned int character;
+	union{
+		/*Text*/
+		struct{
+			const char* start;
+			size_t len;
+		}text;
+		/*Var*/
+		struct{
+			char* varname;
+			size_t name_len;
+			char* defaultval;
+			size_t default_len;
+		}var;
+
+		/*If, elseif*/
+		struct{
+			char* varname;
+			char* testval;
+			struct TMPL_tagnode* tbranch;
+			struct TMPL_tagnode* fbranch;
+		}ifelse;
+
+		/*Loop*/
+		struct{
+			char* loopname;
+			struct TMPL_tagnode* body;
+		}loop;
+
+		/*Break and Continue*/
+		struct{
+			int level;
+		}breakcont;
+	}TMPL_tag;
+}TMPL_tagnode;
+
+//typedef void (*TMPL_fmtfuncs) (const char*, struct TMPL_buf*);
+/*
+ * TMPL_fmtlist is a list of format functions, which are passed to
+ * a template.  A TMPL_VAR tag can specify a format function for
+ * outputting the variable with the fmt="fmtname" attribute.
+ */
+struct TMPL_fmtlist{
+	struct TMPL_fmtlist* next;
+	void* fmtfunc;
+	char* name;
+} TMPL_fmtlist;
+
+/* Holdes all the data needed for a template*/
+struct TMPL_templates{
+	struct TMPL_buf* out;
+	struct TMPL_buf* errout;
+	struct TMPL_tagnode* roottag;
+	int linenum;
+	int error;
+} TMPL_templates;
+
+
+struct TMPL_token{
+	char* start;//Start of token
+	char* end;//End of token
+	enum TMPL_tagtype type;//The type of token
+	size_t length;//Length of token, should always be end-start
+	struct TMPL_token* next;//The next token
+	unsigned int line;// Not used currently
+	unsigned int character;// Not used currently
+}TMPL_token;
+
+void TMPL_add_var_to_varlist(struct TMPL_varlist* vl, char* name, char* value);
+void TMPL_add_loop_to_varlist(struct TMPL_varlist* vl, char* name, struct TMPL_loop* loop);
+void TMPL_add_varlist_to_loop(struct TMPL_loop* l, struct TMPL_varlist* vl);
+
+
+struct TMPL_varlist* TMPL_alloc_varlist(void);
+void                 TMPL_free_varlist(struct TMPL_varlist* t);
+
+struct TMPL_varitem* TMPL_alloc_varitem(void);
+void TMPL_free_varitem(struct TMPL_varitem* vi);
+
+struct TMPL_templates* TMPL_alloc_template(char* t);
+void                   TMPL_free_template(struct TMPL_templates* t);
+
+struct TMPL_loop* TMPL_alloc_loop(void);
+void              TMPL_free_loop(struct TMPL_loop* tl);
+
+char* TMPL_render(struct TMPL_templates* t, struct TMPL_varlist* varlist, size_t* size_p);
+
+struct TMPL_tagnode* TMPL_alloc_tagnode(enum TMPL_tagtype);
+void TMPL_free_tagnode(struct TMPL_tagnode* tn);
+
+/*A debug function*/
+void print_varlist(struct TMPL_varlist* vl);
+void print_ast(struct TMPL_templates* root);
+
+#endif
diff --git a/src/fbuf.c b/src/fbuf.c
new file mode 100644
index 0000000..9ce4163
--- /dev/null
+++ b/src/fbuf.c
@@ -0,0 +1,121 @@
+#include "fbuf.h"
+
+void bputc(struct TMPL_buf* b,char s){
+	if(b->head == NULL){
+		struct LLNode* new = (struct LLNode*)malloc(sizeof(struct LLNode));
+		new->length = 1;
+		new->data = (char*)malloc(sizeof(char));
+		new->data[0] = s;
+		new->next = NULL;
+		b->total_len = 1;
+		b->head = new;
+		b->tail = new;
+	}else{
+		struct LLNode* last = b->tail;
+		struct LLNode* new = (struct LLNode*)malloc(sizeof(struct LLNode));
+		new->length = 1;
+		new->data = (char*)malloc(sizeof(char));
+		new->data[0] = s;
+		new->next = NULL;
+		b->total_len += new->length;
+		last->next = new;
+		b->tail = new;
+	}
+}
+
+void bputsn(struct TMPL_buf* b, char* s, size_t size){
+	if(b->head == NULL){
+		struct LLNode* new = (struct LLNode*)malloc(sizeof(struct LLNode));
+		new->length = size;
+		new->data = (char*)malloc(sizeof(char)*size);
+		memcpy(new->data,s,size);
+		b->total_len = size;
+		b->head = new;
+		b->tail = new;
+		new->next = NULL;
+	}else{
+		struct LLNode* last = b->tail;
+		struct LLNode* new = (struct LLNode*)malloc(sizeof(struct LLNode));
+		new->length = size;
+		new->data = (char*)malloc(sizeof(char)*size);
+		memcpy(new->data,s,size);
+		last->next = new;
+		new->next = NULL;
+		b->tail = new;
+		b->total_len += size;
+	}
+}
+
+void bputs(struct TMPL_buf* b, char* s){
+	size_t len = strlen(s);
+	bputsn(b,s,len);
+}
+
+struct TMPL_buf* alloc_tmpl_buf(){
+	struct TMPL_buf* ret = (struct TMPL_buf*)malloc(sizeof(struct TMPL_buf));
+	ret->total_len = 0;
+	ret->head = NULL;
+	ret->tail = NULL;
+	return ret;
+}
+
+void free_llnodes(struct LLNode* l){
+	struct LLNode* cursor = l;
+	struct LLNode* next;
+	while(cursor != NULL){
+		next = cursor->next;
+		free(cursor->data);
+		free(cursor);
+		cursor = next;
+	}
+}
+
+void free_tmpl_buf(struct TMPL_buf* b){
+	free_llnodes(b->head);
+	free(b);
+}
+
+void bprint(struct TMPL_buf* b){
+	printf("-------------\n");
+	struct LLNode* cursor = b->head;
+	while(cursor != NULL){
+		printf("Cursor is %p\n",(void*)cursor);
+		printf("Length:%d\nData:",(int)cursor->length);
+		char* cb = cursor->data;
+		size_t cn;
+		for(cn = 0; cn < cursor->length; cn++){
+			printf("%c",*cb);
+			cb++;
+		}
+		cursor = cursor->next;
+		printf("\n-------------\n");
+	}
+	printf("Done printing\n");
+	printf("-----------------------\n");
+
+}
+
+char* bstringify(struct TMPL_buf* b, size_t* size){
+	struct LLNode* cursora = b->head;
+	size_t cursorb = 0;
+
+	struct LLNode* single = (struct LLNode*)malloc(sizeof(struct LLNode));
+	single->length = b->total_len;
+	single->data = (char*)malloc(sizeof(char)*(b->total_len + 1));
+	single->data[b->total_len] = '\0';
+	single->next = NULL;
+	
+	while(cursora != NULL){
+		memcpy(single->data + cursorb,cursora->data,cursora->length);
+		cursorb += cursora->length;
+		cursora = cursora->next;
+	}
+
+	free_llnodes(b->head);
+
+	b->head = single;
+	b->tail = single;
+	*size = b->total_len;
+
+	return single->data;
+}
diff --git a/src/fbuf.h b/src/fbuf.h
new file mode 100644
index 0000000..212979b
--- /dev/null
+++ b/src/fbuf.h
@@ -0,0 +1,29 @@
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/*Oh boy, CS101 linked lists*/
+struct LLNode{
+	size_t length;
+	char* data;
+	struct LLNode* next;
+};
+
+struct TMPL_buf{
+	size_t total_len;
+	struct LLNode* head;
+	struct LLNode* tail;
+};
+
+void bputs(struct TMPL_buf* b, char* s);
+void bputsn(struct TMPL_buf* b, char* s, size_t size);
+
+void bputc(struct TMPL_buf* b, char s);
+
+struct TMPL_buf* alloc_tmpl_buf(void);
+
+void free_tmpl_buf(struct TMPL_buf* b);
+
+char* bstringify(struct TMPL_buf* b, size_t* size);
+
+void bprint(struct TMPL_buf* b);
diff --git a/src/hashmap.c b/src/hashmap.c
new file mode 100644
index 0000000..f91e743
--- /dev/null
+++ b/src/hashmap.c
@@ -0,0 +1,397 @@
+/*
+ * Generic map implementation.
+ */
+#include "hashmap.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#define INITIAL_SIZE (256)
+#define MAX_CHAIN_LENGTH (8)
+
+/* We need to keep keys and values */
+typedef struct _hashmap_element{
+	char* key;
+	int in_use;
+	any_t data;
+} hashmap_element;
+
+/* A hashmap has some maximum size and current size,
+ * as well as the data to hold. */
+typedef struct _hashmap_map{
+	int table_size;
+	int size;
+	hashmap_element *data;
+} hashmap_map;
+
+/*
+ * Return an empty hashmap, or NULL on failure.
+ */
+map_t hashmap_new() {
+	hashmap_map* m = (hashmap_map*) malloc(sizeof(hashmap_map));
+	if(!m) goto err;
+
+	m->data = (hashmap_element*) calloc(INITIAL_SIZE, sizeof(hashmap_element));
+	if(!m->data) goto err;
+
+	m->table_size = INITIAL_SIZE;
+	m->size = 0;
+
+	return m;
+	err:
+		if (m)
+			hashmap_free(m);
+		return NULL;
+}
+
+/* The implementation here was originally done by Gary S. Brown.  I have
+   borrowed the tables directly, and made some minor changes to the
+   crc32-function (including changing the interface). //ylo */
+
+  /* ============================================================= */
+  /*  COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or       */
+  /*  code or tables extracted from it, as desired without restriction.     */
+  /*                                                                        */
+  /*  First, the polynomial itself and its table of feedback terms.  The    */
+  /*  polynomial is                                                         */
+  /*  X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0   */
+  /*                                                                        */
+  /*  Note that we take it "backwards" and put the highest-order term in    */
+  /*  the lowest-order bit.  The X^32 term is "implied"; the LSB is the     */
+  /*  X^31 term, etc.  The X^0 term (usually shown as "+1") results in      */
+  /*  the MSB being 1.                                                      */
+  /*                                                                        */
+  /*  Note that the usual hardware shift register implementation, which     */
+  /*  is what we're using (we're merely optimizing it by doing eight-bit    */
+  /*  chunks at a time) shifts bits into the lowest-order term.  In our     */
+  /*  implementation, that means shifting towards the right.  Why do we     */
+  /*  do it this way?  Because the calculated CRC must be transmitted in    */
+  /*  order from highest-order term to lowest-order term.  UARTs transmit   */
+  /*  characters in order from LSB to MSB.  By storing the CRC this way,    */
+  /*  we hand it to the UART in the order low-byte to high-byte; the UART   */
+  /*  sends each low-bit to hight-bit; and the result is transmission bit   */
+  /*  by bit from highest- to lowest-order term without requiring any bit   */
+  /*  shuffling on our part.  Reception works similarly.                    */
+  /*                                                                        */
+  /*  The feedback terms table consists of 256, 32-bit entries.  Notes:     */
+  /*                                                                        */
+  /*      The table can be generated at runtime if desired; code to do so   */
+  /*      is shown later.  It might not be obvious, but the feedback        */
+  /*      terms simply represent the results of eight shift/xor opera-      */
+  /*      tions for all combinations of data and CRC register values.       */
+  /*                                                                        */
+  /*      The values must be right-shifted by eight bits by the "updcrc"    */
+  /*      logic; the shift must be unsigned (bring in zeroes).  On some     */
+  /*      hardware you could probably optimize the shift in assembler by    */
+  /*      using byte-swap instructions.                                     */
+  /*      polynomial $edb88320                                              */
+  /*                                                                        */
+  /*  --------------------------------------------------------------------  */
+
+static unsigned long crc32_tab[] = {
+      0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
+      0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
+      0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
+      0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
+      0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
+      0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
+      0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
+      0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
+      0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
+      0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
+      0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
+      0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
+      0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
+      0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
+      0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
+      0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
+      0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
+      0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
+      0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
+      0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
+      0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
+      0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
+      0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
+      0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
+      0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
+      0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
+      0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
+      0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
+      0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
+      0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
+      0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
+      0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
+      0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
+      0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
+      0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
+      0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
+      0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
+      0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
+      0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
+      0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
+      0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
+      0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
+      0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
+      0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
+      0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
+      0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
+      0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
+      0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
+      0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
+      0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
+      0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
+      0x2d02ef8dL
+   };
+
+/* Return a 32-bit CRC of the contents of the buffer. */
+
+unsigned long crc32(const unsigned char *s, unsigned int len)
+{
+  unsigned int i;
+  unsigned long crc32val;
+
+  crc32val = 0;
+  for (i = 0;  i < len;  i ++)
+    {
+      crc32val =
+	crc32_tab[(crc32val ^ s[i]) & 0xff] ^
+	  (crc32val >> 8);
+    }
+  return crc32val;
+}
+
+/*
+ * Hashing function for a string
+ */
+unsigned int hashmap_hash_int(hashmap_map * m, char* keystring){
+
+    unsigned long key = crc32((unsigned char*)(keystring), strlen(keystring));
+
+	/* Robert Jenkins' 32 bit Mix Function */
+	key += (key << 12);
+	key ^= (key >> 22);
+	key += (key << 4);
+	key ^= (key >> 9);
+	key += (key << 10);
+	key ^= (key >> 2);
+	key += (key << 7);
+	key ^= (key >> 12);
+
+	/* Knuth's Multiplicative Method */
+	key = (key >> 3) * 2654435761;
+
+	return key % m->table_size;
+}
+
+/*
+ * Return the integer of the location in data
+ * to store the point to the item, or MAP_FULL.
+ */
+int hashmap_hash(map_t in, char* key){
+	int curr;
+	int i;
+
+	/* Cast the hashmap */
+	hashmap_map* m = (hashmap_map *) in;
+
+	/* If full, return immediately */
+	if(m->size >= (m->table_size/2)) return MAP_FULL;
+
+	/* Find the best index */
+	curr = hashmap_hash_int(m, key);
+
+	/* Linear probing */
+	for(i = 0; i< MAX_CHAIN_LENGTH; i++){
+		if(m->data[curr].in_use == 0)
+			return curr;
+
+		if(m->data[curr].in_use == 1 && (strcmp(m->data[curr].key,key)==0))
+			return curr;
+
+		curr = (curr + 1) % m->table_size;
+	}
+
+	return MAP_FULL;
+}
+
+/*
+ * Doubles the size of the hashmap, and rehashes all the elements
+ */
+int hashmap_rehash(map_t in){
+	int i;
+	int old_size;
+	hashmap_element* curr;
+
+	/* Setup the new elements */
+	hashmap_map *m = (hashmap_map *) in;
+	hashmap_element* temp = (hashmap_element *)
+		calloc(2 * m->table_size, sizeof(hashmap_element));
+	if(!temp) return MAP_OMEM;
+
+	/* Update the array */
+	curr = m->data;
+	m->data = temp;
+
+	/* Update the size */
+	old_size = m->table_size;
+	m->table_size = 2 * m->table_size;
+	m->size = 0;
+
+	/* Rehash the elements */
+	for(i = 0; i < old_size; i++){
+        int status;
+
+        if (curr[i].in_use == 0)
+            continue;
+
+		status = hashmap_put(m, curr[i].key, curr[i].data);
+		if (status != MAP_OK)
+			return status;
+	}
+
+	free(curr);
+
+	return MAP_OK;
+}
+
+/*
+ * Add a pointer to the hashmap with some key
+ */
+int hashmap_put(map_t in, char* key, any_t value){
+	int index;
+	hashmap_map* m;
+
+	/* Cast the hashmap */
+	m = (hashmap_map *) in;
+
+	/* Find a place to put our value */
+	index = hashmap_hash(in, key);
+	while(index == MAP_FULL){
+		if (hashmap_rehash(in) == MAP_OMEM) {
+			return MAP_OMEM;
+		}
+		index = hashmap_hash(in, key);
+	}
+
+	/* Set the data */
+	m->data[index].data = value;
+	m->data[index].key = key;
+	m->data[index].in_use = 1;
+	m->size++;
+
+	return MAP_OK;
+}
+
+/*
+ * Get your pointer out of the hashmap with a key
+ */
+int hashmap_get(map_t in, char* key, any_t *arg){
+	int curr;
+	int i;
+	hashmap_map* m;
+
+	/* Cast the hashmap */
+	m = (hashmap_map *) in;
+
+	/* Find data location */
+	curr = hashmap_hash_int(m, key);
+
+	/* Linear probing, if necessary */
+	for(i = 0; i<MAX_CHAIN_LENGTH; i++){
+
+        int in_use = m->data[curr].in_use;
+        if (in_use == 1){
+            if (strcmp(m->data[curr].key,key)==0){
+                *arg = (m->data[curr].data);
+                return MAP_OK;
+            }
+		}
+
+		curr = (curr + 1) % m->table_size;
+	}
+
+	*arg = NULL;
+
+	/* Not found */
+	return MAP_MISSING;
+}
+
+/*
+ * Iterate the function parameter over each element in the hashmap.  The
+ * additional any_t argument is passed to the function as its first
+ * argument and the hashmap element is the second.
+ */
+int hashmap_iterate(map_t in, PFany f, any_t item) {
+	int i;
+
+	/* Cast the hashmap */
+	hashmap_map* m = (hashmap_map*) in;
+
+	/* On empty hashmap, return immediately */
+	if (hashmap_length(m) <= 0)
+		return MAP_MISSING;
+
+	/* Linear probing */
+	for(i = 0; i< m->table_size; i++)
+		if(m->data[i].in_use != 0) {
+			any_t data = (any_t) (m->data[i].data);
+			int status = f(item, data);
+			if (status != MAP_OK) {
+				return status;
+			}
+		}
+
+    return MAP_OK;
+}
+
+/*
+ * Remove an element with that key from the map
+ */
+int hashmap_remove(map_t in, char* key){
+	int i;
+	int curr;
+	hashmap_map* m;
+
+	/* Cast the hashmap */
+	m = (hashmap_map *) in;
+
+	/* Find key */
+	curr = hashmap_hash_int(m, key);
+
+	/* Linear probing, if necessary */
+	for(i = 0; i<MAX_CHAIN_LENGTH; i++){
+
+        int in_use = m->data[curr].in_use;
+        if (in_use == 1){
+            if (strcmp(m->data[curr].key,key)==0){
+                /* Blank out the fields */
+                m->data[curr].in_use = 0;
+                m->data[curr].data = NULL;
+                m->data[curr].key = NULL;
+
+                /* Reduce the size */
+                m->size--;
+                return MAP_OK;
+            }
+		}
+		curr = (curr + 1) % m->table_size;
+	}
+
+	/* Data not found */
+	return MAP_MISSING;
+}
+
+/* Deallocate the hashmap */
+void hashmap_free(map_t in){
+	hashmap_map* m = (hashmap_map*) in;
+	free(m->data);
+	free(m);
+}
+
+/* Return the length of the hashmap */
+int hashmap_length(map_t in){
+	hashmap_map* m = (hashmap_map *) in;
+	if(m != NULL) return m->size;
+	else return 0;
+}
diff --git a/src/hashmap.h b/src/hashmap.h
new file mode 100644
index 0000000..16c76dd
--- /dev/null
+++ b/src/hashmap.h
@@ -0,0 +1,81 @@
+/*
+ * Generic hashmap manipulation functions
+ *
+ * Originally by Elliot C Back - http://elliottback.com/wp/hashmap-implementation-in-c/
+ *
+ * Modified by Pete Warden to fix a serious performance problem, support strings as keys
+ * and removed thread synchronization - http://petewarden.typepad.com
+ */
+#ifndef __HASHMAP_H__
+#define __HASHMAP_H__
+
+#define MAP_MISSING -3  /* No such element */
+#define MAP_FULL -2 	/* Hashmap is full */
+#define MAP_OMEM -1 	/* Out of Memory */
+#define MAP_OK 0 	/* OK */
+
+/*
+ * any_t is a pointer.  This allows you to put arbitrary structures in
+ * the hashmap.
+ */
+typedef void *any_t;
+
+/*
+ * PFany is a pointer to a function that can take two any_t arguments
+ * and return an integer. Returns status code..
+ */
+typedef int (*PFany)(any_t, any_t);
+
+/*
+ * map_t is a pointer to an internally maintained data structure.
+ * Clients of this package do not need to know how hashmaps are
+ * represented.  They see and manipulate only map_t's.
+ */
+typedef any_t map_t;
+
+/*
+ * Return an empty hashmap. Returns NULL if empty.
+*/
+extern map_t hashmap_new();
+
+/*
+ * Iteratively call f with argument (item, data) for
+ * each element data in the hashmap. The function must
+ * return a map status code. If it returns anything other
+ * than MAP_OK the traversal is terminated. f must
+ * not reenter any hashmap functions, or deadlock may arise.
+ */
+extern int hashmap_iterate(map_t in, PFany f, any_t item);
+
+/*
+ * Add an element to the hashmap. Return MAP_OK or MAP_OMEM.
+ */
+extern int hashmap_put(map_t in, char* key, any_t value);
+
+/*
+ * Get an element from the hashmap. Return MAP_OK or MAP_MISSING.
+ */
+extern int hashmap_get(map_t in, char* key, any_t *arg);
+
+/*
+ * Remove an element from the hashmap. Return MAP_OK or MAP_MISSING.
+ */
+extern int hashmap_remove(map_t in, char* key);
+
+/*
+ * Get any element. Return MAP_OK or MAP_MISSING.
+ * remove - should the element be removed from the hashmap
+ */
+extern int hashmap_get_one(map_t in, any_t *arg, int remove);
+
+/*
+ * Free the hashmap
+ */
+extern void hashmap_free(map_t in);
+
+/*
+ * Get the current size of a hashmap
+ */
+extern int hashmap_length(map_t in);
+
+#endif //__HASHMAP_H__
diff --git a/src/kmp.c b/src/kmp.c
new file mode 100644
index 0000000..d5923bf
--- /dev/null
+++ b/src/kmp.c
@@ -0,0 +1,70 @@
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "kmp.h"
+
+/* KMP implementation stolen from Github user cagdass*/
+
+int* init_array(int size) {
+  int* arr = (int*)malloc(size * sizeof(int));
+  int i;
+  for(i = 0; i < size; i++) {
+    arr[i] = 0;
+  }
+
+  return arr;
+}
+
+int kmp(char* t,size_t tlen, char* p,size_t plen) {
+  int m = plen;
+  int n = tlen;
+
+  int* f = init_array(m); // Failure function values.
+  int i = 0;
+  int j = 0;
+
+  while (i < n) {
+    if (t[i] == p[j]) {
+      if (j == m - 1) {
+        return i - j;
+      }
+      else {
+        i += 1;
+        j += 1;
+      }
+    }
+    else {
+      if (j > 0) {
+        j = f[j-1];
+      }
+      else {
+        i += 1;
+      }
+    }
+  }
+
+  return -1;
+}
+
+void failure(char* p, int* f) {
+  f[0] = 0;
+  int i = 1;
+  int j = 0;
+
+  int m = strlen(p);
+
+  while (i < m) {
+    if (p[i] == p[j]) {
+      f[i] = j + 1; // j+1 matches up to the current character.
+      i += 1;
+      j += 1;
+    }
+    else if (j > 0) {
+      j = f[j - 1];
+    }
+    else {
+      f[i] = 0;
+      i += 1;
+    }
+  }
+}
diff --git a/src/kmp.h b/src/kmp.h
new file mode 100644
index 0000000..24c609e
--- /dev/null
+++ b/src/kmp.h
@@ -0,0 +1,3 @@
+
+void failure(char* pattern, int* f);
+int kmp(char* t,size_t tlen, char* p,size_t plen);