replace SCM_ASSERT_TYPE with LY_ASSERT_TYPE and friends

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

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 868d2d11fb1f2620aaad23fa5f0117b76d70b5e0..b12e2664e649cd0338349757fe49e7c785ce9c4c 100644 (file)
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -32,7 +32,7 @@ LY_DEFINE (ly_find_file, "ly:find-file",
           "Return the absolute file name of @var{name}, "
           "or @code{#f} if not found.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, name);
 
   string nm = ly_scm2string (name);
   string file_name = global_path.find (nm);
@@ -51,11 +51,11 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file",
           "Read the file @var{name}, and return its contents in a string.  "
           "The file is looked up using the search path. ")
 {
-  SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, name);
   int sz = INT_MAX;
   if (size != SCM_UNDEFINED)
     {
-      SCM_ASSERT_TYPE (scm_is_number (size), size, SCM_ARG2, __FUNCTION__, "number");
+      LY_ASSERT_TYPE(scm_is_number, 2);
       sz = scm_to_int (size);
     }
   
@@ -68,7 +68,7 @@ LY_DEFINE (ly_error, "ly:error",
           "Scheme callable function to issue the error @code{msg}. "
           "The error is formatted with @code{format} and @code{rest}.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
   error (ly_scm2string (str));
   return SCM_UNSPECIFIED;
@@ -79,7 +79,7 @@ LY_DEFINE (ly_message, "ly:message",
           "Scheme callable function to issue the message @code{msg}. "
           "The message is formatted with @code{format} and @code{rest}.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
   message (ly_scm2string (str));
   return SCM_UNSPECIFIED;
@@ -90,7 +90,7 @@ LY_DEFINE (ly_progress, "ly:progress",
           "Scheme callable function to print progress @code{str}. "
           "The message is formatted with @code{format} and @code{rest}.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
   progress_indication (ly_scm2string (str));
   return SCM_UNSPECIFIED;
@@ -101,7 +101,7 @@ LY_DEFINE (ly_programming_error, "ly:programming-error",
           "Scheme callable function to issue the warning @code{msg}. "
           "The message is formatted with @code{format} and @code{rest}.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
   programming_error (ly_scm2string (str));
   return SCM_UNSPECIFIED;
@@ -112,7 +112,7 @@ LY_DEFINE (ly_warning, "ly:warning",
           "Scheme callable function to issue the warning @code{str}. "
           "The message is formatted with @code{format} and @code{rest}.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
   str = scm_simple_format (SCM_BOOL_F, str, rest);
   warning (ly_scm2string (str));
   return SCM_UNSPECIFIED;
@@ -152,9 +152,9 @@ LY_DEFINE (ly_string_substitute, "ly:string-substitute",
           3, 0, 0, (SCM a, SCM b, SCM s),
           "Replace @var{a} by @var{b} in @var{s}.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (a), s, SCM_ARG1, __FUNCTION__, "string");
-  SCM_ASSERT_TYPE (scm_is_string (b), s, SCM_ARG2, __FUNCTION__, "string");
-  SCM_ASSERT_TYPE (scm_is_string (s), s, SCM_ARG3, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, s);
+  LY_ASSERT_TYPE(scm_is_string, 2);
+  LY_ASSERT_TYPE(scm_is_string, 3);
 
   string ss = ly_scm2string (s);
   replace_all (ss, string (scm_i_string_chars (a)),
@@ -166,7 +166,7 @@ LY_DEFINE (ly_number_2_string, "ly:number->string",
           1, 0, 0, (SCM s),
           "Convert @var{num} to a string without generating many decimals.")
 {
-  SCM_ASSERT_TYPE (scm_is_number (s), s, SCM_ARG1, __FUNCTION__, "number");
+  LY_ASSERT_FIRST_TYPE(scm_is_number, s);
 
   char str[400];                       // ugh.
 
@@ -224,8 +224,7 @@ LY_DEFINE (ly_gettext, "ly:gettext",
           1, 0, 0, (SCM string),
           "Gettext wrapper.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1,
-                  __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, string);
   return ly_string2scm (_ (scm_i_string_chars (string)));
 }
 
@@ -257,7 +256,7 @@ LY_DEFINE (ly_wide_char_2_utf_8, "ly:wide-char->utf-8",
 {
   char buf[5];
 
-  SCM_ASSERT_TYPE (scm_is_integer (wc), wc, SCM_ARG1, __FUNCTION__, "integer");
+  LY_ASSERT_FIRST_TYPE(scm_is_integer, wc);
   unsigned wide_char = (unsigned) scm_to_int (wc);
   char *p = buf;
 
@@ -315,8 +314,7 @@ LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect",
           1, 1, 0, (SCM file_name, SCM mode),
           "Redirect stderr to FILE-NAME, opened with MODE.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (file_name), file_name, SCM_ARG1,
-                  __FUNCTION__, "file_name");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, file_name);
 
   string m = "w";
   if (mode != SCM_UNDEFINED && scm_string_p (mode))
@@ -348,8 +346,7 @@ LY_DEFINE (ly_camel_case_2_lisp_identifier, "ly:camel-case->lisp-identifier",
           1, 0, 0, (SCM name_sym),
           "Convert FooBar_Bla to foo-bar-bla style symbol.")
 {
-  SCM_ASSERT_TYPE(scm_is_symbol (name_sym), name_sym,
-                 SCM_ARG1, __FUNCTION__, "symbol");
+  LY_ASSERT_FIRST_TYPE(ly_is_symbol, name_sym);
   
   /*
     TODO: should use strings instead?
@@ -365,8 +362,7 @@ LY_DEFINE (ly_expand_environment, "ly:expand-environment",
           1, 0, 0, (SCM str),
           "Expand $VAR and $@{VAR@} in @var{str}.")
 {
-  SCM_ASSERT_TYPE(scm_is_string (str), str,
-                 SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
 
   return ly_string2scm (expand_environment_variables (ly_scm2string (str)));
 }
@@ -376,8 +372,7 @@ LY_DEFINE (ly_truncate_list_x, "ly:truncate-list!",
           2, 0, 0, (SCM lst, SCM i),
           "Take at most the first @var{i} of list @var{lst}")
 {
-  SCM_ASSERT_TYPE(scm_is_integer (i), i,
-                 SCM_ARG1, __FUNCTION__, "integer");
+  LY_ASSERT_FIRST_TYPE(scm_is_integer, i);
 
   int k = scm_to_int (i);
   if (k == 0)
@@ -432,7 +427,7 @@ LY_DEFINE (ly_format, "ly:format",
           1, 0, 1, (SCM str, SCM rest),
           "LilyPond specific format, supporting ~a ~[0-9]f.")
 {
-  SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+  LY_ASSERT_FIRST_TYPE(scm_is_string, str);
 
   string format = ly_scm2string (str);
   vector<string> results;