gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include the code for handling structs and arrays.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@872 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mccallum 1996-01-27 00:54:11 +00:00
parent d3a426f865
commit 98284cfa16
1 changed files with 91 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

98
Source/BinaryCStream.m
View file

@ -29,6 +29,10 @@
#define DEFAULT_FORMAT_VERSION 0 #define DEFAULT_FORMAT_VERSION 0
#define ROUND(V, A) \
({ typeof(V) __v=(V); typeof(A) __a=(A); \
__a*((__v+__a-1)/__a); })
@implementation BinaryCStream @implementation BinaryCStream
@ -80,8 +84,6 @@ static BOOL debug_binary_coder;
assert(*type != '@'); assert(*type != '@');
assert(*type != '^'); assert(*type != '^');
assert(*type != ':'); assert(*type != ':');
assert(*type != '{');
assert(*type != '[');
/* A fairly stupid, inefficient binary encoding. This could use /* A fairly stupid, inefficient binary encoding. This could use
some improvement. For instance, we could compress the sign some improvement. For instance, we could compress the sign
@ -96,7 +98,7 @@ static BOOL debug_binary_coder;
{ {
int length = strlen(*(char**)d); int length = strlen(*(char**)d);
[self encodeValueOfCType:@encode(int) [self encodeValueOfCType:@encode(int)
at:&length withName:@"BinaryCoder char* length"]; at:&length withName:@"BinaryCStream char* length"];
[stream writeBytes:*(char**)d length:length]; [stream writeBytes:*(char**)d length:length];
break; break;
} }
@ -170,7 +172,7 @@ static BOOL debug_binary_coder;
char *s = buf; char *s = buf;
sprintf(buf, "%f", *(float*)d); sprintf(buf, "%f", *(float*)d);
[self encodeValueOfCType:@encode(char*) [self encodeValueOfCType:@encode(char*)
at:&s withName:@"BinaryCoder float"]; at:&s withName:@"BinaryCStream float"];
break; break;
} }
case _C_DBL: case _C_DBL:
@ -179,7 +181,48 @@ static BOOL debug_binary_coder;
char *s = buf; char *s = buf;
sprintf(buf, "%f", *(double*)d); sprintf(buf, "%f", *(double*)d);
[self encodeValueOfCType:@encode(char*) [self encodeValueOfCType:@encode(char*)
at:&s withName:@"BinaryCoder double"]; at:&s withName:@"BinaryCStream double"];
break;
}
case _C_ARY_B:
{
int len = atoi (type+1); /* xxx why +1 ? */
int offset;
while (isdigit(*++type));
offset = objc_sizeof_type(type);
[self encodeName:name];
[self encodeIndent];
while (len-- > 0)
{
/* Change this so we don't re-write type info every time. */
[self encodeValueOfCType:type
at:d
withName:@"array component"];
((char*)d) += offset;
}
[self encodeUnindent];
break;
}
case _C_STRUCT_B:
{
int acc_size = 0;
int align;
while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
[self encodeName:name];
[self encodeIndent];
while (*type != _C_STRUCT_E)
{
align = objc_alignof_type (type); /* pad to alignment */
acc_size = ROUND (acc_size, align);
[self encodeValueOfCType:type
at:((char*)d)+acc_size
withName:@"structure component"];
acc_size += objc_sizeof_type (type); /* add component size */
type = objc_skip_typespec (type); /* skip component */
}
[self encodeUnindent];
break; break;
} }
default: default:
@ -199,8 +242,6 @@ static BOOL debug_binary_coder;
assert(*type != '@'); assert(*type != '@');
assert(*type != '^'); assert(*type != '^');
assert(*type != ':'); assert(*type != ':');
assert(*type != '{');
assert(*type != '[');
[stream readByte:&encoded_type]; [stream readByte:&encoded_type];
if (encoded_type != *type if (encoded_type != *type
@ -305,6 +346,49 @@ static BOOL debug_binary_coder;
(*objc_free)(buf); (*objc_free)(buf);
break; break;
} }
case _C_ARY_B:
{
/* xxx Do we need to allocate space, just like _C_CHARPTR ? */
int len = atoi(type+1);
int offset;
[self decodeName:namePtr];
[self decodeIndent];
while (isdigit(*++type));
offset = objc_sizeof_type(type);
while (len-- > 0)
{
[self decodeValueOfCType:type
at:d
withName:namePtr];
((char*)d) += offset;
}
[self decodeUnindent];
break;
}
case _C_STRUCT_B:
{
/* xxx Do we need to allocate space just like char* ? No. */
int acc_size = 0;
int align;
char *save_type = type;
while (*type != _C_STRUCT_E && *type++ != '='); /* skip "<name>=" */
[self decodeName:namePtr];
[self decodeIndent]; /* xxx insert [self decodeName:] */
while (*type != _C_STRUCT_E)
{
align = objc_alignof_type (type); /* pad to alignment */
acc_size = ROUND (acc_size, align);
[self decodeValueOfCType:type
at:((char*)d)+acc_size
withName:namePtr];
acc_size += objc_sizeof_type (type); /* add component size */
type = objc_skip_typespec (type); /* skip component */
}
type = save_type;
[self decodeUnindent];
break;
}
default: default:
[self error:"Unrecognized Type %s", type]; [self error:"Unrecognized Type %s", type];
} }