SCM
internal_ly_parse_scm (Parse_start *ps)
{
- Source_file *sf = ps->start_location_.source_file_;
+ Source_file *sf = ps->start_location_.get_source_file ();
SCM port = sf->get_port ();
- int off = ps->start_location_.start_ - sf->to_str0 ();
+ int off = ps->start_location_.start () - sf->to_str0 ();
scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET));
SCM from = scm_ftell (port);
- SCM form;
SCM answer = SCM_UNSPECIFIED;
+ SCM form = scm_read (port);
/* Read expression from port. */
- if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
+ if (!SCM_EOF_OBJECT_P (form))
{
if (ps->safe_)
{