lots of updates to macros to make them use sq_ prefix;

Author: sampersand

Makefile

@@ -23,7 +23,7 @@ ifeq ($(MAKECMDGOALS),debug)
 	CFLAGS+=-g -fsanitize=address,undefined -DSQ_LOG
 	NJOKE=1
 else ifeq ($(MAKECMDGOALS),optimized)
-	CFLAGS+=-flto -DNDEBUG -O3
+	CFLAGS+=-flto -DNDEBUG -O3 --DSQ_RELEASE_FAST
 endif
 
 ifdef NJOKE

examples/showcase.sq

@@ -0,0 +1 @@
+onward

include/squire/book.h

@@ -39,7 +39,7 @@ static inline struct sq_book *sq_book_new2(size_t length, sq_value *pages) {
 
 // Creates a new book with the given capacity.
 static inline struct sq_book *sq_book_allocate(size_t capacity) {
-	return sq_book_new(0, capacity, xmalloc(sizeof_array(sq_value, capacity)));
+	return sq_book_new(0, capacity, sq_malloc(sizeof_array(sq_value, capacity)));
 }
 
 /** Deallocates the memory associated with `book`.

include/squire/shared.h

@@ -4,41 +4,72 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(__GNUC__) || defined(SQ_USE_ATTRIBUTES)
+#ifdef __has_builtin
+# define SQ_HAS_BUILTIN(x) __has_builtin(x)
+#else
+# define SQ_HAS_BUILTIN(x) 0
+#endif /* defined __has_builtin */
+
+#ifdef __has_attribute
+# define SQ_HAS_ATTRIBUTE(x) __has_attribute(x)
+#else
+# define SQ_HAS_ATTRIBUTE(x) 0
+#endif /* defined __has_attribute */
+
+#if defined(__GNUC__) || defined(__clang__)
 # define SQ_ATTR(...) __attribute__((__VA_ARGS__))
 #else
 # define SQ_ATTR(...)
-#endif /* __GNUC__ || SQ_USE_ATTRIBUTES */
+#endif /* __GNUC__ || __clang__ */
 
-#define SQ_NONNULL SQ_ATTR(nonnull)
-#define sizeof_array(kind, length) (sizeof(kind) * (length))
+#if SQ_HAS_ATTRIBUTE(nonnull)
+# define SQ_NONNULL SQ_ATTR(nonnull)
+#else
+# define SQ_NONNULL
+#endif /* SQ_HAS_ATTRIBUTE(nonnull) */
 
-#define SQ_UNLIKELY(x) (x)
-#define SQ_LIKELY(x) (x)
+#if SQ_HAS_BUILTIN(__builtin_expect)
+# define SQ_LIKELY(x) (__builtin_expect(1, !!(x)))
+#else
+# define SQ_LIKELY(x) (!!(x))
+#endif /* SQ_HAS_BUILTIN(__builtin_expect) */
+#define SQ_UNLIKELY(x) SQ_LIKELY(!(x))
 
-#include <squire/exception.h>
+#if SQ_HAS_BUILTIN(__builtin_unreachable)
+# define SQ_UNREACHABLE do { __builtin_unreachable(); } while(0)
+#else
+# define SQ_UNREACHABLE do { abort(); } while(0)
+#endif /* SQ_HAS_BUILTIN(__builtin_unreachable) */
 
-#define die sq_throw
-#define todo(...) (fprintf(stderr, __VA_ARGS__), exit(1))
-#define bug(...) (\
-	fprintf(stderr, "bug at " __FILE__ ":%s:%d: ", __func__, __LINE__),\
-	fprintf(stderr, __VA_ARGS__),\
-	fputc('\n', stderr),\
-	fflush(stderr),\
-	abort())
+#ifdef SQ_RELEASE_FAST
+# define sq_bug(...) SQ_UNREACHABLE
+#else
+# define sq_bug(...) do {sq_bug_fn(__FILE__, __func__, __LINE__, __VA_ARGS__); } while(0)
+#endif /* defined(SQ_RELEASE_FAST) */
 
 #ifdef SQ_LOG
