aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/stdlib/bools.c2
-rw-r--r--src/stdlib/bytes.c2
-rw-r--r--src/stdlib/c_strings.c1
-rw-r--r--src/stdlib/enums.c7
-rw-r--r--src/stdlib/functiontype.c2
-rw-r--r--src/stdlib/integers.c1
-rw-r--r--src/stdlib/lists.c1
-rw-r--r--src/stdlib/memory.c2
-rw-r--r--src/stdlib/metamethods.c8
-rw-r--r--src/stdlib/nums.c1
-rw-r--r--src/stdlib/optionals.c3
-rw-r--r--src/stdlib/paths.c2
-rw-r--r--src/stdlib/pointers.c1
-rw-r--r--src/stdlib/print.c1
-rw-r--r--src/stdlib/stacktrace.c1
-rw-r--r--src/stdlib/stdlib.c1
-rw-r--r--src/stdlib/structs.c5
-rw-r--r--src/stdlib/tables.c1
-rw-r--r--src/stdlib/text.c4
-rw-r--r--src/stdlib/types.c5
20 files changed, 3 insertions, 48 deletions
diff --git a/src/stdlib/bools.c b/src/stdlib/bools.c
index 85de0621..558d184e 100644
--- a/src/stdlib/bools.c
+++ b/src/stdlib/bools.c
@@ -1,10 +1,8 @@
// Boolean methods/type info
-#include <ctype.h>
#include <err.h>
#include <gc.h>
#include <stdbool.h>
#include <stdint.h>
-#include <stdlib.h>
#include <sys/param.h>
#include "bools.h"
diff --git a/src/stdlib/bytes.c b/src/stdlib/bytes.c
index 130a645f..5a581e7e 100644
--- a/src/stdlib/bytes.c
+++ b/src/stdlib/bytes.c
@@ -102,7 +102,7 @@ public CONSTFUNC Closure_t Byte$to(Byte_t first, Byte_t last, OptionalInt8_t ste
public PUREFUNC Byte_t Byte$from_int(Int_t i, bool truncate) {
if unlikely (!truncate && Int$compare_value(i, I_small(0xFF)) > 0)
fail("This value is too large to convert to a byte without truncation: ", i);
- else if unlikely (!truncate && Int$compare_value(i, I_small(0)) < 0)
+ else if unlikely (!truncate && Int$compare_value(i, I_small(0)) < 0)
fail("Negative values can't be converted to bytes: ", i);
return (Byte_t)(i.small >> 2);
}
diff --git a/src/stdlib/c_strings.c b/src/stdlib/c_strings.c
index 860a69ff..4ad56d4e 100644
--- a/src/stdlib/c_strings.c
+++ b/src/stdlib/c_strings.c
@@ -1,5 +1,4 @@
// Type info and methods for CString datatype (char*)
-#include <ctype.h>
#include <err.h>
#include <gc.h>
#include <stdbool.h>
diff --git a/src/stdlib/enums.c b/src/stdlib/enums.c
index ae9f440f..ae0c976d 100644
--- a/src/stdlib/enums.c
+++ b/src/stdlib/enums.c
@@ -1,17 +1,10 @@
// Metamethods for enums
#include <stdint.h>
-#include <string.h>
-#include "lists.h"
-#include "bools.h"
-#include "functiontype.h"
#include "integers.h"
#include "metamethods.h"
-#include "optionals.h"
-#include "pointers.h"
#include "siphash.h"
-#include "tables.h"
#include "text.h"
#include "util.h"
diff --git a/src/stdlib/functiontype.c b/src/stdlib/functiontype.c
index b0fff1a7..6d692c6d 100644
--- a/src/stdlib/functiontype.c
+++ b/src/stdlib/functiontype.c
@@ -4,9 +4,7 @@
#include "datatypes.h"
#include "functiontype.h"
-#include "optionals.h"
#include "structs.h"
-#include "tables.h"
#include "text.h"
#include "types.h"
#include "util.h"
diff --git a/src/stdlib/integers.c b/src/stdlib/integers.c
index 64d1d847..e24d984d 100644
--- a/src/stdlib/integers.c
+++ b/src/stdlib/integers.c
@@ -11,7 +11,6 @@
#include "datatypes.h"
#include "integers.h"
-#include "lists.h"
#include "optionals.h"
#include "print.h"
#include "siphash.h"
diff --git a/src/stdlib/lists.c b/src/stdlib/lists.c
index 31e25f15..a1ffdf0c 100644
--- a/src/stdlib/lists.c
+++ b/src/stdlib/lists.c
@@ -15,7 +15,6 @@
#include "util.h"
// Use inline version of siphash code:
-#include "siphash.h"
#include "siphash-internals.h"
PUREFUNC static INLINE int64_t get_padded_item_size(const TypeInfo_t *info)
diff --git a/src/stdlib/memory.c b/src/stdlib/memory.c
index 46729f83..83efc71f 100644
--- a/src/stdlib/memory.c
+++ b/src/stdlib/memory.c
@@ -2,8 +2,6 @@
#include <gc.h>
#include <stdbool.h>
#include <stdint.h>
-#include <stdlib.h>
-#include <ctype.h>
#include <sys/param.h>
#include <err.h>
diff --git a/src/stdlib/metamethods.c b/src/stdlib/metamethods.c
index e007a52c..8c755c59 100644
--- a/src/stdlib/metamethods.c
+++ b/src/stdlib/metamethods.c
@@ -4,16 +4,8 @@
#include <string.h>
#include "lists.h"
-#include "bools.h"
-#include "bytes.h"
-#include "functiontype.h"
-#include "integers.h"
#include "metamethods.h"
-#include "optionals.h"
-#include "pointers.h"
#include "siphash.h"
-#include "tables.h"
-#include "text.h"
#include "types.h"
#include "util.h"
diff --git a/src/stdlib/nums.c b/src/stdlib/nums.c
index 3775c8f4..cbb0c9d7 100644
--- a/src/stdlib/nums.c
+++ b/src/stdlib/nums.c
@@ -8,7 +8,6 @@
#include <stdlib.h>
#include "fpconv.h"
-#include "lists.h"
#include "nums.h"
#include "string.h"
#include "text.h"
diff --git a/src/stdlib/optionals.c b/src/stdlib/optionals.c
index ead9428a..7cf57f91 100644
--- a/src/stdlib/optionals.c
+++ b/src/stdlib/optionals.c
@@ -1,9 +1,6 @@
// Optional types
-#include "bools.h"
-#include "bytes.h"
#include "datatypes.h"
-#include "integers.h"
#include "metamethods.h"
#include "nums.h"
#include "text.h"
diff --git a/src/stdlib/paths.c b/src/stdlib/paths.c
index 58702ec7..a14b32c2 100644
--- a/src/stdlib/paths.c
+++ b/src/stdlib/paths.c
@@ -19,7 +19,6 @@
#include "lists.h"
#include "enums.h"
-#include "files.h"
#include "integers.h"
#include "optionals.h"
#include "paths.h"
@@ -30,7 +29,6 @@
#include "print.h"
// Use inline version of the siphash code for performance:
-#include "siphash.h"
#include "siphash-internals.h"
static const Path_t HOME_PATH = {.type.$tag=PATH_HOME},
diff --git a/src/stdlib/pointers.c b/src/stdlib/pointers.c
index 6874dd3c..3708da62 100644
--- a/src/stdlib/pointers.c
+++ b/src/stdlib/pointers.c
@@ -1,5 +1,4 @@
// Type infos and methods for Pointer types
-#include <ctype.h>
#include <err.h>
#include <gc.h>
#include <stdbool.h>
diff --git a/src/stdlib/print.c b/src/stdlib/print.c
index 3270c765..476ddd7b 100644
--- a/src/stdlib/print.c
+++ b/src/stdlib/print.c
@@ -1,5 +1,4 @@
// This file defines some of the helper functions used for printing values
-#include <math.h>
#include <stdio.h>
#include <string.h>
#include <unistd.h>
diff --git a/src/stdlib/stacktrace.c b/src/stdlib/stacktrace.c
index 3904ae70..4c8b5af3 100644
--- a/src/stdlib/stacktrace.c
+++ b/src/stdlib/stacktrace.c
@@ -3,7 +3,6 @@
#include <execinfo.h>
#include <gc.h>
#include <limits.h>
-#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/stdlib/stdlib.c b/src/stdlib/stdlib.c
index 02ccd710..767e7705 100644
--- a/src/stdlib/stdlib.c
+++ b/src/stdlib/stdlib.c
@@ -14,7 +14,6 @@
#include "bools.h"
#include "files.h"
-#include "functiontype.h"
#include "integers.h"
#include "metamethods.h"
#include "nums.h"
diff --git a/src/stdlib/structs.c b/src/stdlib/structs.c
index d4a22d93..5d6b2319 100644
--- a/src/stdlib/structs.c
+++ b/src/stdlib/structs.c
@@ -3,14 +3,9 @@
#include <stdint.h>
#include <string.h>
-#include "lists.h"
#include "bools.h"
-#include "functiontype.h"
#include "metamethods.h"
-#include "optionals.h"
-#include "pointers.h"
#include "siphash.h"
-#include "tables.h"
#include "text.h"
#include "util.h"
diff --git a/src/stdlib/tables.c b/src/stdlib/tables.c
index 9301914c..63f8eb09 100644
--- a/src/stdlib/tables.c
+++ b/src/stdlib/tables.c
@@ -22,7 +22,6 @@
#include "memory.h"
#include "metamethods.h"
#include "pointers.h"
-#include "print.h"
#include "siphash.h"
#include "tables.h"
#include "text.h"
diff --git a/src/stdlib/text.c b/src/stdlib/text.c
index 6e2e9072..b246b6ce 100644
--- a/src/stdlib/text.c
+++ b/src/stdlib/text.c
@@ -1784,7 +1784,7 @@ public Int_t Text$memory_size(Text_t text)
return Int$plus(
Int$from_int64((int64_t)sizeof(Text_t)),
Int$plus(Text$memory_size(*text.left), Text$memory_size(*text.right)));
- default: errx(1, "Invalid text tag: ", text.tag);
+ default: errx(1, "Invalid text tag: %d", text.tag);
}
}
@@ -1799,7 +1799,7 @@ public Text_t Text$layout(Text_t text)
return Texts(Text("Blob("), Int64$as_text((int64_t[1]){text.length}, false, NULL), Text(")"));
case TEXT_CONCAT:
return Texts(Text("Concat("), Text$layout(*text.left), Text(", "), Text$layout(*text.right), Text(")"));
- default: errx(1, "Invalid text tag: ", text.tag);
+ default: errx(1, "Invalid text tag: %d", text.tag);
}
}
diff --git a/src/stdlib/types.c b/src/stdlib/types.c
index 0f51d6ea..0f17cb21 100644
--- a/src/stdlib/types.c
+++ b/src/stdlib/types.c
@@ -1,14 +1,9 @@
// Type information and methods for TypeInfos (i.e. runtime representations of types)
#include <err.h>
#include <gc.h>
-#include <stdlib.h>
-#include <string.h>
#include <sys/param.h>
#include "util.h"
-#include "lists.h"
-#include "pointers.h"
-#include "tables.h"
#include "text.h"
#include "types.h"