X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsource-file.cc;h=041c046d2bfc2fa4761df56005f2e76692f962f7;hb=b29bb82ddbf82b9989fa1f1e552491a2f6e5504a;hp=49d8eb4f214f7f669c94e282d5d1c233aa2e9c8f;hpb=62f221b6b3861ff055dc0384ec3c48cc665688cd;p=lilypond.git diff --git a/lily/source-file.cc b/lily/source-file.cc index 49d8eb4f21..041c046d2b 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -1,10 +1,21 @@ /* - source-file.cc -- implement Source_file + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1997--2008 Jan Nieuwenhuizen + Copyright (C) 1997--2011 Jan Nieuwenhuizen Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #if GCC_MAJOR < 4 @@ -16,12 +27,6 @@ #include "config.hh" -#if HAVE_UTF8_WCHAR_H -#include /* mbrtowc */ -#else /* !HAVE_UTF8_WCHAR_H */ -#include /* mbrtowc */ -#endif /* HAVE_UTF8_WCHAR_H */ - #include #if HAVE_SSTREAM @@ -34,6 +39,7 @@ using namespace std; #include "file-name-map.hh" #include "international.hh" +#include "misc.hh" #include "warn.hh" void @@ -42,11 +48,11 @@ Source_file::load_stdin () characters_.clear (); int c; while ((c = fgetc (stdin)) != EOF) - characters_.push_back (c); + characters_.push_back ((char)c); } /* - return contents of FILENAME. *Not 0-terminated!* + return contents of FILENAME. *Not 0-terminated!* */ vector gulp_file (string filename, int desired_size) @@ -68,7 +74,7 @@ gulp_file (string filename, int desired_size) if (desired_size > 0) read_count = min (read_count, desired_size); - + rewind (f); char *str = new char[read_count + 1]; @@ -77,7 +83,7 @@ gulp_file (string filename, int desired_size) int bytes_read = fread (str, sizeof (char), read_count, f); if (bytes_read != read_count) warning (_f ("expected to read %d characters, got %d", bytes_read, - read_count)); + read_count)); fclose (f); int filesize = bytes_read; @@ -85,7 +91,7 @@ gulp_file (string filename, int desired_size) cxx_arr.resize (filesize); copy (str, str + filesize, cxx_arr.begin ()); - + delete[] str; return cxx_arr; } @@ -103,14 +109,14 @@ Source_file::init () Source_file::Source_file (string filename, string data) { init (); - + name_ = filename; characters_.resize (data.length ()); copy (data.begin (), data.end (), characters_.begin ()); characters_.push_back (0); - + init_port (); for (vsize i = 0; i < characters_.size (); i++) @@ -121,7 +127,7 @@ Source_file::Source_file (string filename, string data) Source_file::Source_file (string filename_string) { init (); - + name_ = filename_string; if (filename_string == "-") @@ -148,20 +154,19 @@ Source_file::init_port () scm_set_port_filename_x (str_port_, ly_string2scm (name_)); } - istream * Source_file::get_istream () { if (!istream_) { if (length ()) // can-t this be done without such a hack? - istream_ = new istringstream (c_str ()); + istream_ = new istringstream (c_str ()); else - { - istream_ = new istringstream (""); - istream_->setstate (ios::eofbit); - // istream_->set (ios::eofbit); - } + { + istream_ = new istringstream (""); + istream_->setstate (ios::eofbit); + // istream_->set (ios::eofbit); + } } return istream_; } @@ -173,11 +178,11 @@ Source_file::file_line_column_string (char const *context_str0) const return " (" + _ ("position unknown") + ")"; else { - int l, ch, col; - get_counts (context_str0, &l, &ch, &col); + int l, ch, col, offset; + get_counts (context_str0, &l, &ch, &col, &offset); return name_string () + ":" + to_string (l) - + ":" + to_string (col); + + ":" + to_string (col); } } @@ -187,13 +192,13 @@ 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); + int l, ch, col, offset; + get_counts (pos_str0, &l, &ch, &col, &offset); string line = line_string (pos_str0); - string context = line.substr (0, ch) - + to_string ('\n') - + to_string (' ', col) - + line.substr (ch, line.length ()-ch); + string context = line.substr (0, offset) + + to_string ('\n') + + to_string (' ', col) + + line.substr (offset, line.length () - offset); return context; } @@ -223,16 +228,16 @@ Source_file::line_slice (char const *pos_str0) const while (begin_str0 > data_str0) if (*--begin_str0 == '\n') { - begin_str0++; - break; + begin_str0++; + break; } char const *end_str0 = pos_str0; while (end_str0 < eof_C_) if (*end_str0++ == '\n') { - end_str0--; - break; + end_str0--; + break; } return Slice (begin_str0 - data_str0, end_str0 - data_str0); @@ -251,14 +256,17 @@ Source_file::line_string (char const *pos_str0) const void Source_file::get_counts (char const *pos_str0, - int *line_number, - int *line_char, - int *column) const + int *line_number, + int *line_char, + int *column, + int *byte_offset) const { + // Initialize arguments to defaults, needed if pos_str0 is not in source *line_number = 0; *line_char = 0; *column = 0; - + *byte_offset = 0; + if (!contains (pos_str0)) return; @@ -272,43 +280,24 @@ Source_file::get_counts (char const *pos_str0, string line_begin (line_start, left); char const *line_chars = line_begin.c_str (); - *column = 0; - *line_char = 0; - - mbstate_t state; - - /* Initialize the state. */ - memset (&state, '\0', sizeof (state)); - while (left > 0) { - /* - FIXME, this is apparently locale dependent. - */ -#if HAVE_MBRTOWC - wchar_t multibyte[2]; - 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 - 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; + size_t thislen = utf8_char_len (*line_chars); if (thislen == 1 && line_chars[0] == '\t') - (*column) = (*column / 8 + 1) * 8; + (*column) = (*column / 8 + 1) * 8; else - (*column)++; + (*column)++; (*line_char)++; + + /* + To have decent output in UTF-8 aware terminals, + we must keep track of the number of bytes from + the left edge of the terminal. + */ + *byte_offset += thislen; + /* Advance past this character. */ line_chars += thislen; left -= thislen; @@ -332,8 +321,8 @@ Source_file::get_line (char const *pos_str0) const /* this will find the '\n' character at the end of our line */ vsize lo = lower_bound (newline_locations_, - pos_str0, - less ()); + pos_str0, + less ()); /* the return value will be indexed from 1 */ return lo + 1 + line_offset_; @@ -382,7 +371,6 @@ Source_file::mark_smob (SCM smob) return sc->str_port_; } - int Source_file::print_smob (SCM smob, SCM port, scm_print_state *) {