*** empty log message ***

[lilypond.git] / lily / lily-lexer.cc

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 06ab799acc0760a0b661c8231046d7c2254ff94a..57475d37d340f98c48e97b1d41016017d3985a4c 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -10,6 +10,7 @@
 
 #include <cctype>
 #include <sstream>
+using namespace std;
 
 #include "scm-hash.hh"
 #include "interval.hh"
@@ -98,7 +99,7 @@ Lily_lexer::Lily_lexer (Sources *sources)
 
   add_scope (ly_make_anonymous_module (false));
   push_note_state (scm_c_make_hash_table (0));
-  chordmodifier_tab_ = scm_make_vector (scm_int2num (1), SCM_EOL);
+  chordmodifier_tab_ = scm_make_vector (scm_from_int (1), SCM_EOL);
 }
 
 Lily_lexer::Lily_lexer (Lily_lexer const &src)
@@ -109,7 +110,7 @@ Lily_lexer::Lily_lexer (Lily_lexer const &src)
   pitchname_tab_stack_ = src.pitchname_tab_stack_;
   sources_ = src.sources_;
   start_module_ = SCM_EOL;
-  
+
   error_level_ = src.error_level_;
   is_main_input_ = src.is_main_input_;
 
@@ -142,17 +143,14 @@ Lily_lexer::add_scope (SCM module)
   ly_reexport_module (scm_current_module ());
   if (!scm_is_pair (scopes_))
     start_module_ = scm_current_module ();
-  
+
   for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
-    {
-      ly_use_module (module, scm_car (s));
-    }
+    ly_use_module (module, scm_car (s));
   scopes_ = scm_cons (module, scopes_);
 
   set_current_scope ();
 }
 
-
 SCM
 Lily_lexer::remove_scope ()
 {
@@ -166,7 +164,7 @@ SCM
 Lily_lexer::set_current_scope ()
 {
   SCM old = scm_current_module ();
-  
+
   if (scm_is_pair (scopes_))
     scm_set_current_module (scm_car (scopes_));
   else
@@ -270,7 +268,7 @@ Lily_lexer::escaped_char (char c) const
 Input
 Lily_lexer::here_input () const
 {
-  return Input(*lexloc);
+  return Input (*lexloc);
 }
 
 void
@@ -286,7 +284,7 @@ Lily_lexer::prepare_for_next_token ()
 void
 Lily_lexer::add_lexed_char (int count)
 {
-  char const * start = here_str0 ();
+  char const *start = here_str0 ();
   lexloc->set (get_source_file (),
               start, start + count);
   char_count_stack_.top () += count;