summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libguile/ChangeLog8
-rw-r--r--libguile/eval.c10
-rw-r--r--libguile/evalext.c9
-rw-r--r--libguile/gc.c5
4 files changed, 11 insertions, 21 deletions
diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 28aaf6e22..65c3d9ff1 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,5 +1,13 @@
2000-09-22 Dirk Herrmann <D.Herrmann@tu-bs.de>
+ * 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 <D.Herrmann@tu-bs.de>
+
* backtrace.c (display_frame_expr), environments.c
(print_observer, print_leaf_environment, print_eval_environment,
print_import_environment, print_export_environment), gh_data.c
diff --git a/libguile/eval.c b/libguile/eval.c
index effa23b56..eb10b3459 100644
--- a/libguile/eval.c
+++ b/libguile/eval.c
@@ -900,16 +900,6 @@ scm_m_define (SCM x, SCM env)
}
#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);
diff --git a/libguile/evalext.c b/libguile/evalext.c
index f358bca99..124320503 100644
--- a/libguile/evalext.c
+++ b/libguile/evalext.c
@@ -134,15 +134,6 @@ scm_m_undefine (SCM x, SCM env)
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);
diff --git a/libguile/gc.c b/libguile/gc.c
index 0463cba46..d9d8dc890 100644
--- a/libguile/gc.c
+++ b/libguile/gc.c
@@ -1650,10 +1650,11 @@ scm_gc_sweep ()
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);