65 files changed, 38 insertions, 38 deletions

diff --git a/Makefile b/Makefile
index 8cbfef32..d4694d53 100644
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,10 @@ O=-Og
 CFLAGS=$(CCONFIG) $(EXTRA) $(CWARN) $(G) $(O) $(OSFLAGS)
 CFLAGS_PLACEHOLDER="$$(echo -e '\033[2m<flags...>\033[m')" 
 LDLIBS=-lgc -lcord -lm -lunistring -lgmp -ldl
-BUILTIN_OBJS=builtins/siphash.o builtins/arrays.o builtins/bools.o builtins/channels.o builtins/nums.o builtins/integers.o \
-						 builtins/pointers.o builtins/memory.o builtins/text.o builtins/threads.o builtins/c_strings.o builtins/tables.o \
-						 builtins/types.o builtins/util.o builtins/files.o builtins/ranges.o builtins/shell.o builtins/paths.o \
-						 builtins/optionals.o builtins/patterns.o builtins/metamethods.o builtins/functiontype.o builtins/stdlib.o
+BUILTIN_OBJS=stdlib/siphash.o stdlib/arrays.o stdlib/bools.o stdlib/channels.o stdlib/nums.o stdlib/integers.o \
+						 stdlib/pointers.o stdlib/memory.o stdlib/text.o stdlib/threads.o stdlib/c_strings.o stdlib/tables.o \
+						 stdlib/types.o stdlib/util.o stdlib/files.o stdlib/ranges.o stdlib/shell.o stdlib/paths.o \
+						 stdlib/optionals.o stdlib/patterns.o stdlib/metamethods.o stdlib/functiontype.o stdlib/stdlib.o
 TESTS=$(patsubst %.tm,%.tm.testresult,$(wildcard test/*.tm))
 
 all: libtomo.so tomo
@@ -63,14 +63,14 @@ test: $(TESTS)
 	@echo -e '\x1b[32;7m ALL TESTS PASSED! \x1b[m'
 
 clean:
-	rm -f tomo *.o builtins/*.o libtomo.so test/*.tm.{c,h,o,testresult} examples/*.tm.*{c,h,o}
+	rm -f tomo *.o stdlib/*.o libtomo.so test/*.tm.{c,h,o,testresult} examples/*.tm.*{c,h,o}
 
 %: %.md
 	pandoc --lua-filter=.pandoc/bold-code.lua -s $< -t man -o $@
 
 install: tomo libtomo.so tomo.1
 	mkdir -p -m 755 "$(PREFIX)/man/man1" "$(PREFIX)/bin" "$(PREFIX)/include/tomo" "$(PREFIX)/lib" "$(PREFIX)/share/tomo/modules"
-	cp -v builtins/*.h "$(PREFIX)/include/tomo/"
+	cp -v stdlib/*.h "$(PREFIX)/include/tomo/"
 	cp -v libtomo.so "$(PREFIX)/lib/"
 	rm -f "$(PREFIX)/bin/tomo"
 	cp -v tomo "$(PREFIX)/bin/"
diff --git a/ast.c b/ast.c
index aa8b1b50..f00ae5c1 100644
--- a/ast.c
+++ b/ast.c
@@ -5,8 +5,8 @@
 #include <printf.h>
 
 #include "ast.h"
-#include "builtins/integers.h"
-#include "builtins/text.h"
+#include "stdlib/integers.h"
+#include "stdlib/text.h"
 #include "cordhelpers.h"
 
 static const char *OP_NAMES[] = {
diff --git a/ast.h b/ast.h
index 198e3d80..55ac28fb 100644
--- a/ast.h
+++ b/ast.h
@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <printf.h>
 
-#include "builtins/files.h"
-#include "builtins/util.h"
+#include "stdlib/files.h"
+#include "stdlib/util.h"
 
 #define NewAST(_file, _start, _end, ast_tag, ...) (new(ast_t, .file=_file, .start=_start, .end=_end,\
                                                      .tag=ast_tag, .__data.ast_tag={__VA_ARGS__}))
diff --git a/compile.c b/compile.c
index c9e08c92..2802519a 100644
--- a/compile.c
+++ b/compile.c
@@ -7,15 +7,15 @@
 #include <uninorm.h>
 
 #include "ast.h"
-#include "builtins/integers.h"
-#include "builtins/text.h"
+#include "stdlib/integers.h"
+#include "stdlib/text.h"
 #include "compile.h"
 #include "cordhelpers.h"
 #include "enums.h"
 #include "structs.h"
 #include "environment.h"
 #include "typecheck.h"
-#include "builtins/util.h"
+#include "stdlib/util.h"
 
 typedef ast_t* (*comprehension_body_t)(ast_t*, ast_t*);
 
diff --git a/compile.h b/compile.h
index fa18ee89..d53262da 100644
--- a/compile.h
+++ b/compile.h
@@ -6,7 +6,7 @@
 #include <gc.h>
 #include <stdio.h>
 
-#include "builtins/util.h"
+#include "stdlib/util.h"
 #include "environment.h"
 
 CORD expr_as_text(env_t *env, CORD expr, type_t *t, CORD color);
diff --git a/cordhelpers.c b/cordhelpers.c
index f0e1ab38..5a0066f7 100644
--- a/cordhelpers.c
+++ b/cordhelpers.c
@@ -3,7 +3,7 @@
 #include <gc/cord.h>
 #include <stdarg.h>
 
-#include "builtins/util.h"
+#include "stdlib/util.h"
 
 __attribute__((format(printf, 1, 2)))
 public CORD CORD_asprintf(CORD fmt, ...)
diff --git a/enums.c b/enums.c
index 7268d565..e06ca0e0 100644
--- a/enums.c
+++ b/enums.c
@@ -5,13 +5,13 @@
 #include <stdio.h>
 
 #include "ast.h"
-#include "builtins/text.h"
+#include "stdlib/text.h"
 #include "compile.h"
 #include "cordhelpers.h"
 #include "structs.h"
 #include "environment.h"
 #include "typecheck.h"
-#include "builtins/util.h"
+#include "stdlib/util.h"
 
 PUREFUNC static bool has_extra_data(tag_ast_t *tags)
 {
diff --git a/environment.c b/environment.c
index 5170fa95..dc31eee1 100644
--- a/environment.c
+++ b/environment.c
@@ -3,9 +3,9 @@
 #include <stdlib.h>
 #include <signal.h>
 
-#include "builtins/tables.h"
-#include "builtins/text.h"
-#include "builtins/util.h"
+#include "stdlib/tables.h"
+#include "stdlib/text.h"
+#include "stdlib/util.h"
 #include "cordhelpers.h"
 #include "environment.h"
 #include "typecheck.h"
diff --git a/environment.h b/environment.h
index 005fda7b..59af36da 100644
--- a/environment.h
+++ b/environment.h
@@ -5,7 +5,7 @@
 #include <gc/cord.h>
 
 #include "types.h"
-#include "builtins/tables.h"
+#include "stdlib/tables.h"
 
 typedef struct {
     CORD local_typedefs;
diff --git a/parse.c b/parse.c
index 4e57cabf..a5ad136b 100644
--- a/parse.c
+++ b/parse.c
@@ -12,10 +12,10 @@
 #include <signal.h>
 
 #include "ast.h"
-#include "builtins/integers.h"
-#include "builtins/text.h"
-#include "builtins/tables.h"
-#include "builtins/util.h"
+#include "stdlib/integers.h"
+#include "stdlib/text.h"
+#include "stdlib/tables.h"
+#include "stdlib/util.h"
 #include "cordhelpers.h"
 
 // The cache of {filename -> parsed AST} will hold at most this many entries:
diff --git a/repl.c b/repl.c
index 06806c3c..1dbc01c0 100644
--- a/repl.c
+++ b/repl.c
@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "builtins/tomo.h"
-#include "builtins/util.h"
+#include "stdlib/tomo.h"
+#include "stdlib/util.h"
 #include "typecheck.h"
 #include "parse.h"
 
diff --git a/builtins/arrays.c b/stdlib/arrays.c
index 58a33754..58a33754 100644
--- a/builtins/arrays.c
+++ b/stdlib/arrays.c
diff --git a/builtins/arrays.h b/stdlib/arrays.h
index 1e945e5e..1e945e5e 100644
--- a/builtins/arrays.h
+++ b/stdlib/arrays.h
diff --git a/builtins/bools.c b/stdlib/bools.c
index d7b3718f..d7b3718f 100644
--- a/builtins/bools.c
+++ b/stdlib/bools.c
diff --git a/builtins/bools.h b/stdlib/bools.h
index 98b2ac06..98b2ac06 100644
--- a/builtins/bools.h
+++ b/stdlib/bools.h
diff --git a/builtins/c_strings.c b/stdlib/c_strings.c
index 392565ab..392565ab 100644
--- a/builtins/c_strings.c
+++ b/stdlib/c_strings.c
diff --git a/builtins/c_strings.h b/stdlib/c_strings.h
index d4c1caa7..d4c1caa7 100644
--- a/builtins/c_strings.h
+++ b/stdlib/c_strings.h
diff --git a/builtins/channels.c b/stdlib/channels.c
index 3681b0b8..3681b0b8 100644
--- a/builtins/channels.c
+++ b/stdlib/channels.c
diff --git a/builtins/channels.h b/stdlib/channels.h
index 8deb0569..8deb0569 100644
--- a/builtins/channels.h
+++ b/stdlib/channels.h
diff --git a/builtins/datatypes.h b/stdlib/datatypes.h
index 8c13d3c4..8c13d3c4 100644
--- a/builtins/datatypes.h
+++ b/stdlib/datatypes.h
diff --git a/builtins/files.c b/stdlib/files.c
index 4a4220e7..4a4220e7 100644
--- a/builtins/files.c
+++ b/stdlib/files.c
diff --git a/builtins/files.h b/stdlib/files.h
index f650f78e..f650f78e 100644
--- a/builtins/files.h
+++ b/stdlib/files.h
diff --git a/builtins/functiontype.c b/stdlib/functiontype.c
index 251a01ed..251a01ed 100644
--- a/builtins/functiontype.c
+++ b/stdlib/functiontype.c
diff --git a/builtins/functiontype.h b/stdlib/functiontype.h
index e3feb03e..e3feb03e 100644
--- a/builtins/functiontype.h
+++ b/stdlib/functiontype.h
diff --git a/builtins/integers.c b/stdlib/integers.c
index ef588984..ef588984 100644
--- a/builtins/integers.c
+++ b/stdlib/integers.c
diff --git a/builtins/integers.h b/stdlib/integers.h
index 1c0ab1cd..1c0ab1cd 100644
--- a/builtins/integers.h
+++ b/stdlib/integers.h
diff --git a/builtins/memory.c b/stdlib/memory.c
index 9d7dbc80..9d7dbc80 100644
--- a/builtins/memory.c
+++ b/stdlib/memory.c
diff --git a/builtins/memory.h b/stdlib/memory.h
index 701ea68a..701ea68a 100644
--- a/builtins/memory.h
+++ b/stdlib/memory.h
diff --git a/builtins/metamethods.c b/stdlib/metamethods.c
index 9b0560ab..9b0560ab 100644
--- a/builtins/metamethods.c
+++ b/stdlib/metamethods.c
diff --git a/builtins/metamethods.h b/stdlib/metamethods.h
index be712a61..be712a61 100644
--- a/builtins/metamethods.h
+++ b/stdlib/metamethods.h
diff --git a/builtins/nums.c b/stdlib/nums.c
index 1956140a..1956140a 100644
--- a/builtins/nums.c
+++ b/stdlib/nums.c
diff --git a/builtins/nums.h b/stdlib/nums.h
index 78f32c1e..78f32c1e 100644
--- a/builtins/nums.h
+++ b/stdlib/nums.h
diff --git a/builtins/optionals.c b/stdlib/optionals.c
index b6ca8dfb..b6ca8dfb 100644
--- a/builtins/optionals.c
+++ b/stdlib/optionals.c
diff --git a/builtins/optionals.h b/stdlib/optionals.h
index e37d5345..e37d5345 100644
--- a/builtins/optionals.h
+++ b/stdlib/optionals.h
diff --git a/builtins/paths.c b/stdlib/paths.c
index 231a7c23..231a7c23 100644
--- a/builtins/paths.c
+++ b/stdlib/paths.c
diff --git a/builtins/paths.h b/stdlib/paths.h
index e0d85258..e0d85258 100644
--- a/builtins/paths.h
+++ b/stdlib/paths.h
diff --git a/builtins/patterns.c b/stdlib/patterns.c
index 81beaffe..81beaffe 100644
--- a/builtins/patterns.c
+++ b/stdlib/patterns.c
diff --git a/builtins/patterns.h b/stdlib/patterns.h
index 804fb286..804fb286 100644
--- a/builtins/patterns.h
+++ b/stdlib/patterns.h
diff --git a/builtins/pointers.c b/stdlib/pointers.c
index 1ad9f407..1ad9f407 100644
--- a/builtins/pointers.c
+++ b/stdlib/pointers.c
diff --git a/builtins/pointers.h b/stdlib/pointers.h
index faa95316..faa95316 100644
--- a/builtins/pointers.h
+++ b/stdlib/pointers.h
diff --git a/builtins/ranges.c b/stdlib/ranges.c
index 9dfd1efe..9dfd1efe 100644
--- a/builtins/ranges.c
+++ b/stdlib/ranges.c
diff --git a/builtins/ranges.h b/stdlib/ranges.h
index 2a4f1d68..2a4f1d68 100644
--- a/builtins/ranges.h
+++ b/stdlib/ranges.h
diff --git a/builtins/shell.c b/stdlib/shell.c
index 36b6a9ad..36b6a9ad 100644
--- a/builtins/shell.c
+++ b/stdlib/shell.c
diff --git a/builtins/shell.h b/stdlib/shell.h
index 48c59abc..48c59abc 100644
--- a/builtins/shell.h
+++ b/stdlib/shell.h
diff --git a/builtins/siphash-internals.h b/stdlib/siphash-internals.h
index d1906be4..d1906be4 100644
--- a/builtins/siphash-internals.h
+++ b/stdlib/siphash-internals.h
diff --git a/builtins/siphash.c b/stdlib/siphash.c
index 671fbad6..671fbad6 100644
--- a/builtins/siphash.c
+++ b/stdlib/siphash.c
diff --git a/builtins/siphash.h b/stdlib/siphash.h
index 8104a306..8104a306 100644
--- a/builtins/siphash.h
+++ b/stdlib/siphash.h
diff --git a/builtins/stdlib.c b/stdlib/stdlib.c
index b8e40a54..b8e40a54 100644
--- a/builtins/stdlib.c
+++ b/stdlib/stdlib.c
diff --git a/builtins/stdlib.h b/stdlib/stdlib.h
index da3ddbf7..da3ddbf7 100644
--- a/builtins/stdlib.h
+++ b/stdlib/stdlib.h
diff --git a/builtins/tables.c b/stdlib/tables.c
index e644fd23..e644fd23 100644
--- a/builtins/tables.c
+++ b/stdlib/tables.c
diff --git a/builtins/tables.h b/stdlib/tables.h
index 53e0c583..53e0c583 100644
--- a/builtins/tables.h
+++ b/stdlib/tables.h
diff --git a/builtins/text.c b/stdlib/text.c
index 283dfb01..283dfb01 100644
--- a/builtins/text.c
+++ b/stdlib/text.c
diff --git a/builtins/text.h b/stdlib/text.h
index 841d51fe..841d51fe 100644
--- a/builtins/text.h
+++ b/stdlib/text.h
diff --git a/builtins/threads.c b/stdlib/threads.c
index 74e73832..74e73832 100644
--- a/builtins/threads.c
+++ b/stdlib/threads.c
diff --git a/builtins/threads.h b/stdlib/threads.h
index 52091677..52091677 100644
--- a/builtins/threads.h
+++ b/stdlib/threads.h
diff --git a/builtins/tomo.h b/stdlib/tomo.h
index 7db0f490..7db0f490 100644
--- a/builtins/tomo.h
+++ b/stdlib/tomo.h
diff --git a/builtins/types.c b/stdlib/types.c
index c9f2578f..c9f2578f 100644
--- a/builtins/types.c
+++ b/stdlib/types.c
diff --git a/builtins/types.h b/stdlib/types.h
index bcdafad2..bcdafad2 100644
--- a/builtins/types.h
+++ b/stdlib/types.h
diff --git a/builtins/util.c b/stdlib/util.c
index 7749b22c..7749b22c 100644
--- a/builtins/util.c
+++ b/stdlib/util.c
diff --git a/builtins/util.h b/stdlib/util.h
index a24264cd..a24264cd 100644
--- a/builtins/util.h
+++ b/stdlib/util.h
diff --git a/structs.c b/structs.c
index 328fa3be..6584eac8 100644
--- a/structs.c
+++ b/structs.c
@@ -5,12 +5,12 @@
 #include <stdio.h>
 
 #include "ast.h"
-#include "builtins/text.h"
+#include "stdlib/text.h"
 #include "compile.h"
 #include "cordhelpers.h"
 #include "environment.h"
 #include "typecheck.h"
-#include "builtins/util.h"
+#include "stdlib/util.h"
 
 static CORD compile_str_method(env_t *env, ast_t *ast)
 {
diff --git a/tomo.c b/tomo.c
index ec4f1c35..4d1692a8 100644
--- a/tomo.c
+++ b/tomo.c
@@ -10,9 +10,9 @@
 #include <sys/wait.h>
 
 #include "ast.h"
-#include "builtins/arrays.h"
-#include "builtins/datatypes.h"
-#include "builtins/text.h"
+#include "stdlib/arrays.h"
+#include "stdlib/datatypes.h"
+#include "stdlib/text.h"
 #include "compile.h"
 #include "cordhelpers.h"
 #include "parse.h"
diff --git a/typecheck.c b/typecheck.c
index 65597a8a..86c204dc 100644
--- a/typecheck.c
+++ b/typecheck.c
@@ -8,8 +8,8 @@
 #include <sys/stat.h>
 
 #include "ast.h"
-#include "builtins/text.h"
-#include "builtins/util.h"
+#include "stdlib/text.h"
+#include "stdlib/util.h"
 #include "cordhelpers.h"
 #include "environment.h"
 #include "parse.h"
diff --git a/types.c b/types.c
index 3f546432..bc54015c 100644
--- a/types.c
+++ b/types.c
@@ -6,9 +6,9 @@
 #include <stdint.h>
 #include <sys/param.h>
 
-#include "builtins/integers.h"
-#include "builtins/tables.h"
-#include "builtins/util.h"
+#include "stdlib/integers.h"
+#include "stdlib/tables.h"
+#include "stdlib/util.h"
 #include "cordhelpers.h"
 #include "types.h"
 
diff --git a/types.h b/types.h
index 94d74022..8b1ded4a 100644
--- a/types.h
+++ b/types.h
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "ast.h"
-#include "builtins/arrays.h"
+#include "stdlib/arrays.h"
 
 typedef struct type_s type_t;