Ensure clearance between Dots and Flags; issue 1230

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

diff --git a/lily/include/lily-lexer.hh b/lily/include/lily-lexer.hh
index c53263d33ec3da6ebfa40cdfd697087703acb6c1..3fe836277f1ef10a08dcaf94764fafb139ea7ec0 100644 (file)
--- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 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
@@ -25,6 +25,7 @@
 #include "input.hh"
 #include "duration.hh"
 #include "pitch.hh"
+#include "parser.hh"
 
 bool busy_parsing ();
 void kill_lexer ();
@@ -56,6 +57,7 @@ private:
   int scan_scm_id (SCM);
   int identifier_type (SCM);
   char escaped_char (char) const;
+  const char * YYText_utf8 ();
 
   Lily_parser *parser_;
   Keyword_table *keytable_;
@@ -65,7 +67,7 @@ private:
 public:
   SCM eval_scm (SCM);
   SCM extra_tokens_;
-  void *lexval_;
+  YYSTYPE *lexval_;
   Input *lexloc_;
   bool is_main_input_;
 
@@ -100,6 +102,7 @@ public:
   virtual void new_input (string s, Sources *);
   virtual void new_input (string s, string d, Sources *);
 
+  bool top_input () { return include_stack_.size () < 2; }
   SCM keyword_list () const;
   SCM lookup_identifier (string s);
   SCM lookup_identifier_symbol (SCM s);