* SConstruct: Further development.

[lilypond.git] / lily / source-file.cc

diff --git a/lily/source-file.cc b/lily/source-file.cc
index f56c406638cba67471b9b677c63b5ee09804204d..f083fedfd3a077e62e0cc48ac4a73a5b1aed7f4f 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -3,18 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include "config.h"
+#include "config.hh"
 
 #include <stdio.h>
 #include <assert.h>
 #if HAVE_SSTREAM
 #include <sstream>
 #else
-#include <strstream.h>
+#include <strstream>
 #define istringstream(x) istrstream(x, length ()) 
 #endif
 
@@ -34,59 +34,52 @@ Source_file::load_stdin ()
   while ((c = fgetc (stdin)) != EOF)
     chs.push (c);
 
+  chs.push (0);
   length_ = chs.size ();
   contents_str0_ = chs.remove_array ();
 }
 
-
-
-char *
-gulp_file (String fn, int* len)
+char*
+gulp_file (String filename, int *filesize)
 {
-  /*
-    let's hope that "b" opens anything binary, and does not apply
-    CR/LF translation
-    */
-  FILE * f =  fopen (fn.to_str0 (), "rb");
-
+  /* "b" must ensure to open literally, avoiding text (CR/LF)
+     conversions.  */
+  FILE *f = fopen (filename.to_str0 (), "rb");
   if (!f)
     {
-      warning (_f ("can't open file: `%s'", fn.to_str0 ()));
+      warning (_f ("can't open file: `%s'", filename.to_str0 ()));
       return 0;
     }
 
-  int ret = fseek (f, 0, SEEK_END);
-
-  *len = ftell (f);
+  fseek (f, 0, SEEK_END);
+  *filesize = ftell (f);
   rewind (f);
-  char *  str = new char[*len+1];
-  str[*len] = 0;
-  ret = fread (str, sizeof (char), *len, f);
 
-  if (ret!=*len)
-    warning (_f ("Huh?  Got %d, expected %d characters", ret, *len));
+  char *str = new char[*filesize + 1];
+  str[*filesize] = 0;
 
+  int bytes_read = fread (str, sizeof (char), *filesize, f);
+  if (bytes_read != *filesize)
+    warning (_f ("Huh?  Got %d, expected %d characters", bytes_read,
+                *filesize));
   fclose (f);
 
-
   return str;
 }
 
-
-
 Source_file::Source_file (String filename, String data)
 {
-  name_string_ = "";
+  name_ = filename;
   istream_ = 0;
   contents_str0_ = data.get_copy_str0();
-  length_ = data.length();
+  length_ = data.length ();
   pos_str0_ = to_str0 ();
-  init_port();
+  init_port ();
 }
 
 Source_file::Source_file (String filename_string)
 {
-  name_string_ = filename_string;
+  name_ = filename_string;
   istream_ = 0;
   contents_str0_ = 0;
 
@@ -97,7 +90,7 @@ Source_file::Source_file (String filename_string)
   
   pos_str0_ = to_str0 ();
 
-  init_port();
+  init_port ();
 
   for (int i = 0; i < length_; i++)
     if (contents_str0_[i] == '\n')
@@ -107,12 +100,9 @@ Source_file::Source_file (String filename_string)
 void
 Source_file::init_port ()
 {
-  SCM str =scm_makfrom0str (contents_str0_);
-  
-  str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG,
-                            __FUNCTION__);
-  scm_set_port_filename_x (str_port_,
-                          scm_makfrom0str (name_string_.get_str0()));
+  SCM str = scm_makfrom0str (contents_str0_);
+  str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, __FUNCTION__);
+  scm_set_port_filename_x (str_port_, scm_makfrom0str (name_.get_str0 ()));
 }
 
 int
@@ -151,7 +141,7 @@ Source_file::file_line_column_string (char const *context_str0) const
 String
 Source_file::name_string () const
 {
-  return name_string_;
+  return name_;
 }
 
 Source_file::~Source_file ()
@@ -164,7 +154,7 @@ Source_file::~Source_file ()
 Slice
 Source_file::line_slice (char const* pos_str0) const
 {
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return Slice (0,0);
 
   char const* data_str0 = to_str0 ();
@@ -194,7 +184,7 @@ Source_file::line_slice (char const* pos_str0) const
 String
 Source_file::line_string (char const* pos_str0) const
 {
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return "";
 
   Slice line = line_slice (pos_str0);
@@ -205,7 +195,7 @@ Source_file::line_string (char const* pos_str0) const
 int
 Source_file::get_char (char const* pos_str0) const
 {
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return 0;
 
   char const* data_str0 = to_str0 ();
@@ -215,7 +205,7 @@ Source_file::get_char (char const* pos_str0) const
 int
 Source_file::get_column (char const* pos_str0) const
 {
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return 0;
 
   int ch_i = get_char (pos_str0);
@@ -234,7 +224,7 @@ Source_file::get_column (char const* pos_str0) const
 String
 Source_file::error_string (char const* pos_str0) const
 {
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return " (" + _ ("position unknown") + ")";
 
   int ch_i = get_char (pos_str0);
@@ -248,7 +238,7 @@ Source_file::error_string (char const* pos_str0) const
 }
 
 bool
-Source_file::in_b (char const* pos_str0) const
+Source_file::contains (char const* pos_str0) const
 {
   return (pos_str0 && (pos_str0 >= to_str0 ()) && (pos_str0 <= to_str0 () + length ()));
 }
@@ -256,14 +246,14 @@ Source_file::in_b (char const* pos_str0) const
 int
 Source_file::get_line (char const* pos_str0) const
 {
-  if (!in_b (pos_str0))
+  if (!contains (pos_str0))
     return 0;
 
-  if (!newline_locations_.size())
+  if (!newline_locations_.size ())
     return 1;
   
   int lo=0;
-  int hi = newline_locations_.size();
+  int hi = newline_locations_.size ();
 
   if (newline_locations_[lo] > pos_str0)
     return 1;
@@ -296,7 +286,7 @@ Source_file::to_str0 () const
 void
 Source_file::set_pos (char const * pos_str0)
 {
-  if (in_b (pos_str0))
+  if (contains (pos_str0))
     pos_str0_ = pos_str0;
   else
     error (error_string (pos_str0) + "invalid pos");
@@ -308,7 +298,7 @@ Source_file::seek_str0 (int n)
   char const* new_str0 = to_str0 () + n;
   if (n < 0)
     new_str0 += length ();
-  if (in_b (new_str0))
+  if (contains (new_str0))
     pos_str0_ = new_str0;
   else
     error (error_string (new_str0) + "seek past eof");
@@ -321,7 +311,7 @@ Source_file::forward_str0 (int n)
 {
   char const* old_pos = pos_str0_;
   char const* new_str0 = pos_str0_ + n;
-  if (in_b (new_str0))
+  if (contains (new_str0))
     pos_str0_ = new_str0;
   else
     error (error_string (new_str0)  + "forward past eof");