Imported Upstream version 2.18.2

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index 4bc4cbe887403eb685cecf84442c2f741ad0f7f7..ff78cf9901bc3f2155c7046bbfd8b64f5e134be0 100644 (file)
--- a/lily/include/lily-lexer.hh
+++ b/lily/include/lily-lexer.hh
@@ -51,9 +51,13 @@ private:
   SCM start_module_;
   int hidden_state_;
   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_;