From 3ce4544cfa84d6fd9c025ad2afeab6af22c25680 Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Sun, 27 Aug 2000 03:20:55 +0000 Subject: [PATCH] * objects.c (scm_init_objects), print.c (scm_init_print), struct.c (scm_init_struct): First arg to scm_make_vtable_vtable should be a string, not a symbol. (`make-vtable-vtable' needs to append this string to another string and then pass it through `make-struct-layout'.) --- libguile/objects.c | 6 ++---- libguile/print.c | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/libguile/objects.c b/libguile/objects.c index 568e25a9e..b8c6ac0dd 100644 --- a/libguile/objects.c +++ b/libguile/objects.c @@ -468,13 +468,11 @@ void scm_init_objects () { SCM ms = scm_makfrom0str (SCM_METACLASS_STANDARD_LAYOUT); - SCM ml = scm_make_struct_layout (ms); - SCM mt = scm_make_vtable_vtable (ml, SCM_INUM0, + SCM mt = scm_make_vtable_vtable (ms, SCM_INUM0, SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL)); SCM os = scm_makfrom0str (SCM_METACLASS_OPERATOR_LAYOUT); - SCM ol = scm_make_struct_layout (os); - SCM ot = scm_make_vtable_vtable (ol, SCM_INUM0, + SCM ot = scm_make_vtable_vtable (os, SCM_INUM0, SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL)); SCM es = scm_makfrom0str (SCM_ENTITY_LAYOUT); diff --git a/libguile/print.c b/libguile/print.c index 225a81bcd..5b3e35e69 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -1113,9 +1113,7 @@ scm_init_print () SCM vtable, layout, type; scm_init_opts (scm_print_options, scm_print_opts, SCM_N_PRINT_OPTIONS); - vtable = scm_make_vtable_vtable (scm_make_struct_layout (scm_nullstr), - SCM_INUM0, - SCM_EOL); + vtable = scm_make_vtable_vtable (scm_nullstr, SCM_INUM0, SCM_EOL); layout = scm_make_struct_layout (scm_makfrom0str (SCM_PRINT_STATE_LAYOUT)); type = scm_make_struct (vtable, SCM_INUM0, SCM_LIST1 (layout)); scm_set_struct_vtable_name_x (type, SCM_CAR (scm_intern0 ("print-state")));