Fixed bugfixes

Fixed bug with tokenizing,
also fixed a bug with parsing loops
also fixed a bug with adding vars to a varlist

1 files changed, 6 insertions, 42 deletions

diff --git a/ctemplates.h b/ctemplates.h
index e0e4a63..3dba429 100644
--- a/ctemplates.h
+++ b/ctemplates.h
@@ -9,11 +9,9 @@
 #ifndef _CTEMPLATE_H
 #define _CTEMPLATE_H
 
-
 #include "fbuf.h"
 #include "kmp.h"
 #include "hashmap.h"
-#include "ctemplates.h"
 
 #define MAX_TEMPLATE_LENGTH 2147384647
 
@@ -176,44 +174,11 @@ struct TMPL_token{
 	struct TMPL_token* next;//The next token
 }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);
 
 
-typedef void (*TMPL_fmtfunc) (const char *, FILE *);
-
-/*
-
-TMPL_varlist *TMPL_add_var(TMPL_varlist *varlist,
-    const char *varname1, const char *value1, ... , 0);
-*/
-
-//TMPL_varlist *TMPL_add_var(TMPL_varlist *varlist, ...);
-extern struct TMPL_varlist* TMPL_add_var(struct TMPL_varlist* varlist, ...);
-
-/*TMPL_varlist *TMPL_add_loop(TMPL_varlist *varlist,
-    const char *name, TMPL_loop *loop);
-    */
-extern struct TMPL_varlist* TMPL_add_loop(struct TMPL_varlist* varlist,
-	const char* name, struct TMPL_loop* loop);
-
-
-//TMPL_loop *TMPL_add_varlist(TMPL_loop *loop, TMPL_varlist *varlist);
-struct TMPL_loop* TMPL_add_varlist(struct TMPL_loop* loop, struct TMPL_varlist* varlist);
-
-//void TMPL_free_varlist(TMPL_varlist *varlist);
-void TMPL_free_varlist(struct TMPL_varlist* varlist);
-
-//TMPL_fmtlist *TMPL_add_fmt(TMPL_fmtlist *fmtlist,
-    //const char *name, TMPL_fmtfunc fmtfunc);
-struct TMPL_fmtlist* TMPL_add_fmt(struct TMPL_fmtlist* fmtlist,
-	const char* name, void* fmtfunc);
-
-void TMPL_free_fmtlist(struct TMPL_fmtlist* fmtlist);
-
-/*int TMPL_write(const char *filename, const char *tmplstr,
-    const TMPL_fmtlist *fmtlist, const TMPL_varlist *varlist,
-    FILE *out, FILE *errout);
-*/
-
 struct TMPL_varlist* TMPL_alloc_varlist(void);
 void                 TMPL_free_varlist(struct TMPL_varlist* t);
 
@@ -223,13 +188,12 @@ 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);
 
-/* TODO: Remove this after testing is done */
-struct TMPL_token* TMPL_tokenize(char* tmplstr, size_t strlen);
-
-
 #endif