source file of the LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 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;
+ path_ = 0;
is_binary_ = false;
}
}
/**
- open a file
+ 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
- */
-Source_file*
-Sources::get_file (String &file_string) //UGH
+ 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
{
- 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;
}
void
-Sources::add (Source_file* sourcefile)
+Sources::add (Source_file *sourcefile)
{
- sourcefile_list_ = new Killing_cons<Source_file> (sourcefile, sourcefile_list_);
+ sourcefiles_.push_back (sourcefile);
}
Sources::~Sources ()
{
- delete sourcefile_list_;
+ junk_pointers (sourcefiles_);
}
-/**
- search the list for file whose map contains pointer #str0#
- @return 0 if not found.
- */
-Source_file*
-Sources::get_sourcefile (char const* str0)
+Source_file *
+Sources::get_sourcefile (char const *str0)
{
+ for (vector<Source_file*>::iterator i = sourcefiles_.begin();
+ i != sourcefiles_.end (); i++)
+ {
+ if ((*i)->contains (str0))
+ return *i;
+ }
- for (Cons<Source_file> *i = sourcefile_list_; i; i = i->next_)
- if (i->car_->contains (str0))
- return i->car_;
return 0;
}