Added break statement to templates

Added a break statement that can break out of loops, also added
some tests to test the functionality of the same.

6 files changed, 425 insertions, 326 deletions

diff --git a/Makefile b/Makefile
index 3738077..906d19d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ else
 	CFLAGS += -O3
 endif
 
-objs = ctemplates fbuf hashmap kmp
+objs = ctemplates fbuf hashmap kmp lexer
 objfiles = $(objs:%=build/%.o)
 
 
diff --git a/src/ctemplates.c b/src/ctemplates.c
index 9d11f28..070b51b 100644
--- a/src/ctemplates.c
+++ b/src/ctemplates.c
@@ -32,21 +32,6 @@
 #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(const char* str, size_t strlen);
-size_t                       tagtype_len(enum TMPL_tagtype t);
-struct TMPL_token*           scan_text(
-                                       const char* start,
-                                       size_t strlen,
-                                       size_t* consumed
-                                      );
-struct TMPL_token*           scan_tag(
-                                      const 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);
 int                          TMPL_add_var_to_varlist(
@@ -55,6 +40,7 @@ int                          TMPL_add_var_to_varlist(
                                                      const char* var
                                                     );
 void                         print_ast_helper(
+                                              struct TMPL_templates* t,
                                               struct TMPL_tagnode* cursor,
                                               int level
                                              );
@@ -121,43 +107,35 @@ struct TMPL_templates*       alloc_templates(void);
 struct TMPL_templates*       compile(const 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_continue(
                                          struct TMPL_templates* t,
-                                         struct TMPL_tagnode* node,
                                          struct TMPL_varlist* varlist
                                         );
 int                          render_break(
                                          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(
@@ -178,179 +156,6 @@ void                         print_varlist_helper(
                                                   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(const 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'){
-		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'){
-		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(const char* start, size_t strlen, size_t* consumed){
-	struct TMPL_token* t = TMPL_alloc_token();
-	t->start = start;
-	enum TMPL_tagtype type = tag_null;
-	const char* cursor = start;
-	while(type == tag_null){
-		int left = strlen - (cursor - start);
-		cursor = (const 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;
-	return t;
-}
-
-struct TMPL_token*
-scan_tag(const 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);
-		const 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));
@@ -382,10 +187,15 @@ TMPL_add_var_to_varlist(struct TMPL_varlist* t, const char* varname, const char*
 }
 
 void
-print_ast_helper(struct TMPL_tagnode* cursor, int level){
+print_ast_helper(struct TMPL_templates* t, struct TMPL_tagnode* cursor, int level){
 	/*printf("Helper called, level %d\n",level);*/
 	int i;
 	/*printf("Cursor is: %p\n", (void*)cursor);*/
+	if(t->cursor == cursor){
+		printf("> ");
+	}else{
+		printf("  ");
+	}
 	for(i = 0; i < level; i++){
 		printf("|");
 	}
@@ -396,11 +206,22 @@ print_ast_helper(struct TMPL_tagnode* cursor, int level){
 			printf("TAG NULL");
 			break;
 		case tag_text:
-			printf("TAG Text %d\n", (int)cursor->TMPL_tag.text.len);
+			printf("TAG Text \"");
+			if(cursor->TMPL_tag.text.len < 10){
+				int i;
+				for(i = 0; i < cursor->TMPL_tag.text.len; i++)
+					putchar(*(cursor->TMPL_tag.text.start + i));
+				printf("\"\n");
+			}else{
+				int i;
+				for(i = 0; i < 7; i++)
+					putchar(*(cursor->TMPL_tag.text.start + i));
+				printf("...\"\n");
+			}
 			break;
 		case tag_var:
 			printf("TAG var(%s)",cursor->TMPL_tag.var.varname);
-			if(cursor->TMPL_tag.var.default_len > 0){
+			if(cursor->TMPL_tag.var.defaultval != NULL){
 				printf(" +default:%d",(int)cursor->TMPL_tag.var.default_len);
 			}
 			printf("\n");
@@ -409,17 +230,19 @@ print_ast_helper(struct TMPL_tagnode* cursor, int level){
 		case tag_elseif:
 			printf("TAG If/elseif,(%s) == (%s)\n",cursor->TMPL_tag.ifelse.varname,cursor->TMPL_tag.ifelse.testval);
 			level++;
+			printf("  ");
 			for(i=0;i<level;i++){
 				printf("|");
 			}
 			printf("True:\n");
-			print_ast_helper(cursor->TMPL_tag.ifelse.tbranch,level);
+			print_ast_helper(t,cursor->TMPL_tag.ifelse.tbranch,level);
 			if(cursor->TMPL_tag.ifelse.fbranch != NULL){
+				printf("  ");
 				for(i=0;i<level;i++){
 					printf("|");
 				}
 				printf("False:\n");
-				print_ast_helper(cursor->TMPL_tag.ifelse.fbranch,level);
+				print_ast_helper(t,cursor->TMPL_tag.ifelse.fbranch,level);
 			}
 			level--;
 			break;
@@ -430,23 +253,25 @@ print_ast_helper(struct TMPL_tagnode* cursor, int level){
 			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);
+			printf("TAG Loop (%s)(%p), body:\n",cursor->TMPL_tag.loop.loopname, cursor);
+			print_ast_helper(t,cursor->TMPL_tag.loop.body,level+1);
 			break;
 		case tag_break:
-			printf("TAG Break (%d)\n",cursor->TMPL_tag.breakcont.level);
+			printf("TAG Break (%d) -> (%p)\n",cursor->TMPL_tag.breakcont.level, cursor->TMPL_tag.breakcont.into);
 			break;
 		case tag_continue:
 			printf("TAG Continue (%d)\n",cursor->TMPL_tag.breakcont.level);
 			break;
 	}
 	if(cursor->next != NULL){
-		print_ast_helper(cursor->next,level);
+		print_ast_helper(t,cursor->next,level);
 	}
 }
 void
 print_ast(struct TMPL_templates* t){
-	print_ast_helper(t->roottag,0);
+	printf("continues: %5d | breaks: %5d | jumping: %5d\n",t->continues, t->breaks, t->jumping);
+	printf("-----------------------------\n");
+	print_ast_helper(t,t->roottag,0);
 }
 
 struct TMPL_token*
@@ -870,6 +695,7 @@ parse_variable(struct TMPL_token* head, struct TMPL_buf* errbuf){
 		t->TMPL_tag.var.defaultval = def;
 		t->TMPL_tag.var.default_len = default_size;
 	}else{
+		t->TMPL_tag.var.defaultval = NULL;
 		t->TMPL_tag.var.default_len = 0;
 	}
 	t->type = tag_var;
@@ -930,7 +756,7 @@ struct TMPL_tagnode*
 parse_break(struct TMPL_token* head, struct TMPL_buf* errbuf){
 	struct TMPL_tagnode* t = alloc_tagnode();
 	head->into = t;
-	const char* start_of_attribs = head->start + TAG_CONTINUE_LENGTH;
+	const char* start_of_attribs = head->start + TAG_BREAK_LENGTH;
 	unsigned int level = 1; //how many loops to continue
 	/*We might have multiple loops to continue through*/
 	int level_offset = kmp(start_of_attribs,head->length,ATTRIBUTE_LEVEL, ATTRIBUTE_LEVEL_LENGTH);
@@ -956,6 +782,9 @@ parse_break(struct TMPL_token* head, struct TMPL_buf* errbuf){
 	while(y > 0){
 		//Scan backwards until we find the loop we're in
 		while(cursor != NULL && cursor->type != tag_loop){
+			char token_text[cursor->length+1];
+			memcpy(token_text, cursor->start, cursor->length);
+			token_text[cursor->length] = '\0';
 			cursor = cursor->last;
 		}
 		y--;
@@ -965,7 +794,9 @@ parse_break(struct TMPL_token* head, struct TMPL_buf* errbuf){
 			char errmsg[msglen];
 			sprintf(errmsg,"Parsing error: Break was %d levels, but was only nested %d levels deep\n",level,level - y);
 			bputs(errbuf,errmsg);
-		}
+		}else if(y > 0){
+			cursor = cursor->last; //move back one
+		}//else break
 	}
 	t->next = NULL;
 	t->TMPL_tag.breakcont.into = cursor->into;
@@ -1110,43 +941,54 @@ compile(const char* tmplstr){
 	ret->errout = alloc_tmpl_buf();
 	ret->breaks = 0;
 	ret->continues = 0;
+	ret->jumping = 0;
 	struct TMPL_token* tokens = TMPL_tokenize(tmplstr,slen);
 	struct TMPL_tagnode* ast = parse(tokens,ret->errout);
 	if(ast == NULL){
 	}else{
 		ret->roottag = ast;
+		ret->cursor = ret->roottag;
 	}
-	print_ast(ret);
 	return ret;
 }
 
 int
-render_variable(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+render_variable(struct TMPL_templates* t, struct TMPL_varlist* varlist){
 	struct TMPL_varitem* vi;
-	char* varname = node->TMPL_tag.var.varname;
+	char* varname = t->cursor->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);
+		size_t has_default = t->cursor->TMPL_tag.var.default_len;
+		if(t->cursor->TMPL_tag.var.defaultval != NULL){
+			bputs(t->out,t->cursor->TMPL_tag.var.defaultval);
 		}else{
+			printf("Variable not bound, and no default\n");
 			/*Error, not bound and no default*/
 			return -1;
 		}
 	}else{
+		printf("Not MAP_OK or MAP_MISSING: %d\n", err);
 		return -1;
 	}
+	advance_cursor(t);
 	return 0;
 }
 
+void
+advance_cursor(struct TMPL_templates* t){
+	if(t->cursor != NULL && t->cursor->type != tag_end)
+		t->cursor = t->cursor->next;
+}
+
 int
-render_text(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+render_text(struct TMPL_templates* t, 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;
+	char* text = (char*)t->cursor->TMPL_tag.text.start;
+	size_t length = t->cursor->TMPL_tag.text.len;
 	bputsn(buf,text,length);
+	advance_cursor(t);
 	return 0;
 }
 
@@ -1200,44 +1042,53 @@ print_varlist(struct TMPL_varlist* vl){
 }
 
 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;
+render_if(struct TMPL_templates* t, struct TMPL_varlist* varlist){
+	char* varname = t->cursor->TMPL_tag.ifelse.varname;
+	char* testval = t->cursor->TMPL_tag.ifelse.testval;
 	struct TMPL_varitem* vi;
 	int err = hashmap_get(varlist->map,varname,(void**)&vi);
+	struct TMPL_templates* nt = (struct TMPL_templates*)malloc(sizeof(struct TMPL_templates));
+	nt->out = t->out;
+	nt->errout = t->errout;
+	nt->breaks = t->breaks;
+	nt->continues = t->continues;
+	nt->jumping = 0;
 	struct TMPL_tagnode* cursor;
 	if(err == MAP_OK){
+		//These two if statements can't be combined because of
+		//the condition for the elseif
 		if(testval == NULL || strcmp(vi->item.s, testval) == 0){
-			cursor = node->TMPL_tag.ifelse.tbranch;
-			while(cursor != NULL){
-				render_any(t,cursor,varlist);
-				if(t->breaks > 0 || t->continues > 0){
-					break;
-				}
-				cursor = cursor->next;
-			}
-
+			nt->roottag = t->cursor->TMPL_tag.ifelse.tbranch;
+			nt->cursor = nt->roottag;
+			TMPL_render_helper(nt,varlist);
+			if(nt->jumping)
+				t->cursor = nt->cursor;
+			t->breaks += nt->breaks;
+			t->continues = nt->continues;
+			t->jumping = nt->jumping;
 		}else{
 
 		}
 
-	}else if(node->TMPL_tag.ifelse.fbranch != NULL){
-		cursor = node->TMPL_tag.ifelse.fbranch;
-		while(cursor != NULL){
-			render_any(t,cursor,varlist);
-			if(t->breaks > 0 || t->continues > 0){
-				break;
-			}
-			cursor = cursor->next;
-		}
+	}else if(t->cursor->TMPL_tag.ifelse.fbranch != NULL){
+		nt->roottag = t->cursor->TMPL_tag.ifelse.fbranch;
+		nt->cursor = nt->roottag;
+		TMPL_render_helper(nt,varlist);
+		if(nt->jumping)
+			t->cursor = nt->cursor;
+		t->breaks += nt->breaks;
+		t->continues = nt->continues;
+		t->jumping = nt->jumping;
+	}else{
 	}
+	advance_cursor(t);
 	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);
+render_elseif(struct TMPL_templates* t, struct TMPL_varlist* varlist){
+	return render_if(t,varlist);
 }
 
 int
@@ -1258,20 +1109,25 @@ resolve_name(struct TMPL_varlist* varlist, char* name,struct TMPL_varitem** item
 }
 
 int
-render_break(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
-	t->breaks = t->breaks + node->TMPL_tag.breakcont.level;
-	return render_any(t,node->TMPL_tag.breakcont.into->next,varlist->parent->parent);
+render_break(struct TMPL_templates* t, struct TMPL_varlist* varlist){
+	t->breaks += t->cursor->TMPL_tag.breakcont.level;
+	t->jumping = 1;
+	/*t->cursor = t->cursor->TMPL_tag.breakcont.into->next;*/
+	t->cursor = t->cursor->TMPL_tag.breakcont.into;
+	return 0;
 }
 
 int
-render_continue(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
-	t->continues = t->continues + node->TMPL_tag.breakcont.level;
-	return render_any(t,node->next,varlist->parent->next->varlist);
+render_continue(struct TMPL_templates* t, struct TMPL_varlist* varlist){
+	t->continues = t->continues + t->cursor->TMPL_tag.breakcont.level;
+	t->jumping = 1;
+	return 0;
 }
 
 int
-render_loop(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
-	char* loopname = node->TMPL_tag.loop.loopname;
+render_loop(struct TMPL_templates* t, struct TMPL_varlist* varlist){
+	char* loopname = t->cursor->TMPL_tag.loop.loopname;
+	struct TMPL_tagnode* loopnode = t->cursor;
 	struct TMPL_varitem* loop;
 	int err = resolve_name(varlist,loopname,&loop);
 	if(err != MAP_OK){
@@ -1280,62 +1136,91 @@ render_loop(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_var
 	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;
+	nt->roottag = t->cursor->TMPL_tag.loop.body;
+	nt->cursor = nt->roottag;
 	nt->breaks = t->breaks;
 	nt->continues = t->continues;
+	nt->jumping = 0;
 	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){
+		size_t dummy;
+		nt->cursor = nt->roottag;
 		if(err != 0){
 		}
-		if(t->breaks > 0){
-			t->breaks--;
-			break;
-		}
-		if(t->continues > 0){
-			t->continues--;
+		if(t->jumping){
+			if(t->breaks > 0){
+				t->breaks--;
+				if(t->breaks == 0){
+					t->jumping = 0;
+				}
+				break;
+			}
+			if(t->continues > 0){
+				t->continues--;
+				if(t->continues == 0){
+					t->jumping = 0;
+				}
+			}
 		}else{
 			TMPL_render_helper(nt,cursor->varlist);
+			t->breaks += nt->breaks;
+			t->continues += nt->continues;
+			t->jumping += nt->jumping;
+			if(nt->jumping){
+				t->cursor = nt->cursor;
+			}
+			nt->breaks = 0;
+			nt->continues = 0;
+			nt->jumping = 0;
 		}
 	}
+	if(t->jumping > 0){
+		t->breaks--;
+		if(t->breaks == 0){
+			t->jumping = 0;
+		}
+	}
+	if(t->cursor == loopnode)
+		advance_cursor(t);
 	free(nt);
 	return 0;
 }
 
 int
-render_any(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varlist* varlist){
+render_any(struct TMPL_templates* t, struct TMPL_varlist* varlist){
 	/*Interpret the template*/
+	if(t->jumping) return;
+	size_t dummy;
 	int err;
-	if(t->breaks > 0 || t->continues > 0)
-		return err;
-	switch(node->type){
+	switch(t->cursor->type){
 		case tag_text:
-			err = render_text(t,node,varlist);
+			err = render_text(t,varlist);
 			if(err < 0){
 			}
 			break;
 		case tag_var:
-			err = render_variable(t,node,varlist);
+			err = render_variable(t,varlist);
 			if(err < 0){
 			}
 			break;
 		case tag_loop:
-			err = render_loop(t,node,varlist);
+			err = render_loop(t,varlist);
 			if(err < 0){
 			}
 			break;
 		case tag_if:
-			err = render_if(t,node,varlist);
+			err = render_if(t,varlist);
 			if(err < 0){
 			}
 			break;
 		case tag_elseif:
-			err = render_elseif(t,node,varlist);
+			err = render_elseif(t,varlist);
 			if(err < 0){
 			}
 			break;
 		case tag_break:
-			err = render_break(t,node,varlist);
+			err = render_break(t,varlist);
 			break;
 		default:
 			exit(-1);
@@ -1346,12 +1231,9 @@ render_any(struct TMPL_templates* t, struct TMPL_tagnode* node, struct TMPL_varl
 
 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;
+	while(t->cursor != NULL && t->jumping == 0){
+		render_any(t,varlist);
 	}
-
 }
 
 char*
@@ -1397,7 +1279,7 @@ TMPL_free_tagnode(struct TMPL_tagnode* tn){
 			break;
 		case tag_var:
 			free(tn->TMPL_tag.var.varname);
-			if(tn->TMPL_tag.var.default_len > 0){
+			if(tn->TMPL_tag.var.defaultval != NULL){
 				free(tn->TMPL_tag.var.defaultval);
 			}
 			break;
diff --git a/src/ctemplates.h b/src/ctemplates.h
index f84876c..b422b77 100644
--- a/src/ctemplates.h
+++ b/src/ctemplates.h
@@ -12,6 +12,7 @@
 #include "fbuf.h"
 #include "kmp.h"
 #include "hashmap.h"
+#include "lexer.h"
 
 #define MAX_TEMPLATE_LENGTH 2147384647
 
@@ -21,36 +22,8 @@ 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 ATTRIBUTE_LEVEL "level"
-
 #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
@@ -63,20 +36,6 @@ typedef struct TMPL_fmtlists TMPL_fmtlists;
 //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;
@@ -172,6 +131,9 @@ struct TMPL_templates{
 	struct TMPL_buf* out;
 	struct TMPL_buf* errout;
 	struct TMPL_tagnode* roottag;
+	struct TMPL_tagnode* cursor;
+	int jumping; //tells other functions that they should not change
+	             //the cursor, set after a break or continue.
 	int breaks;
 	int continues;
 	int linenum;
@@ -179,17 +141,6 @@ struct TMPL_templates{
 } TMPL_templates;
 
 
-struct TMPL_token{
-	const char* start;//Start of token
-	const 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
-	struct TMPL_token* last;//The last token
-	unsigned int line;// Not used currently
-	unsigned int character;// Not used currently
-	struct TMPL_tagnode* into;//The tag node this item became
-}TMPL_token;
 
 int TMPL_add_var_to_varlist(struct TMPL_varlist* vl, const char* name, const char* value);
 int TMPL_add_loop_to_varlist(struct TMPL_varlist* vl, const char* name, struct TMPL_loop* loop);
diff --git a/src/lexer.c b/src/lexer.c
new file mode 100644
index 0000000..13f80b8
--- /dev/null
+++ b/src/lexer.c
@@ -0,0 +1,191 @@
+#include "lexer.h"
+
+struct TMPL_token*           TMPL_alloc_token(void);
+void                         TMPL_free_token(struct TMPL_token* token);
+enum TMPL_tagtype            starts_with_token(const char* str, size_t strlen);
+size_t                       tagtype_len(enum TMPL_tagtype t);
+struct TMPL_token*           scan_text(
+                                       const char* start,
+                                       size_t strlen,
+                                       size_t* consumed
+                                      );
+struct TMPL_token*           scan_tag(
+                                      const char* start,
+                                      size_t strlen,
+                                      size_t* consumed
+                                     );
+void                         print_tokens(struct TMPL_token* head);
+
+
+/*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(const 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'){
+		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'){
+		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(const char* start, size_t strlen, size_t* consumed){
+	struct TMPL_token* t = TMPL_alloc_token();
+	t->start = start;
+	enum TMPL_tagtype type = tag_null;
+	const char* cursor = start;
+	while(type == tag_null){
+		int left = strlen - (cursor - start);
+		cursor = (const 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;
+	return t;
+}
+
+struct TMPL_token*
+scan_tag(const 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);
+		const char* i;
+		for(i = cursor->start; i != cursor->end; i++){
+			printf("%c",*i);
+		}
+		printf("\n----\n");
+		cursor = cursor->next;
+	}
+	printf("Finished printing tokens\n");
+}
+
diff --git a/src/lexer.h b/src/lexer.h
new file mode 100644
index 0000000..06b4bc5
--- /dev/null
+++ b/src/lexer.h
@@ -0,0 +1,75 @@
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#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 ATTRIBUTE_LEVEL "level"
+
+#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)
+
+/*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_token{
+	const char* start;//Start of token
+	const 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
+	struct TMPL_token* last;//The last token
+	unsigned int line;// Not used currently
+	unsigned int character;// Not used currently
+	struct TMPL_tagnode* into;//The tag node this item became
+}TMPL_token;
+
+struct TMPL_token*           TMPL_alloc_token(void);
+void                         TMPL_free_token(struct TMPL_token* token);
+enum TMPL_tagtype            starts_with_token(const char* str, size_t strlen);
+size_t                       tagtype_len(enum TMPL_tagtype t);
+struct TMPL_token*           scan_text(
+                                       const char* start,
+                                       size_t strlen,
+                                       size_t* consumed
+                                      );
+struct TMPL_token*           scan_tag(
+                                      const char* start,
+                                      size_t strlen,
+                                      size_t* consumed
+                                     );
+void                         print_tokens(struct TMPL_token* head);
diff --git a/t/test_2.c b/t/test_2.c
index e11fcdc..f099460 100644
--- a/t/test_2.c
+++ b/t/test_2.c
@@ -21,7 +21,7 @@ char c_3_3[] = "Check variable scope after breaking loop one four five eight nin
 char c_3_4[] = "Check variable scope after breaking loop one four five eight and a half nine.";//loop1 does not have test1, loop1 has loop2, after is "and a half "
 
 #define log(x) printf(x)
-#define check(n,n2,a,b) if(strcmp(a,b) != 0){fprintf(stderr, "Error in test 2.%d.%d\n",n,n2);printf("Result should have been '%s'\n was '%s'\n", b, a); if(t->error) printf(TMPL_err(t, NULL)); return -1;}
+#define check(n,n2,a,b) if(strcmp(a,b) != 0){fprintf(stderr, "Error in test 2.%d.%d\n",n,n2);printf("Result should have been '%s'\n was '%s'\n", b, a); if(t->error) printf(TMPL_err(t, NULL)); return -1;}else{printf("\n\n##########\n##Test %d.%d passed\n##########\n\n\n",n,n2);}
 
 int main(){
 	log("Running tests2\n");