Library .txr files become .tl and are autoloaded.

* lisplib.c (ver_set_entries, ver_instantiate,
txr_case_set_entries, txr_case_instantiate): New
static functions.
(lisplib_init): Register new functions.

* share/txr/stdlib/txr-case.txr: Reduced to a load for the
corresponding .tl file, retained for backward compatibility.

* share/txr/stdlib/ver.txr: Likewise.

* share/txr/stdlib/txr-case.tl: New file, based on previous
contents of corresponding .txr file.

* share/txr/stdlib/ver.tl: Likewise.

1 files changed, 30 insertions, 0 deletions

diff --git a/lisplib.c b/lisplib.c
index b6a15203..f84b47b6 100644
--- a/lisplib.c
+++ b/lisplib.c
@@ -83,6 +83,20 @@ static val place_instantiate(val set_fun)
                                    colon_k, lit("place.tl")), nil);
 }
 
+static val ver_set_entries(val dlt, val fun)
+{
+  val name[] = { lit("*lib-version*"), nil };
+  set_dlt_entries(dlt, name, fun);
+  return nil;
+}
+
+static val ver_instantiate(val set_fun)
+{
+  funcall1(set_fun, nil);
+  load(format(nil, lit("~a/ver.tl"), stdlib_path, nao));
+  return nil;
+}
+
 static val ifa_set_entries(val dlt, val fun)
 {
   val name[] = { lit("ifa"), nil };
@@ -97,6 +111,20 @@ static val ifa_instantiate(val set_fun)
   return nil;
 }
 
+static val txr_case_set_entries(val dlt, val fun)
+{
+  val name[] = { lit("txr-if"), lit("txr-when"), lit("txr-case"), nil };
+  set_dlt_entries(dlt, name, fun);
+  return nil;
+}
+
+static val txr_case_instantiate(val set_fun)
+{
+  funcall1(set_fun, nil);
+  load(format(nil, lit("~a/txr-case.tl"), stdlib_path, nao));
+  return nil;
+}
+
 static val dlt_register(val dlt,
                         val (*instantiate)(val),
                         val (*set_entries)(val, val))
@@ -109,7 +137,9 @@ void lisplib_init(void)
   prot1(&dl_table);
   dl_table = make_hash(nil, nil, nil);
   dlt_register(dl_table, place_instantiate, place_set_entries);
+  dlt_register(dl_table, ver_instantiate, ver_set_entries);
   dlt_register(dl_table, ifa_instantiate, ifa_set_entries);
+  dlt_register(dl_table, txr_case_instantiate, txr_case_set_entries);
 }
 
 val lisplib_try_load(val sym)