conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unify more cases

This commit is contained in:
Yuichi Nishiwaki 2015-08-26 22:37:40 +09:00
parent 210fecab3f
commit 333813d0ba
1 changed files with 33 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
extlib/benz/vm.c
View File

@ -102,82 +102,36 @@ pic_get_args(pic_state *pic, const char *format, ...)
*p = GET_OPERAND(pic,i); *p = GET_OPERAND(pic,i);
break; break;
} }
case 'f': case 'F': {
double *f;
bool *e, dummy;
pic_value v;
f = va_arg(ap, double *); #define NUM_CASE(c1, c2, ctype) \
e = (c == 'F' ? va_arg(ap, bool *) : &dummy); case c1: case c2: { \
ctype *n; \
v = GET_OPERAND(pic, i); bool *e, dummy; \
switch (pic_type(v)) { pic_value v; \
case PIC_TT_FLOAT: \
*f = pic_float(v); n = va_arg(ap, ctype *); \
*e = false; e = (c == c2 ? va_arg(ap, bool *) : &dummy); \
break; \
case PIC_TT_INT: v = GET_OPERAND(pic, i); \
*f = pic_int(v); switch (pic_type(v)) { \
*e = true; case PIC_TT_FLOAT: \
break; *n = pic_float(v); \
default: *e = false; \
pic_errorf(pic, "pic_get_args: expected float or int, but got ~s", v); break; \
case PIC_TT_INT: \
*n = pic_int(v); \
*e = true; \
break; \
default: \
pic_errorf(pic, "pic_get_args: expected float or int, but got ~s", v); \
} \
break; \
} }
break;
}
case 'i': case 'I': {
int *k;
bool *e, dummy;
pic_value v;
k = va_arg(ap, int *); NUM_CASE('i', 'I', int)
e = (c == 'I' ? va_arg(ap, bool *) : &dummy); NUM_CASE('f', 'F', double)
v = GET_OPERAND(pic, i); #define VAL_CASE(c, type, ctype, conv) \
switch (pic_type(v)) {
case PIC_TT_FLOAT:
*k = pic_float(v);
*e = false;
break;
case PIC_TT_INT:
*k = pic_int(v);
*e = true;
break;
default:
pic_errorf(pic, "pic_get_args: expected float or int, but got ~s", v);
}
break;
}
case 'c': {
char *k;
pic_value v;
k = va_arg(ap, char *);
v = GET_OPERAND(pic,i);
if (pic_char_p(v)) {
*k = pic_char(v);
}
else {
pic_errorf(pic, "pic_get_args: expected char, but got ~s", v);
}
break;
}
case 'z': {
const char **cstr;
pic_value v;
cstr = va_arg(ap, const char **);
v = GET_OPERAND(pic,i);
if (pic_str_p(v)) {
*cstr = pic_str_cstr(pic, pic_str_ptr(v));
}
else {
pic_errorf(pic, "pic_get_args: expected string, but got ~s", v);
}
break;
}
#define PTR_CASE(c, type, ctype) \
case c: { \ case c: { \
ctype *ptr; \ ctype *ptr; \
pic_value v; \ pic_value v; \
@ -185,7 +139,7 @@ pic_get_args(pic_state *pic, const char *format, ...)
ptr = va_arg(ap, ctype *); \ ptr = va_arg(ap, ctype *); \
v = GET_OPERAND(pic, i); \ v = GET_OPERAND(pic, i); \
if (pic_## type ##_p(v)) { \ if (pic_## type ##_p(v)) { \
*ptr = pic_## type ##_ptr(v); \ *ptr = conv; \
} \ } \
else { \ else { \
pic_errorf(pic, "pic_get_args: expected " #type ", but got ~s", v); \ pic_errorf(pic, "pic_get_args: expected " #type ", but got ~s", v); \
@ -193,6 +147,12 @@ pic_get_args(pic_state *pic, const char *format, ...)
break; \ break; \
} }
VAL_CASE('c', char, char, pic_char(v))
VAL_CASE('z', str, const char *, pic_str_cstr(pic, pic_str_ptr(v)))
#define PTR_CASE(c, type, ctype) \
VAL_CASE(c, type, ctype, pic_## type ##_ptr(v))
PTR_CASE('s', str, pic_str *) PTR_CASE('s', str, pic_str *)
PTR_CASE('m', sym, pic_sym *) PTR_CASE('m', sym, pic_sym *)
PTR_CASE('v', vec, pic_vec *) PTR_CASE('v', vec, pic_vec *)