X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Flily-lexer.hh;h=588da0d8f2356111b146e7869aa664e253eedc2e;hb=3e89af67bc6a9e3fd5d9a28db256608ac79510e0;hp=9659abbd198634a29efa25be19e9c8ac51ba858c;hpb=2fa31a12ca8c7444ddb5aae5b26d4a2d956d8b1e;p=lilypond.git

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 9659abbd19..588da0d8f2 100644
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -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--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,15 +31,18 @@ bool busy_parsing ();
 void kill_lexer ();
 void set_lexer ();
 
-class Lily_lexer : public Includable_lexer
+class Lily_lexer : public Smob<Lily_lexer>, public Includable_lexer
 {
-  DECLARE_SMOBS (Lily_lexer);
-
+public:
+  int print_smob (SCM, scm_print_state *) const;
+  SCM mark_smob () const;
+  static const char type_p_name_[];
+  virtual ~Lily_lexer ();
 private:
-  int lookup_keyword (const string&);
-  int scan_bare_word (const string&);
-  int scan_escaped_word (const string&);
-  int scan_shorthand (const string&);
+  int lookup_keyword (const std::string&);
+  int scan_bare_word (const std::string&);
+  int scan_escaped_word (const std::string&);
+  int scan_shorthand (const std::string&);
   int scan_scm_id (SCM);
   int identifier_type (SCM);
   char escaped_char (char) const;
@@ -50,9 +53,13 @@ private:
   SCM scopes_;
   SCM start_module_;
   Input override_input_;
-  SCM eval_scm (SCM, char extra_token = 0);
+  SCM eval_scm (SCM, Input, char extra_token = 0);
 public:
-  SCM eval_scm_token (SCM sval) { return eval_scm (sval, '#'); }
+  SCM eval_scm_token (SCM sval, Input w)
+  {
+    w.step_forward ();
+    return eval_scm (sval, w, '#');
+  }
   SCM extra_tokens_;
   SCM *lexval_;
   Input *lexloc_;
@@ -86,12 +93,12 @@ public:
 
   void start_main_input ();
 
-  virtual void new_input (const string &s, Sources *);
-  virtual void new_input (const string &s, string d, Sources *);
+  virtual void new_input (const std::string &s, Sources *);
+  virtual void new_input (const std::string &s, std::string d, Sources *);
 
   bool top_input () { return include_stack_.size () < 2; }
   SCM keyword_list () const;
-  SCM lookup_identifier (const string &s);
+  SCM lookup_identifier (const std::string &s);
   SCM lookup_identifier_symbol (SCM s);
   void push_extra_token (Input const &where,
                          int token_type, SCM scm = SCM_UNSPECIFIED);