Fix #221.

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

diff --git a/lily/include/input.hh b/lily/include/input.hh
index 9c255b70f0cc5ce83e09c7338c8652fc850e3d86..15f54aef223f4c411acc65955eba61a86da78d23 100644 (file)
--- a/lily/include/input.hh
+++ b/lily/include/input.hh
@@ -10,7 +10,6 @@
 #define INPUT_HH
 
 #include "flower-proto.hh"
-#include "std-string.hh"
 
 /**
    Base class for anything that records its poisition in the parse file.
@@ -20,24 +19,26 @@ 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 (std::string) const; // should use member func?
-  void non_fatal_error (std::string) const;
-  void error (std::string) const;
-  void message (std::string) 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;
-  std::string location_string () const;
-  std::string line_number_string () const;
-  std::string file_string ()const;
+
+  string location_string () const;
+  string line_number_string () const;
+  string file_string ()const;
 
   int line_number ()const;
   int column_number ()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