partial: 1.3.24.jcn

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

diff --git a/lib/include/input.hh b/lib/include/input.hh
index 80ab11a1bb235c418fe6813173a03a6f03f9dcc0..1c9e61ccbfb5f840b55d6bf139c766cff6a94f59 100644 (file)
--- a/lib/include/input.hh
+++ b/lib/include/input.hh
@@ -3,23 +3,33 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
 #ifndef INPUT_HH
 #define INPUT_HH
 
+#include "proto.hh"
+
 /**
   Base class for anything that records its poisition in the parse file.
  */
 class Input {
-    char const *defined_ch_C_ ;
-
+  char const *defined_ch_C_ ;
+  Source_file * source_file_l_;
 public:
-    set_spot(char const *);
-    Input(char const *);
-    Input(Input 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 &);
+  Input spot () const;
+  String location_str () const;
+  String line_number_str () const;
+  Input (Source_file*, char const*);
+  Input ();
 };
 
 #endif // INPUT_HH