(GUILE_ELLIPSIS): define to get clean

[lilypond.git] / lily / lily-parser.cc

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 059d5a8153d945e9d6066c26497d2eab630b6bab..b0949fb664d33b4ce5f49db3aaeb092fff421020 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -42,6 +42,7 @@ Lily_parser::Lily_parser (Lily_parser const &src)
   sources_ = src.sources_;
   default_duration_ = src.default_duration_;
   error_level_ = src.error_level_;
+  output_basename_ = src.output_basename_;
 
   smobify_self ();
   if (src.lexer_)
@@ -103,7 +104,7 @@ Lily_parser::parse_file (String init, String name, String out_name)
 
   File_name f (name);
   String s = global_path.find (f.base_ + ".twy");
-  s = gulp_file_to_string (s, false);
+  s = gulp_file_to_string (s, false, -1);
   scm_eval_string (scm_makfrom0str (s.to_str0 ()));
 
   /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to
@@ -220,7 +221,7 @@ get_header (Lily_parser *parser)
     id = ly_make_anonymous_module (be_safe_global);
   else
     {
-      nid = ly_make_anonymous_module (false);
+      SCM nid = ly_make_anonymous_module (false);
       ly_module_copy(nid,id);
       id = nid;
     }