X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Finput.hh;h=9c255b70f0cc5ce83e09c7338c8652fc850e3d86;hb=49cae4a7b28489a51e8c97dc33fc64cf83ea25e7;hp=75bc07249d0f01c46e24968617bbc6305ee9bb20;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 75bc07249d..9c255b70f0 100644
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,41 +3,49 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INPUT_HH
 #define INPUT_HH
 
 #include "flower-proto.hh"
+#include "std-string.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
 */
 class Input
 {
-public:
   char const *start_;
   char const *end_;
   Source_file *source_file_;
 
-  void warning (String) const; // should use member func?
-  void non_fatal_error (String) const;
-  void error (String) const;
-  void message (String) const;
+public:
+  Source_file *get_source_file () const;
+  char const *start () const;
+  char const *end () const;
+
+  void set (Source_file *, char const *, char const *);
+  void warning (std::string) const; // should use member func?
+  void non_fatal_error (std::string) const;
+  void error (std::string) const;
+  void message (std::string) const;
   void set_spot (Input const &);
   void step_forward ();
   void set_location (Input const &, Input const &);
   Input spot () const;
-  String location_string () const;
-  String line_number_string () const;
+  std::string location_string () const;
+  std::string line_number_string () const;
+  std::string file_string ()const;
 
-  String file_string ()const;
   int line_number ()const;
   int column_number ()const;
   int end_line_number ()const;
   int end_column_number ()const;
 
+  void get_counts (int *line, int *char_count, int *col) const;
+
   Input (Input const &i);
   Input ();
 };