T1055: Avoid using deprecated %module-public-interface in guile initialisation.

lily/lily-lexer.cc

 /*
   This file is part of LilyPond, the GNU music typesetter.
 
   Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
@@ skipping 191 matching lines @@
 Lily_lexer::keyword_list () const
 {
   if (!keytable_)
     return SCM_EOL;
 
   SCM l = SCM_EOL;
   SCM *tail = &l;
   for (vsize i = 0; i < keytable_->table_.size (); i++)
     {
       *tail = scm_acons (scm_from_locale_string (keytable_->table_[i].name_),
-                        scm_from_int (keytable_->table_[i].tokcode_),
-                        SCM_EOL);
+                         scm_from_int (keytable_->table_[i].tokcode_),
+                         SCM_EOL);
 
       tail = SCM_CDRLOC (*tail);
     }
 
   return l;
 }
 
 SCM
 Lily_lexer::lookup_identifier_symbol (SCM sym)
 {
   for (SCM s = scopes_; scm_is_pair (s); s = scm_cdr (s))
     {
       SCM var = ly_module_lookup (scm_car (s), sym);
       if (var != SCM_BOOL_F)
-        return scm_variable_ref (var);
+        return scm_variable_ref (var);
     }
 
   return SCM_UNDEFINED;
 }
 
 SCM
 Lily_lexer::lookup_identifier (string name)
 {
   return lookup_identifier_symbol (ly_symbol2scm (name.c_str ()));
 }
 
 void
 Lily_lexer::start_main_input ()
 {
   yy_flex_debug = get_program_option ("debug-lexer");
   parser_->set_yydebug (get_program_option ("debug-parser"));
 
   new_input (main_input_name_, sources_);
 
   scm_module_define (scm_car (scopes_),
-                    ly_symbol2scm ("input-file-name"),
-                    ly_string2scm (main_input_name_));
+                     ly_symbol2scm ("input-file-name"),
+                     ly_string2scm (main_input_name_));
 }
 
 void
 Lily_lexer::new_input (string str, string d, Sources *ss)
 {
   Includable_lexer::new_input (str, d, ss);
 }
 
 void
 Lily_lexer::new_input (string str, Sources *ss)
@@ skipping 17 matching lines @@
   if (scm_is_string (path))
     sym = scm_string_to_symbol (path);
   else if (scm_is_pair (path))
     {
       sym = scm_car (path);
       path = scm_cdr (path);
     }
 
   if (scm_is_symbol (sym))
     {
-     string symstr = ly_symbol2string (sym);
-     if (lookup_keyword (ly_symbol2string (sym)) >= 0)
-       {
-         warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
-       }
+      string symstr = ly_symbol2string (sym);
+      if (lookup_keyword (ly_symbol2string (sym)) >= 0)
+        {
+          warning (_f ("identifier name is a keyword: `%s'", symstr.c_str ()));
+        }
 
       SCM mod = scm_car (scopes_);
+
       if (scm_is_pair (path))
-       {
-         SCM prev = scm_module_lookup (mod, sym);
-         if (prev != SCM_UNDEFINED)
-           val = nested_property_alist (prev, path, val);
-       }
-    /* Do the equivalent of (define-public( sym val) */
+        {
+          SCM prev = scm_module_lookup (mod, sym);
+          if (prev != SCM_UNDEFINED)
+            val = nested_property_alist (prev, path, val);
+        }
+
+      /* Do the equivalent of (define-public( sym val) */
       scm_module_define (mod, sym, val);
       scm_c_export (symstr.c_str(), NULL);
     }
   else
     programming_error ("identifier is not a symbol");
 }
 
 void
 Lily_lexer::LexerError (char const *s)
 {
@@ skipping 38 matching lines @@
 
 /**
    Since we don't create the buffer state from the bytes directly, we
    don't know about the location of the lexer. Add this as a
    YY_USER_ACTION */
 void
 Lily_lexer::add_lexed_char (int count)
 {
   char const *start = here_str0 ();
   lexloc_->set (get_source_file (),
-                start, start + count);
+                start, start + count);
   char_count_stack_.back () += count;
 }
 
 #include "ly-smobs.icc"
 
 IMPLEMENT_SMOBS (Lily_lexer);
 IMPLEMENT_TYPE_P (Lily_lexer, "ly:lily-lexer?");
 IMPLEMENT_DEFAULT_EQUAL_P (Lily_lexer);
 
 SCM
@@ skipping 14 matching lines @@
 int
 Lily_lexer::print_smob (SCM s, SCM port, scm_print_state*)
 {
   Lily_lexer *lexer = Lily_lexer::unsmob (s);
 
   scm_puts ("#<Lily_lexer ", port);
   scm_display (lexer->scopes_, port);
   scm_puts (" >", port);
   return 1;
 }