X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-parser-scheme.cc;h=fbeb7db5072d0f3aef51382291f377ed7e92dc11;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=8bc7ca0abc2726d697436c685154ff62ff035119;hpb=c8f344d88d0a18834e4ae0f38539fe264c37aa7d;p=lilypond.git

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index 8bc7ca0abc..fbeb7db507 100644
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -3,13 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include <unistd.h>
 
 #include "lily-parser.hh"
-6
+
 #include "file-name-map.hh"
 #include "file-name.hh"
 #include "file-path.hh"
@@ -18,7 +18,7 @@
 #include "ly-module.hh"
 #include "main.hh"
 #include "program-option.hh"
-#include "source.hh"
+#include "sources.hh"
 #include "warn.hh"
 
 /* Do not append `!' suffix, since 1st argument is not modified. */
@@ -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.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_TYPE (scm_is_string, name, 1);
   string file = ly_scm2string (name);
   char const *extensions[] = {"ly", "", 0};
 
@@ -51,31 +51,25 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
 
   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 +85,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 +95,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));
@@ -138,31 +131,15 @@ LY_DEFINE (ly_parse_file, "ly:parse-file",
 
   /*
     outside the if-else to ensure cleanup fo Sources object, 
-   */
+  */
   if (error)
     /* TODO: pass renamed input file too.  */
     scm_throw (ly_symbol2scm ("ly-file-failed"),
-	       scm_list_1 (scm_makfrom0str (file_name.c_str ())));
+	       scm_list_1 (ly_string2scm (file_name)));
   
   return SCM_UNSPECIFIED;
 }
 
-LY_DEFINE (ly_parse_string, "ly:parse-string",
-	   1, 0, 0, (SCM ly_code),
-	   "Parse the string LY_CODE.  "
-	   "Upon failure, throw @code{ly-file-failed} key.")
-{
-  SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG1, __FUNCTION__, "string");
-
-  Sources sources;
-  sources.set_path (&global_path);
-  Lily_parser *parser = new Lily_parser (&sources);
-  parser->parse_string (ly_scm2string (ly_code));
-  parser->unprotect ();
-  parser = 0;
-
-  return SCM_UNSPECIFIED;
-}
 
 LY_DEFINE (ly_parser_lexer, "ly:parser-lexer",
 	   1, 0, 0, (SCM parser_smob),
@@ -176,33 +153,37 @@ LY_DEFINE (ly_parser_clone, "ly:parser-clone",
 	   1, 0, 0, (SCM parser_smob),
 	   "Return a clone of @var{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);
 
   return clone->unprotect ();
 }
 
-LY_DEFINE (ly_parser_define, "ly:parser-define!",
+LY_DEFINE (ly_parser_define_x, "ly:parser-define!",
 	   3, 0, 0, (SCM parser_smob, SCM symbol, SCM val),
 	   "Bind @var{symbol} to @var{val} in @var{parser-smob}'s module.")
 {
+  
+  LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
   Lily_parser *parser = unsmob_lily_parser (parser_smob);
-  SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");
 
+  LY_ASSERT_TYPE (ly_is_symbol, symbol, 2);
+    
   parser->lexer_->set_identifier (scm_symbol_to_string (symbol), val);
   return SCM_UNSPECIFIED;
 }
 
 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.")
 {
-  Lily_parser *parser = unsmob_lily_parser (parser_smob);
+  LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
 
-  SCM_ASSERT_TYPE (scm_is_symbol (symbol), symbol, SCM_ARG2, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG2, __FUNCTION__, "parser");
+  Lily_parser *parser = unsmob_lily_parser (parser_smob);
+ 
+  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)
@@ -213,13 +194,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.")
 {
-  Lily_parser *parser = unsmob_lily_parser (parser_smob);
-
-  SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "parser");
-  SCM_ASSERT_TYPE (scm_is_string (ly_code), ly_code, SCM_ARG2, __FUNCTION__, "string");
+  LY_ASSERT_SMOB (Lily_parser, parser_smob, 1);
+  Lily_parser *parser = unsmob_lily_parser (parser_smob); 
+  LY_ASSERT_TYPE (scm_is_string, ly_code, 2);
 
   parser->parse_string (ly_scm2string (ly_code));
 
@@ -228,12 +208,12 @@ 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_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
-  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
   if (p->lexer_->is_note_state ())
     {
@@ -248,19 +228,20 @@ 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_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
-  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
-  return scm_makfrom0str (p->output_basename_.c_str ());
+  return ly_string2scm (p->output_basename_);
 }
 
 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_SMOB (Lily_parser, parser, 1);
   Lily_parser *p = unsmob_lily_parser (parser);
-  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
-  SCM_ASSERT_TYPE (scm_is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string");
+  
+  LY_ASSERT_TYPE (scm_is_string, msg, 2);
   string s = ly_scm2string (msg);
   
   Input *i = unsmob_input (input);
@@ -271,3 +252,27 @@ LY_DEFINE (ly_parser_error, "ly:parser-error",
 
   return parser;
 }
+
+LY_DEFINE (ly_parser_clear_error, "ly:parser-clear-error",
+	   1, 0, 0, (SCM parser),
+	   "Clear the error flag for the parser.")
+{
+  LY_ASSERT_SMOB (Lily_parser, parser, 1);
+  Lily_parser *p = unsmob_lily_parser (parser);
+  
+
+  p->error_level_ = 0;
+  p->lexer_->error_level_ = 0;
+  
+  return SCM_UNSPECIFIED;
+}
+
+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_SMOB (Lily_parser, parser, 1);
+  Lily_parser *p = unsmob_lily_parser (parser);
+
+  return scm_from_bool (p->error_level_ || p->lexer_->error_level_);
+}