* The grand 2005-2006 replace.

[lilypond.git] / lily / include / input.hh

diff --git a/lily/include/input.hh b/lily/include/input.hh
index e0b160978eb830fb07bad14037a2e5695396ef3e..f9300bf4e84a958ddd8dd352a6cf89bdc225b834 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,7 +3,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INPUT_HH
@@ -12,29 +12,40 @@
 #include "flower-proto.hh"
 
 /**
-  Base class for anything that records its poisition in the parse file.
- */
-class Input {
+   Base class for anything that records its poisition in the parse file.
+*/
+class Input
+{
+  char const *start_;
+  char const *end_;
+  Source_file *source_file_;
+
 public:
-  char const *defined_str0_ ;
-  Source_file * source_file_;
-    
+  Source_file *get_source_file () const;
+  char const *start () const;
+  char const *end () const;
+
+  void set (Source_file *, char const *, char const *);
   void warning (String) const; // should use member func?
   void non_fatal_error (String) const;
   void error (String) const;
   void message (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;
-
-
   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 (Source_file*, char const*);
+  Input (Input const &i);
   Input ();
 };