source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
while ((c = fgetc (stdin)) != EOF)
chs.push (c);
+ chs.push (0);
length_ = chs.size ();
contents_str0_ = chs.remove_array ();
}
return str;
}
-
+/*
+ Unused.
+ */
Source_file::Source_file (String filename, String data)
{
-#if 1
- #warning FILENAME junked. If intentional, add comment here.
- name_string_ = "";
-#else
- name_string_ = filename;
-#endif
+ name_ = filename;
istream_ = 0;
contents_str0_ = data.get_copy_str0();
length_ = data.length();
Source_file::Source_file (String filename_string)
{
- name_string_ = filename_string;
+ name_ = filename_string;
istream_ = 0;
contents_str0_ = 0;
str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG,
__FUNCTION__);
scm_set_port_filename_x (str_port_,
- scm_makfrom0str (name_string_.get_str0()));
+ scm_makfrom0str (name_.get_str0()));
}
int
String
Source_file::name_string () const
{
- return name_string_;
+ return name_;
}
Source_file::~Source_file ()