Rename builtins to use plurals when appropriate

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

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"
 

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"

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"

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"

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"

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"
 

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"

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"
 

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"

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"
 

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"

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"
 

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"

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"

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:

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"

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

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"
 

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"

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;

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"
 

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"

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"

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;