X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Finput.hh;h=94e00527a22395a62d3fb3391f7982f29cf849f5;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=e1b4169841000f48b806fdfd0a81cd8c3fe0c175;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/include/input.hh b/lily/include/input.hh
index e1b4169841..94e00527a2 100644
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -3,14 +3,13 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INPUT_HH
 #define INPUT_HH
 
-#include "flower-proto.hh"
-#include "std-string.hh"
+#include "lily-proto.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -20,21 +19,23 @@ class Input
   char const *start_;
   char const *end_;
   Source_file *source_file_;
-
 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 (string) const; // should use member func?
+  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;
@@ -50,4 +51,12 @@ public:
   Input ();
 };
 
+
+#include "smobs.hh"
+
+SCM make_input (Input spot);
+Input *unsmob_input (SCM);
+
+extern Input dummy_input_global;
+
 #endif // INPUT_HH