Issue 4878: Make type_p_name_ always char pointer

[lilypond.git] / lily / include / lily-parser.hh

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index 0255b46074ebc9a0d34cc55a3f1adb06c4d58609..e4ff2969b92ce8143326b8a4a7889ee0ee64169e 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,10 +31,12 @@
 */
 class Lily_parser : public Smob<Lily_parser>
 {
+  SCM do_yyparse ();
+  static SCM do_yyparse_trampoline (void *parser);
 public:
-  static int print_smob (SCM, SCM, scm_print_state *);
-  SCM mark_smob ();
-  static const char type_p_name_[];
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static const char * const type_p_name_;
   virtual ~Lily_parser ();
   Lily_lexer *lexer_;
   Sources *sources_;
@@ -55,7 +57,6 @@ public:
 
   void clear ();
   void do_init_file ();
-  SCM do_yyparse ();
   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);