luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Serializing an object is not ambiguous anymore.

Browse source 
[INTERPRETER]
* BUG: Serializing an object is not ambiguous anymore.
This commit is contained in:
gambas 2019-12-21 17:35:30 +01:00
parent 3d956c269c
commit f39ed34592
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
main/gbx/gbx_stream.c
View file

@ -1166,34 +1166,37 @@ void STREAM_read_type(STREAM *stream, TYPE type, VALUE *value)
return;
}
if (buffer._byte == 'O')
if (buffer._byte == 'O' || buffer._byte == 'o')
{
int len;
char *name = COMMON_buffer;
CLASS *class;
CLASS *class = NULL;
void *object;
void *cstream;
if (variant || type == T_OBJECT)
if (buffer._byte == 'o')
{
int len;
char *name = COMMON_buffer;
len = read_length(stream);
if (len > 255)
THROW_SERIAL();
STREAM_read(stream, name, len);
class = CLASS_look(name, len);
if (!class)
THROW_SERIAL();
if (TYPE_is_pure_object(type) && (CLASS *)type != class)
}
if (TYPE_is_pure_object(type))
{
if (class && (CLASS *)type != class)
THROW_SERIAL();
}
else if (TYPE_is_pure_object(type))
{
class = (CLASS *)type;
}
else
THROW_SERIAL();
{
if (!class)
THROW_SERIAL();
}
object = OBJECT_ref(OBJECT_create(class, NULL, NULL, 0));
@ -1534,17 +1537,22 @@ void STREAM_write_type(STREAM *stream, TYPE type, VALUE *value)
{
CSTREAM *ob;
buffer._byte = 'O';
STREAM_write(stream, &buffer._byte, 1);
if (variant)
if (variant || type == T_OBJECT)
{
char *name = class->name;
int len = strlen(name);
buffer._byte = 'o';
STREAM_write(stream, &buffer._byte, 1);
write_length(stream, len);
STREAM_write(stream, name, len);
}
else
{
buffer._byte = 'O';
STREAM_write(stream, &buffer._byte, 1);
}
ob = CSTREAM_FROM_STREAM(stream);
STACK_check(1);