cvsuser 04/09/22 01:46:56
Modified: imcc imcc.l
io io_buf.c
Log:
fix 31665
buffered IO string mem is using Parrot_allocate - don't set sysmem_FLAG,
don't change buflen
Revision Changes Path
1.114 +1 -1 parrot/imcc/imcc.l
Index: imcc.l
===================================================================
RCS file: /cvs/public/parrot/imcc/imcc.l,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -w -r1.113 -r1.114
--- imcc.l 7 Sep 2004 07:36:37 -0000 1.113
+++ imcc.l 22 Sep 2004 08:46:55 -0000 1.114
@@ -897,7 +897,7 @@
frame->next = frames;
frames = frame;
- sourcefile = frame->file;
+ frame->file = sourcefile;
line = 1;
yy_switch_to_buffer(yy_create_buffer(file, YY_BUF_SIZE));
1.31 +2 -4 parrot/io/io_buf.c
Index: io_buf.c
===================================================================
RCS file: /cvs/public/parrot/io/io_buf.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -w -r1.30 -r1.31
--- io_buf.c 21 Sep 2004 19:13:57 -0000 1.30
+++ io_buf.c 22 Sep 2004 08:46:56 -0000 1.31
@@ -1,6 +1,6 @@
/*
Copyright: 2001-2003 The Perl Foundation. All Rights Reserved.
-$Id: io_buf.c,v 1.30 2004/09/21 19:13:57 dan Exp $
+$Id: io_buf.c,v 1.31 2004/09/22 08:46:56 leo Exp $
=head1 NAME
@@ -554,7 +554,7 @@
int may_realloc;
if (*buf == NULL) {
- *buf = new_string_header(interpreter, PObj_sysmem_FLAG);
+ *buf = new_string_header(interpreter, 0);
}
s = *buf;
s->strlen = 0;
@@ -583,7 +583,6 @@
} else {
Parrot_allocate_string(interpreter, s, l);
}
- PObj_buflen(s) = l;
}
else
internal_exception(1, "readline: buffer too short");
@@ -604,7 +603,6 @@
} else {
Parrot_allocate_string(interpreter, s, l);
}
- PObj_buflen(s) = l;
}
else
internal_exception(1, "readline: buffer too short");
