From f12612bbc52921bc77a647d5a0dd90adc41323bf Mon Sep 17 00:00:00 2001 From: "Wolfgang (Blub) Bumiller" Date: Mon, 25 Jun 2012 11:54:30 +0200 Subject: [PATCH] Don't add the var_ prefix to function names in the ast-test macros... --- test/ast-macros.h | 7 +++++-- test/ast-test.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test/ast-macros.h b/test/ast-macros.h index efbf7b6..d4ed607 100644 --- 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 159c668..bb705a2 100644 --- 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); -- 2.39.2