Merge with master

[lilypond.git] / lily / source.cc

diff --git a/lily/source.cc b/lily/source.cc
index 4cf670458a8652e1855e4ebb7403e4c4d01d764d..068baed379405c532d1b144eac81dd228322d365 100644 (file)
--- a/lily/source.cc
+++ b/lily/source.cc
@@ -3,28 +3,26 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "source.hh"
 
-#include "killing-cons.tcc"
 #include "source-file.hh"
 #include "file-path.hh"
 
 Sources::Sources ()
 {
-  sourcefile_list_ = 0;
   path_ = 0;
-  is_binary_ = false;
 }
 
-void
-Sources::set_binary (bool bo)
+
+Sources::Sources (Sources const &)
 {
-  is_binary_ = bo;
+  assert (false);
 }
 
+
 void
 Sources::set_path (File_path *f)
 {
@@ -34,22 +32,20 @@ Sources::set_path (File_path *f)
 /**
    open a file
 
-   @param file_string the file to be opened, name might be changed if it
-   is found in a search path. UGH!
-
-   @return 0 if no file found
+   File_string the file to be opened, name might be changed if it is
+   found in a search path.
 */
 Source_file *
-Sources::get_file (String &file_string) //UGH
+Sources::get_file (string *file_string) //UGH
 {
-  if ((file_string != "-") && path_)
+  if (*file_string != "-" && path_)
     {
-      String file_string_o = path_->find (file_string);
-      if ((file_string_o == "") && (file_string != ""))
+      string file_string_o = path_->find (*file_string);
+      if ((file_string_o == "") && (*file_string != ""))
        return 0;
-      file_string = file_string_o;
+      *file_string = file_string_o;
     }
-  Source_file *f = new Source_file (file_string);
+  Source_file *f = new Source_file (*file_string);
   add (f);
   return f;
 }
@@ -57,25 +53,14 @@ Sources::get_file (String &file_string) //UGH
 void
 Sources::add (Source_file *sourcefile)
 {
-  sourcefile_list_ = new Killing_cons<Source_file> (sourcefile, sourcefile_list_);
+  sourcefiles_.push_back (sourcefile);
 }
 
 Sources::~Sources ()
 {
-  delete sourcefile_list_;
-}
-/**
-   search the list for file whose map contains pointer #str0#
-
-   @return 0 if not found.
-*/
-Source_file *
-Sources::get_sourcefile (char const *str0)
-{
-
-  for (Cons<Source_file> *i = sourcefile_list_; i; i = i->next_)
-    if (i->car_->contains (str0))
-      return i->car_;
-  return 0;
+  for (vsize i = 0; i < sourcefiles_.size (); i++)
+    {
+      sourcefiles_[i]->unprotect ();
+    }
 }