mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-09 13:30:26 +02:00
Code Activity

Soft port fill-input doesn't alter line or column

Browse source 
* libguile/vports.c (sf_fill_input): Save and restore the line/column
  info around the ungetc.
This commit is contained in:
Andy Wingo 2014-07-21 21:36:30 +02:00
parent 681f2b8585
commit 3c01acbcf5
1 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libguile/vports.c
View file

@ -88,6 +88,7 @@ sf_fill_input (SCM port)
{ {
SCM p = SCM_PACK (SCM_STREAM (port)); SCM p = SCM_PACK (SCM_STREAM (port));
SCM ans; SCM ans;
scm_t_wchar c;
scm_t_port_internal *pti; scm_t_port_internal *pti;
ans = scm_call_0 (SCM_SIMPLE_VECTOR_REF (p, 3)); /* get char. */ ans = scm_call_0 (SCM_SIMPLE_VECTOR_REF (p, 3)); /* get char. */
@ -96,18 +97,29 @@ sf_fill_input (SCM port)
SCM_ASSERT (SCM_CHARP (ans), ans, SCM_ARG1, "sf_fill_input"); SCM_ASSERT (SCM_CHARP (ans), ans, SCM_ARG1, "sf_fill_input");
pti = SCM_PORT_GET_INTERNAL (port); pti = SCM_PORT_GET_INTERNAL (port);
if (pti->encoding_mode == SCM_PORT_ENCODING_MODE_LATIN1) c = SCM_CHAR (ans);
if (pti->encoding_mode == SCM_PORT_ENCODING_MODE_LATIN1
|| (pti->encoding_mode == SCM_PORT_ENCODING_MODE_UTF8 && c < 0xff))
{ {
scm_t_port *pt = SCM_PTAB_ENTRY (port); scm_t_port *pt = SCM_PTAB_ENTRY (port);
*pt->read_buf = SCM_CHAR (ans); *pt->read_buf = c;
pt->read_pos = pt->read_buf; pt->read_pos = pt->read_buf;
pt->read_end = pt->read_buf + 1; pt->read_end = pt->read_buf + 1;
return *pt->read_buf;
} }
else else
scm_ungetc_unlocked (SCM_CHAR (ans), port); {
return SCM_CHAR (ans); long line = SCM_LINUM (port);
int column = SCM_COL (port);
scm_ungetc_unlocked (c, port);
SCM_LINUM (port) = line;
SCM_COL (port) = column;
}
return c;
} }