* configure.in: check for C language.

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

diff --git a/lily/source-file.cc b/lily/source-file.cc
index cbe4967b52537339c7b665ae2c92811ebf6c58be..108c68b6a23e9b3b2a21bb9dc50860ce3a210d5d 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -3,16 +3,18 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-  & Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <assert.h>
 #if HAVE_SSTREAM
 #include <sstream>
 #else
-#include <strstream.h>
+#include <strstream>
 #define istringstream(x) istrstream(x, length ()) 
 #endif
 
@@ -32,6 +34,7 @@ Source_file::load_stdin ()
   while ((c = fgetc (stdin)) != EOF)
     chs.push (c);
 
+  chs.push (0);
   length_ = chs.size ();
   contents_str0_ = chs.remove_array ();
 }
@@ -70,24 +73,22 @@ gulp_file (String fn, int* len)
   return str;
 }
 
-
-
+/*
+  Unused.
+ */
 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;
 
@@ -98,7 +99,11 @@ 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')
+      newline_locations_.push (contents_str0_ + i);
 }
 
 void
@@ -109,7 +114,7 @@ Source_file::init_port ()
   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_makfrom0str (name_.get_str0()));
 }
 
 int
@@ -121,11 +126,6 @@ Source_file::tell () const
 std::istream*
 Source_file::get_istream ()
 {
-  /*
-    if (!name_string_.length ())
-      return &cin;
-    */
-
   if (!istream_)
     {
       if (length ()) // can-t this be done without such a hack?
@@ -153,20 +153,20 @@ 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 ()
 {
   delete istream_;
   istream_ = 0;
-  delete contents_str0_;
+  delete[] contents_str0_;
 }
 
 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 ();
@@ -196,7 +196,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);
@@ -207,7 +207,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 ();
@@ -217,7 +217,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);
@@ -236,7 +236,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);
@@ -250,7 +250,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 ()));
 }
@@ -258,18 +258,29 @@ 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;
 
-  int i = 1;
-  char const* scan_str0 = to_str0 ();
-  if (!scan_str0)
-    return 0;
+  if (!newline_locations_.size ())
+    return 1;
+  
+  int lo=0;
+  int hi = newline_locations_.size ();
 
-  while (scan_str0 < pos_str0)
-    if (*scan_str0++ == '\n')
-      i++;
-  return i;
+  if (newline_locations_[lo] > pos_str0)
+    return 1;
+  
+  if (newline_locations_[hi-1] < pos_str0)
+    return hi;
+  
+  binary_search_bounds (newline_locations_,
+                       pos_str0, 
+                       Link_array<char>::default_compare,
+                       &lo, &hi);
+
+  if (*pos_str0 == '\n')
+    lo --;
+  return lo + 2;
 }
 
 int
@@ -287,7 +298,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");
@@ -299,7 +310,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");
@@ -312,7 +323,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");