diff options
author | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-01-10 00:41:42 +0100 |
commit | 91ee7515da0bad91330ce5c87b250d6cf12a2789 (patch) | |
tree | ce023c92c0d9bf895c1265b107b270c35ba59b94 /libguile/goops.c | |
parent | 0bdd43515eb3c62839512181cf33e5aea383e661 (diff) | |
parent | 0e947e1d14597651c5762a4209225c472bdaef45 (diff) | |
download | guile-91ee7515da0bad91330ce5c87b250d6cf12a2789.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/__scm.h
libguile/array-map.c
libguile/procprop.c
libguile/tags.h
module/ice-9/deprecated.scm
module/ice-9/psyntax-pp.scm
module/ice-9/psyntax.scm
test-suite/standalone/test-num2integral.c
test-suite/tests/regexp.test
Diffstat (limited to 'libguile/goops.c')
-rw-r--r-- | libguile/goops.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libguile/goops.c b/libguile/goops.c index df1a64f7f..5e846eeae 100644 --- a/libguile/goops.c +++ b/libguile/goops.c @@ -160,6 +160,8 @@ static SCM class_vm; static SCM class_vm_cont; static SCM class_bytevector; static SCM class_uvec; +static SCM class_array; +static SCM class_bitvector; static SCM vtable_class_map = SCM_BOOL_F; @@ -275,6 +277,10 @@ SCM_DEFINE (scm_class_of, "class-of", 1, 0, 0, return class_bytevector; else return class_uvec; + case scm_tc7_array: + return class_array; + case scm_tc7_bitvector: + return class_bitvector; case scm_tc7_string: return scm_class_string; case scm_tc7_number: @@ -2519,6 +2525,10 @@ create_standard_classes (void) scm_class_class, scm_class_top, SCM_EOL); make_stdcls (&class_uvec, "<uvec>", scm_class_class, class_bytevector, SCM_EOL); + make_stdcls (&class_array, "<array>", + scm_class_class, scm_class_top, SCM_EOL); + make_stdcls (&class_bitvector, "<bitvector>", + scm_class_class, scm_class_top, SCM_EOL); make_stdcls (&scm_class_number, "<number>", scm_class_class, scm_class_top, SCM_EOL); make_stdcls (&scm_class_complex, "<complex>", |