From 1eec9dcce4da55817b4346fa8ecbc2bb045f8138 Mon Sep 17 00:00:00 2001
From: Ian Piumarta <piumarta@gmail.com>
Date: Wed, 5 Feb 2025 16:27:43 +0900
Subject: [PATCH] add primitive atoi()

---
 Makefile         |  2 +-
 include/stdlib.h |  2 ++
 main.leg         | 39 ++++++++++++++++++++++++++-------------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index aec5803..a22f348 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CFLAGS 	 = -std=c99 -Werror -Wall -Wno-unused -g
-OFLAGS 	 = -std=c99 -Werror -Wall -Wno-unused -DNDEBUG -O2
+OFLAGS 	 = -std=c99 -Wno-unused -DNDEBUG -O2
 CPPFLAGS = -I/opt/local/include
 LDFLAGS  = -L/opt/local/lib
 LDLIBS   = -lgc -lm
diff --git a/include/stdlib.h b/include/stdlib.h
index 17bb138..12645fc 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -3,3 +3,5 @@ extern void  free(void *pointer);
 
 extern void exit(int status);
 extern void abort(void);
+
+extern int atoi(char *string);
diff --git a/main.leg b/main.leg
index 7768371..20281a2 100644
--- a/main.leg
+++ b/main.leg
@@ -1,6 +1,6 @@
 # main.leg -- C parser + interpreter
 #
-# Last edited: 2025-02-05 12:43:42 by piumarta on m1mbp
+# Last edited: 2025-02-05 13:53:41 by piumarta on xubuntu
 
 %{
 ;
@@ -105,8 +105,8 @@ char *binaryName(int op) {
 
 #undef _
 
-#define _do_primitives(_)						\
-    _(printf) _(assert) _(malloc) _(free) _(exit) _(abort) _(sqrtf)
+#define _do_primitives(_)							\
+    _(printf) _(assert) _(malloc) _(free) _(exit) _(abort) _(atoi) _(sqrtf)
 
 #define _(X) oop s_##X = 0;
 _do_primitives(_)
@@ -2389,6 +2389,17 @@ oop pointerMemory(oop arg)
     return base;
 }
 
+char *pointerString(oop ptr)
+{
+    oop mem = pointerMemory(ptr);
+    if (nil == mem) fatal("cannot get string from pointer: ", toString(ptr));
+    char *addr = get(mem, Memory,base);
+    int   size = get(mem, Memory,size);
+    char *term = memchr(addr, '\0', size);
+    if (!term) fatal("unterminated string: %s", toString(ptr));
+    return addr;
+}
+
 oop prim_printf(int argc, oop *argv, oop env) // array
 {
     if (argc < 1) fatal("printf: no format string");
@@ -2454,16 +2465,9 @@ oop prim_printf(int argc, oop *argv, oop env) // array
 		    case Array: {
 			oop type = elementType(arg);
 			if (t_char == type) {
-			    oop mem = pointerMemory(arg);
-			    if (nil != mem) {
-				char *addr = get(mem, Memory,base);
-				int   size = get(mem, Memory,size);
-				char *term = memchr(addr, '\0', size);
-				if (!term)
-				    fatal("printf: %%s with unterminated string: %s", toString(arg));
-				n += printf(buf, addr);
-				continue;
-			    }
+			    char *addr = pointerString(arg);
+			    n += printf(buf, addr);
+			    continue;
 			}
 			break;
 		    }
@@ -2549,6 +2553,15 @@ oop prim_abort(int argc, oop *argv, oop env) // array
     return nil;
 }
 
+oop prim_atoi(int argc, oop *argv, oop env) // array
+{
+    if (argc != 1) fatal("atoi: wrong number of arguments");
+    oop arg = argv[0];
+    if (!is(Pointer, arg) || t_pchar != get(arg, Pointer,type))
+	fatal("atoi: illegal argument: %s", toString(arg));
+    return newInteger(atoi(pointerString(arg)));
+}
+
 oop prim_sqrtf(int argc, oop *argv, oop env) // array
 {
     if (argc != 1) fatal("sqrtf: wrong number of arguments");