From d1e775648cba50537070b3bb598ed7dc7e5cbb64 Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Sat, 20 Jun 2015 08:07:18 -0700
Subject: Remove places.h generation hack.
* Makefile (GEN_HDRS, LISP_TO_C_STRING): Variables removed.
(%.h: %.tl): Rule removed. The place.h header is no longer
generated from place.tl.
* lisplib.c (place_instantiate): Load place.tl from stdlib directory,
rather than obtaining it from a string literal in generated header
place.h.
* place.tl: Moved to share/txr/stdlib directory.
* genvim.txr: Refer to place.tl in stdlib.
---
lisplib.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
(limited to 'lisplib.c')
diff --git a/lisplib.c b/lisplib.c
index f84b47b6..33277b7b 100644
--- a/lisplib.c
+++ b/lisplib.c
@@ -35,7 +35,6 @@
#include "stream.h"
#include "hash.h"
#include "gc.h"
-#include "place.h"
#include "txr.h"
#include "lisplib.h"
@@ -79,8 +78,8 @@ static val place_set_entries(val dlt, val fun)
static val place_instantiate(val set_fun)
{
funcall1(set_fun, nil);
- return eval_intrinsic(lisp_parse(string_utf8(place_code), std_error,
- colon_k, lit("place.tl")), nil);
+ load(format(nil, lit("~a/place.tl"), stdlib_path, nao));
+ return nil;
}
static val ver_set_entries(val dlt, val fun)
--
cgit v1.2.3