-#define LOG printf
+#define sq_log printf
 #else
-#define LOG(...) ((void) 0)
+#define sq_log(...) ((void) 0)
 #endif
 
-void *xcalloc(size_t count, size_t size) SQ_ATTR(malloc);
-void *xmalloc(size_t size) SQ_ATTR(malloc);
-void *xrealloc(void *ptr, size_t size);
-void *memdup(void *ptr, size_t size);
 
-void sq_memory_error(char *msg, ...) SQ_ATTR(cold,noreturn);
-char *read_file(const char *filename);
+#include <squire/exception.h>
+#define die sq_throw
+#define sq_todo(...) (fprintf(stderr, __VA_ARGS__), exit(1))
+
+#define sq_
+#define sizeof_array(kind, length) (sizeof(kind) * (length))
+
+void *sq_calloc(size_t count, size_t size) SQ_ATTR(malloc) ;
+void *sq_malloc(size_t size) SQ_ATTR(malloc);
+void *sq_realloc(void *ptr, size_t size);
+void *sq_memdup(void *ptr, size_t size);
+
+void sq_bug_fn(
+	const char *file, const char *function, long long line, const char *fmt, ...
+) SQ_ATTR(cold,noreturn);
+void sq_memory_error(const char *fmt, ...) SQ_ATTR(cold,noreturn);
+char *sq_read_file(const char *filename);
 
 #endif /* !SQ_SHARED_H */

src/exception.c

