From 0b4de175110bdf6ffaeb0ba3b86053fd2fec78be Mon Sep 17 00:00:00 2001
From: Aleksey Veresov <aleksey@veresov.pro>
Date: Mon, 4 Jan 2021 01:25:44 +0300
Subject: .
---
src/csx.c | 29 +++++++++++++++++++++++++++--
1 file changed, 27 insertions(+), 2 deletions(-)
(limited to 'src')
diff --git a/src/csx.c b/src/csx.c
index 57b4778..eca55e7 100644
--- a/src/csx.c
+++ b/src/csx.c
@@ -3,6 +3,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
+#include <stdio.h>
static void init();
@@ -146,7 +147,7 @@ static void *base_set(void *arg)
{
pair_data *res;
void *name = head(arg);
- void *value = head(tail(arg));
+ void *value = csx_run(head(tail(arg)));
if (type(context) == type_null) {
void *nameval = new_pair(name, value);
context = new_pair(new_pair(nameval, null), null);
@@ -202,7 +203,7 @@ static void *base_tail(void *arg)
static void *base_quote(void *arg)
{
- return arg;
+ return head(arg);
}
static void *base_same(void *arg)
@@ -293,6 +294,12 @@ static void *base_inv(void *arg)
return csx_int(0);
}
+static void *base_div(void *arg)
+{
+ arg = run_each(arg);
+ return csx_int(*(int *)head(arg) / *(int *)head(tail(arg)));
+}
+
static void *base_mod(void *arg)
{
arg = run_each(arg);
@@ -330,6 +337,21 @@ static void *base_dec(void *arg)
}
+static void *base_out(void *arg)
+{
+ arg = run_each(arg);
+ int res = putchar(*(int *)head(arg));
+ return res != EOF ? one : null;
+}
+
+static void *base_in(void *arg)
+{
+ arg = run_each(arg);
+ int res = getchar();
+ return res != EOF ? csx_int(res) : null;
+}
+
+
static void *zip(void *params, void *values)
{
void *res = null;
@@ -398,9 +420,12 @@ static void new_context()
base_set(csx_list(csx_name("*"), csx_base(base_prod), 0));
base_set(csx_list(csx_name("neg"), csx_base(base_neg), 0));
base_set(csx_list(csx_name("inv"), csx_base(base_inv), 0));
+ base_set(csx_list(csx_name("div"), csx_base(base_div), 0));
base_set(csx_list(csx_name("mod"), csx_base(base_mod), 0));
base_set(csx_list(csx_name("<"), csx_base(base_inc), 0));
base_set(csx_list(csx_name(">"), csx_base(base_dec), 0));
+ base_set(csx_list(csx_name("out"), csx_base(base_out), 0));
+ base_set(csx_list(csx_name("in"), csx_base(base_in), 0));
base_set(csx_list(csx_name("run"), csx_base(csx_run), 0));
}
--
cgit v1.2.3