[Guile-commits] GNU Guile branch, master, updated. v2.1.0-545-g61989c7

[Mark H Weaver]

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=61989c705359c50c61d7f52392f244d386218298

The branch, master has been updated
       via  61989c705359c50c61d7f52392f244d386218298 (commit)
       via  e0096e479894acac139f0047eae0f89a4e6bf4c2 (commit)
       via  97dd74c00e40271dd4bcfefec5957bab71793066 (commit)
       via  2bbdd2ce1c11ba05a6b6a508f7a91c5ca7392492 (commit)
       via  70057f3408f8bb469941fa3ab497076ec8f2a117 (commit)
       via  e54c7dd67cd299e248c544caf330587915cc95a0 (commit)
       via  60ce72b9b9b230cb7dfafebdfba04ca318c8fb47 (commit)
       via  7cfcb60bc16263ee48323781a57b1007a27380d0 (commit)
      from  812c83d48b38240d4c6c61c3ba89ea67a44efd42 (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 61989c705359c50c61d7f52392f244d386218298
Merge: e0096e4 97dd74c
Author: Mark H Weaver <address@hidden>
Date:   Thu Dec 12 23:44:46 2013 -0500

    Merge branch 'stable-2.0'
    
    Conflicts:
        libguile/pairs.c
        libguile/vm.c
        test-suite/tests/control.test

commit e0096e479894acac139f0047eae0f89a4e6bf4c2
Author: Tom Tromey <address@hidden>
Date:   Tue Dec 10 07:43:33 2013 -0700

    Remove unused function scm_i_tag_name.
    
    * libguile/gc.c (scm_i_tag_name): Remove.

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

Summary of changes:
 configure.ac       |    9 +++--
 doc/ref/goops.texi |    6 ++--
 libguile/gc.c      |   78 ----------------------------------------------
 libguile/pairs.c   |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 94 insertions(+), 86 deletions(-)

diff --git a/configure.ac b/configure.ac
index 92dcb1e..34c4aa4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1526,10 +1526,11 @@ AC_SUBST(GCC_CFLAGS)
 GUILE_GNU_LD_RELRO
 
 
-## If we're creating a shared library (using libtool!), then we'll
-## need to generate a list of .lo files corresponding to the .o files
-## given in LIBOBJS.  We'll call it LIBLOBJS.
-LIBLOBJS="`echo ${LIB@&address@hidden | sed 's,\.[[^.]]* ,.lo 
,g;s,\.[[^.]]*$,.lo,'`"
+LIBLOBJS=""
+for file in $LIBOBJS; do
+  file=`echo "$file" | sed 's,\.[[^.]]*$,.lo,'`
+  LIBLOBJS="$LIBLOBJS libguile_${GUILE_EFFECTIVE_VERSION}_la-$file"
+done
 
 ## We also need to create corresponding .doc and .x files
 EXTRA_DOT_DOC_FILES="`echo ${LIB@&address@hidden | sed 's,\.[[^.]]* ,.doc 
,g;s,\.[[^.]]*$,.doc,'`"
diff --git a/doc/ref/goops.texi b/doc/ref/goops.texi
index bc04985..ce0b76b 100644
--- a/doc/ref/goops.texi
+++ b/doc/ref/goops.texi
@@ -1941,13 +1941,13 @@ which in turn expands to:
 
 @example
 (define <my-class>
-  (make <class> #:supers (list <object>) #:slots slots))
+  (make <class> #:dsupers (list <object>) #:slots slots))
 @end example
 
 As this expansion makes clear, the resulting value of @code{<my-class>}
 is an instance of the class @code{<class>} with slot values specifying
 the superclasses and slot definitions for the class @code{<my-class>}.
-(@code{#:supers} and @code{#:slots} are initialization keywords for the
+(@code{#:dsupers} and @code{#:slots} are initialization keywords for the
 @code{dsupers} and @code{dslots} slots of the @code{<class>} class.)
 
 Now suppose that you want to define a new class with a metaclass other
@@ -1964,7 +1964,7 @@ and Guile expands @emph{this} to something like:
 
 @example
 (define <my-class2>
-  (make <my-metaclass> #:supers (list <object>) #:slots slots))
+  (make <my-metaclass> #:dsupers (list <object>) #:slots slots))
 @end example
 
 In this case, the value of @code{<my-class2>} is an instance of the more
diff --git a/libguile/gc.c b/libguile/gc.c
index 4ec57aa..7015af9 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -848,84 +848,6 @@ scm_gc_register_allocation (size_t size)
 
 
 
-
-static char const *
-scm_i_tag_name (scm_t_bits tag)
-{
-  switch (tag & 0x7f) /* 7 bits */
-    {
-    case scm_tcs_struct:
-      return "struct";
-    case scm_tcs_cons_imcar:
-      return "cons (immediate car)";
-    case scm_tcs_cons_nimcar:
-      return "cons (non-immediate car)";
-    case scm_tc7_pointer:
-      return "foreign";
-    case scm_tc7_hashtable:
-      return "hashtable";
-    case scm_tc7_weak_set:
-      return "weak-set";
-    case scm_tc7_weak_table:
-      return "weak-table";
-    case scm_tc7_fluid:
-      return "fluid";
-    case scm_tc7_dynamic_state:
-      return "dynamic state";
-    case scm_tc7_frame:
-      return "frame";
-    case scm_tc7_vm_cont:
-      return "vm continuation";
-    case scm_tc7_wvect:
-      return "weak vector";
-    case scm_tc7_vector:
-      return "vector";
-    case scm_tc7_number:
-      switch (tag)
-       {
-       case scm_tc16_real:
-         return "real";
-         break;
-       case scm_tc16_big:
-         return "bignum";
-         break;
-       case scm_tc16_complex:
-         return "complex number";
-         break;
-       case scm_tc16_fraction:
-         return "fraction";
-         break;
-       }
-      break;
-    case scm_tc7_string:
-      return "string";
-      break;
-    case scm_tc7_stringbuf:
-      return "string buffer";
-      break;
-    case scm_tc7_symbol:
-      return "symbol";
-      break;
-    case scm_tc7_variable:
-      return "variable";
-      break;
-    case scm_tc7_port:
-      return "port";
-      break;
-    case scm_tc7_smob:
-      {
-        int k = 0xff & (tag >> 8);
-        return (scm_smobs[k].name);
-      }
-      break; 
-    }
-
-  return NULL;
-}
-
-
-
-
 void
 scm_init_gc ()
 {
diff --git a/libguile/pairs.c b/libguile/pairs.c
index 1a3c5a1..764458e 100644
--- a/libguile/pairs.c
+++ b/libguile/pairs.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995,1996,2000,2001, 2004, 2005, 2006, 2008, 2009, 2011, 2012 
Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,2000,2001, 2004, 2005, 2006, 2008, 2009,
+ *   2011, 2012, 2013 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -132,117 +133,201 @@ SCM_DEFINE (scm_set_cdr_x, "set-cdr!", 2, 0, 0,
 
 
 SCM_DEFINE (scm_cddr, "cddr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cddr
 {
   CHASE_PAIRS (x, "cddr", 0x0a); /* 00001010 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdar, "cdar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdar
 {
   CHASE_PAIRS (x, "cdar", 0x0b); /* 00001011 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cadr, "cadr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cadr
 {
   CHASE_PAIRS (x, "cadr", 0x0e); /* 00001110 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caar, "caar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caar
 {
   CHASE_PAIRS (x, "caar", 0x0f); /* 00001111 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdddr, "cdddr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdddr
 {
   CHASE_PAIRS (x, "cdddr", 0x2a); /* 00101010 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cddar, "cddar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cddar
 {
   CHASE_PAIRS (x, "cddar", 0x2b); /* 00101011 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdadr, "cdadr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdadr
 {
   CHASE_PAIRS (x, "cdadr", 0x2e); /* 00101110 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdaar, "cdaar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdaar
 {
   CHASE_PAIRS (x, "cdaar", 0x2f); /* 00101111 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caddr, "caddr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caddr
 {
   CHASE_PAIRS (x, "caddr", 0x3a); /* 00111010 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cadar, "cadar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cadar
 {
   CHASE_PAIRS (x, "cadar", 0x3b); /* 00111011 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caadr, "caadr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caadr
 {
   CHASE_PAIRS (x, "caadr", 0x3e); /* 00111110 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caaar, "caaar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caaar
 {
   CHASE_PAIRS (x, "caaar", 0x3f); /* 00111111 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cddddr, "cddddr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cddddr
 {
   CHASE_PAIRS (x, "cddddr", 0xaa); /* 10101010 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdddar, "cdddar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdddar
 {
   CHASE_PAIRS (x, "cdddar", 0xab); /* 10101011 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cddadr, "cddadr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cddadr
 {
   CHASE_PAIRS (x, "cddadr", 0xae); /* 10101110 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cddaar, "cddaar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cddaar
 {
   CHASE_PAIRS (x, "cddaar", 0xaf); /* 10101111 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdaddr, "cdaddr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdaddr
 {
   CHASE_PAIRS (x, "cdaddr", 0xba); /* 10111010 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdadar, "cdadar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdadar
 {
   CHASE_PAIRS (x, "cdadar", 0xbb); /* 10111011 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdaadr, "cdaadr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdaadr
 {
   CHASE_PAIRS (x, "cdaadr", 0xbe); /* 10111110 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cdaaar, "cdaaar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cdaaar
 {
   CHASE_PAIRS (x, "cdaaar", 0xbf); /* 10111111 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cadddr, "cadddr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cadddr
 {
   CHASE_PAIRS (x, "cadddr", 0xea); /* 11101010 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caddar, "caddar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caddar
 {
   CHASE_PAIRS (x, "caddar", 0xeb); /* 11101011 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cadadr, "cadadr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cadadr
 {
   CHASE_PAIRS (x, "cadadr", 0xee); /* 11101110 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_cadaar, "cadaar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_cadaar
 {
   CHASE_PAIRS (x, "cadaar", 0xef); /* 11101111 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caaddr, "caaddr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caaddr
 {
   CHASE_PAIRS (x, "caaddr", 0xfa); /* 11111010 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caadar, "caadar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caadar
 {
   CHASE_PAIRS (x, "caadar", 0xfb); /* 11111011 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caaadr, "caaadr", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caaadr
 {
   CHASE_PAIRS (x, "caaadr", 0xfe); /* 11111110 */
 }
+#undef FUNC_NAME
+
 SCM_DEFINE (scm_caaaar, "caaaar", 1, 0, 0, (SCM x), "")
+#define FUNC_NAME s_scm_caaaar
 {
   CHASE_PAIRS (x, "caaaar", 0xff); /* 11111111 */
 }
+#undef FUNC_NAME
+
 
 
 


hooks/post-receive
-- 
GNU Guile