tisp

commit cc5bc24160a8d536fa190209852032d5fbdaef15
parent e70bd0ec97c8b5dac060f3ebb7adf36637de3703
Author: Ed van Bruggen <edvb@uw.edu>
Date:   Fri, 25 Jan 2019 21:17:53 -0800

Separate string and symbol interning

Diffstat:
tisp.c
 | 
13
+++++--------
tisp.h
 | 
2
+-

2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/tisp.c b/tisp.c
@@ -338,10 +338,8 @@ mk_rat(int num, int den)
 Val
 mk_str(Env env, char *s) {
 	Val ret;
-	if ((ret = hash_get(env->strs, s))) {
-		ret->t = STRING;
+	if ((ret = hash_get(env->strs, s)))
 		return ret;
-	}
 	ret = emalloc(sizeof(struct Val));
 	ret->t = STRING;
 	ret->v.s = emalloc((strlen(s)+1) * sizeof(char));
@@ -350,19 +348,16 @@ mk_str(Env env, char *s) {
 	return ret;
 }
 
-/* TODO return existing symbol */
 Val
 mk_sym(Env env, char *s)
 {
 	Val ret;
-	if ((ret = hash_get(env->strs, s))) {
-		ret->t = SYMBOL;
+	if ((ret = hash_get(env->syms, s)))
 		return ret;
-	}
 	ret = emalloc(sizeof(struct Val));
 	ret->t = SYMBOL;
 	ret->v.s = s;
-	hash_add(env->strs, s, ret);
+	hash_add(env->syms, s, ret);
 	return ret;
 }
 
@@ -827,6 +822,7 @@ tisp_env_init(size_t cap)
 	hash_add(e->h, "load",   mk_prim(prim_load));
 
 	e->strs = hash_new(cap);
+	e->syms = hash_new(cap);
 
 	e->libh = NULL;
 	e->libhc = 0;
@@ -840,6 +836,7 @@ tisp_env_free(Env env)
 
 	hash_free(env->h);
 	hash_free(env->strs);
+	hash_free(env->syms);
 	for (i = 0; i < env->libhc; i++)
 		dlclose(env->libh[i]);
 	free(env->nil);
diff --git a/tisp.h b/tisp.h
@@ -114,7 +114,7 @@ struct Val {
 
 struct Env {
 	Val none, nil, t;
-	Hash h, strs;
+	Hash h, strs, syms;
 	void **libh;
 	size_t libhc;
 };