/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 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!*
*/
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. */
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 ();
newline_locations_.push_back (&characters_[0] + i);
}
-Source_file::Source_file (string filename_string)
+Source_file::Source_file (const string &filename_string)
{
init ();
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_));
}
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)
+ + ::to_string ('\n')
+ + ::to_string (' ', col)
+ line.substr (offset, line.length () - offset);
return context;
}
// called in mid-character, the results are somewhat arbitrary,
// but there is no really sane definition anyway.
if ((*line_chars & 0xc0) == 0x80)
- continue;
+ continue;
if (*line_chars == '\t')
(*column) = (*column / 8 + 1) * 8;
/****************************************************************/
-#include "ly-smobs.icc"
-IMPLEMENT_SMOBS (Source_file);
-IMPLEMENT_DEFAULT_EQUAL_P (Source_file);
-IMPLEMENT_TYPE_P (Source_file, "ly:source-file?");
+const char 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;
}
-