psyc-mirrors/psyclpc
1
0
Fork 0
mirror of git://git.psyced.org/git/psyclpc synced 2024-08-15 03:20:16 +00:00
Code Issues Releases Wiki Activity

allow null methods and bodies

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2011-04-27 00:19:55 +02:00
parent aaece680c7
commit f7dcb2eb89
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/pkg-psyc.c
View file

@ -42,14 +42,17 @@ f_psyc_render(svalue_t *sp) {
vector_t *v; vector_t *v;
psycPacket packet; psycPacket packet;
string_t *out; string_t *out;
char *meth, *body;
int mlen, blen;
// unless (sp->type == T_POINTER) return sp; // unless (sp->type == T_POINTER) return sp;
v = sp->u.vec; v = sp->u.vec;
if ((i = (mp_int)VEC_SIZE(v)) != 4) { if ((i = (mp_int)VEC_SIZE(v)) != 1+PSYC_BODY) {
errorf("Wrong number of elements (%"PRIdMPINT") in array argument to psyc_render()\n", i); errorf("Wrong number of elements (%"PRIdMPINT") in array argument to psyc_render()\n", i);
/* NOTREACHED */ /* NOTREACHED */
return sp; return sp;
} }
#if 0
if (v->item[PSYC_METHOD].type != T_STRING) { if (v->item[PSYC_METHOD].type != T_STRING) {
errorf("Wrong type for PSYC_METHOD element in PSYC packet.\n"); errorf("Wrong type for PSYC_METHOD element in PSYC packet.\n");
/* NOTREACHED */ /* NOTREACHED */
@ -60,11 +63,26 @@ f_psyc_render(svalue_t *sp) {
/* NOTREACHED */ /* NOTREACHED */
return sp; return sp;
} }
#else
if (v->item[PSYC_METHOD].type == T_STRING) {
meth = get_txt(v->item[PSYC_METHOD].u.str);
mlen = mstrsize(v->item[PSYC_METHOD].u.str);
} else {
meth = NULL;
mlen = 0;
}
if (v->item[PSYC_BODY].type == T_STRING) {
body = get_txt(v->item[PSYC_BODY].u.str);
blen = mstrsize(v->item[PSYC_BODY].u.str);
} else {
body = NULL;
blen = 0;
}
#endif
// TODO: handle _lists
// FIXME: handle mappings // FIXME: handle mappings
packet = psyc_newPacket2(NULL, 0, NULL, 0, packet = psyc_newPacket2(NULL, 0, NULL, 0,
get_txt(v->item[PSYC_METHOD].u.str), mstrsize(v->item[PSYC_METHOD].u.str), meth, mlen, body, blen,
// this should be an int* when "binary".. TODO
get_txt(v->item[PSYC_BODY].u.str), mstrsize(v->item[PSYC_BODY].u.str),
PSYC_PACKET_CHECK_LENGTH); PSYC_PACKET_CHECK_LENGTH);
printf("rendering... packet.length = %d\n", packet.length); printf("rendering... packet.length = %d\n", packet.length);

2
src/version.sh
View file

@ -17,7 +17,7 @@ version_longtype="stable"
# A timestamp, to be used by bumpversion and other scripts. # A timestamp, to be used by bumpversion and other scripts.
# It can be used, for example, to 'touch' this file on every build, thus # It can be used, for example, to 'touch' this file on every build, thus
# forcing revision control systems to add it on every checkin automatically. # forcing revision control systems to add it on every checkin automatically.
version_stamp="Tue Apr 26 22:00:17 CEST 2011" version_stamp="Wed Apr 27 00:18:40 CEST 2011"
# Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
version_major=4 version_major=4