Fixed test to use new template alloc

1 files changed, 28 insertions, 10 deletions

diff --git a/t/test_2.c b/t/test_2.c
index f099460..86438c0 100644
--- a/t/test_2.c
+++ b/t/test_2.c
@@ -21,7 +21,24 @@ 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;}else{printf("\n\n##########\n##Test %d.%d passed\n##########\n\n\n",n,n2);}
+
+#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);\
+	}
+
+#define template(x,y) \
+	err = TMPL_alloc_template(x,&y);\
+	if(err != 0){\
+		printf("Error: %s\n",TMPL_err(y,&dummy));\
+		return -1;\
+	}
 
 int main(){
 	log("Running tests2\n");
@@ -30,9 +47,10 @@ int main(){
 	struct TMPL_loop *l1,*l2;
 	char* ret;
 	size_t dummy;
+	int err;
 	
 	/*Test 1: Variable*/
-	t = TMPL_alloc_template(t_1);
+	template(t_1,t);
 	vl = TMPL_alloc_varlist();
 	TMPL_add_var_to_varlist(vl,"what","template");
 	l1 = TMPL_alloc_loop();
@@ -59,7 +77,7 @@ int main(){
 	TMPL_free_varlist(vl);
 	log("Test 1 complete\n");
 	
-	t = TMPL_alloc_template(t_2);
+	template(t_2,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	TMPL_add_loop_to_varlist(vl,"loop1",l1);
@@ -70,7 +88,7 @@ int main(){
 	printf("Freed template...\n");
 	TMPL_free_varlist(vl);
 
-	t = TMPL_alloc_template(t_2);
+	template(t_2,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	vl1 = TMPL_alloc_varlist();
@@ -83,7 +101,7 @@ int main(){
 	TMPL_free_template(t);
 	TMPL_free_varlist(vl);
 
-	t = TMPL_alloc_template(t_2);
+	template(t_2,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	for(int i = 0; i < 3; i++){
@@ -97,7 +115,7 @@ int main(){
 	TMPL_free_template(t);
 	TMPL_free_varlist(vl);
 
-	t = TMPL_alloc_template(t_2);
+	template(t_2,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	vl1 = TMPL_alloc_varlist();
@@ -110,7 +128,7 @@ int main(){
 	TMPL_free_template(t);
 	TMPL_free_varlist(vl);
 
-	t = TMPL_alloc_template(t_2);
+	template(t_2,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	vl1 = TMPL_alloc_varlist();
@@ -125,7 +143,7 @@ int main(){
 	TMPL_free_template(t);
 	TMPL_free_varlist(vl);
 
-	t = TMPL_alloc_template(t_3);
+	template(t_3,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	vl1 = TMPL_alloc_varlist();
@@ -138,7 +156,7 @@ int main(){
 	TMPL_free_template(t);
 	TMPL_free_varlist(vl);
 
-	t = TMPL_alloc_template(t_3);
+	template(t_3,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	vl1 = TMPL_alloc_varlist();
@@ -152,7 +170,7 @@ int main(){
 	TMPL_free_template(t);
 	TMPL_free_varlist(vl);
 
-	t = TMPL_alloc_template(t_3);
+	template(t_3,t);
 	vl = TMPL_alloc_varlist();
 	l1 = TMPL_alloc_loop();
 	vl1 = TMPL_alloc_varlist();