Rename builtins to use plurals when appropriate

35 files changed, 54 insertions, 52 deletions

diff --git a/Makefile b/Makefile
index 6f29a964..b82efdb8 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/array.o builtins/bool.o builtins/channel.o builtins/nums.o builtins/integers.o \
-						 builtins/pointer.o builtins/memory.o builtins/text.o builtins/thread.o builtins/c_string.o builtins/table.o \
-						 builtins/types.o builtins/util.o builtins/files.o builtins/range.o builtins/shell.o builtins/path.o \
-						 builtins/optionals.o builtins/pattern.o builtins/metamethods.o builtins/functiontype.o builtins/stdlib.o
+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_string.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
 TESTS=$(patsubst %.tm,%.tm.testresult,$(wildcard test/*.tm))
 
 all: libtomo.so tomo
diff --git a/builtins/array.c b/builtins/arrays.c
index 35227725..58a33754 100644
--- a/builtins/array.c
+++ b/builtins/arrays.c
@@ -5,10 +5,10 @@
 #include <stdint.h>
 #include <sys/param.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "metamethods.h"
 #include "optionals.h"
-#include "table.h"
+#include "tables.h"
 #include "text.h"
 #include "util.h"
 
diff --git a/builtins/array.h b/builtins/arrays.h
index 1e945e5e..1e945e5e 100644
--- a/builtins/array.h
+++ b/builtins/arrays.h
diff --git a/builtins/bool.c b/builtins/bools.c
index 14406c5f..d7b3718f 100644
--- a/builtins/bool.c
+++ b/builtins/bools.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <sys/param.h>
 
-#include "bool.h"
+#include "bools.h"
 #include "optionals.h"
 #include "text.h"
 #include "util.h"
diff --git a/builtins/bool.h b/builtins/bools.h
index 98b2ac06..98b2ac06 100644
--- a/builtins/bool.h
+++ b/builtins/bools.h
diff --git a/builtins/channel.c b/builtins/channels.c
index 11978397..3681b0b8 100644
--- a/builtins/channel.c
+++ b/builtins/channels.c
@@ -10,7 +10,7 @@
 #include <pthread.h>
 #include <sys/param.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "metamethods.h"
 #include "integers.h"
 #include "siphash.h"
diff --git a/builtins/channel.h b/builtins/channels.h
index 8deb0569..8deb0569 100644
--- a/builtins/channel.h
+++ b/builtins/channels.h
diff --git a/builtins/functiontype.c b/builtins/functiontype.c
index c376ba26..251a01ed 100644
--- a/builtins/functiontype.c
+++ b/builtins/functiontype.c
@@ -1,7 +1,7 @@
 // Logic for handling function type values
 
 #include "datatypes.h"
-#include "table.h"
+#include "tables.h"
 #include "text.h"
 #include "types.h"
 #include "util.h"
diff --git a/builtins/integers.c b/builtins/integers.c
index 65ac5c82..ef588984 100644
--- a/builtins/integers.c
+++ b/builtins/integers.c
@@ -6,7 +6,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "datatypes.h"
 #include "integers.h"
 #include "optionals.h"
diff --git a/builtins/metamethods.c b/builtins/metamethods.c
index a244bf75..9d5bfcaa 100644
--- a/builtins/metamethods.c
+++ b/builtins/metamethods.c
@@ -2,14 +2,14 @@
 
 #include <stdint.h>
 
-#include "array.h"
-#include "channel.h"
+#include "arrays.h"
+#include "channels.h"
 #include "functiontype.h"
 #include "metamethods.h"
 #include "optionals.h"
-#include "pointer.h"
+#include "pointers.h"
 #include "siphash.h"
-#include "table.h"
+#include "tables.h"
 #include "text.h"
 #include "util.h"
 
diff --git a/builtins/nums.c b/builtins/nums.c
index c54e8fc5..1956140a 100644
--- a/builtins/nums.c
+++ b/builtins/nums.c
@@ -7,7 +7,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "nums.h"
 #include "string.h"
 #include "text.h"
diff --git a/builtins/optionals.c b/builtins/optionals.c
index 276e92f8..b6ca8dfb 100644
--- a/builtins/optionals.c
+++ b/builtins/optionals.c
@@ -1,10 +1,12 @@
 // Optional types
 
-#include "bool.h"
+#include <pthread.h>
+
+#include "bools.h"
 #include "datatypes.h"
 #include "integers.h"
 #include "metamethods.h"
-#include "thread.h"
+#include "threads.h"
 #include "text.h"
 #include "util.h"
 
diff --git a/builtins/path.c b/builtins/paths.c
index 0168462f..231a7c23 100644
--- a/builtins/path.c
+++ b/builtins/paths.c
@@ -12,12 +12,12 @@
 #include <unistd.h>
 #include <unistr.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "files.h"
 #include "integers.h"
 #include "optionals.h"
-#include "path.h"
-#include "pattern.h"
+#include "paths.h"
+#include "patterns.h"
 #include "text.h"
 #include "types.h"
 #include "util.h"
diff --git a/builtins/path.h b/builtins/paths.h
index e0d85258..e0d85258 100644
--- a/builtins/path.h
+++ b/builtins/paths.h
diff --git a/builtins/pattern.c b/builtins/patterns.c
index 7e82ec13..81beaffe 100644
--- a/builtins/pattern.c
+++ b/builtins/patterns.c
@@ -5,10 +5,10 @@
 #include <unictype.h>
 #include <uniname.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "integers.h"
-#include "pattern.h"
-#include "table.h"
+#include "patterns.h"
+#include "tables.h"
 #include "text.h"
 #include "types.h"
 
diff --git a/builtins/pattern.h b/builtins/patterns.h
index 804fb286..804fb286 100644
--- a/builtins/pattern.h
+++ b/builtins/patterns.h
diff --git a/builtins/pointer.c b/builtins/pointers.c
index 1ad9f407..1ad9f407 100644
--- a/builtins/pointer.c
+++ b/builtins/pointers.c
diff --git a/builtins/pointer.h b/builtins/pointers.h
index faa95316..faa95316 100644
--- a/builtins/pointer.h
+++ b/builtins/pointers.h
diff --git a/builtins/range.c b/builtins/ranges.c
index 9dfd1efe..9dfd1efe 100644
--- a/builtins/range.c
+++ b/builtins/ranges.c
diff --git a/builtins/range.h b/builtins/ranges.h
index 2a4f1d68..2a4f1d68 100644
--- a/builtins/range.h
+++ b/builtins/ranges.h
diff --git a/builtins/shell.c b/builtins/shell.c
index a73b0aac..36b6a9ad 100644
--- a/builtins/shell.c
+++ b/builtins/shell.c
@@ -2,9 +2,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "integers.h"
-#include "pattern.h"
+#include "patterns.h"
 #include "shell.h"
 #include "text.h"
 #include "types.h"
diff --git a/builtins/stdlib.c b/builtins/stdlib.c
index e072a8fc..b8e40a54 100644
--- a/builtins/stdlib.c
+++ b/builtins/stdlib.c
@@ -13,9 +13,9 @@
 #include "files.h"
 #include "integers.h"
 #include "metamethods.h"
-#include "pattern.h"
+#include "patterns.h"
 #include "siphash.h"
-#include "table.h"
+#include "tables.h"
 #include "text.h"
 #include "util.h"
 
diff --git a/builtins/table.c b/builtins/tables.c
index 1b017ff6..17e7339f 100644
--- a/builtins/table.c
+++ b/builtins/tables.c
@@ -16,13 +16,13 @@
 #include <string.h>
 #include <sys/param.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "c_string.h"
 #include "datatypes.h"
 #include "memory.h"
 #include "metamethods.h"
 #include "siphash.h"
-#include "table.h"
+#include "tables.h"
 #include "text.h"
 #include "types.h"
 #include "util.h"
diff --git a/builtins/table.h b/builtins/tables.h
index e589e6ec..53e0c583 100644
--- a/builtins/table.h
+++ b/builtins/tables.h
@@ -6,7 +6,7 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "datatypes.h"
 #include "types.h"
 #include "util.h"
diff --git a/builtins/text.c b/builtins/text.c
index 42a6c165..283dfb01 100644
--- a/builtins/text.c
+++ b/builtins/text.c
@@ -61,10 +61,10 @@
 #include <unigbrk.h>
 #include <uniname.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "integers.h"
-#include "pattern.h"
-#include "table.h"
+#include "patterns.h"
+#include "tables.h"
 #include "text.h"
 
 // Use inline version of the siphash code for performance:
diff --git a/builtins/thread.c b/builtins/threads.c
index 2772604d..74e73832 100644
--- a/builtins/thread.c
+++ b/builtins/threads.c
@@ -10,7 +10,7 @@
 #include <pthread.h>
 #include <sys/param.h>
 
-#include "array.h"
+#include "arrays.h"
 #include "text.h"
 #include "types.h"
 #include "util.h"
diff --git a/builtins/thread.h b/builtins/threads.h
index 52091677..52091677 100644
--- a/builtins/thread.h
+++ b/builtins/threads.h
diff --git a/builtins/tomo.h b/builtins/tomo.h
index 78458304..fdd3ea0c 100644
--- a/builtins/tomo.h
+++ b/builtins/tomo.h
@@ -9,10 +9,10 @@
 #include <stdint.h>
 #include <sys/param.h>
 
-#include "array.h"
-#include "bool.h"
+#include "arrays.h"
+#include "bools.h"
 #include "c_string.h"
-#include "channel.h"
+#include "channels.h"
 #include "datatypes.h"
 #include "functiontype.h"
 #include "integers.h"
@@ -21,15 +21,15 @@
 #include "metamethods.h"
 #include "nums.h"
 #include "optionals.h"
-#include "path.h"
-#include "pattern.h"
-#include "pointer.h"
-#include "range.h"
+#include "paths.h"
+#include "patterns.h"
+#include "pointers.h"
+#include "ranges.h"
 #include "shell.h"
 #include "siphash.h"
-#include "table.h"
+#include "tables.h"
 #include "text.h"
-#include "thread.h"
+#include "threads.h"
 #include "types.h"
 
 // vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1,\:0
diff --git a/builtins/types.c b/builtins/types.c
index cf0e30c1..c9f2578f 100644
--- a/builtins/types.c
+++ b/builtins/types.c
@@ -6,9 +6,9 @@
 #include <sys/param.h>
 
 #include "util.h"
-#include "array.h"
-#include "pointer.h"
-#include "table.h"
+#include "arrays.h"
+#include "pointers.h"
+#include "tables.h"
 #include "text.h"
 #include "types.h"
 
diff --git a/environment.c b/environment.c
index ac1e27e1..5170fa95 100644
--- a/environment.c
+++ b/environment.c
@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <signal.h>
 
-#include "builtins/table.h"
+#include "builtins/tables.h"
 #include "builtins/text.h"
 #include "builtins/util.h"
 #include "cordhelpers.h"
diff --git a/environment.h b/environment.h
index dac3065a..005fda7b 100644
--- a/environment.h
+++ b/environment.h
@@ -5,7 +5,7 @@
 #include <gc/cord.h>
 
 #include "types.h"
-#include "builtins/table.h"
+#include "builtins/tables.h"
 
 typedef struct {
     CORD local_typedefs;
diff --git a/parse.c b/parse.c
index e1567c4b..4e57cabf 100644
--- a/parse.c
+++ b/parse.c
@@ -14,7 +14,7 @@
 #include "ast.h"
 #include "builtins/integers.h"
 #include "builtins/text.h"
-#include "builtins/table.h"
+#include "builtins/tables.h"
 #include "builtins/util.h"
 #include "cordhelpers.h"
 
diff --git a/tomo.c b/tomo.c
index c92887d9..ec4f1c35 100644
--- a/tomo.c
+++ b/tomo.c
@@ -10,7 +10,7 @@
 #include <sys/wait.h>
 
 #include "ast.h"
-#include "builtins/array.h"
+#include "builtins/arrays.h"
 #include "builtins/datatypes.h"
 #include "builtins/text.h"
 #include "compile.h"
diff --git a/types.c b/types.c
index 321e6a5d..3f546432 100644
--- a/types.c
+++ b/types.c
@@ -7,7 +7,7 @@
 #include <sys/param.h>
 
 #include "builtins/integers.h"
-#include "builtins/table.h"
+#include "builtins/tables.h"
 #include "builtins/util.h"
 #include "cordhelpers.h"
 #include "types.h"
diff --git a/types.h b/types.h
index 6dedeaf8..94d74022 100644
--- a/types.h
+++ b/types.h
@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "ast.h"
-#include "builtins/array.h"
+#include "builtins/arrays.h"
 
 typedef struct type_s type_t;