Issue 4550 (2/2) Avoid "using namespace std;" in included files

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

diff --git a/lily/source-file.cc b/lily/source-file.cc
index d847605425b0d9be7a9ec79bf66f0d2b462a8004..98d4a0f8785ca534803b1cc7a53730f212c53d6d 100644 (file)
--- a/lily/source-file.cc
+++ b/lily/source-file.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -33,15 +33,23 @@
 #include <sstream>
 #else
 #include <strstream>
-#define istringstream(x) istrstream (x, length ())
 #endif
-using namespace std;
 
 #include "file-name-map.hh"
 #include "international.hh"
 #include "misc.hh"
 #include "warn.hh"
 
+#if HAVE_SSTREAM
+using std::istringstream;
+#else
+#define istringstream(x) std::istrstream (x, length ())
+#endif
+
+using std::istream;
+using std::string;
+using std::vector;
+
 void
 Source_file::load_stdin ()
 {
@@ -55,7 +63,7 @@ Source_file::load_stdin ()
   return contents of FILENAME. *Not 0-terminated!*
  */
 vector<char>
-gulp_file (string filename, int desired_size)
+gulp_file (const string &filename, int desired_size)
 {
   /* "b" must ensure to open literally, avoiding text (CR/LF)
      conversions.  */
@@ -73,7 +81,7 @@ gulp_file (string filename, int desired_size)
   int read_count = real_size;
 
   if (desired_size > 0)
-    read_count = min (read_count, desired_size);
+    read_count = std::min (read_count, desired_size);
 
   rewind (f);
 
@@ -102,11 +110,10 @@ Source_file::init ()
   istream_ = 0;
   line_offset_ = 0;
   str_port_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   smobify_self ();
 }
 
-Source_file::Source_file (string filename, string data)
+Source_file::Source_file (const string &filename, const string &data)
 {
   init ();
 
@@ -124,7 +131,7 @@ Source_file::Source_file (string filename, string data)
       newline_locations_.push_back (&characters_[0] + i);
 }
 
-Source_file::Source_file (string filename_string)
+Source_file::Source_file (const string &filename_string)
 {
   init ();
 
@@ -149,7 +156,10 @@ Source_file::Source_file (string filename_string)
 void
 Source_file::init_port ()
 {
-  SCM str = scm_from_locale_string (c_str ());
+  // This is somewhat icky: the string will in general be in utf8, but
+  // we do our own utf8 encoding and verification in the parser, so we
+  // use the no-conversion equivalent of latin1
+  SCM str = scm_from_latin1_string (c_str ());
   str_port_ = scm_mkstrport (SCM_INUM0, str, SCM_OPN | SCM_RDNG, __FUNCTION__);
   scm_set_port_filename_x (str_port_, ly_string2scm (name_));
 }
@@ -164,8 +174,8 @@ Source_file::get_istream ()
       else
         {
           istream_ = new istringstream ("");
-          istream_->setstate (ios::eofbit);
-          //      istream_->set (ios::eofbit);
+          istream_->setstate (std::ios::eofbit);
+          //      istream_->set (std::ios::eofbit);
         }
     }
   return istream_;
@@ -181,8 +191,8 @@ Source_file::file_line_column_string (char const *context_str0) const
       int l, ch, col, offset;
       get_counts (context_str0, &l, &ch, &col, &offset);
 
-      return name_string () + ":" + to_string (l)
-             + ":" + to_string (col);
+      return name_string () + ":" + ::to_string (l)
+             + ":" + ::to_string (col + 1);
     }
 }
 
@@ -196,8 +206,8 @@ Source_file::quote_input (char const *pos_str0) const
   get_counts (pos_str0, &l, &ch, &col, &offset);
   string line = line_string (pos_str0);
   string context = line.substr (0, offset)
-                   + to_string ('\n')
-                   + to_string (' ', col)
+                   + ::to_string ('\n')
+                   + ::to_string (' ', col)
                    + line.substr (offset, line.length () - offset);
   return context;
 }
@@ -319,7 +329,7 @@ Source_file::get_line (char const *pos_str0) const
   /* this will find the '\n' character at the end of our line */
   vsize lo = lower_bound (newline_locations_,
                           pos_str0,
-                          less<char const *> ());
+                          std::less<char const *> ());
 
   /* the return value will be indexed from 1 */
   return lo + 1 + line_offset_;
@@ -359,30 +369,22 @@ Source_file::get_port () const
 
 /****************************************************************/
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Source_file);
-IMPLEMENT_DEFAULT_EQUAL_P (Source_file);
-IMPLEMENT_TYPE_P (Source_file, "ly:source-file?");
+const char Source_file::type_p_name_[] = "ly:source-file?";
 
 SCM
-Source_file::mark_smob (SCM smob)
+Source_file::mark_smob () const
 {
-  Source_file *sc = (Source_file *) SCM_CELL_WORD_1 (smob);
-
-  return sc->str_port_;
+  return str_port_;
 }
 
 int
-Source_file::print_smob (SCM smob, SCM port, scm_print_state *)
+Source_file::print_smob (SCM port, scm_print_state *) const
 {
-  Source_file *sc = (Source_file *) SCM_CELL_WORD_1 (smob);
-
   scm_puts ("#<Source_file ", port);
-  scm_puts (sc->name_.c_str (), port);
+  scm_puts (name_.c_str (), port);
 
   /* Do not print properties, that is too much hassle.  */
   scm_puts (" >", port);
   return 1;
 }
-