Merge commit 'b5cba4f'

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

diff --git a/lily/lily-parser-scheme.cc b/lily/lily-parser-scheme.cc
index ca1d224bd6ac7703f7d8f54b64434fe4102965ee..1631c4a3daa85036b1089bfe62377af3578af684 100644 (file)
--- a/lily/lily-parser-scheme.cc
+++ b/lily/lily-parser-scheme.cc
@@ -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};
 
@@ -138,7 +138,7 @@ 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"),
@@ -160,33 +160,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)
@@ -197,13 +201,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));
 
@@ -212,12 +215,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 ())
     {
@@ -232,19 +235,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 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);
@@ -260,8 +264,9 @@ 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);
-  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
+  
 
   p->error_level_ = 0;
   p->lexer_->error_level_ = 0;
@@ -273,8 +278,8 @@ 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);
-  SCM_ASSERT_TYPE (p, parser, SCM_ARG1, __FUNCTION__, "Lilypond parser");
 
   return scm_from_bool (p->error_level_ || p->lexer_->error_level_);
 }