Merging deletions of obsolete mps_space_t into version 1.110. we don't want these leaking further.

Merging important fix to Scheme example to version 1.110, since we don't want a broken example leaking out.

Copied from Perforce
 Change: 179448
 ServerID: perforce.ravenbrook.com

2 files changed, 3 insertions, 49 deletions

diff --git a/mps/code/mps.h b/mps/code/mps.h
index 6e3a450a3ac..469639b6c6d 100644
--- a/mps/code/mps.h
+++ b/mps/code/mps.h
@@ -48,7 +48,6 @@
 /* Abstract Types */
 
 typedef struct mps_arena_s  *mps_arena_t;  /* arena */
-typedef mps_arena_t          mps_space_t;  /* space, for backward comp. */
 typedef struct mps_arena_class_s *mps_arena_class_t;  /* arena class */
 typedef struct mps_pool_s   *mps_pool_t;   /* pool */
 typedef struct mps_chain_s  *mps_chain_t;  /* chain */
@@ -273,10 +272,6 @@ extern void mps_arena_unsafe_restore_protection(mps_arena_t);
 extern mps_res_t mps_arena_start_collect(mps_arena_t);
 extern mps_res_t mps_arena_collect(mps_arena_t);
 extern mps_bool_t mps_arena_step(mps_arena_t, double, double);
-extern void mps_space_clamp(mps_space_t);
-extern void mps_space_release(mps_space_t);
-extern void mps_space_park(mps_space_t);
-extern mps_res_t mps_space_collect(mps_space_t);
 
 extern mps_res_t mps_arena_create(mps_arena_t *, mps_arena_class_t, ...);
 extern mps_res_t mps_arena_create_v(mps_arena_t *, mps_arena_class_t, va_list);
@@ -291,9 +286,6 @@ extern mps_res_t mps_arena_commit_limit_set(mps_arena_t, size_t);
 extern void mps_arena_spare_commit_limit_set(mps_arena_t, size_t);
 extern size_t mps_arena_spare_commit_limit(mps_arena_t);
 
-extern size_t mps_space_reserved(mps_space_t);
-extern size_t mps_space_committed(mps_space_t);
-
 extern mps_bool_t mps_arena_has_addr(mps_arena_t, mps_addr_t);
 extern mps_bool_t mps_addr_pool(mps_pool_t *, mps_arena_t, mps_addr_t);
 extern mps_bool_t mps_addr_fmt(mps_fmt_t *, mps_arena_t, mps_addr_t);
diff --git a/mps/code/mpsi.c b/mps/code/mpsi.c
index 7e82291142a..240861f8dad 100644
--- a/mps/code/mpsi.c
+++ b/mps/code/mpsi.c
@@ -165,12 +165,6 @@ size_t mps_arena_reserved(mps_arena_t arena)
   return (size_t)size;
 }
 
-/* for backward compatibility */
-size_t mps_space_reserved(mps_space_t mps_space)
-{
-  return mps_arena_reserved(mps_space);
-}
-
 size_t mps_arena_committed(mps_arena_t arena)
 {
   Size size;
@@ -182,12 +176,6 @@ size_t mps_arena_committed(mps_arena_t arena)
   return (size_t)size;
 }
 
-/* for backward compatibility */
-size_t mps_space_committed(mps_space_t mps_space)
-{
-  return mps_arena_committed(mps_space);
-}
-
 size_t mps_arena_spare_committed(mps_arena_t arena)
 {
   Size size;
@@ -248,12 +236,6 @@ void mps_arena_clamp(mps_arena_t arena)
   ArenaLeave(arena);
 }
 
-/* for backward compatibility */
-void mps_space_clamp(mps_space_t mps_space)
-{
-  mps_arena_clamp(mps_space);
-}
-
 
 void mps_arena_release(mps_arena_t arena)
 {
@@ -262,26 +244,14 @@ void mps_arena_release(mps_arena_t arena)
   ArenaLeave(arena);
 }
 
-/* for backward compatibility */
-void mps_space_release(mps_space_t mps_space)
-{
-  mps_arena_release(mps_space);
-}
 
-
-void mps_arena_park(mps_space_t mps_space)
+void mps_arena_park(mps_arena_t arena)
 {
-  Arena arena = (Arena)mps_space;
   ArenaEnter(arena);
   ArenaPark(ArenaGlobals(arena));
   ArenaLeave(arena);
 }
 
-/* for backward compatibility */
-void mps_space_park(mps_space_t mps_space)
-{
-  mps_arena_park(mps_space);
-}
 
 void mps_arena_expose(mps_arena_t arena)
 {
@@ -306,20 +276,18 @@ void mps_arena_unsafe_restore_protection(mps_arena_t arena)
 }
 
 
-mps_res_t mps_arena_start_collect(mps_space_t mps_space)
+mps_res_t mps_arena_start_collect(mps_arena_t arena)
 {
   Res res;
-  Arena arena = (Arena)mps_space;
   ArenaEnter(arena);
   res = ArenaStartCollect(ArenaGlobals(arena), TraceStartWhyCLIENTFULL_INCREMENTAL);
   ArenaLeave(arena);
   return res;
 }
 
-mps_res_t mps_arena_collect(mps_space_t mps_space)
+mps_res_t mps_arena_collect(mps_arena_t arena)
 {
   Res res;
-  Arena arena = (Arena)mps_space;
   ArenaEnter(arena);
   res = ArenaCollect(ArenaGlobals(arena), TraceStartWhyCLIENTFULL_BLOCK);
   ArenaLeave(arena);
@@ -337,12 +305,6 @@ mps_bool_t mps_arena_step(mps_arena_t arena,
   return b;
 }
 
-/* for backward compatibility */
-mps_res_t mps_space_collect(mps_space_t mps_space)
-{
-  return mps_arena_collect(mps_space);
-}
-
 
 /* mps_arena_create -- create an arena object */