Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / lily / lily-parser.cc

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 1b78abaed0588debaf4adb9769ed328ce70e88d5..a82ec94bed4c79034caf28e128fa8dcfc309c56a 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -44,6 +44,7 @@ Lily_parser::Lily_parser (Sources *sources)
   lexer_ = 0;
   sources_ = sources;
   default_duration_ = Duration (2, 0);
+  default_tremolo_type_ = 8;
   error_level_ = 0;
   closures_ = SCM_EOL;
 
@@ -58,6 +59,7 @@ Lily_parser::Lily_parser (Lily_parser const &src, SCM closures, SCM location)
   lexer_ = 0;
   sources_ = src.sources_;
   default_duration_ = src.default_duration_;
+  default_tremolo_type_ = src.default_tremolo_type_;
   error_level_ = 0;
   output_basename_ = src.output_basename_;
   closures_ = closures;
@@ -97,7 +99,7 @@ Lily_parser::print_smob (SCM s, SCM port, scm_print_state *)
 
 /* Process one .ly file, or book.  */
 void
-Lily_parser::parse_file (string init, string name, string out_name)
+Lily_parser::parse_file (const string &init, const string &name, const string &out_name)
 {
   lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
   output_basename_ = out_name;
@@ -139,7 +141,7 @@ Lily_parser::parse_file (string init, string name, string out_name)
 }
 
 void
-Lily_parser::parse_string (string ly_code)
+Lily_parser::parse_string (const string &ly_code)
 {
   lexer_->main_input_name_ = "<string>";
   lexer_->new_input (lexer_->main_input_name_, ly_code, sources_);
@@ -155,7 +157,7 @@ Lily_parser::parse_string (string ly_code)
 }
 
 SCM
-Lily_parser::parse_string_expression (string ly_code, string filename,
+Lily_parser::parse_string_expression (const string &ly_code, const string &filename,
                                       int line)
 {
   lexer_->main_input_name_ = filename;
@@ -167,7 +169,7 @@ Lily_parser::parse_string_expression (string ly_code, string filename,
   SCM mod = lexer_->set_current_scope ();
   SCM parser = lexer_->lookup_identifier_symbol (ly_symbol2scm ("parser"));
   lexer_->set_identifier (ly_symbol2scm ("parser"), self_scm ());
-  lexer_->push_extra_token (EMBEDDED_LILY);
+  lexer_->push_extra_token (Input (), EMBEDDED_LILY);
   SCM result = do_yyparse ();
 
   lexer_->set_identifier (ly_symbol2scm ("parser"), parser);
@@ -178,7 +180,7 @@ Lily_parser::parse_string_expression (string ly_code, string filename,
 }
 
 void
-Lily_parser::include_string (string ly_code)
+Lily_parser::include_string (const string &ly_code)
 {
   lexer_->new_input ("<included string>", ly_code, sources_);
 }
@@ -195,21 +197,15 @@ Lily_parser::clear ()
   lexer_ = 0;
 }
 
-char const *
-Lily_parser::here_str0 () const
-{
-  return lexer_->here_str0 ();
-}
-
 void
-Lily_parser::parser_error (string s)
+Lily_parser::parser_error (const 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, const string &s)
 {
   i.error (s);
   error_level_ = 1;