From c455e7b67d2e55e6ed03e3449203d4e307f5a7dd Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Fri, 13 Sep 2024 20:18:08 -0400 Subject: [PATCH] Rename builtins/ -> stdlib/ --- Makefile | 12 ++++++------ ast.c | 4 ++-- ast.h | 4 ++-- compile.c | 6 +++--- compile.h | 2 +- cordhelpers.c | 2 +- enums.c | 4 ++-- environment.c | 6 +++--- environment.h | 2 +- parse.c | 8 ++++---- repl.c | 4 ++-- {builtins => stdlib}/arrays.c | 0 {builtins => stdlib}/arrays.h | 0 {builtins => stdlib}/bools.c | 0 {builtins => stdlib}/bools.h | 0 {builtins => stdlib}/c_strings.c | 0 {builtins => stdlib}/c_strings.h | 0 {builtins => stdlib}/channels.c | 0 {builtins => stdlib}/channels.h | 0 {builtins => stdlib}/datatypes.h | 0 {builtins => stdlib}/files.c | 0 {builtins => stdlib}/files.h | 0 {builtins => stdlib}/functiontype.c | 0 {builtins => stdlib}/functiontype.h | 0 {builtins => stdlib}/integers.c | 0 {builtins => stdlib}/integers.h | 0 {builtins => stdlib}/memory.c | 0 {builtins => stdlib}/memory.h | 0 {builtins => stdlib}/metamethods.c | 0 {builtins => stdlib}/metamethods.h | 0 {builtins => stdlib}/nums.c | 0 {builtins => stdlib}/nums.h | 0 {builtins => stdlib}/optionals.c | 0 {builtins => stdlib}/optionals.h | 0 {builtins => stdlib}/paths.c | 0 {builtins => stdlib}/paths.h | 0 {builtins => stdlib}/patterns.c | 0 {builtins => stdlib}/patterns.h | 0 {builtins => stdlib}/pointers.c | 0 {builtins => stdlib}/pointers.h | 0 {builtins => stdlib}/ranges.c | 0 {builtins => stdlib}/ranges.h | 0 {builtins => stdlib}/shell.c | 0 {builtins => stdlib}/shell.h | 0 {builtins => stdlib}/siphash-internals.h | 0 {builtins => stdlib}/siphash.c | 0 {builtins => stdlib}/siphash.h | 0 {builtins => stdlib}/stdlib.c | 0 {builtins => stdlib}/stdlib.h | 0 {builtins => stdlib}/tables.c | 0 {builtins => stdlib}/tables.h | 0 {builtins => stdlib}/text.c | 0 {builtins => stdlib}/text.h | 0 {builtins => stdlib}/threads.c | 0 {builtins => stdlib}/threads.h | 0 {builtins => stdlib}/tomo.h | 0 {builtins => stdlib}/types.c | 0 {builtins => stdlib}/types.h | 0 {builtins => stdlib}/util.c | 0 {builtins => stdlib}/util.h | 0 structs.c | 4 ++-- tomo.c | 6 +++--- typecheck.c | 4 ++-- types.c | 6 +++--- types.h | 2 +- 65 files changed, 38 insertions(+), 38 deletions(-) rename {builtins => stdlib}/arrays.c (100%) rename {builtins => stdlib}/arrays.h (100%) rename {builtins => stdlib}/bools.c (100%) rename {builtins => stdlib}/bools.h (100%) rename {builtins => stdlib}/c_strings.c (100%) rename {builtins => stdlib}/c_strings.h (100%) rename {builtins => stdlib}/channels.c (100%) rename {builtins => stdlib}/channels.h (100%) rename {builtins => stdlib}/datatypes.h (100%) rename {builtins => stdlib}/files.c (100%) rename {builtins => stdlib}/files.h (100%) rename {builtins => stdlib}/functiontype.c (100%) rename {builtins => stdlib}/functiontype.h (100%) rename {builtins => stdlib}/integers.c (100%) rename {builtins => stdlib}/integers.h (100%) rename {builtins => stdlib}/memory.c (100%) rename {builtins => stdlib}/memory.h (100%) rename {builtins => stdlib}/metamethods.c (100%) rename {builtins => stdlib}/metamethods.h (100%) rename {builtins => stdlib}/nums.c (100%) rename {builtins => stdlib}/nums.h (100%) rename {builtins => stdlib}/optionals.c (100%) rename {builtins => stdlib}/optionals.h (100%) rename {builtins => stdlib}/paths.c (100%) rename {builtins => stdlib}/paths.h (100%) rename {builtins => stdlib}/patterns.c (100%) rename {builtins => stdlib}/patterns.h (100%) rename {builtins => stdlib}/pointers.c (100%) rename {builtins => stdlib}/pointers.h (100%) rename {builtins => stdlib}/ranges.c (100%) rename {builtins => stdlib}/ranges.h (100%) rename {builtins => stdlib}/shell.c (100%) rename {builtins => stdlib}/shell.h (100%) rename {builtins => stdlib}/siphash-internals.h (100%) rename {builtins => stdlib}/siphash.c (100%) rename {builtins => stdlib}/siphash.h (100%) rename {builtins => stdlib}/stdlib.c (100%) rename {builtins => stdlib}/stdlib.h (100%) rename {builtins => stdlib}/tables.c (100%) rename {builtins => stdlib}/tables.h (100%) rename {builtins => stdlib}/text.c (100%) rename {builtins => stdlib}/text.h (100%) rename {builtins => stdlib}/threads.c (100%) rename {builtins => stdlib}/threads.h (100%) rename {builtins => stdlib}/tomo.h (100%) rename {builtins => stdlib}/types.c (100%) rename {builtins => stdlib}/types.h (100%) rename {builtins => stdlib}/util.c (100%) rename {builtins => stdlib}/util.h (100%) diff --git a/Makefile b/Makefile index 8cbfef3..d4694d5 100644 --- a/Makefile +++ b/Makefile @@ -28,10 +28,10 @@ O=-Og CFLAGS=$(CCONFIG) $(EXTRA) $(CWARN) $(G) $(O) $(OSFLAGS) CFLAGS_PLACEHOLDER="$$(echo -e '\033[2m\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 aa8b1b5..f00ae5c 100644 --- a/ast.c +++ b/ast.c @@ -5,8 +5,8 @@ #include #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 198e3d8..55ac28f 100644 --- a/ast.h +++ b/ast.h @@ -8,8 +8,8 @@ #include #include -#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 c9e08c9..2802519 100644 --- a/compile.c +++ b/compile.c @@ -7,15 +7,15 @@ #include #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 fa18ee8..d53262d 100644 --- a/compile.h +++ b/compile.h @@ -6,7 +6,7 @@ #include #include -#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 f0e1ab3..5a0066f 100644 --- a/cordhelpers.c +++ b/cordhelpers.c @@ -3,7 +3,7 @@ #include #include -#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 7268d56..e06ca0e 100644 --- a/enums.c +++ b/enums.c @@ -5,13 +5,13 @@ #include #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 5170fa9..dc31eee 100644 --- a/environment.c +++ b/environment.c @@ -3,9 +3,9 @@ #include #include -#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 005fda7..59af36d 100644 --- a/environment.h +++ b/environment.h @@ -5,7 +5,7 @@ #include #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 4e57cab..a5ad136 100644 --- a/parse.c +++ b/parse.c @@ -12,10 +12,10 @@ #include #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 06806c3..1dbc01c 100644 --- a/repl.c +++ b/repl.c @@ -8,8 +8,8 @@ #include #include -#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 similarity index 100% rename from builtins/arrays.c rename to stdlib/arrays.c diff --git a/builtins/arrays.h b/stdlib/arrays.h similarity index 100% rename from builtins/arrays.h rename to stdlib/arrays.h diff --git a/builtins/bools.c b/stdlib/bools.c similarity index 100% rename from builtins/bools.c rename to stdlib/bools.c diff --git a/builtins/bools.h b/stdlib/bools.h similarity index 100% rename from builtins/bools.h rename to stdlib/bools.h diff --git a/builtins/c_strings.c b/stdlib/c_strings.c similarity index 100% rename from builtins/c_strings.c rename to stdlib/c_strings.c diff --git a/builtins/c_strings.h b/stdlib/c_strings.h similarity index 100% rename from builtins/c_strings.h rename to stdlib/c_strings.h diff --git a/builtins/channels.c b/stdlib/channels.c similarity index 100% rename from builtins/channels.c rename to stdlib/channels.c diff --git a/builtins/channels.h b/stdlib/channels.h similarity index 100% rename from builtins/channels.h rename to stdlib/channels.h diff --git a/builtins/datatypes.h b/stdlib/datatypes.h similarity index 100% rename from builtins/datatypes.h rename to stdlib/datatypes.h diff --git a/builtins/files.c b/stdlib/files.c similarity index 100% rename from builtins/files.c rename to stdlib/files.c diff --git a/builtins/files.h b/stdlib/files.h similarity index 100% rename from builtins/files.h rename to stdlib/files.h diff --git a/builtins/functiontype.c b/stdlib/functiontype.c similarity index 100% rename from builtins/functiontype.c rename to stdlib/functiontype.c diff --git a/builtins/functiontype.h b/stdlib/functiontype.h similarity index 100% rename from builtins/functiontype.h rename to stdlib/functiontype.h diff --git a/builtins/integers.c b/stdlib/integers.c similarity index 100% rename from builtins/integers.c rename to stdlib/integers.c diff --git a/builtins/integers.h b/stdlib/integers.h similarity index 100% rename from builtins/integers.h rename to stdlib/integers.h diff --git a/builtins/memory.c b/stdlib/memory.c similarity index 100% rename from builtins/memory.c rename to stdlib/memory.c diff --git a/builtins/memory.h b/stdlib/memory.h similarity index 100% rename from builtins/memory.h rename to stdlib/memory.h diff --git a/builtins/metamethods.c b/stdlib/metamethods.c similarity index 100% rename from builtins/metamethods.c rename to stdlib/metamethods.c diff --git a/builtins/metamethods.h b/stdlib/metamethods.h similarity index 100% rename from builtins/metamethods.h rename to stdlib/metamethods.h diff --git a/builtins/nums.c b/stdlib/nums.c similarity index 100% rename from builtins/nums.c rename to stdlib/nums.c diff --git a/builtins/nums.h b/stdlib/nums.h similarity index 100% rename from builtins/nums.h rename to stdlib/nums.h diff --git a/builtins/optionals.c b/stdlib/optionals.c similarity index 100% rename from builtins/optionals.c rename to stdlib/optionals.c diff --git a/builtins/optionals.h b/stdlib/optionals.h similarity index 100% rename from builtins/optionals.h rename to stdlib/optionals.h diff --git a/builtins/paths.c b/stdlib/paths.c similarity index 100% rename from builtins/paths.c rename to stdlib/paths.c diff --git a/builtins/paths.h b/stdlib/paths.h similarity index 100% rename from builtins/paths.h rename to stdlib/paths.h diff --git a/builtins/patterns.c b/stdlib/patterns.c similarity index 100% rename from builtins/patterns.c rename to stdlib/patterns.c diff --git a/builtins/patterns.h b/stdlib/patterns.h similarity index 100% rename from builtins/patterns.h rename to stdlib/patterns.h diff --git a/builtins/pointers.c b/stdlib/pointers.c similarity index 100% rename from builtins/pointers.c rename to stdlib/pointers.c diff --git a/builtins/pointers.h b/stdlib/pointers.h similarity index 100% rename from builtins/pointers.h rename to stdlib/pointers.h diff --git a/builtins/ranges.c b/stdlib/ranges.c similarity index 100% rename from builtins/ranges.c rename to stdlib/ranges.c diff --git a/builtins/ranges.h b/stdlib/ranges.h similarity index 100% rename from builtins/ranges.h rename to stdlib/ranges.h diff --git a/builtins/shell.c b/stdlib/shell.c similarity index 100% rename from builtins/shell.c rename to stdlib/shell.c diff --git a/builtins/shell.h b/stdlib/shell.h similarity index 100% rename from builtins/shell.h rename to stdlib/shell.h diff --git a/builtins/siphash-internals.h b/stdlib/siphash-internals.h similarity index 100% rename from builtins/siphash-internals.h rename to stdlib/siphash-internals.h diff --git a/builtins/siphash.c b/stdlib/siphash.c similarity index 100% rename from builtins/siphash.c rename to stdlib/siphash.c diff --git a/builtins/siphash.h b/stdlib/siphash.h similarity index 100% rename from builtins/siphash.h rename to stdlib/siphash.h diff --git a/builtins/stdlib.c b/stdlib/stdlib.c similarity index 100% rename from builtins/stdlib.c rename to stdlib/stdlib.c diff --git a/builtins/stdlib.h b/stdlib/stdlib.h similarity index 100% rename from builtins/stdlib.h rename to stdlib/stdlib.h diff --git a/builtins/tables.c b/stdlib/tables.c similarity index 100% rename from builtins/tables.c rename to stdlib/tables.c diff --git a/builtins/tables.h b/stdlib/tables.h similarity index 100% rename from builtins/tables.h rename to stdlib/tables.h diff --git a/builtins/text.c b/stdlib/text.c similarity index 100% rename from builtins/text.c rename to stdlib/text.c diff --git a/builtins/text.h b/stdlib/text.h similarity index 100% rename from builtins/text.h rename to stdlib/text.h diff --git a/builtins/threads.c b/stdlib/threads.c similarity index 100% rename from builtins/threads.c rename to stdlib/threads.c diff --git a/builtins/threads.h b/stdlib/threads.h similarity index 100% rename from builtins/threads.h rename to stdlib/threads.h diff --git a/builtins/tomo.h b/stdlib/tomo.h similarity index 100% rename from builtins/tomo.h rename to stdlib/tomo.h diff --git a/builtins/types.c b/stdlib/types.c similarity index 100% rename from builtins/types.c rename to stdlib/types.c diff --git a/builtins/types.h b/stdlib/types.h similarity index 100% rename from builtins/types.h rename to stdlib/types.h diff --git a/builtins/util.c b/stdlib/util.c similarity index 100% rename from builtins/util.c rename to stdlib/util.c diff --git a/builtins/util.h b/stdlib/util.h similarity index 100% rename from builtins/util.h rename to stdlib/util.h diff --git a/structs.c b/structs.c index 328fa3b..6584eac 100644 --- a/structs.c +++ b/structs.c @@ -5,12 +5,12 @@ #include #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 ec4f1c3..4d1692a 100644 --- a/tomo.c +++ b/tomo.c @@ -10,9 +10,9 @@ #include #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 65597a8..86c204d 100644 --- a/typecheck.c +++ b/typecheck.c @@ -8,8 +8,8 @@ #include #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 3f54643..bc54015 100644 --- a/types.c +++ b/types.c @@ -6,9 +6,9 @@ #include #include -#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 94d7402..8b1ded4 100644 --- a/types.h +++ b/types.h @@ -6,7 +6,7 @@ #include #include "ast.h" -#include "builtins/arrays.h" +#include "stdlib/arrays.h" typedef struct type_s type_t;