From 599f0d1c2c72e1364c564226c69d40dcfff1f960 Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Wed, 14 Dec 1994 13:04:05 +0000 Subject: - Added ability to get at strings embedded in the struct - For the mac, added ability to get at pascal-style strings --- Python/structmember.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'Python/structmember.c') diff --git a/Python/structmember.c b/Python/structmember.c index 784bbf5b49..7ec48b3410 100644 --- a/Python/structmember.c +++ b/Python/structmember.c @@ -108,6 +108,24 @@ getmember(addr, mlist, name) else v = newstringobject(*(char**)addr); break; + case T_STRING_INPLACE: + v = newstringobject((char*)addr); + break; +#ifdef macintosh + case T_PSTRING: + if (*(char**)addr == NULL) { + INCREF(None); + v = None; + } + else + v = newsizedstringobject((*(char**)addr)+1, + **(unsigned char**)addr); + break; + case T_PSTRING_INPLACE: + v = newsizedstringobject(((char*)addr)+1, + *(unsigned char*)addr); + break; +#endif /* macintosh */ case T_CHAR: v = newsizedstringobject((char*)addr, 1); break; @@ -140,7 +158,11 @@ setmember(addr, mlist, name, v) for (l = mlist; l->name != NULL; l++) { if (strcmp(l->name, name) == 0) { - if (l->readonly || l->type == T_STRING) { +#ifdef macintosh + if (l->readonly || l->type == T_STRING || l->type == T_PSTRING) { +#else + if (l->readonly || l->type == T_STRING ) { +#endif /* macintosh */ err_setstr(TypeError, "readonly attribute"); return -1; } -- cgit v1.2.1