Don't add the var_ prefix to function names in the ast-test macros...

diff --git a/test/ast-macros.h b/test/ast-macros.h
index efbf7b6383986db9422487fc716bd83715ab726a..d4ed60721400ee5919ddc3d95e49abf4acb904b1 100644 (file)
--- a/test/ast-macros.h
+++ b/test/ast-macros.h
@@ -15,6 +15,9 @@ ast_value *name
 #define VAR(type, name) \
 name = ast_value_new(ctx, #name, type)
 
+#define VARnamed(type, name, varname) \
+name = ast_value_new(ctx, #varname, type)
+
 #define MKGLOBAL(name) \
 assert(globals_add(name) >= 0)
 
@@ -58,7 +61,7 @@ do {                                                            \
     ast_function *func_##name;                                  \
     ast_block    *my_funcblock;                                 \
     DEFVAR(var_##name);                                         \
-    VAR(TYPE_FUNCTION, var_##name);                             \
+    VARnamed(TYPE_FUNCTION, var_##name, name);                  \
     MKGLOBAL(var_##name);                                       \
     func_##name = ast_function_new(ctx, #name, var_##name);     \
     assert(functions_add(func_##name) >= 0);                    \
@@ -66,7 +69,7 @@ do {                                                            \
     assert(my_funcblock);                                       \
     assert(ast_function_blocks_add(func_##name, my_funcblock)); \
     curblock = my_funcblock;
-    
+
 #define MKLOCAL(var) \
     assert(ast_block_locals_add(curblock, var))
 

diff --git a/test/ast-test.c b/test/ast-test.c
index 159c668fb9aa0156c38a6064599bbe09f1a9faac..bb705a278c299fb483c1d347b842322c83ccbcfd 100644 (file)
--- a/test/ast-test.c
+++ b/test/ast-test.c
@@ -168,7 +168,7 @@ int main()
     DEFVAR(f0);
     DEFVAR(f1);
     DEFVAR(f5);
-    
+
     TESTINIT();
 VAR(TYPE_FLOAT, f0);
 VAR(TYPE_FLOAT, f1);