Run fixcc + astyle2.02.

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 833fe6e1588fc7feea90375adfe1a16f18f06579..67b7bcac1fe7a473471cdf71be42d718d7eb5c37 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -120,9 +120,11 @@ Lily_parser::parse_file (string init, string name, string out_name)
      OUT_FILE (unless IN_FILE redefines output file name).  */
 
   SCM mod = lexer_->set_current_scope ();
-  do {
-    do_yyparse ();
-  } while (!lexer_->is_clean ());
+  do
+    {
+      do_yyparse ();
+    }
+  while (!lexer_->is_clean ());
 
   /*
     Don't mix cyclic pointers with weak tables.

diff --git a/lily/relocate.cc b/lily/relocate.cc
index 3b6a57b715c2e3fbbc06bc3a06676d3c8d581732..7408106d8bb8fce3c9c00e086ef768010d754985 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -212,9 +212,8 @@ setup_paths (char const *argv0_ptr)
           prefix_directory = bindir + "/" + FRAMEWORKDIR;
         }
 
-
       lilypond_datadir = prefix_directory
-                     + "/share/lilypond/" TOPLEVEL_VERSION;
+                         + "/share/lilypond/" TOPLEVEL_VERSION;
     }
 
   if (getenv ("LILYPONDPREFIX"))