X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=75f161540dfd0e705520c4fabf3f80b82d7c7b26;hb=0a3bf6ccc46e213a24eeee74b6f1722a6f3ffec4;hp=78a3c52865fa33c768a04911493aaffa56428e8d;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 78a3c52865..75f161540d 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -3,13 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "parse-scm.hh"
 
 #include <cstdio>
+using namespace std;
 
+#include "international.hh"
 #include "main.hh"
 #include "paper-book.hh"
 #include "source-file.hh"
@@ -21,19 +23,19 @@
 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->c_str ();
 
   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_)
 	{