hyung-hwan/qse
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed a bug in squeezing a new line for a continuing script stream

Browse Source
This commit is contained in:
hyung-hwan 2011-10-03 01:30:44 +00:00
parent 7505e0723f
commit cae3fbe798
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qse/lib/sed/std.c
View File

@ -151,7 +151,7 @@ static void close_main_stream (
static int open_input_stream ( static int open_input_stream (
qse_sed_t* sed, qse_sed_io_arg_t* arg, qse_sed_iostd_t* io, xtn_in_t* base) qse_sed_t* sed, qse_sed_io_arg_t* arg, qse_sed_iostd_t* io, xtn_in_t* base)
{ {
xtn_t* xtn = (xtn_t*) QSE_XTN (sed); /* xtn_t* xtn = (xtn_t*) QSE_XTN (sed);*/
QSE_ASSERT (io != QSE_NULL); QSE_ASSERT (io != QSE_NULL);
switch (io->type) switch (io->type)
@ -284,23 +284,6 @@ static qse_ssize_t read_input_stream (
/* == end of file on the current input stream == */ /* == end of file on the current input stream == */
/* ============================================= */ /* ============================================= */
if (base == &xtn->s.in && !newline_forced)
{
/* == ONLY FOR A SCRIPT STREAM ==
* squeeze in a new line in case the previous script
* stream doesn't end with a line terminator.*/
/* TODO: support different line terminator */
buf[0] = QSE_T('\n');
buf++; len--;
newline_forced = 1;
/* set the line number to 0 for the newline
* squeezed in */
sed->src.loc.line = 0;
sed->src.loc.colm = 0;
}
next = base->cur + 1; next = base->cur + 1;
if (next->type == QSE_SED_IOSTD_NULL) if (next->type == QSE_SED_IOSTD_NULL)
{ {
@ -332,6 +315,23 @@ static qse_ssize_t read_input_stream (
arg->handle = new; arg->handle = new;
base->cur++; base->cur++;
if (base == &xtn->s.in && !newline_forced)
{
/* == ONLY FOR A SCRIPT STREAM ==
* squeeze in a new line in case the previous script
* stream doesn't end with a line terminator.*/
/* TODO: support different line terminator */
buf[0] = QSE_T('\n');
buf++; len--;
newline_forced = 1;
/* set the line number to 0 for the newline
* squeezed in */
sed->src.loc.line = 0;
sed->src.loc.colm = 0;
}
} }
while (1); while (1);