source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "source-file.hh"
#if HAVE_UTF8_WCHAR_H
#include <utf8/wchar.h> /* mbrtowc */
#else
-#include <wchar.h> /* mbrtowc */
+#include <cwchar> /* mbrtowc */
#endif
#include <cstdio>
#include <strstream>
#define istringstream(x) istrstream (x, length ())
#endif
+using namespace std;
-#include "warn.hh"
#include "file-name-map.hh"
+#include "international.hh"
+#include "warn.hh"
void
Source_file::load_stdin ()
{
length_ = 0;
-
+ chs_.clear ();
int c;
- Array<char> chs; // ugh.
while ((c = fgetc (stdin)) != EOF)
- chs.push (c);
+ chs_.push_back (c);
- chs.push (0);
- length_ = chs.size ();
- contents_str0_ = chs.remove_array ();
+ chs_.push_back (0);
+ length_ = chs_.size ();
+ contents_str0_ = &chs_[0];
}
char *
-gulp_file (String filename, int *filesize)
+gulp_file (string filename, int *filesize)
{
/* "b" must ensure to open literally, avoiding text (CR/LF)
conversions. */
- FILE *f = fopen (filename.to_str0 (), "rb");
+ FILE *f = fopen (filename.c_str (), "rb");
if (!f)
{
- warning (_f ("can't open file: `%s'", filename.to_str0 ()));
+ warning (_f ("can't open file: `%s'", filename.c_str ()));
return 0;
}
warning (_f ("expected to read %d characters, got %d", bytes_read,
read_count));
fclose (f);
-
+ *filesize = bytes_read;
return str;
}
-Source_file::Source_file (String filename, String data)
+Source_file::Source_file (string filename, string data)
{
name_ = filename;
istream_ = 0;
- contents_str0_ = data.get_copy_str0 ();
length_ = data.length ();
- pos_str0_ = to_str0 ();
+ contents_str0_ = string_copy (data);
+ pos_str0_ = c_str ();
init_port ();
for (int i = 0; i < length_; i++)
if (contents_str0_[i] == '\n')
- newline_locations_.push (contents_str0_ + i);
+ newline_locations_.push_back (contents_str0_ + i);
}
-Source_file::Source_file (String filename_string)
+Source_file::Source_file (string filename_string)
{
name_ = filename_string;
istream_ = 0;
contents_str0_ = gulp_file (filename_string, &length_);
}
- pos_str0_ = to_str0 ();
+ pos_str0_ = c_str ();
init_port ();
for (int i = 0; i < length_; i++)
if (contents_str0_[i] == '\n')
- newline_locations_.push (contents_str0_ + i);
+ newline_locations_.push_back (contents_str0_ + i);
}
void
{
SCM str = scm_makfrom0str (contents_str0_);
str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, __FUNCTION__);
- scm_set_port_filename_x (str_port_, scm_makfrom0str (name_.get_str0 ()));
+ scm_set_port_filename_x (str_port_, scm_makfrom0str (name_.c_str ()));
}
int
return pos_str0_ - contents_str0_;
}
-std::istream *
+istream *
Source_file::get_istream ()
{
if (!istream_)
{
if (length ()) // can-t this be done without such a hack?
- istream_ = new std::istringstream (to_str0 ());
+ istream_ = new istringstream (c_str ());
else
{
- istream_ = new std::istringstream ("");
- istream_->setstate (std::ios::eofbit);
+ istream_ = new istringstream ("");
+ istream_->setstate (ios::eofbit);
// istream_->set (ios::eofbit);
}
}
return istream_;
}
-String
+string
Source_file::file_line_column_string (char const *context_str0) const
{
- if (!to_str0 ())
+ if (!c_str ())
return " (" + _ ("position unknown") + ")";
else
{
}
}
-String
+string
Source_file::quote_input (char const *pos_str0) const
{
if (!contains (pos_str0))
int l, ch, col;
get_counts (pos_str0, &l, &ch, &col);
- String line = line_string (pos_str0);
- String context = line.left_string (ch)
+ string line = line_string (pos_str0);
+ string context = line.substr (0, ch)
+ to_string ('\n')
+ to_string (' ', col)
- + line.cut_string (ch, INT_MAX);
+ + line.substr (ch, line.length()-ch);
return context;
}
-String
+string
Source_file::name_string () const
{
return map_file_name (name_);
if (!contains (pos_str0))
return Slice (0, 0);
- char const *data_str0 = to_str0 ();
+ char const *data_str0 = c_str ();
char const *eof_C_ = data_str0 + length ();
if (pos_str0 == eof_C_)
return Slice (begin_str0 - data_str0, end_str0 - data_str0);
}
-String
+string
Source_file::line_string (char const *pos_str0) const
{
if (!contains (pos_str0))
return "";
Slice line = line_slice (pos_str0);
- char const *data_str0 = to_str0 ();
- return String ((Byte const *)data_str0 + line[LEFT], line.length ());
+ char const *data_str0 = c_str ();
+ return string (data_str0 + line[LEFT], line.length ());
}
void
int *line_char,
int *column) const
{
+ *line_number = 0;
+ *line_char = 0;
+ *column = 0;
+
if (!contains (pos_str0))
return;
*line_number = get_line (pos_str0);
Slice line = line_slice (pos_str0);
- char const *data = to_str0 ();
- Byte const *line_start = (Byte const *)data + line[LEFT];
+ char const *data = c_str ();
+ char const *line_start = (char const *)data + line[LEFT];
- int left = (Byte const *) pos_str0 - line_start;
- String line_begin (line_start, left);
- char const *line_chars = line_begin.to_str0 ();
+ ssize left = (char const *) pos_str0 - line_start;
+ string line_begin (line_start, left);
+ char const *line_chars = line_begin.c_str ();
*column = 0;
*line_char = 0;
/*
FIXME, this is apparently locale dependent.
*/
+#if HAVE_MBRTOWC
size_t thislen = mbrtowc (multibyte, line_chars, left, &state);
+#else
+ size_t thislen = 1;
+#endif /* !HAVE_MBRTOWC */
/* Stop converting at invalid character;
this can mean we have read just the first part
bool
Source_file::contains (char const *pos_str0) const
{
- return (pos_str0 && (pos_str0 >= to_str0 ()) && (pos_str0 <= to_str0 () + length ()));
+ return (pos_str0 && (pos_str0 >= c_str ()) && (pos_str0 <= c_str () + length ()));
}
int
if (!newline_locations_.size ())
return 1;
- int lo = 0;
- int hi = newline_locations_.size ();
+ vsize lo = 0;
+ vsize hi = newline_locations_.size ();
if (newline_locations_[lo] > pos_str0)
return 1;
return hi;
binary_search_bounds (newline_locations_,
- pos_str0,
- Link_array<char>::default_compare,
+ (char const*&)pos_str0,
+ default_compare,
&lo, &hi);
if (*pos_str0 == '\n')
}
char const *
-Source_file::to_str0 () const
+Source_file::c_str () const
{
return contents_str0_;
}
char const *
Source_file::seek_str0 (int n)
{
- char const *new_str0 = to_str0 () + n;
+ char const *new_str0 = c_str () + n;
if (n < 0)
new_str0 += length ();
if (contains (new_str0))
return old_pos;
}
-String
+string
Source_file::get_string (int n)
{
- String str = String ((Byte const *)forward_str0 (n), n);
+ string str = string ((char const *)forward_str0 (n), n);
return str;
}