Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / include / source-file.hh

diff --git a/lily/include/source-file.hh b/lily/include/source-file.hh
index d3c5ab0aa5dfdcb2cfdd26d8d526e3fc556a71c3..dd88a2c65ae2255263dcf8c467bc7ec58120fed3 100644 (file)
--- a/lily/include/source-file.hh
+++ b/lily/include/source-file.hh
@@ -9,13 +9,14 @@
 #ifndef SOURCE_FILE_HH
 #define SOURCE_FILE_HH
 
+#include "flower-proto.hh"
+#include "std-vector.hh"
+#include "lily-proto.hh"
+#include "protected-scm.hh"
+
 #include <iostream>
 using namespace std;
 
-#include "string.hh"
-#include "protected-scm.hh"
-#include "parray.hh"
-
 /**
    class for reading and mapping a file.
 
@@ -27,19 +28,19 @@ using namespace std;
 class Source_file
 {
 public:
-  Source_file (String fn);
-  Source_file (String, String);
+  Source_file (string fn);
+  Source_file (string, string);
 
   virtual ~Source_file ();
 
-  char const *to_str0 () const;
-  virtual String quote_input (char const *pos_str0) const;
+  char const *c_str () const;
+  virtual string quote_input (char const *pos_str0) const;
   istream *get_istream ();
   bool contains (char const *pos_str0) const;
   int length () const;
   virtual int get_line (char const *pos_str0) const;
-  String name_string () const;
-  String file_line_column_string (char const *str0) const;
+  string name_string () const;
+  string file_line_column_string (char const *str0) const;
 
   // return start + n
   char const *seek_str0 (int n);
@@ -48,11 +49,11 @@ public:
   // return here + n bytes
   char const *forward_str0 (int n);
   char const *pos_str0 () { return pos_str0_; }
-  String get_string (int n);
+  string get_string (int n);
   void set_pos (char const *pos_str0);
 public:
   Slice line_slice (char const *pos_str0) const;
-  String line_string (char const *pos_str0) const;
+  string line_string (char const *pos_str0) const;
   void get_counts (char const *pos_str0, int *, int *, int *) const;
 
   /*
@@ -63,12 +64,13 @@ public:
   char const *pos_str0_;
 
   SCM get_port () const;
-  String name_;
+  string name_;
 
 private:
-  Link_array<char> newline_locations_;
+  vector<char*> newline_locations_;
   istream *istream_;
   char *contents_str0_;
+  vector<char> chs_;
   int length_;
   void load_stdin ();
   void init_port ();
@@ -76,7 +78,7 @@ private:
   Protected_scm str_port_;
 };
 
-char *gulp_file (String fn, int *len);
+char *gulp_file (string fn, int *len);
 
 #endif /* SOURCE_FILE_HH */