Clean up builtins

5 files changed, 15 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index e8f9b200..6f929050 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ G=-ggdb
 O=-Og
 CFLAGS=$(CCONFIG) $(EXTRA) $(CWARN) $(G) $(O) $(OSFLAGS)
 LDLIBS=-lgc -lgccjit -lcord -lm -lunistring
-BUILTIN_OBJS=builtins/array.o builtins/bool.o builtins/floats.o builtins/functions.o builtins/integers.o \
+BUILTIN_OBJS=builtins/array.o builtins/bool.o builtins/nums.o builtins/functions.o builtins/integers.o \
 						 builtins/pointer.o builtins/memory.o builtins/string.o builtins/table.o builtins/types.o
 
 all: libnext.so nextlang
diff --git a/builtins/memory.c b/builtins/memory.c
index bb5240e1..2973fb8a 100644
--- a/builtins/memory.c
+++ b/builtins/memory.c
@@ -9,11 +9,10 @@
 #include <sys/param.h>
 #include <err.h>
 
-#include "types.h"
 #include "../util.h"
 #include "../SipHash/halfsiphash.h"
-
-extern const void *SSS_HASH_VECTOR;
+#include "memory.h"
+#include "types.h"
 
 public CORD Memory__as_str(const void *p, bool colorize, const TypeInfo *type) {
     (void)type;
diff --git a/builtins/memory.h b/builtins/memory.h
new file mode 100644
index 00000000..91f86b04
--- /dev/null
+++ b/builtins/memory.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <gc/cord.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "types.h"
+
+extern TypeInfo Memory_type;
+CORD Memory__as_str(const void *p, bool colorize, const TypeInfo *type);
+
+// vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1,\:0
diff --git a/builtins/floats.c b/builtins/nums.c
index cd71700e..bc0196cf 100644
--- a/builtins/floats.c
+++ b/builtins/nums.c
@@ -11,7 +11,7 @@
 
 #include "../SipHash/halfsiphash.h"
 #include "array.h"
-#include "floats.h"
+#include "nums.h"
 #include "string.h"
 #include "types.h"
 
diff --git a/builtins/floats.h b/builtins/nums.h
index 5e2cb062..5e2cb062 100644
--- a/builtins/floats.h
+++ b/builtins/nums.h