/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
}
/*
- return contents of FILENAME. *Not 0-terminated!*
+ return contents of FILENAME. *Not 0-terminated!*
*/
vector<char>
-gulp_file (string filename, int desired_size)
+gulp_file (const string &filename, int desired_size)
{
/* "b" must ensure to open literally, avoiding text (CR/LF)
conversions. */
if (desired_size > 0)
read_count = min (read_count, desired_size);
-
+
rewind (f);
char *str = new char[read_count + 1];
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;
cxx_arr.resize (filesize);
copy (str, str + filesize, cxx_arr.begin ());
-
+
delete[] str;
return cxx_arr;
}
istream_ = 0;
line_offset_ = 0;
str_port_ = SCM_EOL;
- self_scm_ = SCM_EOL;
smobify_self ();
}
-Source_file::Source_file (string filename, string data)
+Source_file::Source_file (const string &filename, const 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++)
newline_locations_.push_back (&characters_[0] + i);
}
-Source_file::Source_file (string filename_string)
+Source_file::Source_file (const string &filename_string)
{
init ();
-
+
name_ = filename_string;
if (filename_string == "-")
void
Source_file::init_port ()
{
- SCM str = scm_from_locale_string (c_str ());
+ // This is somewhat icky: the string will in general be in utf8, but
+ // we do our own utf8 encoding and verification in the parser, so we
+ // use the no-conversion equivalent of latin1
+ SCM str = scm_from_latin1_string (c_str ());
str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, __FUNCTION__);
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_;
}
int l, ch, col, offset;
get_counts (context_str0, &l, &ch, &col, &offset);
- return name_string () + ":" + to_string (l)
- + ":" + to_string (col);
+ return name_string () + ":" + ::to_string (l)
+ + ":" + ::to_string (col + 1);
}
}
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;
}
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);
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;
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;
}
}
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<char const*> ());
+ pos_str0,
+ less<char const *> ());
/* the return value will be indexed from 1 */
return lo + 1 + line_offset_;
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
/****************************************************************/
-#include "ly-smobs.icc"
-IMPLEMENT_SMOBS (Source_file);
-IMPLEMENT_DEFAULT_EQUAL_P (Source_file);
-IMPLEMENT_TYPE_P (Source_file, "ly:source-file?");
+const char * const Source_file::type_p_name_ = "ly:source-file?";
SCM
-Source_file::mark_smob (SCM smob)
+Source_file::mark_smob () const
{
- Source_file *sc = (Source_file *) SCM_CELL_WORD_1 (smob);
-
- return sc->str_port_;
+ return str_port_;
}
-
int
-Source_file::print_smob (SCM smob, SCM port, scm_print_state *)
+Source_file::print_smob (SCM port, scm_print_state *) const
{
- Source_file *sc = (Source_file *) SCM_CELL_WORD_1 (smob);
-
scm_puts ("#<Source_file ", port);
- scm_puts (sc->name_.c_str (), port);
+ scm_puts (name_.c_str (), port);
/* Do not print properties, that is too much hassle. */
scm_puts (" >", port);
return 1;
}
-
projects / lilypond.git / blobdiff