Docs: compile fix.

[lilypond.git] / lily / lily-parser-scheme.cc

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 45c61898f23277fd453d3cfcca69c2107823a951..7dfeab6057b7dd4e12799e90b401a3c62b3de0c6 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <unistd.h>
@@ -33,10 +33,10 @@ LY_DEFINE (ly_set_point_and_click, "ly:set-point-and-click",
 
 LY_DEFINE (ly_parse_file, "ly:parse-file",
           1, 0, 0, (SCM name),
-          "Parse a single @code{.ly} file.  "
-          "Upon failure, throw @code{ly-file-failed} key.")
+          "Parse a single @code{.ly} file."
+          "  Upon failure, throw @code{ly-file-failed} key.")
 {
-  LY_ASSERT_FIRST_TYPE(scm_is_string, name);
+  LY_ASSERT_TYPE (scm_is_string, name, 1);
   string file = ly_scm2string (name);
   char const *extensions[] = {"ly", "", 0};
 
@@ -47,35 +47,27 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
      file name.  */
   File_name out_file_name (file_name);
 
-  global_path.append (out_file_name.dir_);
-
   out_file_name.ext_ = "";
   out_file_name.root_ = "";
-  out_file_name.dir_ = "";
-
+  if (ly_get_option (ly_symbol2scm ("gui")) != SCM_BOOL_T
+      && ly_get_option (ly_symbol2scm ("strip-output-dir")) == SCM_BOOL_T) {
+    out_file_name.dir_ = "";
+  }
+  
   /* When running from gui, generate output in .ly source directory.  */
-  if (output_name_global.empty ()
-      && ly_get_option (ly_symbol2scm ("gui")) == SCM_BOOL_T)
+  string output_name = output_name_global;
+  if (!output_name.empty ())
     {
-      File_name f (file);
-      f.base_ = "";
-      f.ext_ = "";
-      output_name_global = f.to_string ();
-    }
-
-  if (!output_name_global.empty ())
-    {
-      
       /* Interpret --output=DIR to mean --output=DIR/BASE.  */
       string dir;
-      if (is_dir (output_name_global))
+      if (is_dir (output_name))
        {
-         dir = output_name_global;
-         output_name_global = "";
+         dir = output_name;
+         output_name = "";
        }
       else
        {
-         File_name out (output_name_global);
+         File_name out (output_name);
          if (is_dir (out.dir_part ()))
            {
              dir = out.dir_part ();
@@ -91,7 +83,7 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
          chdir (dir.c_str ());
        }
       else
-       out_file_name = File_name (output_name_global);
+       out_file_name = File_name (output_name);
     }
 
   string init;
@@ -101,7 +93,6 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
     init = "init.ly";
 
   string out_file = out_file_name.to_string ();
-
   if (init.length () && global_path.find (init).empty ())
     {
       warning (_f ("cannot find init file: `%s'", init));
@@ -160,7 +151,7 @@ LY_DEFINE (ly_parser_clone, "ly:parser-clone",
           1, 0, 0, (SCM parser_smob),
           "Return a clone of @var{parser-smob}.")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser_smob);
+  LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
   Lily_parser *clone = new Lily_parser (*parser);
 
@@ -172,10 +163,10 @@ LY_DEFINE (ly_parser_define_x, "ly:parser-define!",
           "Bind @var{symbol} to @var{val} in @var{parser-smob}'s module.")
 {
   
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser_smob);
+  LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
 
-  LY_ASSERT_TYPE (ly_is_symbol, 2);
+  LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
     
   parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val);
   return SCM_UNSPECIFIED;
@@ -183,14 +174,14 @@ LY_DEFINE (ly_parser_define_x, "ly:parser-define!",
 
 LY_DEFINE (ly_parser_lookup, "ly:parser-lookup",
           2, 0, 0, (SCM parser_smob, SCM symbol),
-          "Lookup @var{symbol} in @var{parser-smob}'s module.  "
-          "Undefined is '().")
+          "Look up @var{symbol} in @var{parser-smob}'s module."
+          "  Return @code{'()} if not defined.")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser_smob);
+  LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
 
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
  
-  LY_ASSERT_TYPE (ly_is_symbol, 2);
+  LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
 
   SCM val = parser->lexer_->lookup_identifier (ly_scm2string (scm_symbol_to_string (symbol)));
   if (val != SCM_UNDEFINED)
@@ -201,12 +192,12 @@ LY_DEFINE (ly_parser_lookup, "ly:parser-lookup",
 
 LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string",
           2, 0, 0, (SCM parser_smob, SCM ly_code),
-          "Parse the string @code{ly-code} with @code{parser-smob}."
-          "Upon failure, throw @code{ly-file-failed} key.")
+          "Parse the string @var{ly-code} with @var{parser-smob}."
+          "  Upon failure, throw @code{ly-file-failed} key.")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser_smob);
+  LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob); 
-  LY_ASSERT_TYPE(scm_is_string, 2);
+  LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
 
   parser->parse_string (ly_scm2string (ly_code));
 
@@ -215,11 +206,11 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string",
 
 LY_DEFINE (ly_parser_set_note_names, "ly:parser-set-note-names",
           2, 0, 0, (SCM parser, SCM names),
-          "Replace current note names in @var{parser}. "
-          "@var{names} is an alist of symbols.  "
-          "This only has effect if the current mode is notes.")
+          "Replace current note names in @var{parser}."
+          "  @var{names} is an alist of symbols.  This only has effect"
+          " if the current mode is notes.")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser);
+  LY_ASSERT_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
 
   if (p->lexer_->is_note_state ())
@@ -235,7 +226,7 @@ LY_DEFINE (ly_parser_output_name, "ly:parser-output-name",
           1, 0, 0, (SCM parser),
           "Return the base name of the output file.")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser);
+  LY_ASSERT_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
 
   return ly_string2scm (p->output_basename_);
@@ -243,12 +234,12 @@ LY_DEFINE (ly_parser_output_name, "ly:parser-output-name",
 
 LY_DEFINE (ly_parser_error, "ly:parser-error",
           2, 1, 0, (SCM parser, SCM msg, SCM input),
-          "Display an error message, and make the parser fail")
+          "Display an error message and make the parser fail.")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser);
+  LY_ASSERT_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
   
-  LY_ASSERT_TYPE(scm_is_string, 2);
+  LY_ASSERT_TYPE (scm_is_string, msg, 2);
   string s = ly_scm2string (msg);
   
   Input *i = unsmob_input (input);
@@ -264,7 +255,7 @@ LY_DEFINE (ly_parser_clear_error, "ly:parser-clear-error",
           1, 0, 0, (SCM parser),
           "Clear the error flag for the parser.")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser);
+  LY_ASSERT_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
   
 
@@ -278,7 +269,7 @@ LY_DEFINE (ly_parser_has_error_p, "ly:parser-has-error?",
           1, 0, 0, (SCM parser),
           "Does @var{parser} have an error flag?")
 {
-  LY_ASSERT_FIRST_SMOB (Lily_parser, parser);
+  LY_ASSERT_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
 
   return scm_from_bool (p->error_level_ || p->lexer_->error_level_);