* lily/object-key-dumper-scheme.cc: new file.

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

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 8677daa1160bef11084845011b3e9108aeadef55..710d6b97d8cdc0cae946e990a1c6ca4394db482d 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,30 +3,39 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-
 #ifndef INPUT_HH
 #define INPUT_HH
 
+#include "flower-proto.hh"
+
 /**
   Base class for anything that records its poisition in the parse file.
  */
 class Input {
-    char const *defined_ch_C_ ;
-    Sources * sources_l_;
 public:
+  char const *defined_str0_ ;
+  Source_file * source_file_;
     
-    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();
+  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_string () const;
+  String line_number_string () const;
+
+
+  String file_string ()const;
+  int line_number ()const;
+  int column_number ()const;
+
+  
+  Input (Source_file*, char const*);
+  Input ();
 };
 
 #endif // INPUT_HH