public:
int print_smob (SCM, scm_print_state *) const;
SCM mark_smob () const;
- static const char type_p_name_[];
+ static const char * const type_p_name_;
virtual ~Lily_parser ();
Lily_lexer *lexer_;
Sources *sources_;
Duration default_duration_;
int default_tremolo_type_;
- std::string output_basename_;
+ string output_basename_;
SCM closures_;
int fatal_error_;
void clear ();
void do_init_file ();
- void include_string (const std::string &ly_code);
- void parse_file (const std::string &init, const std::string &name, const std::string &out_name);
- void parse_string (const std::string &ly_code);
- SCM parse_string_expression (const std::string &ly_code, const std::string &filename, int line);
- void parser_error (const std::string&);
- void parser_error (Input const &, const std::string&);
+ void include_string (const string &ly_code);
+ void parse_file (const string &init, const string &name, const string &out_name);
+ void parse_string (const string &ly_code);
+ SCM parse_string_expression (const string &ly_code, const string &filename, int line);
+ void parser_error (const string&);
+ void parser_error (Input const &, const string&);
// The following is called as yyerror
- static void parser_error (Input const *i, Lily_parser *parser, SCM *, const std::string &s);
+ static void parser_error (Input const *i, Lily_parser *parser, SCM *, const string &s);
void set_yydebug (bool);
SCM make_scope () const;