*/
#include "lily-parser.hh"
-#include "text-metrics.hh"
+
#include "book.hh"
-#include "lilypond-key.hh"
+#include "file-name.hh"
+#include "file-path.hh"
+#include "international.hh"
+#include "lily-lexer.hh"
#include "lily-version.hh"
+#include "lilypond-key.hh"
#include "main.hh"
-#include "lily-lexer.hh"
#include "output-def.hh"
#include "paper-book.hh"
#include "parser.hh"
#include "score.hh"
-#include "file-name.hh"
-#include "file-path.hh"
#include "source.hh"
+#include "text-metrics.hh"
#include "warn.hh"
#include "ly-smobs.icc"
/* Process one .ly file, or book. */
void
-Lily_parser::parse_file (String init, String name, String out_name)
+Lily_parser::parse_file (std::string init, std::string name, std::string out_name)
{
if (output_backend_global == "tex")
try_load_text_metrics (out_name);
lexer_->new_input (init, sources_);
File_name f (name);
- String s = global_path.find (f.base_ + ".twy");
+ std::string s = global_path.find (f.base_ + ".twy");
s = gulp_file_to_string (s, false, -1);
scm_eval_string (scm_makfrom0str (s.c_str ()));
}
void
-Lily_parser::parse_string (String ly_code)
+Lily_parser::parse_string (std::string ly_code)
{
// TODO: use $parser
lexer_->set_identifier (ly_symbol2scm ("parser"),
}
void
-Lily_parser::parser_error (String s)
+Lily_parser::parser_error (std::string s)
{
lexer_->here_input ().error (_ (s.c_str ()));
error_level_ = 1;
}
void
-Lily_parser::parser_error (Input const &i, String s)
+Lily_parser::parser_error (Input const &i, std::string s)
{
i.error (s);
error_level_ = 1;