guile/guile-core/libguile ChangeLog eval.c eval...

[Dirk Herrmann]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Dirk Herrmann <address@hidden>  00/09/22 10:43:57

Modified files:
        guile-core/libguile: ChangeLog eval.c evalext.c gc.c 

Log message:
        * Eliminated some more calls to SCM_CHARS.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/ChangeLog.diff?r1=1.1117&r2=1.1118
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/eval.c.diff?r1=1.172&r2=1.173
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/evalext.c.diff?r1=1.26&r2=1.27
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/libguile/gc.c.diff?r1=1.154&r2=1.155

Patches:
Index: guile/guile-core/libguile/ChangeLog
diff -u guile/guile-core/libguile/ChangeLog:1.1117 
guile/guile-core/libguile/ChangeLog:1.1118
--- guile/guile-core/libguile/ChangeLog:1.1117  Fri Sep 22 10:17:54 2000
+++ guile/guile-core/libguile/ChangeLog Fri Sep 22 10:43:57 2000
@@ -1,5 +1,13 @@
 2000-09-22  Dirk Herrmann  <address@hidden>
 
+       * eval.c (scm_m_define), evalext.c (scm_m_undefine):  Removed dead
+       code.
+
+       * gc.c (scm_gc_sweep):  Use SCM_STRING_CHARS or SCM_SYMBOL_CHARS
+       instead of SCM_CHARS.
+
+2000-09-22  Dirk Herrmann  <address@hidden>
+
        * backtrace.c (display_frame_expr), environments.c
        (print_observer, print_leaf_environment, print_eval_environment,
        print_import_environment, print_export_environment), gh_data.c
Index: guile/guile-core/libguile/eval.c
diff -u guile/guile-core/libguile/eval.c:1.172 
guile/guile-core/libguile/eval.c:1.173
--- guile/guile-core/libguile/eval.c:1.172      Tue Sep 12 05:30:36 2000
+++ guile/guile-core/libguile/eval.c    Fri Sep 22 10:43:57 2000
@@ -900,16 +900,6 @@
        }
 #endif
       arg1 = scm_sym2vcell (proc, scm_env_top_level (env), SCM_BOOL_T);
-#if 0
-#ifndef SCM_RECKLESS
-      if (SCM_NIMP (SCM_CDR (arg1)) && (SCM_SNAME (SCM_CDR (arg1)) == proc)
-         && (SCM_CDR (arg1) != x))
-       scm_warn ("redefining built-in ", SCM_CHARS (proc));
-      else
-#endif
-      if (5 <= scm_verbose && SCM_UNDEFINED != SCM_CDR (arg1))
-       scm_warn ("redefining ", SCM_CHARS (proc));
-#endif
       SCM_SETCDR (arg1, x);
 #ifdef SICP
       return scm_cons2 (scm_sym_quote, SCM_CAR (arg1), SCM_EOL);
Index: guile/guile-core/libguile/evalext.c
diff -u guile/guile-core/libguile/evalext.c:1.26 
guile/guile-core/libguile/evalext.c:1.27
--- guile/guile-core/libguile/evalext.c:1.26    Fri Aug 11 01:43:08 2000
+++ guile/guile-core/libguile/evalext.c Fri Sep 22 10:43:57 2000
@@ -134,15 +134,6 @@
   arg1 = scm_sym2vcell (x, scm_env_top_level (env), SCM_BOOL_F);
   SCM_ASSYNT (SCM_NFALSEP (arg1) && !SCM_UNBNDP (SCM_CDR (arg1)),
              x, "variable already unbound ", s_undefine);
-#if 0
-#ifndef SCM_RECKLESS
-  if (SCM_NIMP (SCM_CDR (arg1)) && ((SCM) SCM_SNAME (SCM_CDR (arg1)) == x))
-    scm_warn ("undefining built-in ", SCM_CHARS (x));
-  else
-#endif
-    if (5 <= scm_verbose && SCM_UNDEFINED != SCM_CDR (arg1))
-      scm_warn ("redefining ", SCM_CHARS (x));
-#endif
   SCM_SETCDR (arg1, SCM_UNDEFINED);
 #ifdef SICP
   return SCM_CAR (arg1);
Index: guile/guile-core/libguile/gc.c
diff -u guile/guile-core/libguile/gc.c:1.154 
guile/guile-core/libguile/gc.c:1.155
--- guile/guile-core/libguile/gc.c:1.154        Tue Sep 12 05:30:36 2000
+++ guile/guile-core/libguile/gc.c      Fri Sep 22 10:43:57 2000
@@ -1650,10 +1650,11 @@
              break;
            case scm_tc7_string:
              m += SCM_HUGE_LENGTH (scmptr) + 1;
-             goto freechars;
+             scm_must_free (SCM_STRING_CHARS (scmptr));
+             break;
            case scm_tc7_symbol:
              m += SCM_LENGTH (scmptr) + 1;
-             scm_must_free (SCM_CHARS (scmptr));
+             scm_must_free (SCM_SYMBOL_CHARS (scmptr));
              break;
            case scm_tc7_contin:
              m += SCM_LENGTH (scmptr) * sizeof (SCM_STACKITEM) + sizeof 
(scm_contregs);