Use struct instead of cons for lazy string fields.

* gc.c (finalize): Must free the dynamic structure attached
to the LSTR type now.
(mark_obj): Must mark interior of LSTR type's props structure.

* lib.c (lazy_sub_str, copy_lazy_str): Copy props structure.
(lazy_str): Allocate and initialize props structure.
(lazy_str_force, lazy_str_put, lazy_str_force_upto,
lazy_str_get_trailing_list, out_lazy_str): Follow
representation change.

* lib.h (struct lazy_string_props): New struct type.
(strut lazy_string): Member opts replaced with props
pointer to struct lazy_string_props.

1 files changed, 6 insertions, 2 deletions

diff --git a/gc.c b/gc.c
index 2615b025..cc5e9597 100644
--- a/gc.c
+++ b/gc.c
@@ -230,7 +230,6 @@ static void finalize(val obj)
   case PKG:
   case FUN:
   case LCONS:
-  case LSTR:
   case ENV:
   case FLNUM:
   case RNG:
@@ -243,6 +242,10 @@ static void finalize(val obj)
     free(obj->st.str);
     obj->st.str = 0;
     return;
+  case LSTR:
+    free(obj->ls.props);
+    obj->ls.props = 0;
+    return;
   case VEC:
     free(obj->v.vec-2);
     obj->v.vec = 0;
@@ -351,7 +354,8 @@ tail_call:
     mark_obj_tail(obj->lc.cdr);
   case LSTR:
     mark_obj(obj->ls.prefix);
-    mark_obj(obj->ls.opts);
+    mark_obj(obj->ls.props->limit);
+    mark_obj(obj->ls.props->term);
     mark_obj_tail(obj->ls.list);
   case COBJ:
     obj->co.ops->mark(obj);