X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Finclude%2Flily-lexer.hh;h=d0a188ab69883d77fca0c278266a74ff67f9e4ac;hb=8b500afb9431f5471e385fa2eeb8fde868e4fc49;hp=f1b88bf7c6a0bda217f965423586ccd73e0aef19;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index f1b88bf7c6..d0a188ab69 100644
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -24,10 +24,10 @@ class Lily_lexer : public Includable_lexer
   DECLARE_SMOBS (Lily_lexer,);
 
 private:
-  int lookup_keyword (String);
-  int scan_bare_word (String);
-  SCM scan_markup_word (String);
-  int scan_escaped_word (String);
+  int lookup_keyword (string);
+  int scan_bare_word (string);
+  SCM scan_markup_word (string);
+  int scan_escaped_word (string);
   int identifier_type (SCM);
   char escaped_char (char) const;
 
@@ -35,7 +35,7 @@ private:
   SCM scopes_;
   SCM start_module_;
 public:
-  String main_input_name_;
+  string main_input_name_;
   void *lexval;
   Input *lexloc;
   bool is_main_input_;
@@ -65,7 +65,7 @@ public:
 
   void start_main_input ();
 
-  SCM lookup_identifier (String s);
+  SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);
   void push_chord_state (SCM tab);
   void push_figuredbass_state ();