X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Finput.hh;h=2ae9f093eed3fa7d9cf580f25ac6e1c7825e346b;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=d3cad3577871e376de45359377c04b21d4e0daff;hpb=474c8729dc274a30558102a015a01fa5882673db;p=lilypond.git

diff --git a/lily/include/input.hh b/lily/include/input.hh
index d3cad35778..2ae9f093ee 100644
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -1,15 +1,26 @@
 /*
-  input.hh -- declare Input
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2007 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef INPUT_HH
 #define INPUT_HH
 
-#include "flower-proto.hh"
+#include "lily-proto.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -25,11 +36,12 @@ public:
   char const *end () const;
 
   void set (Source_file *, char const *, char const *);
-  void warning (string) const;
+  void error (string) const;
   void programming_error (string) const;
   void non_fatal_error (string) const;
-  void error (string) const;
+  void warning (string) const;
   void message (string) const;
+  void debug_output (string) const;
   void set_spot (Input const &);
   void step_forward ();
   void set_location (Input const &, Input const &);
@@ -45,13 +57,15 @@ public:
   int end_line_number ()const;
   int end_column_number ()const;
 
-  void get_counts (int *line, int *char_count, int *col) const;
+  void get_counts (int *, int *, int *, int *) const;
 
   Input (Input const &i);
   Input ();
+protected:
+  string message_location () const;
+  string message_string (string msg) const;
 };
 
-
 #include "smobs.hh"
 
 SCM make_input (Input spot);