guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-120-gc60e6


From: Andy Wingo
Subject: [Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.3-120-gc60e6ed
Date: Sun, 08 Jan 2012 16:55:25 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=c60e6ed4b855cb451b45fbba7e19e714d20be466

The branch, stable-2.0 has been updated
       via  c60e6ed4b855cb451b45fbba7e19e714d20be466 (commit)
       via  fb2be758b76ea0ede398ed9a7f559d96d806c50e (commit)
      from  20c360b298dd9d29d0b1a6301f43ff6da4968908 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c60e6ed4b855cb451b45fbba7e19e714d20be466
Author: Andy Wingo <address@hidden>
Date:   Sun Jan 8 17:55:01 2012 +0100

    no need to warn people off of s_FOO generated by SCM_DEFINE
    
    * doc/ref/libguile-snarf.texi (Function Snarfing): The s_FOO binding
      isn't deprecated; no need to warn people to stop using it.  Thanks to
      Peter Brett for the hint.

commit fb2be758b76ea0ede398ed9a7f559d96d806c50e
Author: Andy Wingo <address@hidden>
Date:   Sun Jan 8 16:37:22 2012 +0100

    allow scm_display_error to use a stack as the first argument
    
    * libguile/backtrace.c (scm_display_error): Allow a deprecated use of
      this function to pass a stack as the first argument.  Thanks to Peter
      Brett for pointing it out, in
      http://lists.gnu.org/archive/html/guile-user/2011-06/msg00000.html.

-----------------------------------------------------------------------

Summary of changes:
 doc/ref/libguile-snarf.texi |   10 +++++-----
 libguile/backtrace.c        |   13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/doc/ref/libguile-snarf.texi b/doc/ref/libguile-snarf.texi
index b295270..c70727f 100644
--- a/doc/ref/libguile-snarf.texi
+++ b/doc/ref/libguile-snarf.texi
@@ -1,6 +1,6 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Guile Reference Manual.
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004
address@hidden Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2012
 @c   Free Software Foundation, Inc.
 @c See the file guile.texi for copying conditions.
 
@@ -82,10 +82,10 @@ The @code{SCM_DEFINE} declaration says that the C function
 rest argument.  The string @code{"Clear the image."} provides a short
 help text for the function, it is called a @dfn{docstring}.
 
-For historical reasons, the @code{SCM_DEFINE} macro also defines a
-static array of characters named @code{s_clear_image}, initialized to
-the string "clear-image".  You shouldn't use this array, but you might
-need to be aware that it exists.
address@hidden macro also defines a static array of characters
+initialized to the Scheme name of the function.  In this case,
address@hidden is set to the C string, "clear-image".  You might
+want to use this symbol when generating error messages.
 
 Assuming the text above lives in a file named @file{image-type.c}, you
 will need to execute the following command to prepare this file for
diff --git a/libguile/backtrace.c b/libguile/backtrace.c
index db22c17..7dd66ad 100644
--- a/libguile/backtrace.c
+++ b/libguile/backtrace.c
@@ -144,6 +144,19 @@ SCM_DEFINE (scm_display_error, "display-error", 6, 0, 0,
 {
   SCM_VALIDATE_OUTPUT_PORT (2, port);
 
+#if SCM_ENABLE_DEPRECATED
+  if (SCM_STACKP (frame))
+    {
+      scm_c_issue_deprecation_warning
+        ("Passing a stack as the first argument to `scm_display_error' is "
+         "deprecated.  Pass a frame instead.");
+      if (SCM_STACK_LENGTH (frame))
+        frame = scm_stack_ref (frame, SCM_INUM0);
+      else
+        frame = SCM_BOOL_F;
+    }
+#endif
+
   scm_i_display_error (frame, port, subr, message, args, rest);
 
   return SCM_UNSPECIFIED;


hooks/post-receive
-- 
GNU Guile



reply via email to

[Prev in Thread] Current Thread [Next in Thread]