Mercurial > pub > dyncall > dyncall

diff test/call_suite_aggrs/main.c @ 492:29d09d10ecd9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- added unsigned types to call_suite_aggrs
author Tassilo Philipp
date Mon, 21 Mar 2022 10:04:10 +0100
parents 0c68b3f91367
children 62c3746390da
line wrap: on
line diff
--- a/test/call_suite_aggrs/main.c	Mon Mar 21 10:02:04 2022 +0100
+++ b/test/call_suite_aggrs/main.c	Mon Mar 21 10:04:10 2022 +0100
@@ -89,6 +89,11 @@
       case 'i': dcArgInt     (p,K_i[pos]); break;
       case 'j': dcArgLong    (p,K_j[pos]); break;
       case 'l': dcArgLongLong(p,K_l[pos]); break;
+      case 'C': dcArgChar    (p,K_C[pos]); break;
+      case 'S': dcArgShort   (p,K_S[pos]); break;
+      case 'I': dcArgInt     (p,K_I[pos]); break;
+      case 'J': dcArgLong    (p,K_J[pos]); break;
+      case 'L': dcArgLongLong(p,K_L[pos]); break;
       case 'p': dcArgPointer (p,K_p[pos]); break;
       case 'f': dcArgFloat   (p,K_f[pos]); break;
       case 'd': dcArgDouble  (p,K_d[pos]); break;
