Release v0.5.0

Do not free an expansion until its offset is *past* its size.
This means potentially freeing a nested stack of expansions
all at once.

Fixes #696

.editorconfig

@@ -0,0 +1,9 @@
+[*]
+root = true
+indent_style = tab
+indent_size = tab
+tab_width = 8
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf

CONTRIBUTING.rst

@@ -1,10 +1,9 @@
 Contributing
 ============
 
-RGBDS was created in the late 90's and has received contributions from several
+RGBDS was created in the late '90s and has received contributions from several
 developers since then. It wouldn't have been possible to get to this point
-without their work and, for that reason, it is always open to the contributions
+without their work, and it is always open to the contributions of other people.
-of other people.
 
 Reporting Bugs
 --------------

README.rst

@@ -18,6 +18,8 @@ The documentation of this toolchain can be viewed online
 `here <https://rgbds.gbdev.io/docs/>`__, it is generated from the man pages
 found in this repository.
 
+If you want to contribute or maintain RGBDS, and have questions regarding the code, its organisation, etc. you can find me `on GBDev <https://gbdev.io/chat>`__ or via mail at ``rgbds at eldred dot fr``.
+
 1. Installing RGBDS
 -------------------
 

RELEASE.rst

@@ -0,0 +1,65 @@
+Releasing
+=========
+
+This describes for the maintainers of RGBDS how to publish a new release on
+GitHub.
+
+1. Update, commit, and push `include/version.h <include/version.h>`__ with
+   values for ``PACKAGE_VERSION_MAJOR``, ``PACKAGE_VERSION_MINOR``,
+   ``PACKAGE_VERSION_PATCH``, and ``PACKAGE_VERSION_RC``. Only define
+   ``PACKAGE_VERSION_RC`` if you are publishing a release candidate! You can
+   use ``git commit -m "Release <version>"`` and ``git push origin master``.
+
+2. Create a Git tag formatted as ``v<MAJOR>.<MINOR>.<PATCH>``, or
+   ``v<MAJOR>.<MINOR>.<PATCH>-rc<RC>`` for a release candidate. ``MAJOR``,
+   ``MINOR``, ``PATCH``, and ``RC`` should match their values from
+   `include/version.h <include/version.h>`__. You can use ``git tag <tag>``.
+
+3. Push the tag to GitHub. You can use ``git push origin <tag>``.
+
+   GitHub Actions will run the `create-release-artifacts.yaml
+   <.github/workflows/create-release-artifacts.yaml>`__ workflow to detect the
+   tag starting with "``v[0-9]``" and automatically do the following:
+
+   1. Build 32-bit and 64-bit RGBDS binaries for Windows with ``cmake``.
+
+   2. Package the binaries into zip files.
+
+   3. Package the source code into a tar.gz file with ``make dist``.
+
+   4. Create a draft GitHub release for the tag, attaching the three
+      packaged files. It will be a prerelease if the tag contains "``-rc``".
+
+      If an error occurred in the above steps, delete the tag and restart the
+      procedure. You can use ``git push --delete origin <tag>`` and
+      ``git tag --delete <tag>``.
+
+4. GitHub Actions will run the `create-release-docs.yml
+   <.github/workflows/create-release-docs.yml>`__ workflow to add the release
+   documentation to `rgbds-www <https://github.com/gbdev/rgbds-www>`__.
+
+   For a release candidate, which creates a prerelease, you will have to
+   take these steps yourself.
+
+   1. Clone `rgbds-www <https://github.com/gbdev/rgbds-www>`__. You can use
+      ``git clone https://github.com/gbdev/rgbds-www.git``.
+
+   2. Make sure that you have installed ``groff`` and ``mandoc``. You will
+      need ``mandoc`` 1.14.5 or later to support ``-O toc``.
+
+   3. Run ``.github/actions/get-pages.sh -r <path/to/rgbds-www> <tag>``. This
+      will render the RGBDS documentation as HTML and PDF and copy it to
+      ``rgbds-www``.
+
+      If you do not have ``groff`` installed, you can change
+      ``groff -Tpdf -mdoc -wall`` to ``mandoc -Tpdf -I os=Linux`` in
+      `.github/actions/get-pages.sh <.github/actions/get-pages.sh>`__ and it
+      will suffice.
+
+   4. Commit and push the documentation. You can use ``git commit -m
+      "Create RGBDS <tag> documentation"`` and ``git push origin master``
+      (within the ``rgbds-www`` directory, not RGBDS).
+
+5. Write a changelog in the GitHub draft release.
+
+6. Click the "Publish release" button to publish it!

include/asm/format.h

@@ -28,9 +28,9 @@ struct FormatSpec {
 	bool prefix;
 	bool alignLeft;
 	bool padZero;
-	uint8_t width;
+	size_t width;
 	bool hasFrac;
-	uint8_t fracWidth;
+	size_t fracWidth;
 	int type;
 	bool valid;
 };

include/asm/util.h

@@ -11,8 +11,8 @@
 
 #include <stdint.h>
 
-uint32_t calchash(const char *s);
+char const *printChar(int c);
-char const *print(int c);
+
 /*
  * @return The number of bytes read, or 0 if invalid data was found
  */

include/asm/warning.h

@@ -15,6 +15,7 @@ extern unsigned int nbErrors;
 
 enum WarningID {
 	WARNING_ASSERT,		      /* Assertions */
+	WARNING_BACKWARDS_FOR,	      /* `for` loop with backwards range */
 	WARNING_BUILTIN_ARG,	      /* Invalid args to builtins */
 	WARNING_CHARMAP_REDEF,        /* Charmap entry re-definition */
 	WARNING_DIV,		      /* Division undefined behavior */

include/hashmap.h

@@ -29,19 +29,9 @@ typedef struct HashMapEntry *HashMap[HASHMAP_NB_BUCKETS];
  * @param map The HashMap to add the element to
  * @param key The key with which the element will be stored and retrieved
  * @param element The element to add
- * @return True if a collision occurred (for statistics)
+ * @return A pointer to the pointer to the element.
  */
-bool hash_AddElement(HashMap map, char const *key, void *element);
+void **hash_AddElement(HashMap map, char const *key, void *element);
-
-/**
- * Replaces an element with an already-present key in a hashmap.
- * @warning Inserting a NULL will make `hash_GetElement`'s return ambiguous!
- * @param map The HashMap to replace the element in
- * @param key The key with which the element will be stored and retrieved
- * @param element The element to replace
- * @return True if the element was found and replaced
- */
-bool hash_ReplaceElement(HashMap const map, char const *key, void *element);
 
 /**
  * Removes an element from a hashmap.
@@ -51,6 +41,14 @@ bool hash_ReplaceElement(HashMap const map, char const *key, void *element);
  */
 bool hash_RemoveElement(HashMap map, char const *key);
 
+/**
+ * Finds an element in a hashmap, and returns a pointer to its value field.
+ * @param map The map to consider the elements of
+ * @param key The key to search an element for
+ * @return A pointer to the pointer to the element, or NULL if not found.
+ */
+void **hash_GetNode(HashMap const map, char const *key);
+
 /**
  * Finds an element in a hashmap.
  * @param map The map to consider the elements of

include/version.h

@@ -12,7 +12,6 @@
 #define PACKAGE_VERSION_MAJOR 0
 #define PACKAGE_VERSION_MINOR 5
 #define PACKAGE_VERSION_PATCH 0
-#define PACKAGE_VERSION_RC 2
 
 const char *get_package_version_string(void);
 

src/asm/charmap.c

@@ -44,32 +44,35 @@ struct Charmap {
 
 static HashMap charmaps;
 
-static struct Charmap *currentCharmap;
+/*
+ * Store pointers to hashmap nodes, so that there is only one pointer to the memory block
+ * that gets reallocated.
+ */
+static struct Charmap **currentCharmap;
 
 struct CharmapStackEntry {
-	struct Charmap *charmap;
+	struct Charmap **charmap;
 	struct CharmapStackEntry *next;
 };
 
 struct CharmapStackEntry *charmapStack;
 
-static inline struct Charmap *charmap_Get(const char *name)
+static struct Charmap *charmap_Get(const char *name)
 {
 	return hash_GetElement(charmaps, name);
 }
 
-static inline struct Charmap *resizeCharmap(struct Charmap *map, size_t capacity)
+static void resizeCharmap(struct Charmap **map, size_t capacity)
 {
-	struct Charmap *new = realloc(map, sizeof(*map) + sizeof(*map->nodes) * capacity);
+	*map = realloc(*map, sizeof(**map) + sizeof(*(*map)->nodes) * capacity);
 
-	if (!new)
+	if (!*map)
 		fatalerror("Failed to %s charmap: %s\n",
-			   map ? "create" : "resize", strerror(errno));
+			   *map ? "create" : "resize", strerror(errno));
-	new->capacity = capacity;
+	(**map).capacity = capacity;
-	return new;
 }
 
