diff options
| -rw-r--r-- | builtins/array.c | 8 | ||||
| -rw-r--r-- | builtins/bool.c | 1 | ||||
| -rw-r--r-- | builtins/c_string.c | 2 | ||||
| -rw-r--r-- | builtins/functions.c | 2 | ||||
| -rw-r--r-- | builtins/siphash-internals.h | 2 | ||||
| -rw-r--r-- | builtins/siphash.c | 5 | ||||
| -rw-r--r-- | builtins/siphash.h | 3 | ||||
| -rw-r--r-- | builtins/text.c | 8 | ||||
| -rw-r--r-- | builtins/text.h | 1 | ||||
| -rw-r--r-- | builtins/thread.c | 1 | ||||
| -rw-r--r-- | builtins/tomo.h | 3 |
11 files changed, 9 insertions, 27 deletions
diff --git a/builtins/array.c b/builtins/array.c index 72e1c790..f4d7a3da 100644 --- a/builtins/array.c +++ b/builtins/array.c @@ -1,22 +1,14 @@ // Functions that operate on arrays -#include <ctype.h> -#include <err.h> #include <gc.h> -#include <gc/cord.h> -#include <math.h> #include <stdbool.h> #include <stdint.h> -#include <stdlib.h> #include <sys/param.h> #include "array.h" -#include "functions.h" -#include "integers.h" #include "optionals.h" #include "table.h" #include "text.h" -#include "types.h" #include "util.h" // Use inline version of siphash code: diff --git a/builtins/bool.c b/builtins/bool.c index ce27ce79..7759cf38 100644 --- a/builtins/bool.c +++ b/builtins/bool.c @@ -11,7 +11,6 @@ #include "bool.h" #include "optionals.h" #include "text.h" -#include "types.h" #include "util.h" PUREFUNC public Text_t Bool$as_text(const bool *b, bool colorize, const TypeInfo *type) diff --git a/builtins/c_string.c b/builtins/c_string.c index bda127f0..ab9c606e 100644 --- a/builtins/c_string.c +++ b/builtins/c_string.c @@ -7,10 +7,8 @@ #include <stdint.h> #include <stdlib.h> -#include "functions.h" #include "text.h" #include "siphash.h" -#include "types.h" #include "util.h" public Text_t CString$as_text(const char **c_string, bool colorize, const TypeInfo *info) diff --git a/builtins/functions.c b/builtins/functions.c index 08b04c9b..aabb7cab 100644 --- a/builtins/functions.c +++ b/builtins/functions.c @@ -27,8 +27,6 @@ #include "types.h" #include "util.h" -public uint64_t TOMO_HASH_KEY[2] = {23, 42}; // Randomized in tomo_init() - public void tomo_init(void) { GC_INIT(); diff --git a/builtins/siphash-internals.h b/builtins/siphash-internals.h index 4a0dc7cf..d1906be4 100644 --- a/builtins/siphash-internals.h +++ b/builtins/siphash-internals.h @@ -8,7 +8,7 @@ #include <stdint.h> #include <string.h> -#include "tomo.h" +#include "siphash.h" /* <MIT License> Copyright (c) 2013 Marek Majkowski <marek@popcount.org> diff --git a/builtins/siphash.c b/builtins/siphash.c index 35c882ca..671fbad6 100644 --- a/builtins/siphash.c +++ b/builtins/siphash.c @@ -2,7 +2,10 @@ #include <stdint.h> #include <string.h> -#include "tomo.h" +#include "siphash.h" +#include "util.h" + +public uint64_t TOMO_HASH_KEY[2] = {23, 42}; // Randomized in tomo_init() /* <MIT License> Copyright (c) 2013 Marek Majkowski <marek@popcount.org> diff --git a/builtins/siphash.h b/builtins/siphash.h index 0fc7614c..8104a306 100644 --- a/builtins/siphash.h +++ b/builtins/siphash.h @@ -5,6 +5,9 @@ #include <stdint.h> #include <stddef.h> +// This value will be randomized on startup in tomo_init(): +extern uint64_t TOMO_HASH_KEY[2]; + uint64_t siphash24(const uint8_t *src, size_t src_sz); // vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1,\:0 diff --git a/builtins/text.c b/builtins/text.c index 795f55d0..8ed3cfd3 100644 --- a/builtins/text.c +++ b/builtins/text.c @@ -49,9 +49,7 @@ #include <assert.h> #include <ctype.h> -#include <err.h> #include <gc.h> -#include <limits.h> #include <printf.h> #include <stdbool.h> #include <stdint.h> @@ -62,17 +60,13 @@ #include <unictype.h> #include <unigbrk.h> #include <uniname.h> -#include <uninorm.h> -#include <unistd.h> -#include <unistdio.h> -#include <unistr.h> #include "array.h" #include "functions.h" #include "integers.h" +#include "pattern.h" #include "table.h" #include "text.h" -#include "types.h" // Use inline version of the siphash code for performance: #include "siphash.h" diff --git a/builtins/text.h b/builtins/text.h index e5a7b705..841d51fe 100644 --- a/builtins/text.h +++ b/builtins/text.h @@ -10,7 +10,6 @@ #include "datatypes.h" #include "integers.h" -#include "types.h" typedef struct { int64_t subtext, sum_of_previous_subtexts; diff --git a/builtins/thread.c b/builtins/thread.c index b842da94..2772604d 100644 --- a/builtins/thread.c +++ b/builtins/thread.c @@ -11,7 +11,6 @@ #include <sys/param.h> #include "array.h" -#include "functions.h" #include "text.h" #include "types.h" #include "util.h" diff --git a/builtins/tomo.h b/builtins/tomo.h index c674ffe2..b3a60f94 100644 --- a/builtins/tomo.h +++ b/builtins/tomo.h @@ -32,7 +32,4 @@ #include "thread.h" #include "types.h" -// This value will be randomized on startup in tomo_init(): -extern uint64_t TOMO_HASH_KEY[2]; - // vim: ts=4 sw=0 et cino=L2,l1,(0,W4,m1,\:0 |