1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-02 04:40:29 +02:00

* 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'.)
This commit is contained in:
Mikael Djurfeldt 2000-08-27 03:20:55 +00:00
parent 06f0414c85
commit 3ce4544cfa
2 changed files with 3 additions and 7 deletions

View file

@ -468,13 +468,11 @@ void
scm_init_objects () scm_init_objects ()
{ {
SCM ms = scm_makfrom0str (SCM_METACLASS_STANDARD_LAYOUT); SCM ms = scm_makfrom0str (SCM_METACLASS_STANDARD_LAYOUT);
SCM ml = scm_make_struct_layout (ms); SCM mt = scm_make_vtable_vtable (ms, SCM_INUM0,
SCM mt = scm_make_vtable_vtable (ml, SCM_INUM0,
SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL)); SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL));
SCM os = scm_makfrom0str (SCM_METACLASS_OPERATOR_LAYOUT); SCM os = scm_makfrom0str (SCM_METACLASS_OPERATOR_LAYOUT);
SCM ol = scm_make_struct_layout (os); SCM ot = scm_make_vtable_vtable (os, SCM_INUM0,
SCM ot = scm_make_vtable_vtable (ol, SCM_INUM0,
SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL)); SCM_LIST3 (SCM_BOOL_F, SCM_EOL, SCM_EOL));
SCM es = scm_makfrom0str (SCM_ENTITY_LAYOUT); SCM es = scm_makfrom0str (SCM_ENTITY_LAYOUT);

View file

@ -1113,9 +1113,7 @@ scm_init_print ()
SCM vtable, layout, type; SCM vtable, layout, type;
scm_init_opts (scm_print_options, scm_print_opts, SCM_N_PRINT_OPTIONS); scm_init_opts (scm_print_options, scm_print_opts, SCM_N_PRINT_OPTIONS);
vtable = scm_make_vtable_vtable (scm_make_struct_layout (scm_nullstr), vtable = scm_make_vtable_vtable (scm_nullstr, SCM_INUM0, SCM_EOL);
SCM_INUM0,
SCM_EOL);
layout = scm_make_struct_layout (scm_makfrom0str (SCM_PRINT_STATE_LAYOUT)); layout = scm_make_struct_layout (scm_makfrom0str (SCM_PRINT_STATE_LAYOUT));
type = scm_make_struct (vtable, SCM_INUM0, SCM_LIST1 (layout)); type = scm_make_struct (vtable, SCM_INUM0, SCM_LIST1 (layout));
scm_set_struct_vtable_name_x (type, SCM_CAR (scm_intern0 ("print-state"))); scm_set_struct_vtable_name_x (type, SCM_CAR (scm_intern0 ("print-state")));