X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsource-file.cc;h=dee8a9e3c53c19af1e053ab8a541101492929be0;hb=5e24aa455cac67a7e7b42a0539fcbd8c235417bf;hp=674b935ec113aa8819d72a9be646fe21aafe3570;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/source-file.cc b/lily/source-file.cc index 674b935ec1..dee8a9e3c5 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Jan Nieuwenhuizen + (c) 1997--2005 Jan Nieuwenhuizen Han-Wen Nienhuys */ @@ -11,15 +11,23 @@ #include "config.hh" +#if HAVE_UTF8_WCHAR_H +#include /* mbrtowc */ +#else +#include /* mbrtowc */ +#endif + #include + #if HAVE_SSTREAM #include #else #include -#define istringstream(x) istrstream(x, length ()) +#define istringstream(x) istrstream (x, length ()) #endif #include "warn.hh" +#include "file-name-map.hh" void Source_file::load_stdin () @@ -36,7 +44,7 @@ Source_file::load_stdin () contents_str0_ = chs.remove_array (); } -char* +char * gulp_file (String filename, int *filesize) { /* "b" must ensure to open literally, avoiding text (CR/LF) @@ -57,7 +65,7 @@ gulp_file (String filename, int *filesize) int bytes_read = fread (str, sizeof (char), *filesize, f); if (bytes_read != *filesize) - warning (_f ("Huh? Got %d, expected %d characters", bytes_read, + warning (_f ("expected to read %d characters, got %d", bytes_read, *filesize)); fclose (f); @@ -68,10 +76,14 @@ Source_file::Source_file (String filename, String data) { name_ = filename; istream_ = 0; - contents_str0_ = data.get_copy_str0(); + contents_str0_ = data.get_copy_str0 (); length_ = data.length (); pos_str0_ = to_str0 (); init_port (); + + for (int i = 0; i < length_; i++) + if (contents_str0_[i] == '\n') + newline_locations_.push (contents_str0_ + i); } Source_file::Source_file (String filename_string) @@ -84,7 +96,7 @@ Source_file::Source_file (String filename_string) load_stdin (); else contents_str0_ = gulp_file (filename_string, &length_); - + pos_str0_ = to_str0 (); init_port (); @@ -105,7 +117,7 @@ Source_file::init_port () int Source_file::tell () const { - return pos_str0_ - contents_str0_; + return pos_str0_ - contents_str0_; } std::istream* @@ -131,14 +143,37 @@ Source_file::file_line_column_string (char const *context_str0) const if (!to_str0 ()) return " (" + _ ("position unknown") + ")"; else - return name_string () + ":" + to_string (get_line (context_str0)) - + ":" + to_string (get_char (context_str0)); + { + int l, ch, col; + get_counts (context_str0, &l, &ch, &col); + + return name_string () + ":" + to_string (l) + + ":" + to_string (col); + } +} + + + +String +Source_file::quote_input (char const* pos_str0) const +{ + if (!contains (pos_str0)) + return " (" + _ ("position unknown") + ")"; + + int l, ch, col; + get_counts (pos_str0, &l, &ch, &col); + String line = line_string (pos_str0); + String context = line.left_string (ch) + + to_string ('\n') + + to_string (' ', col) + + line.cut_string (ch, INT_MAX); + return context; } String Source_file::name_string () const { - return name_; + return map_file_name (name_); } Source_file::~Source_file () @@ -149,17 +184,17 @@ Source_file::~Source_file () } Slice -Source_file::line_slice (char const* pos_str0) const +Source_file::line_slice (char const *pos_str0) const { if (!contains (pos_str0)) - return Slice (0,0); + return Slice (0, 0); - char const* data_str0 = to_str0 (); - char const * eof_C_ = data_str0 + length (); + char const *data_str0 = to_str0 (); + char const *eof_C_ = data_str0 + length (); if (pos_str0 == eof_C_) - pos_str0 --; - char const* begin_str0 = pos_str0; + pos_str0--; + char const *begin_str0 = pos_str0; while (begin_str0 > data_str0) if (*--begin_str0 == '\n') { @@ -185,53 +220,68 @@ Source_file::line_string (char const* pos_str0) const 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 = to_str0 (); + return String ((Byte const *)data_str0 + line[LEFT], line.length ()); } -int -Source_file::get_char (char const* pos_str0) const -{ - if (!contains (pos_str0)) - return 0; - - char const* data_str0 = to_str0 (); - return pos_str0 - (line_slice (pos_str0)[SMALLER] + data_str0); -} -int -Source_file::get_column (char const* pos_str0) const +void +Source_file::get_counts (char const *pos_str0, + int *line_number, + int *line_char, + int *column) const { if (!contains (pos_str0)) - return 0; - - int ch_i = get_char (pos_str0); - String line = line_string (pos_str0); + return; - int col_i = 0; - for (int i = 0; i < ch_i; i++) - if (line[i] == '\t') - col_i = (col_i / 8 + 1) * 8; - else - col_i++; + *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]; - return col_i; -} + int left = (Byte const*) pos_str0 - line_start; + String line_begin (line_start, left); + char const *line_chars = line_begin.to_str0(); + + *column = 0; + *line_char = 0; + + mbstate_t state; -String -Source_file::error_string (char const* pos_str0) const -{ - if (!contains (pos_str0)) - return " (" + _ ("position unknown") + ")"; + /* Initialize the state. */ + memset (&state, '\0', sizeof (state)); - int ch_i = get_char (pos_str0); - String line = line_string (pos_str0); - String context = line.left_string (ch_i) - + to_string ('\n') - + to_string (' ', get_column (pos_str0)) - + line.cut_string (ch_i, INT_MAX); + while (left > 0) + { + wchar_t multibyte[2]; + + /* + FIXME, this is apparently locale dependent. + */ + size_t thislen = mbrtowc (multibyte, line_chars, left, &state); + + /* Stop converting at invalid character; + this can mean we have read just the first part + of a valid character. */ + if (thislen == (size_t) -1) + break; + + /* We want to handle embedded NUL bytes + but the return value is 0. Correct this. */ + if (thislen == 0) + thislen = 1; + + if (thislen == 1 && line_chars[0] == '\t') + (*column) = (*column / 8 + 1) * 8; + else + (*column) ++; - return context; + (*line_char) ++; + /* Advance past this character. */ + line_chars += thislen; + left -= thislen; + } } bool @@ -249,7 +299,7 @@ Source_file::get_line (char const* pos_str0) const if (!newline_locations_.size ()) return 1; - int lo= 0; + int lo = 0; int hi = newline_locations_.size (); if (newline_locations_[lo] > pos_str0) @@ -264,7 +314,7 @@ Source_file::get_line (char const* pos_str0) const &lo, &hi); if (*pos_str0 == '\n') - lo --; + lo--; return lo + 2; } @@ -286,32 +336,32 @@ Source_file::set_pos (char const * pos_str0) if (contains (pos_str0)) pos_str0_ = pos_str0; else - error (error_string (pos_str0) + "invalid pos"); + error (quote_input (pos_str0) + "invalid pos"); } -char const* +char const * Source_file::seek_str0 (int n) { - char const* new_str0 = to_str0 () + n; + char const *new_str0 = to_str0 () + n; if (n < 0) new_str0 += length (); if (contains (new_str0)) pos_str0_ = new_str0; else - error (error_string (new_str0) + "seek past eof"); + error (quote_input (new_str0) + "seek past eof"); return pos_str0_; } -char const* +char const * Source_file::forward_str0 (int n) { - char const* old_pos = pos_str0_; - char const* new_str0 = pos_str0_ + n; + char const *old_pos = pos_str0_; + char const *new_str0 = pos_str0_ + n; if (contains (new_str0)) pos_str0_ = new_str0; else - error (error_string (new_str0) + "forward past eof"); + error (quote_input (new_str0) + "forward past eof"); return old_pos; } @@ -319,6 +369,12 @@ Source_file::forward_str0 (int n) String Source_file::get_string (int n) { - String str = String ((Byte const*)forward_str0 (n), n); + String str = String ((Byte const *)forward_str0 (n), n); return str; } + +SCM +Source_file::get_port () const +{ + return str_port_; +}