@@ -21,13 +21,13 @@ void sq_exception_init(struct sq_program *program) {
 	sq_exception_form.refcount = 1;
 
 	sq_exception_form.nmatter = 1;
-	sq_exception_form.matter = xmalloc(sizeof(struct sq_form_matter));
+	sq_exception_form.matter = sq_malloc(sizeof(struct sq_form_matter));
 	sq_exception_form.matter[0].name = "msg";
 	sq_exception_form.matter[0].genus = SQ_UNDEFINED; // todo: make it text.
 
 	sq_exception_form.nchanges = 1;
-	sq_exception_form.changes = xmalloc(sizeof(struct sq_journey *));
-	struct sq_journey *to_text = sq_exception_form.changes[0] = xmalloc(sizeof(struct sq_journey));
+	sq_exception_form.changes = sq_malloc(sizeof(struct sq_journey *));
+	struct sq_journey *to_text = sq_exception_form.changes[0] = sq_malloc(sizeof(struct sq_journey));
 
 	(void) to_text;
 	(void) program;
@@ -42,7 +42,7 @@ void sq_exception_init(struct sq_program *program) {
 	// to_text->consts = NULL;
 	// to_text->program = program;
 	// to_text->is_method = true;
-	// to_text->bytecode = xmalloc(sizeof_array(union sq_bytecode, 4));
+	// to_text->bytecode = sq_malloc(sizeof_array(union sq_bytecode, 4));
 	// to_text->bytecode[0].opcode = SQ_OC_ILOAD;
 	// to_text->bytecode[1].index = 0;
 	// to_text->bytecode[2].index = 0;

src/main.c

@@ -18,7 +18,7 @@ int main(int argc, const char **argv) {
 	if (argv[1][1] == 'e') {
 		sq_program_compile(&program, argv[2]);
 	} else {
-		char *contents = read_file(argv[2]);
+		char *contents = sq_read_file(argv[2]);
 		sq_program_compile(&program, contents);
 		free(contents);
 	}

src/other/io/envoy.c

@@ -13,7 +13,7 @@ void sq_envoy_initialize(struct sq_envoy *envoy, const char *filename) {
 	envoy->symlen = 0;
 	envoy->symcap = 4;
 	envoy->filename = strdup(filename);
-	envoy->syms = xmalloc(sizeof_array(struct sq_envoy_sym, envoy->symcap));
+	envoy->syms = sq_malloc(sizeof_array(struct sq_envoy_sym, envoy->symcap));
 }
 
 void sq_envoy_deallocate(struct sq_envoy *envoy) {

src/other/io/scroll.c

@@ -30,7 +30,7 @@ void sq_scroll_init(struct sq_scroll *scroll, const char *filename, const char *
 
 	struct sq_other *other;
 #define NEW_JOURNEY(_name, _nargs) \
-	_name##_journey = sq_value_new(other = xmalloc(sizeof(struct sq_other))); \
+	_name##_journey = sq_value_new(other = sq_malloc(sizeof(struct sq_other))); \
 	other->refcount = 1; \
 	other->kind = SQ_OK_BUILTIN_JOURNEY; \
 	other->builtin_journey.name = "Scroll."#_name; \
@@ -98,7 +98,7 @@ struct sq_text *sq_scroll_read(struct sq_scroll *scroll, size_t length) {
 }
 
 struct sq_text *sq_scroll_read_all(struct sq_scroll *scroll) {
-	return sq_text_new(read_file(scroll->filename));
+	return sq_text_new(sq_read_file(scroll->filename));
 }
 
 void sq_scroll_write(struct sq_scroll *scroll, const char *ptr, size_t length) {
@@ -145,7 +145,7 @@ static sq_value read_func(struct sq_args args) {
 
 	case SQ_G_TEXT:
 		if (strcmp(sq_value_as_text(arg)->ptr, "\n"))
-			die("todo: non-newline gets");
+			sq_throw("todo: non-newline gets");
 
 		{
 			size_t length;

src/other/kingdom.c

@@ -7,7 +7,7 @@
 void sq_kingdom_initialize(struct sq_kingdom *kingdom, unsigned capacity) {
 	kingdom->nsubjects = 0;
 	kingdom->subject_cap = capacity;
-	kingdom->subjects = xmalloc(sizeof_array(struct sq_kingdom_subject, capacity));
+	kingdom->subjects = sq_malloc(sizeof_array(struct sq_kingdom_subject, capacity));
 }
 
 void sq_kingdom_dump(FILE *out, const struct sq_kingdom *kingdom) {
@@ -62,7 +62,7 @@ bool sq_kingdom_set_attr(struct sq_kingdom *kingdom, const char *name, sq_value
 	if (kingdom->subject_cap == kingdom->nsubjects) {
 		kingdom->subject_cap *= 2;
 		kingdom->subjects =
-			xrealloc(
+			sq_realloc(
 				kingdom->subjects,
 				sizeof_array(struct sq_kingdom_subject, kingdom->subject_cap)
 			);

src/other/other.c

@@ -143,7 +143,7 @@ struct sq_text *sq_other_to_text(const struct sq_other *other) {
 	case SQ_OK_BUILTIN_JOURNEY:
 	case SQ_OK_CITATION:
 	case SQ_OK_PAT_HELPER:
-		todo("others to text");
+		sq_todo("others to text");
 	}
 }
 

src/posix.c

@@ -9,7 +9,7 @@ struct _nothing_to_see_here;
 char *strdup(char *str) {
 	size_t length = strlen(str) + 1;
 
-	return memcpy(xmalloc(length), str, length);
+	return memcpy(sq_malloc(length), str, length);
 }
 
 char *strndup(char *str, size_t maxlen) {
@@ -18,7 +18,7 @@ char *strndup(char *str, size_t maxlen) {
 	if (length < maxlen)
 		return strdup(str);
 
-	char *result = xmalloc(maxlen);
+	char *result = sq_malloc(maxlen);
 	memcpy(result, str, maxlen);
 	result[maxlen] = '\0';
 

src/program/bytecode.c

@@ -34,7 +34,7 @@ const char *sq_interrupt_repr(enum sq_interrupt interrupt) {
 
 	case SQ_INT_FOPEN: return "SQ_INT_FOPEN";
 	case SQ_INT_ASCII: return "SQ_INT_ASCII";
-	case SQ_INT_UNDEFINED: bug("undefined encountered");
+	case SQ_INT_UNDEFINED: sq_bug("undefined encountered");
 	}
 }