-static inline void initNode(struct Charnode *node)
+static void initNode(struct Charnode *node)
 {
 	node->isTerminal = false;
 	memset(node->next, 0, sizeof(node->next));
@@ -95,19 +98,18 @@ struct Charmap *charmap_New(const char *name, const char *baseName)
 
 	/* Init the new charmap's fields */
 	if (base) {
-		charmap = resizeCharmap(NULL, base->capacity);
+		resizeCharmap(&charmap, base->capacity);
 		charmap->usedNodes = base->usedNodes;
 
 		memcpy(charmap->nodes, base->nodes, sizeof(base->nodes[0]) * charmap->usedNodes);
 	} else {
-		charmap = resizeCharmap(NULL, INITIAL_CAPACITY);
+		resizeCharmap(&charmap, INITIAL_CAPACITY);
 		charmap->usedNodes = 1;
 		initNode(&charmap->nodes[0]); /* Init the root node */
 	}
 	charmap->name = strdup(name);
 
-	hash_AddElement(charmaps, charmap->name, charmap);
+	currentCharmap = (struct Charmap **)hash_AddElement(charmaps, charmap->name, charmap);
-	currentCharmap = charmap;
 
 	return charmap;
 }
@@ -120,7 +122,7 @@ void charmap_Delete(struct Charmap *charmap)
 
 void charmap_Set(const char *name)
 {
-	struct Charmap *charmap = charmap_Get(name);
+	struct Charmap **charmap = (struct Charmap **)hash_GetNode(charmaps, name);
 
 	if (charmap == NULL)
 		error("Charmap '%s' doesn't exist\n", name);
@@ -158,25 +160,26 @@ void charmap_Pop(void)
 
 void charmap_Add(char *mapping, uint8_t value)
 {
-	struct Charnode *node = &currentCharmap->nodes[0];
+	struct Charmap *charmap = *currentCharmap;
+	struct Charnode *node = &charmap->nodes[0];
 
 	for (uint8_t c; *mapping; mapping++) {
 		c = *mapping - 1;
 
 		if (node->next[c]) {
-			node = &currentCharmap->nodes[node->next[c]];
+			node = &charmap->nodes[node->next[c]];
 		} else {
 			/* Register next available node */
-			node->next[c] = currentCharmap->usedNodes;
+			node->next[c] = charmap->usedNodes;
 			/* If no more nodes are available, get new ones */
-			if (currentCharmap->usedNodes == currentCharmap->capacity) {
+			if (charmap->usedNodes == charmap->capacity) {
-				currentCharmap->capacity *= 2;
+				charmap->capacity *= 2;
-				currentCharmap = resizeCharmap(currentCharmap, currentCharmap->capacity);
+				resizeCharmap(currentCharmap, charmap->capacity);
-				hash_ReplaceElement(charmaps, currentCharmap->name, currentCharmap);
+				charmap = *currentCharmap;
 			}
 
 			/* Switch to and init new node */
-			node = &currentCharmap->nodes[currentCharmap->usedNodes++];
+			node = &charmap->nodes[charmap->usedNodes++];
 			initNode(node);
 		}
 	}
@@ -197,7 +200,8 @@ size_t charmap_Convert(char const *input, uint8_t *output)
 	 * If no match, read a UTF-8 codepoint and output that.
 	 */
 	size_t outputLen = 0;
-	struct Charnode const *node = &currentCharmap->nodes[0];
+	struct Charmap const *charmap = *currentCharmap;
+	struct Charnode const *node = &charmap->nodes[0];
 	struct Charnode const *match = NULL;
 	size_t rewindDistance = 0;
 
@@ -209,7 +213,7 @@ size_t charmap_Convert(char const *input, uint8_t *output)
 			input++; /* Consume that char */
 			rewindDistance++;
 
-			node = &currentCharmap->nodes[node->next[c]];
+			node = &charmap->nodes[node->next[c]];
 			if (node->isTerminal) {
 				match = node;
 				rewindDistance = 0; /* Rewind from after the match */
@@ -218,7 +222,7 @@ size_t charmap_Convert(char const *input, uint8_t *output)
 		} else {
 			input -= rewindDistance; /* Rewind */
 			rewindDistance = 0;
-			node = &currentCharmap->nodes[0];
+			node = &charmap->nodes[0];
 
 			if (match) { /* Arrived at a dead end with a match found */
 				*output++ = match->value;

src/asm/format.c

@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: MIT
  */
 
+#include <assert.h>
 #include <inttypes.h>
 #include <math.h>
 #include <stdbool.h>
@@ -148,20 +149,24 @@ void fmt_PrintString(char *buf, size_t bufLen, struct FormatSpec const *fmt, cha
 	size_t len = strlen(value);
 	size_t totalLen = fmt->width > len ? fmt->width : len;
 
-	if (totalLen + 1 > bufLen) /* bufLen includes terminator */
+	if (totalLen > bufLen - 1) { /* bufLen includes terminator */
 		error("Formatted string value too long\n");
+		totalLen = bufLen - 1;
+		if (len > totalLen)
+			len = totalLen;
+	}
+	assert(len < bufLen && totalLen < bufLen && len <= totalLen);
 
-	size_t padLen = fmt->width > len ? fmt->width - len : 0;
+	size_t padLen = totalLen - len;
 
 	if (fmt->alignLeft) {
-		strncpy(buf, value, len < bufLen ? len : bufLen);
+		memcpy(buf, value, len);
-		for (size_t i = 0; i < totalLen && len + i < bufLen; i++)
+		for (size_t i = len; i < totalLen; i++)
-			buf[len + i] = ' ';
-	} else {
-		for (size_t i = 0; i < padLen && i < bufLen; i++)
 			buf[i] = ' ';
-		if (bufLen > padLen)
+	} else {
-			strncpy(buf + padLen, value, bufLen - padLen - 1);
+		for (size_t i = 0; i < padLen; i++)
+			buf[i] = ' ';
+		memcpy(buf + padLen, value, len);
 	}
 
 	buf[totalLen] = '\0';
@@ -221,12 +226,18 @@ void fmt_PrintNumber(char *buf, size_t bufLen, struct FormatSpec const *fmt, uin
 		/* Special case for fixed-point */
 
 		/* Default fractional width (C's is 6 for "%f"; here 5 is enough) */
-		uint8_t fracWidth = fmt->hasFrac ? fmt->fracWidth : 5;
+		size_t fracWidth = fmt->hasFrac ? fmt->fracWidth : 5;
 
 		if (fracWidth) {
+			if (fracWidth > 255) {
+				error("Fractional width %zu too long, limiting to 255\n",
+				      fracWidth);
+				fracWidth = 255;
+			}
+
 			char spec[16]; /* Max "%" + 5-char PRIu32 + ".%0255.f" + terminator */
 
-			snprintf(spec, sizeof(spec), "%%" PRIu32 ".%%0%d.f", fracWidth);
+			snprintf(spec, sizeof(spec), "%%" PRIu32 ".%%0%zu.f", fracWidth);
 			snprintf(valueBuf, sizeof(valueBuf), spec, value >> 16,
 				 (value % 65536) / 65536.0 * pow(10, fracWidth) + 0.5);
 		} else {
@@ -244,55 +255,49 @@ void fmt_PrintNumber(char *buf, size_t bufLen, struct FormatSpec const *fmt, uin
 	}
 
 	size_t len = strlen(valueBuf);
-	size_t numLen = len;
+	size_t numLen = !!sign + !!prefix + len;
-
-	if (sign)
-		numLen++;
-	if (prefix)
-		numLen++;
-
 	size_t totalLen = fmt->width > numLen ? fmt->width : numLen;
 
-	if (totalLen + 1 > bufLen) /* bufLen includes terminator */
+	if (totalLen > bufLen - 1) { /* bufLen includes terminator */
 		error("Formatted numeric value too long\n");
+		totalLen = bufLen - 1;
+		if (numLen > totalLen) {
+			len -= numLen - totalLen;
+			numLen = totalLen;
+		}
+	}
+	assert(numLen < bufLen && totalLen < bufLen && numLen <= totalLen && len <= numLen);
 
-	size_t padLen = fmt->width > numLen ? fmt->width - numLen : 0;
+	size_t padLen = totalLen - numLen;
+	size_t pos = 0;
 
 	if (fmt->alignLeft) {
-		size_t pos = 0;
+		if (sign)
-
-		if (sign && pos < bufLen)
 			buf[pos++] = sign;
-		if (prefix && pos < bufLen)
+		if (prefix)
 			buf[pos++] = prefix;
-
+		memcpy(buf + pos, valueBuf, len);
-		strcpy(buf + pos, valueBuf);
+		for (size_t i = pos + len; i < totalLen; i++)
-		pos += len;
+			buf[i] = ' ';
-
-		for (size_t i = 0; i < totalLen && pos + i < bufLen; i++)
-			buf[pos + i] = ' ';
 	} else {
-		size_t pos = 0;
-
 		if (fmt->padZero) {
 			/* sign, then prefix, then zero padding */
-			if (sign && pos < bufLen)
+			if (sign)
 				buf[pos++] = sign;
-			if (prefix && pos < bufLen)
+			if (prefix)
 				buf[pos++] = prefix;
-			for (size_t i = 0; i < padLen && pos < bufLen; i++)
+			for (size_t i = 0; i < padLen; i++)
 				buf[pos++] = '0';
 		} else {
 			/* space padding, then sign, then prefix */
-			for (size_t i = 0; i < padLen && pos < bufLen; i++)
+			for (size_t i = 0; i < padLen; i++)
 				buf[pos++] = ' ';
-			if (sign && pos < bufLen)
+			if (sign)
 				buf[pos++] = sign;
-			if (prefix && pos < bufLen)
+			if (prefix)
 				buf[pos++] = prefix;
 		}
-		if (bufLen > pos)
+		memcpy(buf + pos, valueBuf, len);
-			strcpy(buf + pos, valueBuf);
 	}
 
 	buf[totalLen] = '\0';

src/asm/fstack.c

@@ -191,6 +191,11 @@ bool fstk_FindFile(char const *path, char **fullPath, size_t *size)
 					break;
 				}
 				len = sprintf(*fullPath, "%s%s", incPath, path);
+				if (len < 0) {
+					error("sprintf error during include path search: %s\n",
+					       strerror(errno));
+					break;
+				}
 			}
 
 			if (isPathValid(*fullPath)) {
@@ -487,6 +492,10 @@ void fstk_RunFor(char const *symName, int32_t start, int32_t stop, int32_t step,
 	else if (step == 0)
 		error("FOR cannot have a step value of 0\n");
 
+	if ((step > 0 && start > stop) || (step < 0 && start < stop))
+		warning(WARNING_BACKWARDS_FOR, "FOR goes backwards from %d to %d by %d\n",
+			start, stop, step);
+
 	if (count == 0)
 		return;
 	if (!newReptContext(reptLineNo, body, size))

src/asm/parser.y

@@ -335,7 +335,7 @@ static void freeDsArgList(struct DsArgList *args)
 	free(args->args);
 }
 
-static inline void failAssert(enum AssertionType type)
+static void failAssert(enum AssertionType type)
 {
 	switch (type) {
 		case ASSERT_FATAL:
@@ -349,7 +349,7 @@ static inline void failAssert(enum AssertionType type)
 	}
 }
 
-static inline void failAssertMsg(enum AssertionType type, char const *msg)
+static void failAssertMsg(enum AssertionType type, char const *msg)
 {
 	switch (type) {
 		case ASSERT_FATAL:
@@ -392,6 +392,7 @@ enum {
 	REG_BC = 0,
 	REG_DE = 1,
 	REG_HL = 2,
+	// LD/INC/ADD/DEC allow SP, PUSH/POP allow AF
 	REG_SP = 3,
 	REG_AF = 3
 };
@@ -598,7 +599,6 @@ enum {
 %type	<nConstValue>	ccode
 %type	<sVal>		op_a_n
 %type	<nConstValue>	op_a_r
-%type	<nConstValue>	op_hl_ss
 %type	<sVal>		op_mem_ind
 %type	<assertType>	assert_type
 
@@ -1165,8 +1165,14 @@ popc		: T_POP_POPC	{ charmap_Pop(); }
 print		: T_POP_PRINT print_exprs trailing_comma
 ;
 
-println		: T_POP_PRINTLN { putchar('\n'); }
+println		: T_POP_PRINTLN {
-		| T_POP_PRINTLN print_exprs trailing_comma { putchar('\n'); }
+			putchar('\n');
+			fflush(stdout);
+		}
+		| T_POP_PRINTLN print_exprs trailing_comma {
+			putchar('\n');
+			fflush(stdout);
+		}
 ;
 
 print_exprs	: print_expr
@@ -1662,7 +1668,7 @@ z80_add		: T_Z80_ADD op_a_n {
 			out_RelByte(&$2, 1);
 		}
 		| T_Z80_ADD op_a_r	{ out_AbsByte(0x80 | $2); }
-		| T_Z80_ADD op_hl_ss	{ out_AbsByte(0x09 | ($2 << 4)); }
+		| T_Z80_ADD T_MODE_HL T_COMMA reg_ss	{ out_AbsByte(0x09 | ($4 << 4)); }
 		| T_Z80_ADD T_MODE_SP T_COMMA reloc_8bit {
 			out_AbsByte(0xE8);
 			out_RelByte(&$4, 1);
@@ -1803,9 +1809,9 @@ z80_ld		: z80_ld_mem
 		| z80_ld_a
 ;
 
-z80_ld_hl	: T_Z80_LD T_MODE_HL T_COMMA T_MODE_SP reloc_8bit {
+z80_ld_hl	: T_Z80_LD T_MODE_HL T_COMMA T_MODE_SP T_OP_ADD reloc_8bit {
 			out_AbsByte(0xF8);
-			out_RelByte(&$5, 1);
+			out_RelByte(&$6, 1);
 		}
 		| T_Z80_LD T_MODE_HL T_COMMA reloc_16bit {
 			out_AbsByte(0x01 | (REG_HL << 4));
@@ -2047,10 +2053,6 @@ z80_xor		: T_Z80_XOR op_a_n {
 op_mem_ind	: T_LBRACK reloc_16bit T_RBRACK	{ $$ = $2; }
 ;
 
-op_hl_ss	: reg_ss
-		| T_MODE_HL T_COMMA reg_ss	{ $$ = $3; }
-;
-
 op_a_r		: reg_r
 		| T_MODE_A T_COMMA reg_r	{ $$ = $3; }
 ;

src/asm/rgbasm.1

@@ -189,7 +189,7 @@ Ignoring the
 prefix, entries are listed alphabetically.
 .Bl -tag -width Ds
 .It Fl Wno-assert
-Warns when
+Warn when
 .Ic WARN Ns No -type
 assertions fail. (See
 .Dq Aborting the assembly process
@@ -197,6 +197,12 @@ in
 .Xr rgbasm 5
 for
 .Ic ASSERT ) .
+.It Fl Wbackwards-for
+Warn when
+.Ic FOR
+loops have their start and stop values switched according to the step value.
+This warning is enabled by
+.Fl Wall .
 .It Fl Wbuiltin-args
 Warn about incorrect arguments to built-in functions, such as
 .Fn STRSUB
@@ -239,7 +245,7 @@ constant or
 directive are encountered.
 .It Fl Wshift
 Warn when shifting right a negative value.
-Use a division by 2^N instead.
+Use a division by 2**N instead.
 .It Fl Wshift-amount
 Warn when a shift's operand is negative or greater than 32.
 .It Fl Wno-truncation

src/asm/rgbasm.5

@@ -337,7 +337,7 @@ followed by one or more
 \[en]
 .Ql 9 .
 If specified, prints this many digits of a fixed-point fraction.
-Defaults to 5 digits.
+Defaults to 5 digits, maximum 255 digits.
 .It Ql <type> Ta Specifies the type of value.
 .El
 .Pp
@@ -1272,6 +1272,7 @@ The following symbols are defined by the assembler:
 .It Dv __RGBDS_MINOR__ Ta Ic EQU Ta Minor version number of RGBDS
 .It Dv __RGBDS_PATCH__ Ta Ic EQU Ta Patch version number of RGBDS
 .It Dv __RGBDS_RC__ Ta Ic EQU Ta Release candidate ID of RGBDS, not defined for final releases
+.It Dv __RGBDS_VERSION__ Ta Ic EQUS Ta Version of RGBDS, as printed by Ql rgbasm --version
 .El
 .Pp
 The current time values will be taken from the

src/asm/section.c

@@ -41,7 +41,7 @@ struct UnionStackEntry {
 /*
  * A quick check to see if we have an initialized section
  */
-static inline void checksection(void)
+static void checksection(void)
 {
 	if (pCurrentSection == NULL)
 		fatalerror("Code generation before SECTION directive\n");
@@ -51,7 +51,7 @@ static inline void checksection(void)
  * A quick check to see if we have an initialized section that can contain
  * this much initialized data
  */
-static inline void checkcodesection(void)
+static void checkcodesection(void)
 {
 	checksection();
 
@@ -60,7 +60,7 @@ static inline void checkcodesection(void)
 			   pCurrentSection->name);
 }
 
-static inline void checkSectionSize(struct Section const *sect, uint32_t size)
+static void checkSectionSize(struct Section const *sect, uint32_t size)
 {
 	uint32_t maxSize = maxsize[sect->type];
 
@@ -72,7 +72,7 @@ static inline void checkSectionSize(struct Section const *sect, uint32_t size)
 /*
  * Check if the section has grown too much.
  */
-static inline void reserveSpace(uint32_t delta_size)
+static void reserveSpace(uint32_t delta_size)
 {
 	/*
 	 * This check is here to trap broken code that generates sections that
@@ -339,6 +339,8 @@ static struct Section *getSection(char const *name, enum SectionType type, uint3
 		} else if (startaddr[type] & mask) {
 			error("Section \"%s\"'s alignment cannot be attained in %s\n",
 				name, typeNames[type]);
+			alignment = 0; /* Ignore it if it's unattainable */
+			org = 0;
 		} else if (alignment == 16) {
 			// Treat an alignment of 16 as being fixed at address 0
 			alignment = 0;
@@ -472,7 +474,7 @@ void sect_AlignPC(uint8_t alignment, uint16_t offset)
 	}
 }
 
-static inline void growSection(uint32_t growth)
+static void growSection(uint32_t growth)
 {
 	curOffset += growth;
 	if (curOffset + loadOffset > pCurrentSection->size)
@@ -481,19 +483,19 @@ static inline void growSection(uint32_t growth)
 		currentLoadSection->size = curOffset;
 }
 
-static inline void writebyte(uint8_t byte)
+static void writebyte(uint8_t byte)
 {
 	pCurrentSection->data[sect_GetOutputOffset()] = byte;
 	growSection(1);
 }
 
-static inline void writeword(uint16_t b)
+static void writeword(uint16_t b)
 {
 	writebyte(b & 0xFF);
 	writebyte(b >> 8);
 }
 
-static inline void writelong(uint32_t b)
+static void writelong(uint32_t b)
 {
 	writebyte(b & 0xFF);
 	writebyte(b >> 8);
@@ -501,8 +503,7 @@ static inline void writelong(uint32_t b)
 	writebyte(b >> 24);
 }
 
-static inline void createPatch(enum PatchType type, struct Expression const *expr,
+static void createPatch(enum PatchType type, struct Expression const *expr, uint32_t pcShift)
-			       uint32_t pcShift)
 {
 	out_CreatePatch(type, expr, sect_GetOutputOffset(), pcShift);
 }
@@ -779,8 +780,7 @@ void out_BinaryFile(char const *s, int32_t startPos)
 
 		if (startPos > fsize) {
 			error("Specified start position is greater than length of file\n");
-			fclose(f);
+			goto cleanup;
-			return;
 		}
 
 		fseek(f, startPos, SEEK_SET);
@@ -803,6 +803,7 @@ void out_BinaryFile(char const *s, int32_t startPos)
 	if (ferror(f))
 		error("Error reading INCBIN file '%s': %s\n", s, strerror(errno));
 
+cleanup:
 	fclose(f);
 }
 
@@ -826,16 +827,16 @@ void out_BinaryFileSlice(char const *s, int32_t start_pos, int32_t length)
 
 	if (fstk_FindFile(s, &fullPath, &size))
 		f = fopen(fullPath, "rb");
+	free(fullPath);
 
 	if (!f) {
-		free(fullPath);
 		if (oGeneratedMissingIncludes) {
 			if (verbose)
 				printf("Aborting (-MG) on INCBIN file '%s' (%s)\n", s, strerror(errno));
 			oFailedOnMissingInclude = true;
-			return;
+		} else {
+			error("Error opening INCBIN file '%s': %s\n", s, strerror(errno));
 		}
-		error("Error opening INCBIN file '%s': %s\n", s, strerror(errno));
 		return;
 	}
 
@@ -849,13 +850,13 @@ void out_BinaryFileSlice(char const *s, int32_t start_pos, int32_t length)
 
 		if (start_pos > fsize) {
 			error("Specified start position is greater than length of file\n");
-			return;
+			goto cleanup;
 		}
 
 		if ((start_pos + length) > fsize) {
 			error("Specified range in INCBIN is out of bounds (%" PRIu32 " + %" PRIu32
 			      " > %" PRIu32 ")\n", start_pos, length, fsize);
-			return;
+			goto cleanup;
 		}
 
 		fseek(f, start_pos, SEEK_SET);
@@ -883,8 +884,8 @@ void out_BinaryFileSlice(char const *s, int32_t start_pos, int32_t length)
 		}
 	}
 
+cleanup:
 	fclose(f);
-	free(fullPath);
 }
 
 /*

src/asm/symbol.c

@@ -43,12 +43,6 @@ static char savedTIME[256];
 static char savedDATE[256];
 static char savedTIMESTAMP_ISO8601_LOCAL[256];
 static char savedTIMESTAMP_ISO8601_UTC[256];
-static char savedDAY[3];
-static char savedMONTH[3];
-static char savedYEAR[20];
-static char savedHOUR[3];
-static char savedMINUTE[3];
-static char savedSECOND[3];
 static bool exportall;
 
 bool sym_IsPC(struct Symbol const *sym)
@@ -275,7 +269,7 @@ struct Symbol const *sym_GetPC(void)
 	return PCSymbol;
 }
 
-static inline bool isReferenced(struct Symbol const *sym)
+static bool isReferenced(struct Symbol const *sym)
 {
 	return sym->ID != (uint32_t)-1;
 }
@@ -379,6 +373,7 @@ static struct Symbol *createNonrelocSymbol(char const *symbolName, bool numeric)
 		error("'%s' already defined at ", symbolName);
 		dumpFilename(symbol);
 		putc('\n', stderr);
+		return NULL; // Don't allow overriding the symbol, that'd be bad!
 	} else if (!numeric) {
 		// The symbol has already been referenced, but it's not allowed
 		error("'%s' already referenced at ", symbolName);
@@ -439,6 +434,10 @@ struct Symbol *sym_RedefString(char const *symName, char const *value)
 		error("'%s' already defined as non-EQUS at ", symName);
 		dumpFilename(sym);
 		putc('\n', stderr);
+		return NULL;
+	} else if (sym->isBuiltin) {
+		error("Built-in symbol '%s' cannot be redefined\n", symName);
+		return NULL;
 	}
 
 	/*
@@ -681,18 +680,7 @@ void sym_SetExportAll(bool set)
 	exportall = set;
 }
 
-/**
+static struct Symbol *createBuiltinSymbol(char const *name)
- * Returns a pointer to the first non-zero character in a string
- * Non-'0', not non-'\0'.
- */
-static inline char const *removeLeadingZeros(char const *ptr)
-{
-	while (*ptr == '0')
-		ptr++;
-	return ptr;
-}
-
-static inline struct Symbol *createBuiltinSymbol(char const *name)
 {
 	struct Symbol *sym = createsymbol(name);
 
@@ -722,13 +710,18 @@ void sym_Init(time_t now)
 	__LINE__Symbol->numCallback = Callback__LINE__;
 	__FILE__Symbol->type = SYM_EQUS;
 	__FILE__Symbol->strCallback = Callback__FILE__;
+
 	sym_AddSet("_RS", 0)->isBuiltin = true;
 
-	sym_AddEqu("__RGBDS_MAJOR__", PACKAGE_VERSION_MAJOR)->isBuiltin = true;
+#define addNumber(name, val) sym_AddEqu(name, val)->isBuiltin = true
-	sym_AddEqu("__RGBDS_MINOR__", PACKAGE_VERSION_MINOR)->isBuiltin = true;
+#define addString(name, val) sym_AddString(name, val)->isBuiltin = true
-	sym_AddEqu("__RGBDS_PATCH__", PACKAGE_VERSION_PATCH)->isBuiltin = true;
+
+	addString("__RGBDS_VERSION__", get_package_version_string());
+	addNumber("__RGBDS_MAJOR__", PACKAGE_VERSION_MAJOR);
+	addNumber("__RGBDS_MINOR__", PACKAGE_VERSION_MINOR);
+	addNumber("__RGBDS_PATCH__", PACKAGE_VERSION_PATCH);
 #ifdef PACKAGE_VERSION_RC
-	sym_AddEqu("__RGBDS_RC__", PACKAGE_VERSION_RC)->isBuiltin = true;
+	addNumber("__RGBDS_RC__", PACKAGE_VERSION_RC);
 #endif
 
 	if (now == (time_t)-1) {
@@ -750,25 +743,19 @@ void sym_Init(time_t now)
 		 sizeof(savedTIMESTAMP_ISO8601_UTC), "\"%Y-%m-%dT%H:%M:%SZ\"",
 		 time_utc);
 
-	strftime(savedYEAR, sizeof(savedYEAR), "%Y", time_utc);
-	strftime(savedMONTH, sizeof(savedMONTH), "%m", time_utc);
-	strftime(savedDAY, sizeof(savedDAY), "%d", time_utc);
-	strftime(savedHOUR, sizeof(savedHOUR), "%H", time_utc);
-	strftime(savedMINUTE, sizeof(savedMINUTE), "%M", time_utc);
-	strftime(savedSECOND, sizeof(savedSECOND), "%S", time_utc);
-
-#define addString(name, val) sym_AddString(name, val)->isBuiltin = true
 	addString("__TIME__", savedTIME);
 	addString("__DATE__", savedDATE);
 	addString("__ISO_8601_LOCAL__", savedTIMESTAMP_ISO8601_LOCAL);
 	addString("__ISO_8601_UTC__", savedTIMESTAMP_ISO8601_UTC);
-	/* This cannot start with zeros */
+
-	addString("__UTC_YEAR__", savedYEAR);
+	addNumber("__UTC_YEAR__", time_utc->tm_year + 1900);
-	addString("__UTC_MONTH__", removeLeadingZeros(savedMONTH));
+	addNumber("__UTC_MONTH__", time_utc->tm_mon + 1);
-	addString("__UTC_DAY__", removeLeadingZeros(savedDAY));
+	addNumber("__UTC_DAY__", time_utc->tm_mday);
-	addString("__UTC_HOUR__", removeLeadingZeros(savedHOUR));
+	addNumber("__UTC_HOUR__", time_utc->tm_hour);
-	addString("__UTC_MINUTE__", removeLeadingZeros(savedMINUTE));
+	addNumber("__UTC_MINUTE__", time_utc->tm_min);
-	addString("__UTC_SECOND__", removeLeadingZeros(savedSECOND));
+	addNumber("__UTC_SECOND__", time_utc->tm_sec);
+
+#undef addNumber
 #undef addString
 
 	labelScope = NULL;

src/asm/util.c

@@ -15,52 +15,45 @@
 
 #include "extern/utf8decoder.h"
 
-/*
+char const *printChar(int c)
- * Calculate the hash value for a string.
- * Uses the djb2 algorithm (xor version).
- * http://www.cse.yorku.ca/~oz/hash.html
- */
-uint32_t calchash(const char *s)
 {
-	uint32_t hash = 5381;
+	// "'A'" + '\0': 4 bytes
-
+	// "'\\n'" + '\0': 5 bytes
-	while (*s != 0)
+	// "0xFF" + '\0': 5 bytes
-		hash = (hash * 33) ^ (*s++);
+	static char buf[5];
-
-	return hash;
-}
-
-char const *print(int c)
-{
-	static char buf[5]; /* '\xNN' + '\0' */
 
 	if (c == EOF)
 		return "EOF";
 
 	if (isprint(c)) {
-		buf[0] = c;
+		buf[0] = '\'';
-		buf[1] = '\0';
+		buf[1] = c;
+		buf[2] = '\'';
+		buf[3] = '\0';
 		return buf;
 	}
 
-	buf[0] = '\\';
 	switch (c) {
 	case '\n':
-		buf[1] = 'n';
+		buf[2] = 'n';
 		break;
 	case '\r':
-		buf[1] = 'r';
+		buf[2] = 'r';
 		break;
 	case '\t':
-		buf[1] = 't';
+		buf[2] = 't';
 		break;
 
 	default: /* Print as hex */
+		buf[0] = '0';
 		buf[1] = 'x';
-		sprintf(&buf[2], "%02hhx", (uint8_t)c);
+		snprintf(&buf[2], 3, "%02hhX", (uint8_t)c); // includes the '\0'
 		return buf;
 	}
-	buf[2] = '\0';
+	buf[0] = '\'';
+	buf[1] = '\\';
+	buf[3] = '\'';
+	buf[4] = '\0';
 	return buf;
 }
 

src/asm/warning.c

@@ -30,6 +30,7 @@ enum WarningState {
 
 static enum WarningState const defaultWarnings[NB_WARNINGS] = {
 	[WARNING_ASSERT]		= WARNING_ENABLED,
+	[WARNING_BACKWARDS_FOR]		= WARNING_DISABLED,
 	[WARNING_BUILTIN_ARG]		= WARNING_DISABLED,
 	[WARNING_CHARMAP_REDEF]		= WARNING_DISABLED,
 	[WARNING_DIV]			= WARNING_DISABLED,
@@ -72,6 +73,7 @@ static enum WarningState warningState(enum WarningID id)
 
 static char const *warningFlags[NB_WARNINGS_ALL] = {
 	"assert",
+	"backwards-for",
 	"builtin-args",
 	"charmap-redef",
 	"div",
@@ -100,6 +102,7 @@ enum MetaWarningCommand {
 
 /* Warnings that probably indicate an error */
 static uint8_t const _wallCommands[] = {
+	WARNING_BACKWARDS_FOR,
 	WARNING_BUILTIN_ARG,
 	WARNING_CHARMAP_REDEF,
 	WARNING_EMPTY_DATA_DIRECTIVE,
@@ -119,6 +122,7 @@ static uint8_t const _wextraCommands[] = {
 
 /* Literally everything. Notably useful for testing */
 static uint8_t const _weverythingCommands[] = {
+	WARNING_BACKWARDS_FOR,
 	WARNING_BUILTIN_ARG,
 	WARNING_DIV,
 	WARNING_EMPTY_DATA_DIRECTIVE,

src/gbz80.7

@@ -879,9 +879,9 @@ Bytes: 2
 Flags: None affected.
 .Pp
 This is sometimes written as
-.Ql ldio [n16], a ,
+.Ql LDIO [n16],A ,
 or
-.Ql ld [$ff00+n8], a .
+.Ql LD [$FF00+n8],A .
 .Ss LDH [C],A
 Store value in register
 .Sy A
@@ -895,9 +895,9 @@ Bytes: 1
 Flags: None affected.
 .Pp
 This is sometimes written as
-.Ql ldio [c], a ,
+.Ql LDIO [C],A ,
 or
-.Ql ld [$ff00+c], a .
+.Ql LD [$FF00+C],A .
 .Ss LD A,[r16]
 Load value in register
 .Sy A
@@ -937,9 +937,9 @@ Bytes: 2
 Flags: None affected.
 .Pp
 This is sometimes written as
-.Ql ldio a, [n16] ,
+.Ql LDIO A,[n16] ,
 or
-.Ql ld a, [$ff00+n8] .
+.Ql LD A,[$FF00+n8] .
 .Ss LDH A,[C]
 Load value in register
 .Sy A
@@ -953,9 +953,9 @@ Bytes: 1
 Flags: None affected.
 .Pp
 This is sometimes written as
-.Ql ldio a, [c] ,
+.Ql LDIO A,[C] ,
 or
-.Ql ld a, [$ff00+c] .
+.Ql LD A,[$FF00+C] .
 .Ss LD [HLI],A
 Store value in register
 .Sy A
@@ -970,6 +970,11 @@ Cycles: 2
 Bytes: 1
 .Pp
 Flags: None affected.
+.Pp
+This is sometimes written as
+.Ql LD [HL+],A ,
+or
+.Ql LDI [HL],A .
 .Ss LD [HLD],A
 Store value in register
 .Sy A
@@ -984,6 +989,11 @@ Cycles: 2
 Bytes: 1
 .Pp
 Flags: None affected.
+.Pp
+This is sometimes written as
+.Ql LD [HL-],A ,
+or
+.Ql LDD [HL],A .
 .Ss LD A,[HLD]
 Load value into register
 .Sy A
@@ -998,6 +1008,11 @@ Cycles: 2
 Bytes: 1
 .Pp
 Flags: None affected.
+.Pp
+This is sometimes written as
+.Ql LD A,[HL-] ,
+or
+.Ql LDD A,[HL] .
 .Ss LD A,[HLI]
 Load value into register
 .Sy A
@@ -1012,6 +1027,11 @@ Cycles: 2
 Bytes: 1
 .Pp
 Flags: None affected.
+.Pp
+This is sometimes written as
+.Ql LD A,[HL+], ,
+or
+.Ql LDI A,[HL] .
 .Ss LD SP,n16
 Load value
 .Ar n16

src/hashmap.c

@@ -46,7 +46,7 @@ static HashType hash(char const *str)
 	return hash;
 }
 
-bool hash_AddElement(HashMap map, char const *key, void *element)
+void **hash_AddElement(HashMap map, char const *key, void *element)
 {
 	HashType hashedKey = hash(key);
 	HalfHashType index = hashedKey;
@@ -61,23 +61,7 @@ bool hash_AddElement(HashMap map, char const *key, void *element)
 	newEntry->next = map[index];
 	map[index] = newEntry;
 
-	return newEntry->next != NULL;
+	return &newEntry->content;
-}
-
-bool hash_ReplaceElement(HashMap const map, char const *key, void *element)
-{
-	HashType hashedKey = hash(key);
-	struct HashMapEntry *ptr = map[(HalfHashType)hashedKey];
-
-	while (ptr) {
-		if (hashedKey >> HALF_HASH_NB_BITS == ptr->hash
-		 && !strcmp(ptr->key, key)) {
-			ptr->content = element;
-			return true;
-		}
-		ptr = ptr->next;
-	}
-	return false;
 }
 
 bool hash_RemoveElement(HashMap map, char const *key)
@@ -99,7 +83,7 @@ bool hash_RemoveElement(HashMap map, char const *key)
 	return false;
 }
 
-void *hash_GetElement(HashMap const map, char const *key)
+void **hash_GetNode(HashMap const map, char const *key)
 {
 	HashType hashedKey = hash(key);
 	struct HashMapEntry *ptr = map[(HalfHashType)hashedKey];
@@ -107,13 +91,20 @@ void *hash_GetElement(HashMap const map, char const *key)
 	while (ptr) {
 		if (hashedKey >> HALF_HASH_NB_BITS == ptr->hash
 		 && !strcmp(ptr->key, key)) {
-			return ptr->content;
+			return &ptr->content;
 		}
 		ptr = ptr->next;
 	}
 	return NULL;
 }
 
+void *hash_GetElement(HashMap const map, char const *key)
+{
+	void **node = hash_GetNode(map, key);
+
+	return node ? *node : NULL;
+}
+
 void hash_ForEach(HashMap const map, void (*func)(void *, void *), void *arg)
 {
 	for (size_t i = 0; i < HASHMAP_NB_BUCKETS; i++) {

src/link/assign.c

@@ -106,8 +106,7 @@ static void processLinkerScript(void)
  * @param section The section to assign
  * @param location The location to assign the section to
  */
-static inline void assignSection(struct Section *section,
+static void assignSection(struct Section *section, struct MemoryLocation const *location)
-				 struct MemoryLocation const *location)
 {
 	section->org = location->address;
 	section->bank = location->bank;

src/link/main.c

@@ -205,7 +205,7 @@ static void cleanup(void)
 int main(int argc, char *argv[])
 {
 	int optionChar;
-	char *endptr; /* For error checking with `strtol` */
+	char *endptr; /* For error checking with `strtoul` */
 	unsigned long value; /* For storing `strtoul`'s return value */
 
 	/* Parse options */

src/link/object.c

@@ -452,7 +452,7 @@ static void readAssertion(FILE *file, struct Assertion *assert,
 		   fileName);
 }
 
-static inline struct Section *getMainSection(struct Section *section)
+static struct Section *getMainSection(struct Section *section)
 {
 	if (section->modifier != SECTION_NORMAL)
 		section = sect_GetSection(section->name);

src/link/patch.c

@@ -37,7 +37,7 @@ struct RPNStack {
 	size_t capacity;
 } stack;
 
-static inline void initRPNStack(void)
+static void initRPNStack(void)
 {
 	stack.capacity = 64;
 	stack.values = malloc(sizeof(*stack.values) * stack.capacity);
@@ -46,7 +46,7 @@ static inline void initRPNStack(void)
 		err(1, "Failed to init RPN stack");
 }
 
-static inline void clearRPNStack(void)
+static void clearRPNStack(void)
 {
 	stack.size = 0;
 }
@@ -92,7 +92,7 @@ static int32_t popRPN(struct FileStackNode const *node, uint32_t lineNo)
 	return stack.values[stack.size];
 }
 
-static inline void freeRPNStack(void)
+static void freeRPNStack(void)
 {
 	free(stack.values);
 	free(stack.errorFlags);

src/link/script.c

@@ -78,12 +78,12 @@ static bool popFile(void)
 	return true;
 }
 
-static inline bool isWhiteSpace(int c)
+static bool isWhiteSpace(int c)
 {
 	return c == ' ' || c == '\t';
 }
 
-static inline bool isNewline(int c)
+static bool isNewline(int c)
 {
 	return c == '\r' || c == '\n';
 }

src/link/symbol.c

@@ -54,10 +54,7 @@ void sym_AddSymbol(struct Symbol *symbol)
 	}
 
 	/* If not, add it */
-	bool collided = hash_AddElement(symbols, symbol->name, symbol);
+	hash_AddElement(symbols, symbol->name, symbol);
-
-	if (beVerbose && collided)
-		warnx("Symbol hashmap collision occurred!");
 }
 
 struct Symbol *sym_GetSymbol(char const *name)

test/asm/align-unattainable.asm

@@ -0,0 +1,3 @@
+SECTION UNION "X", WRAM0
+
+SECTION UNION "X", WRAM0, ALIGN[16]

test/asm/align-unattainable.err

@@ -0,0 +1,3 @@
+ERROR: align-unattainable.asm(3):
+    Section "X"'s alignment cannot be attained in WRAM0
+error: Assembly aborted (1 error)!

test/asm/builtin-overwrite.asm

@@ -0,0 +1,43 @@
+macro tickle
+; There once was a bug where overwriting worked only on the second try, so
+; try everything twice for good measure
+
+; Skip this syntax for EQUS, as it is invalid
+IF \2
+\1 = 0
+\1 = 0
+PRINTLN \1
+
+\1 EQU 0
+\1 EQU 0
+PRINTLN \1
+ENDC
+
+PURGE \1
+PURGE \1
+PRINTLN \1
+
+DEF \1 EQU 0
+DEF \1 EQU 0
+PRINTLN \1
+
+DEF \1 = 0
+DEF \1 = 0
+PRINTLN \1
+
+DEF \1 EQUS "hello"
+DEF \1 EQUS "hello"
+PRINTLN \1
+
+REDEF \1 = 0
+REDEF \1 = 0
+PRINTLN \1
+
+REDEF \1 EQUS "hello"
+REDEF \1 EQUS "hello"
+PRINTLN \1
+endm
+
+    ; Representative numeric and string builtins
+    tickle __LINE__, 1
+    tickle __FILE__, 0

test/asm/builtin-overwrite.err

@@ -0,0 +1,57 @@
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(7):
+    '__LINE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(8):
+    '__LINE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(11):
+    '__LINE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(12):
+    '__LINE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(16):
+    Built-in symbol '__LINE__' cannot be purged
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(17):
+    Built-in symbol '__LINE__' cannot be purged
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(20):
+    '__LINE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(21):
+    '__LINE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(24):
+    '__LINE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(25):
+    '__LINE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(28):
+    '__LINE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(29):
+    '__LINE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(32):
+    '__LINE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(33):
+    '__LINE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(36):
+    '__LINE__' already defined as non-EQUS at <builtin>
+ERROR: builtin-overwrite.asm(42) -> builtin-overwrite.asm::tickle(37):
+    '__LINE__' already defined as non-EQUS at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(16):
+    Built-in symbol '__FILE__' cannot be purged
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(17):
+    Built-in symbol '__FILE__' cannot be purged
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(20):
+    '__FILE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(21):
+    '__FILE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(24):
+    '__FILE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(25):
+    '__FILE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(28):
+    '__FILE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(29):
+    '__FILE__' already defined at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(32):
+    '__FILE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(33):
+    '__FILE__' already defined as constant at <builtin>
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(36):
+    Built-in symbol '__FILE__' cannot be redefined
+ERROR: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(37):
+    Built-in symbol '__FILE__' cannot be redefined
+error: Assembly aborted (28 errors)!

test/asm/builtin-overwrite.out

@@ -0,0 +1,14 @@
+$9
+$D
+$12
+$16
+$1A
+$1E
+$22
+$26
+builtin-overwrite.asm
+builtin-overwrite.asm
+builtin-overwrite.asm
+builtin-overwrite.asm
+builtin-overwrite.asm
+builtin-overwrite.asm

test/asm/div-mod.asm

@@ -1,36 +1,62 @@
-_ASM equ 0
+def _ASM equ 0
 
 test: MACRO
-; Test RGBASM
+	; Test RGBASM
-V equs "_ASM +"
+	redef V equs "_ASM +"
 	static_assert \#
-	PURGE V
+	; Test RGBLINK
-; Test RGBLINK
+	redef V equs "_LINK +"
-V equs "_LINK +"
 	assert \#
-	PURGE V
 ENDM
 
-for x, -300, 301
+test_mod: MACRO
-  for y, -x - 1, x + 2
+	def x = \1 ; dividend
-    if y != 0
+	def y = \2 ; divisor
-q = x / y
+	shift 2
-r = x % y
+	def q = x / y ; quotient
-      test (V (q * y + r)) == (V x)
+	def r = x % y ; remainder
-      test (V (x + y) % y) == (V r)
+	; identity laws
-      test (V (x - y) % y) == (V r)
+	test (V (q * y + r)) == (V x)
-    endc
+	test (V (x + y) % y) == (V r)
-  endr
+	test (V (x - y) % y) == (V r)
-endr
+ENDM
 
-for x, -300, 301
+test_each_mod: MACRO
-  for p, 31
+	test_mod (\1), (\2)
-y = 2 ** p
+	test_mod (\1), -(\2)
-r = x % y
+	test_mod -(\1), (\2)
-m = x & (y - 1)
+	test_mod -(\1), -(\2)
-    test (V r) == (V m)
+ENDM
-  endr
+
-endr
+test_pow: MACRO
+	def x = \1 ; dividend
+	def y = 2 ** \2 ; divisor
+	def r = x % y ; remainder
+	def m = x & (y - 1) ; mask
+	; identity law
+	test (V r) == (V m)
+ENDM
+
+test_each_pow: MACRO
+	test_pow (\1), (\2)
+	test_pow -(\1), (\2)
+ENDM
+
+	test_each_mod 0, 1
+	test_each_mod 7, 5
+	test_each_mod 42, 256
+	test_each_mod 567, 256
+	test_each_mod 256, 512
+	test_each_mod 1, 65535
+	test_each_mod 100, 65535
+	test_each_mod 10000, 65535
+	test_each_mod 1000000, 65535
+
+	test_each_pow 5, 1
+	test_each_pow 42, 8
+	test_each_pow 567, 8
+	test_each_pow 12345, 16
+	test_each_pow 99999, 16
 
 SECTION "LINK", ROM0
 _LINK::

test/asm/equs-newline.err

@@ -3,5 +3,6 @@ warning: equs-newline.asm(3): [-Wuser]
 while expanding symbol "ACT"
 warning: equs-newline.asm(3): [-Wuser]
     Second
+while expanding symbol "ACT"
 warning: equs-newline.asm(4): [-Wuser]
     Third

test/asm/equs-recursion.asm

@@ -1,6 +1,2 @@
-recurse EQUS "recurse "
+recurse EQUS "recurse"
 recurse
-
-; FIXME: also handle the following:
-; recurse EQUS "recurse"
-; recurse

test/asm/expand-empty-string.asm

@@ -0,0 +1,6 @@
+test: MACRO
+v equs "X"
+X equs "" ; should not be expanded
+\1
+ENDM
+	test v 0

test/asm/expand-empty-string.err

@@ -0,0 +1,3 @@
+ERROR: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4):
+    syntax error, unexpected number
+error: Assembly aborted (1 error)!

test/asm/expand-empty-string.simple.err

@@ -0,0 +1,3 @@
+ERROR: expand-empty-string.asm(6) -> expand-empty-string.asm::test(4):
+    syntax error
+error: Assembly aborted (1 error)!

test/asm/ff00-plus-c.asm

@@ -0,0 +1,5 @@
+SECTION "test", ROM0[0]
+	ld [ $ff00 + c ], a
+	; 257 spaces exceeds both LEXER_BUF_SIZE (42) and uint8_t limit (255)
+	ld [ $ff00 +                                                                                                                                                                                                                                                                 c ], a
+	ld [ $ff00                                                                                                                                                                                                                                                                 + c ], a

test/asm/ff00-plus-c.out.bin

@@ -0,0 +1 @@
+<EFBFBD><EFBFBD><EFBFBD>

test/asm/for.asm

@@ -8,13 +8,17 @@ for v, 0
 endr
 
 for v, 2, 1
-	print "unreached"
+	print "backwards"
 endr
 
 for v, 1, 2, 0
 	print "unreached"
 endr
 
+for v, 1, 2, -1
+	print "backwards"
+endr
+
 for x, 1, 5+1
 	print "{d:x} "
 endr

test/asm/for.err

@@ -1,6 +1,10 @@
+warning: for.asm(12): [-Wbackwards-for]
+    FOR goes backwards from 2 to 1 by 1
 ERROR: for.asm(16):
     FOR cannot have a step value of 0
-ERROR: for.asm(41) -> for.asm::REPT~4(47):
+warning: for.asm(20): [-Wbackwards-for]
-    'v' already defined as constant at for.asm(41) -> for.asm::REPT~4(45)
+    FOR goes backwards from 1 to 2 by -1
-FATAL: for.asm(41) -> for.asm::REPT~4(47):
+ERROR: for.asm(45) -> for.asm::REPT~4(51):
+    'v' already defined as constant at for.asm(45) -> for.asm::REPT~4(49)
+FATAL: for.asm(45) -> for.asm::REPT~4(51):
     Failed to update FOR symbol value

test/asm/format-truncation.asm

@@ -0,0 +1,15 @@
+num equ 42
+fix equ 123.0
+str equs "hello"
+
+println "{#0260x:num}"
+println "{#-260x:num}"
+println "{0280.260f:fix}"
+println "{260s:str}"
+println "{-260s:str}"
+
+println "<{#0260x:num}>"
+println "<{#-260x:num}>"
+println "<{0280.260f:fix}>"
+println "<{260s:str}>"
+println "<{-260s:str}>"

test/asm/format-truncation.err

@@ -0,0 +1,35 @@
+ERROR: format-truncation.asm(5):
+    Formatted numeric value too long
+ERROR: format-truncation.asm(6):
+    Formatted numeric value too long
+ERROR: format-truncation.asm(7):
+    Fractional width 260 too long, limiting to 255
+ERROR: format-truncation.asm(7):
+    Formatted numeric value too long
+ERROR: format-truncation.asm(8):
+    Formatted string value too long
+ERROR: format-truncation.asm(9):
+    Formatted string value too long
+ERROR: format-truncation.asm(11):
+    Formatted numeric value too long
+warning: format-truncation.asm(11): [-Wlong-string]
+    String constant too long
+ERROR: format-truncation.asm(12):
+    Formatted numeric value too long
+warning: format-truncation.asm(12): [-Wlong-string]
+    String constant too long
+ERROR: format-truncation.asm(13):
+    Fractional width 260 too long, limiting to 255
+ERROR: format-truncation.asm(13):
+    Formatted numeric value too long
+warning: format-truncation.asm(13): [-Wlong-string]
+    String constant too long
+ERROR: format-truncation.asm(14):
+    Formatted string value too long
+warning: format-truncation.asm(14): [-Wlong-string]
+    String constant too long
+ERROR: format-truncation.asm(15):
+    Formatted string value too long
+warning: format-truncation.asm(15): [-Wlong-string]
+    String constant too long
+error: Assembly aborted (12 errors)!

test/asm/format-truncation.out

@@ -0,0 +1,10 @@
+$0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a
+$2a                                                                                                                                                                                                                                                            
+123.00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+                                                                                                                                                                                                                                                          hello
+hello                                                                                                                                                                                                                                                          
+<$0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002
+<$2a                                                                                                                                                                                                                                                           
+<123.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+<                                                                                                                                                                                                                                                          hell
+<hello                                                                                                                                                                                                                                                         

test/asm/interpolation-overflow.asm

@@ -0,0 +1,4 @@
+; It seems that \1 was the easiest way to notice the memory corruption that
+; resulted from this overflow
+x = 0
+{.99999999f:x}\1

test/asm/interpolation-overflow.err

@@ -0,0 +1,9 @@
+ERROR: interpolation-overflow.asm(4):
+    Fractional width 99999999 too long, limiting to 255
+ERROR: interpolation-overflow.asm(4):
+    Formatted numeric value too long
+warning: interpolation-overflow.asm(4): [-Wlarge-constant]
+    Precision of fixed-point constant is too large
+while expanding symbol "0.0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+FATAL: interpolation-overflow.asm(4):
+    Macro argument '\1' not defined

test/asm/interpolation-recursion.asm

@@ -0,0 +1,2 @@
+recurse EQUS "\{recurse\}"
+{recurse}

test/asm/interpolation-recursion.err

@@ -0,0 +1,67 @@
+FATAL: interpolation-recursion.asm(2):
+    Recursion limit (64) exceeded
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"
+while expanding symbol "{recurse}"

test/asm/local-truncated.asm

@@ -0,0 +1,11 @@
+SECTION "Test", ROM0
+
+MACRO a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
+	println "truncated :("
+ENDM
+
+a012:
+	a012.local
+
+a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012:
+	a0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012.local

test/asm/local-truncated.err

@@ -0,0 +1,7 @@
+warning: local-truncated.asm(10): [-Wlong-string]
+    Symbol name too long, got truncated
+ERROR: local-truncated.asm(10):
+    'a000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001' already defined at local-truncated.asm(3)
+warning: local-truncated.asm(11): [-Wlong-string]
+    Symbol name too long, got truncated
+error: Assembly aborted (1 error)!

test/asm/local-truncated.out

@@ -0,0 +1 @@
+truncated :(

test/asm/narg-overwrite.asm

@@ -1,2 +0,0 @@
-_NARG = 0
-_NARG = 0

test/asm/narg-overwrite.err

@@ -1,5 +0,0 @@
-ERROR: narg-overwrite.asm(1):
-    '_NARG' already defined as constant at <builtin>
-ERROR: narg-overwrite.asm(2):
-    '_NARG' already defined as constant at <builtin>
-error: Assembly aborted (2 errors)!

test/asm/nested-expansions.asm

@@ -0,0 +1,6 @@
+def foo equs "bar"
+def bar equs "qux"
+MACRO test
+	\1
+ENDM
+	test foo 0

test/asm/nested-expansions.err

@@ -0,0 +1,3 @@
+ERROR: nested-expansions.asm(6) -> nested-expansions.asm::test(4):
+    Macro "qux" not defined
+error: Assembly aborted (1 error)!

test/asm/nested-interpolation-recursion.asm

@@ -0,0 +1,3 @@
+def s equs "s"
+; 65 nested {}s, recursion limit is 64
+println "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{s}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}"

test/asm/nested-interpolation-recursion.err

@@ -0,0 +1,2 @@
+FATAL: nested-interpolation-recursion.asm(3):
+    Recursion limit (64) exceeded

test/asm/pushc-without-switch.asm

@@ -0,0 +1,6 @@
+; Triggering a charmap realloc while the charmap has been pushed onto the stack used
+; to induce a use-after-free.
+pushc
+charmap "000000000000000000000000000000000",12
+popc
+charmap "000000000000000000000000000000000",34

test/asm/quine.asm

@@ -1,13 +1,13 @@
-N:MACRO
+MACRO N
 FOR I,_NARG
-SHIFT I
+PRINT STRSUB("\n\"\\ INRST1,ABCDEFGHMnOPU_+-()",\1+1,1)
-PRINT STRSUB("\n\"\\ INRT1,ABCDEFGHMOPSUn_(+-:)",\1+1,1)
+SHIFT
-SHIFT-I
 ENDR
-REPT _NARG-1
+SHIFT-I
+REPT I-1
 PRINT"\1,"
 SHIFT
 ENDR
 PRINT"\1\n"
 ENDM
- N 5,28,18,10,12,6,19,0,15,19,6,3,4,9,24,5,10,6,16,0,21,17,4,15,7,3,4,0,20,6,4,5,7,3,21,7,6,21,22,11,25,1,2,23,2,1,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,1,9,2,8,26,8,9,8,29,0,21,17,4,15,7,27,4,0,14,5,13,6,0,6,14,20,7,3,24,5,10,6,16,27,8,0,20,6,4,5,7,1,2,8,9,1,0,21,17,4,15,7,0,14,5,13,6,0,20,6,4,5,7,1,2,8,2,23,1,0,14,5,13,18,0,3,5,3
+ N 19,11,13,6,21,3,5,0,16,21,6,3,4,10,24,5,11,6,17,0,22,6,4,5,8,3,7,8,6,7,23,12,27,1,2,20,2,1,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,1,10,2,9,25,9,10,9,28,0,7,18,4,16,8,0,15,5,14,6,0,7,18,4,16,8,26,4,0,6,15,22,8,3,4,26,9,0,22,6,4,5,8,1,2,9,10,1,0,7,18,4,16,8,0,15,5,14,6,0,22,6,4,5,8,1,2,9,2,20,1,0,15,5,14,19,0,3,5,3

test/asm/quine.out

@@ -1,13 +1,13 @@
-N:MACRO
+MACRO N
 FOR I,_NARG
-SHIFT I
+PRINT STRSUB("\n\"\\ INRST1,ABCDEFGHMnOPU_+-()",\1+1,1)
-PRINT STRSUB("\n\"\\ INRT1,ABCDEFGHMOPSUn_(+-:)",\1+1,1)
+SHIFT
-SHIFT-I
 ENDR
-REPT _NARG-1
+SHIFT-I
+REPT I-1
 PRINT"\1,"
 SHIFT
 ENDR
 PRINT"\1\n"
 ENDM
- N 5,28,18,10,12,6,19,0,15,19,6,3,4,9,24,5,10,6,16,0,21,17,4,15,7,3,4,0,20,6,4,5,7,3,21,7,6,21,22,11,25,1,2,23,2,1,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,1,9,2,8,26,8,9,8,29,0,21,17,4,15,7,27,4,0,14,5,13,6,0,6,14,20,7,3,24,5,10,6,16,27,8,0,20,6,4,5,7,1,2,8,9,1,0,21,17,4,15,7,0,14,5,13,6,0,20,6,4,5,7,1,2,8,2,23,1,0,14,5,13,18,0,3,5,3
+ N 19,11,13,6,21,3,5,0,16,21,6,3,4,10,24,5,11,6,17,0,22,6,4,5,8,3,7,8,6,7,23,12,27,1,2,20,2,1,2,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,1,10,2,9,25,9,10,9,28,0,7,18,4,16,8,0,15,5,14,6,0,7,18,4,16,8,26,4,0,6,15,22,8,3,4,26,9,0,22,6,4,5,8,1,2,9,10,1,0,7,18,4,16,8,0,15,5,14,6,0,22,6,4,5,8,1,2,9,2,20,1,0,15,5,14,19,0,3,5,3

test/asm/quine2.asm

@@ -1,4 +1,4 @@
-q:macro
+macro q
 println\1,"\1"
 endm
- q"q:macro\nprintln\\1,\"\\1\"\nendm\n q"
+ q"macro q\nprintln\\1,\"\\1\"\nendm\n q"

test/asm/quine2.out

@@ -1,4 +1,4 @@
-q:macro
+macro q
 println\1,"\1"
 endm
- q"q:macro\nprintln\\1,\"\\1\"\nendm\n q"
+ q"macro q\nprintln\\1,\"\\1\"\nendm\n q"

test/asm/rst.asm

@@ -16,12 +16,8 @@ SECTION "calls", ROM0[0]
 
 
 defRST: MACRO
-; FIXME: This is required, otherwise the lexer does not paste the two tokens
+	SECTION "rst\1", ROM0[$\1]
-ADDR equs "$\1"
+	rst\1:
-SECTION "rst\1", ROM0[ADDR]
-
-rst\1:
-	PURGE ADDR
 ENDM
 	defRST 00
 	defRST 08

test/asm/test.sh

@@ -38,12 +38,14 @@ tryCmp () {
 
 # Add the version constants test, outputting the closest tag to the HEAD
 if git describe --tags --abbrev=0 > version.out; then
+	$RGBASM --version >> version.out
 	cat > version.asm <<EOF
 IF !DEF(__RGBDS_RC__)
 	PRINTLN "v{d:__RGBDS_MAJOR__}.{d:__RGBDS_MINOR__}.{d:__RGBDS_PATCH__}"
 ELSE
 	PRINTLN "v{d:__RGBDS_MAJOR__}.{d:__RGBDS_MINOR__}.{d:__RGBDS_PATCH__}-rc{d:__RGBDS_RC__}"
 ENDC
+	PRINTLN "rgbasm {__RGBDS_VERSION__}"
 EOF
 else
 	echo "${bold}${orange}Warning: cannot run version test!${rescolors}${resbold}"
@@ -60,6 +62,7 @@ EOF
 	cat > quote\"file.err <<EOF
 warning: quote"file.asm(1): [-Wuser]
     quote"file.asm
+while expanding symbol "__FILE__"
 EOF
 fi
 

test/asm/unique-id.err

@@ -1,19 +1,27 @@
 warning: unique-id.asm(12) -> unique-id.asm::m(4): [-Wuser]
     _u1
+while expanding symbol "warn_unique"
 warning: unique-id.asm(12) -> unique-id.asm::m(5) -> unique-id.asm::m::REPT~1(6): [-Wuser]
     _u2
+while expanding symbol "warn_unique"
 warning: unique-id.asm(12) -> unique-id.asm::m(5) -> unique-id.asm::m::REPT~2(6): [-Wuser]
     _u3
+while expanding symbol "warn_unique"
 warning: unique-id.asm(12) -> unique-id.asm::m(8): [-Wuser]
     _u1
+while expanding symbol "warn_unique"
 warning: unique-id.asm(14) -> unique-id.asm::m(4): [-Wuser]
     _u4
+while expanding symbol "warn_unique"
 warning: unique-id.asm(14) -> unique-id.asm::m(5) -> unique-id.asm::m::REPT~1(6): [-Wuser]
     _u5
+while expanding symbol "warn_unique"
 warning: unique-id.asm(14) -> unique-id.asm::m(5) -> unique-id.asm::m::REPT~2(6): [-Wuser]
     _u6
+while expanding symbol "warn_unique"
 warning: unique-id.asm(14) -> unique-id.asm::m(8): [-Wuser]
     _u4
+while expanding symbol "warn_unique"
 FATAL: unique-id.asm(15):
     Macro argument '\@' not defined
 while expanding symbol "warn_unique"

test/asm/utc-time.asm

@@ -0,0 +1,14 @@
+MACRO between
+	assert (\1) <= (\2) && (\2) <= (\3)
+ENDM
+
+	between 0, __UTC_YEAR__, 9999 ; Y10K problem...
+	between 1, __UTC_MONTH__, 12
+	between 1, __UTC_DAY__, 31
+	between 0, __UTC_HOUR__, 23
+	between 0, __UTC_MINUTE__, 59
+	between 0, __UTC_SECOND__, 60 ; leap seconds!
+
+UTC_TIME EQUS STRCAT("{04d:__UTC_YEAR__}-{02d:__UTC_MONTH__}-{02d:__UTC_DAY__}T", \
+                     "{02d:__UTC_HOUR__}:{02d:__UTC_MINUTE__}:{02d:__UTC_SECOND__}Z")
+	assert !STRCMP("{UTC_TIME}", __ISO_8601_UTC__)

test/link/rst.asm

@@ -14,12 +14,8 @@ SECTION "calls", ROM0[0]
 
 
 defRST: MACRO
-; FIXME: This is required, otherwise the lexer does not paste the two tokens
+	SECTION "rst\1", ROM0[$\1]
-ADDR equs "$\1"
+	rst\1:
-SECTION "rst\1", ROM0[ADDR]
-
-rst\1:
-	PURGE ADDR
 ENDM
 	defRST 00
 	defRST 08

test/link/test.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 export LC_ALL=C
 set -o pipefail

test/run-tests.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Return failure as soon as a command fails to execute