Run `make grand-replace'.

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

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 8677daa1160bef11084845011b3e9108aeadef55..cc9d1bdee3ede39a67e47a45466bf7b60949030b 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,30 +3,60 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-
 #ifndef INPUT_HH
 #define INPUT_HH
 
+#include "lily-proto.hh"
+
 /**
-  Base class for anything that records its poisition in the parse file.
- */
-class Input {
-    char const *defined_ch_C_ ;
-    Sources * sources_l_;
+   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:
-    
-    void warning(String)const; // should use member func?
-    void error(String)const;
-    void message(String)const;
-    void set_spot(Input const &);
-    void set_sources(Sources *);
-    
-    String location_str()const;
-    Input(Sources *,char const*);
-    Input();
+  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;
+  void programming_error (string) const;
+  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 (Input const &i);
+  Input ();
 };
 
+
+#include "smobs.hh"
+
+SCM make_input (Input spot);
+Input *unsmob_input (SCM);
+
+extern Input dummy_input_global;
+
 #endif // INPUT_HH