tisp

commit db3af47026b8efc406831519ec5b932904528d4e
parent 429680f681a166837adfaf2e37efb1979fb9fdf8
Author: Ed van Bruggen <edvb@uw.edu>
Date:   Sun, 20 Oct 2019 16:58:37 -0700

Add string tib

Diffstat:
Makefile
 | 
2
+-
main.c
 | 
2
++
tibs/string.c
 | 
84
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

3 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ endif
 
 EXE = tisp
 SRC = tisp.c main.c
-TIB = tibs/math.c tibs/io.c tibs/time.c
+TIB = tibs/math.c tibs/io.c tibs/time.c tibs/string.c
 OBJ = $(SRC:.c=.o) $(TIB:.c=.o)
 LIB = tibs/libtibmath.so tibs/libtibio.so
 TSP = tibs/lib.tsp tibs/repl.tsp
diff --git a/main.c b/main.c
@@ -10,6 +10,7 @@
 	tsp_include_tib(math);
 	tsp_include_tib(io);
 	tsp_include_tib(time);
+	tsp_include_tib(string);
 #endif
 
 int
@@ -23,6 +24,7 @@ main(int argc, char *argv[])
 	tib_env_math(env);
 	tib_env_io(env);
 	tib_env_time(env);
+	tib_env_string(env);
 #  include "libs.tsp.h"
 	tisp_env_lib(env, libs_tsp);
 #endif
diff --git a/tibs/string.c b/tibs/string.c
@@ -0,0 +1,84 @@
+/* zlib License
+ *
+ * Copyright (c) 2017-2019 Ed van Bruggen
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty.  In no event will the authors be held liable for any damages
+ * arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any purpose,
+ * including commercial applications, and to alter it and redistribute it
+ * freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you must not
+ *    claim that you wrote the original software. If you use this software
+ *    in a product, an acknowledgment in the product documentation would be
+ *    appreciated but is not required.
+ * 2. Altered source versions must be plainly marked as such, and must not be
+ *    misrepresented as being the original software.
+ * 3. This notice may not be removed or altered from any source distribution.
+ */
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "../tisp.h"
+
+typedef Val (*MkFn)(Env, char*);
+
+/* TODO string tib: strlen lower upper strpos strsub */
+
+static Val
+val_string(Env env, Val v, MkFn mk_fn)
+{
+	char s[43];
+	switch (v->t) {
+	case NONE:
+		return mk_fn(env, "void");
+	case NIL:
+		return mk_fn(env, "nil");
+	case INTEGER:
+		snprintf(s, 21, "%d", (int)v->v.n.num);
+		return mk_fn(env, s);
+	case DECIMAL:
+		snprintf(s, 17, "%.15g", v->v.n.num);
+		return mk_fn(env, s);
+	case RATIO:
+		snprintf(s, 43, "%d/%d", (int)v->v.n.num, (int)v->v.n.den);
+		return mk_fn(env, s);
+	case STRING:
+	case SYMBOL:
+		return mk_fn(env, v->v.s);
+	case PAIR:
+	default:
+		tsp_warnf("could not convert type %s into string", type_str(v->t));
+	}
+}
+
+/* TODO string and symbol: multi arguments to concat */
+static Val
+prim_string(Env env, Val args)
+{
+	Val v;
+	tsp_arg_num(args, "string", 1);
+	if (!(v = tisp_eval(env, car(args))))
+		return NULL;
+	return val_string(env, v, mk_str);
+}
+
+static Val
+prim_symbol(Env env, Val args)
+{
+	Val v;
+	tsp_arg_num(args, "symbol", 1);
+	if (!(v = tisp_eval(env, car(args))))
+		return NULL;
+	return val_string(env, v, mk_sym);
+}
+
+void
+tib_env_string(Env env)
+{
+	tsp_env_fn(symbol);
+	tsp_env_fn(string);
+}