Mercurial > pub > dyncall > dyncall
changeset 507:5a3c07a0f376
cleanups
author | Tassilo Philipp |
---|---|
date | Sat, 09 Apr 2022 14:00:59 +0200 |
parents | ed7d1f5e7973 |
children | 1aa2af848e8a |
files | test/callback_suite/README.txt test/callback_suite/cases.c test/callback_suite/globals.c test/callback_suite/main.c test/callback_suite/mk-cases.lua |
diffstat | 5 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/test/callback_suite/README.txt Sat Apr 09 13:57:27 2022 +0200 +++ b/test/callback_suite/README.txt Sat Apr 09 14:00:59 2022 +0200 @@ -63,5 +63,4 @@ "_F" for microsoft compiler -@@@STRUCT review
--- a/test/callback_suite/cases.c Sat Apr 09 13:57:27 2022 +0200 +++ b/test/callback_suite/cases.c Sat Apr 09 14:00:59 2022 +0200 @@ -25,7 +25,6 @@ #include "globals.h" -// @@@STRUCT move or remove #define CONFIG_API #define X(CH,T) typedef T CH;
--- a/test/callback_suite/globals.c Sat Apr 09 13:57:27 2022 +0200 +++ b/test/callback_suite/globals.c Sat Apr 09 14:00:59 2022 +0200 @@ -40,7 +40,7 @@ void get_reference_arg(DCValue* output, char ch, int pos) { output->L = 0xCAFEBABEDEADC0DELL; - pos = pos + 2; //@@@STRUCT unsure about indexing, here + pos = pos + 2; switch(ch) { case DC_SIGCHAR_BOOL: output->B = ((pos*K.i) & 1) ? DC_TRUE : DC_FALSE ; break; case DC_SIGCHAR_CHAR: output->c = pos * K.c; break;
--- a/test/callback_suite/main.c Sat Apr 09 13:57:27 2022 +0200 +++ b/test/callback_suite/main.c Sat Apr 09 14:00:59 2022 +0200 @@ -87,7 +87,7 @@ ch = *signature++; if(ch == DC_SIGCHAR_CC_PREFIX) { - ++signature; /* skip cconv prefix @@@STRUCT needs handling? */ + ++signature; /* skip cconv prefix */ continue; }
--- a/test/callback_suite/mk-cases.lua Sat Apr 09 13:57:27 2022 +0200 +++ b/test/callback_suite/mk-cases.lua Sat Apr 09 14:00:59 2022 +0200 @@ -2,7 +2,7 @@ function trim(l) return l:gsub("^%s+",""):gsub("%s+$","") end function mkcase(id,sig) - local nargs = string.len(sig) - 2 -- @@@STRUCT wrong, b/c ignores callconv prefixes + local nargs = string.len(sig) - 2 local rtype = string.sub(sig, nargs + 2, nargs + 2) local s = "F" .. nargs .. "(f" .. id .. "," .. rtype for i = 1, nargs do @@ -13,7 +13,6 @@ return s end --- @@@STRUCT same as in call_suite{,_aggrs}, share? function mkfuntab(n) local s = { "funptr G_funtab[] = {\n"} for i = 0, n-1 do @@ -23,7 +22,6 @@ return table.concat(s,"") end --- @@@STRUCT same as in call_suite{,_aggrs}, share? function mksigtab(sigs) local s = { "const char * G_sigtab[] = {\n"} for k,v in pairs(sigs) do @@ -34,7 +32,7 @@ end function mkall() - -- force minargs for ordered mode @@@STRUCT why? + -- force minargs for ordered mode if mode == "ordered" then minargs = 0 end