X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fsource-file.cc;h=d847605425b0d9be7a9ec79bf66f0d2b462a8004;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=b01676355840a1877bacc3b9439809cb195ce496;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/source-file.cc b/lily/source-file.cc index b016763558..d847605425 100644 --- a/lily/source-file.cc +++ b/lily/source-file.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2012 Jan Nieuwenhuizen Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify @@ -52,7 +52,7 @@ Source_file::load_stdin () } /* - return contents of FILENAME. *Not 0-terminated!* + return contents of FILENAME. *Not 0-terminated!* */ vector gulp_file (string filename, int desired_size) @@ -74,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]; @@ -83,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; @@ -91,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; } @@ -109,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++) @@ -127,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 == "-") @@ -154,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_; } @@ -183,7 +182,7 @@ Source_file::file_line_column_string (char const *context_str0) const get_counts (context_str0, &l, &ch, &col, &offset); return name_string () + ":" + to_string (l) - + ":" + to_string (col); + + ":" + to_string (col); } } @@ -197,9 +196,9 @@ Source_file::quote_input (char const *pos_str0) const get_counts (pos_str0, &l, &ch, &col, &offset); string line = line_string (pos_str0); string context = line.substr (0, offset) - + to_string ('\n') - + to_string (' ', col) - + line.substr (offset, line.length () - offset); + + to_string ('\n') + + to_string (' ', col) + + line.substr (offset, line.length () - offset); return context; } @@ -229,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); @@ -257,13 +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, - int *byte_offset) 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; @@ -274,34 +277,27 @@ Source_file::get_counts (char const *pos_str0, char const *line_start = (char const *)data + line[LEFT]; ssize left = (char const *) pos_str0 - line_start; + *byte_offset = left; + string line_begin (line_start, left); char const *line_chars = line_begin.c_str (); - *line_char = 0; - *column = 0; - *byte_offset = 0; - - while (left > 0) + for (; left > 0; --left, ++line_chars) { - size_t thislen = utf8_char_len (*line_chars); - - if (thislen == 1 && line_chars[0] == '\t') - (*column) = (*column / 8 + 1) * 8; + // Skip UTF-8 continuation bytes. This is simplistic but + // robust, and we warn against non-UTF-8 input in the lexer + // already. In the case of non-UTF-8 or of this function being + // called in mid-character, the results are somewhat arbitrary, + // but there is no really sane definition anyway. + if ((*line_chars & 0xc0) == 0x80) + continue; + + if (*line_chars == '\t') + (*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; } } @@ -318,12 +314,12 @@ Source_file::get_line (char const *pos_str0) const return 0; if (!newline_locations_.size ()) - return 1; + return 1 + line_offset_; /* 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_; @@ -332,10 +328,15 @@ Source_file::get_line (char const *pos_str0) const void Source_file::set_line (char const *pos_str0, int line) { - int current_line = get_line (pos_str0); - line_offset_ += line - current_line; + if (pos_str0) + { + int current_line = get_line (pos_str0); + line_offset_ += line - current_line; - assert (line == get_line (pos_str0)); + assert (line == get_line (pos_str0)); + } + else + line_offset_ = line; } int @@ -372,7 +373,6 @@ Source_file::mark_smob (SCM smob) return sc->str_port_; } - int Source_file::print_smob (SCM smob, SCM port, scm_print_state *) {