Merge branch 'upstream-kwiml' into update-KWIML
This commit is contained in:
commit
86c4c93888
|
@ -25,8 +25,8 @@
|
||||||
T const x = VALUE(T, U); \
|
T const x = VALUE(T, U); \
|
||||||
T y = C(V); \
|
T y = C(V); \
|
||||||
printf(LANG #C ":" \
|
printf(LANG #C ":" \
|
||||||
" expression [%"@KWIML@_INT_PRI##PRI"]," \
|
" expression [%" @KWIML@_INT_PRI##PRI "]," \
|
||||||
" literal [%"@KWIML@_INT_PRI##PRI"]", x, y); \
|
" literal [%" @KWIML@_INT_PRI##PRI "]", x, y); \
|
||||||
if(x == y) \
|
if(x == y) \
|
||||||
{ \
|
{ \
|
||||||
printf(", PASSED\n"); \
|
printf(", PASSED\n"); \
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
{ \
|
{ \
|
||||||
T const x = VALUE(T, U); \
|
T const x = VALUE(T, U); \
|
||||||
char const* str = STR; \
|
char const* str = STR; \
|
||||||
sprintf(buf, "%"@KWIML@_INT_PRI##PRI, x); \
|
sprintf(buf, "%" @KWIML@_INT_PRI##PRI, x); \
|
||||||
printf(LANG "@KWIML@_INT_PRI" #PRI ":" \
|
printf(LANG "@KWIML@_INT_PRI" #PRI ":" \
|
||||||
" expected [%s], got [%s]", str, buf); \
|
" expected [%s], got [%s]", str, buf); \
|
||||||
if(strcmp(str, buf) == 0) \
|
if(strcmp(str, buf) == 0) \
|
||||||
|
@ -62,13 +62,13 @@
|
||||||
T const x = VALUE(T, U); \
|
T const x = VALUE(T, U); \
|
||||||
T y; \
|
T y; \
|
||||||
char const* str = STR; \
|
char const* str = STR; \
|
||||||
if(sscanf(str, "%"@KWIML@_INT_SCN##SCN, &y) != 1) \
|
if(sscanf(str, "%" @KWIML@_INT_SCN##SCN, &y) != 1) \
|
||||||
{ \
|
{ \
|
||||||
y = 0; \
|
y = 0; \
|
||||||
} \
|
} \
|
||||||
printf(LANG "@KWIML@_INT_SCN" #SCN ":" \
|
printf(LANG "@KWIML@_INT_SCN" #SCN ":" \
|
||||||
" expected [%"@KWIML@_INT_PRI##PRI"]," \
|
" expected [%" @KWIML@_INT_PRI##PRI "]," \
|
||||||
" got [%"@KWIML@_INT_PRI##PRI"]", x, y); \
|
" got [%" @KWIML@_INT_PRI##PRI "]", x, y); \
|
||||||
if(x == y) \
|
if(x == y) \
|
||||||
{ \
|
{ \
|
||||||
printf(", PASSED\n"); \
|
printf(", PASSED\n"); \
|
||||||
|
|
Loading…
Reference in New Issue