@@ -115,15 +120,20 @@
   
   switch(rtype) 
   {
-    case 'v': dcCallVoid(p,t); s=1; /*TODO:check that no return-arg was touched.*/ break;
-    case 'c': s = (dcCallChar    (p,t) == K_c[pos]) ; break;
-    case 's': s = (dcCallShort   (p,t) == K_s[pos]) ; break;
-    case 'i': s = (dcCallInt     (p,t) == K_i[pos]) ; break;
-    case 'j': s = (dcCallLong    (p,t) == K_j[pos]) ; break;
-    case 'l': s = (dcCallLongLong(p,t) == K_l[pos]) ; break;
-    case 'p': s = (dcCallPointer (p,t) == K_p[pos]) ; break;
-    case 'f': s = (dcCallFloat   (p,t) == K_f[pos]) ; break;
-    case 'd': s = (dcCallDouble  (p,t) == K_d[pos]) ; break;
+    case 'v':                          dcCallVoid(p,t); s=1;             break; /*TODO:check that no return-arg was touched.*/
+    case 'c': s = (                    dcCallChar    (p,t) == K_c[pos]); break;
+    case 's': s = (                    dcCallShort   (p,t) == K_s[pos]); break;
+    case 'i': s = (                    dcCallInt     (p,t) == K_i[pos]); break;
+    case 'j': s = (                    dcCallLong    (p,t) == K_j[pos]); break;
+    case 'l': s = (                    dcCallLongLong(p,t) == K_l[pos]); break;
+    case 'C': s = ((unsigned char)     dcCallChar    (p,t) == K_C[pos]); break;
+    case 'S': s = ((unsigned short)    dcCallShort   (p,t) == K_S[pos]); break;
+    case 'I': s = ((unsigned int)      dcCallInt     (p,t) == K_I[pos]); break;
+    case 'J': s = ((unsigned long)     dcCallLong    (p,t) == K_J[pos]); break;
+    case 'L': s = ((unsigned long long)dcCallLongLong(p,t) == K_L[pos]); break;
+    case 'p': s = (                    dcCallPointer (p,t) == K_p[pos]); break;
+    case 'f': s = (                    dcCallFloat   (p,t) == K_f[pos]); break;
+    case 'd': s = (                    dcCallDouble  (p,t) == K_d[pos]); break;
     case '<': /* union */
     case '{': /* struct */
     {
@@ -150,14 +160,19 @@
   pos = 1;
   while ( (atype = *sig) != '\0') {
     switch(atype) {
-      case 'c': s = ( V_c[pos] == K_c[pos] ); if (!s) printf("'c':%d: %d != %d ; ",     pos, V_c[pos], K_c[pos]); break;
-      case 's': s = ( V_s[pos] == K_s[pos] ); if (!s) printf("'s':%d: %d != %d ; ",     pos, V_s[pos], K_s[pos]); break;
-      case 'i': s = ( V_i[pos] == K_i[pos] ); if (!s) printf("'i':%d: %d != %d ; ",     pos, V_i[pos], K_i[pos]); break;
-      case 'j': s = ( V_j[pos] == K_j[pos] ); if (!s) printf("'j':%d: %ld != %ld ; ",   pos, V_j[pos], K_j[pos]); break;
-      case 'l': s = ( V_l[pos] == K_l[pos] ); if (!s) printf("'l':%d: %lld != %lld ; ", pos, V_l[pos], K_l[pos]); break;
-      case 'p': s = ( V_p[pos] == K_p[pos] ); if (!s) printf("'p':%d: %p != %p ; ",     pos, V_p[pos], K_p[pos]); break;
-      case 'f': s = ( V_f[pos] == K_f[pos] ); if (!s) printf("'f':%d: %f != %f ; ",     pos, V_f[pos], K_f[pos]); break;
-      case 'd': s = ( V_d[pos] == K_d[pos] ); if (!s) printf("'d':%d: %f != %f ; ",     pos, V_d[pos], K_d[pos]); break;
+      case 'c': s = ( V_c[pos] == K_c[pos] ); if (!s) printf("'%c':%d: %d != %d ; ",     atype, pos, V_c[pos], K_c[pos]); break;
+      case 's': s = ( V_s[pos] == K_s[pos] ); if (!s) printf("'%c':%d: %d != %d ; ",     atype, pos, V_s[pos], K_s[pos]); break;
+      case 'i': s = ( V_i[pos] == K_i[pos] ); if (!s) printf("'%c':%d: %d != %d ; ",     atype, pos, V_i[pos], K_i[pos]); break;
+      case 'j': s = ( V_j[pos] == K_j[pos] ); if (!s) printf("'%c':%d: %ld != %ld ; ",   atype, pos, V_j[pos], K_j[pos]); break;
+      case 'l': s = ( V_l[pos] == K_l[pos] ); if (!s) printf("'%c':%d: %lld != %lld ; ", atype, pos, V_l[pos], K_l[pos]); break;
+      case 'C': s = ( V_C[pos] == K_C[pos] ); if (!s) printf("'%c':%d: %u != %u ; ",     atype, pos, V_C[pos], K_C[pos]); break;
+      case 'S': s = ( V_S[pos] == K_S[pos] ); if (!s) printf("'%c':%d: %u != %u ; ",     atype, pos, V_S[pos], K_S[pos]); break;
+      case 'I': s = ( V_I[pos] == K_I[pos] ); if (!s) printf("'%c':%d: %u != %u ; ",     atype, pos, V_I[pos], K_I[pos]); break;
+      case 'J': s = ( V_J[pos] == K_J[pos] ); if (!s) printf("'%c':%d: %lu != %lu ; ",   atype, pos, V_J[pos], K_J[pos]); break;
+      case 'L': s = ( V_L[pos] == K_L[pos] ); if (!s) printf("'%c':%d: %llu != %llu ; ", atype, pos, V_L[pos], K_L[pos]); break;
+      case 'p': s = ( V_p[pos] == K_p[pos] ); if (!s) printf("'%c':%d: %p != %p ; ",     atype, pos, V_p[pos], K_p[pos]); break;
+      case 'f': s = ( V_f[pos] == K_f[pos] ); if (!s) printf("'%c':%d: %f != %f ; ",     atype, pos, V_f[pos], K_f[pos]); break;
+      case 'd': s = ( V_d[pos] == K_d[pos] ); if (!s) printf("'%c':%d: %f != %f ; ",     atype, pos, V_d[pos], K_d[pos]); break;
       case '<': /* union */
       case '{': /* struct */
       {