Reduce deep nesting some more

include/diagnostics.hpp

@@ -131,8 +131,8 @@ std::string Diagnostics<L, W>::processWarningFlag(char const *flag) {
 	auto [flagState, param] = getInitialWarningState(rootFlag);
 
 	// Try to match the flag against a parametric warning
-	// If there was an equals sign, it will have set `param`; if not, `param` will be 0, which
-	// applies to all levels
+	// If there was an equals sign, it will have set `param`; if not, `param` will be 0,
+	// which applies to all levels
 	for (ParamWarning<W> const &paramWarning : paramWarnings) {
 		W baseID = paramWarning.firstID;
 		uint8_t maxParam = paramWarning.lastID - baseID + 1;
@@ -173,8 +173,11 @@ std::string Diagnostics<L, W>::processWarningFlag(char const *flag) {
 		return rootFlag;
 	}
 
-	// Try to match against a non-parametric warning, unless there was an equals sign
-	if (!param.has_value()) {
+	if (param.has_value()) {
+		warnx("Unknown warning flag parameter \"%s\"", rootFlag.c_str());
+		return rootFlag;
+	}
+
 	// Try to match against a "meta" warning
 	for (WarningFlag<L> const &metaWarning : metaWarnings) {
 		if (rootFlag != metaWarning.name) {
@@ -190,16 +193,15 @@ std::string Diagnostics<L, W>::processWarningFlag(char const *flag) {
 		return rootFlag;
 	}
 
-		// Try to match the flag against a "normal" flag
+	// Try to match against a "normal" flag
 	for (W id : EnumSeq(W::NB_PLAIN_WARNINGS)) {
 		if (rootFlag == warningFlags[id].name) {
 			state.flagStates[id].update(flagState);
 			return rootFlag;
 		}
 	}
-	}
 
-	warnx("Unknown warning flag \"%s\"", flag);
+	warnx("Unknown warning flag \"%s\"", rootFlag.c_str());
 	return rootFlag;
 }
 

src/asm/charmap.cpp

@@ -41,11 +41,9 @@ struct Charmap {
 			auto [nodeIdx, mapping] = std::move(prefixes.top());
 			prefixes.pop();
 			CharmapNode const &node = nodes[nodeIdx];
-			if (node.isTerminal()) {
-				if (!callback(nodeIdx, mapping)) {
+			if (node.isTerminal() && !callback(nodeIdx, mapping)) {
 				return false;
 			}
-			}
 			for (unsigned c = 0; c < std::size(node.next); c++) {
 				if (size_t nextIdx = node.next[c]; nextIdx) {
 					prefixes.push({nextIdx, mapping + static_cast<char>(c)});

src/asm/lexer.cpp

@@ -641,7 +641,6 @@ static uint32_t readBracketedMacroArgNum() {
 		}
 
 		std::string symName;
-
 		for (; continuesIdentifier(c); c = peek()) {
 			symName += c;
 			shiftChar();
@@ -883,14 +882,21 @@ static void shiftChar() {
 
 static int nextChar() {
 	int c = peek();
-
-	// If not at EOF, advance read position
 	if (c != EOF) {
 		shiftChar();
 	}
 	return c;
 }
 
+template<typename P>
+static int skipChars(P predicate) {
+	int c = peek();
+	for (; predicate(c); c = peek()) {
+		shiftChar();
+	}
+	return c;
+}
+
 static void handleCRLF(int c) {
 	if (c == '\r' && peek() == '\n') {
 		shiftChar();
@@ -1032,10 +1038,7 @@ static uint32_t readFractionalPart(uint32_t integer) {
 			if (divisor > (UINT32_MAX - (c - '0')) / 10) {
 				warning(WARNING_LARGE_CONSTANT, "Precision of fixed-point constant is too large");
 				// Discard any additional digits
-				shiftChar();
-				while (c = peek(), (c >= '0' && c <= '9') || c == '_') {
-					shiftChar();
-				}
+				skipChars([](int d) { return (d >= '0' && d <= '9') || d == '_'; });
 				break;
 			}
 			value = value * 10 + (c - '0');
@@ -1443,8 +1446,24 @@ static void appendExpandedString(std::string &str, std::string const &expanded)
 static void appendCharInLiteral(std::string &str, int c) {
 	bool rawMode = lexerState->mode == LEXER_RAW;
 
-	switch (c) {
-	case '\\': // Character escape or macro arg
+	// Symbol interpolation
+	if (c == '{') {
+		// We'll be exiting the string/character scope, so re-enable expansions
+		// (Not interpolations, since they're handled by the function itself...)
+		lexerState->disableMacroArgs = false;
+		if (std::shared_ptr<std::string> interpolation = readInterpolation(0); interpolation) {
+			appendExpandedString(str, *interpolation);
+		}
+		lexerState->disableMacroArgs = true;
+		return;
+	}
+
+	// Regular characters will just get copied
+	if (c != '\\') {
+		str += c;
+		return;
+	}
+
 	c = peek();
 	switch (c) {
 	// Character escape
@@ -1518,22 +1537,6 @@ static void appendCharInLiteral(std::string &str, int c) {
 		shiftChar();
 		break;
 	}
-		break;
-
-	case '{': // Symbol interpolation
-		// We'll be exiting the string/character scope, so re-enable expansions
-		// (Not interpolations, since they're handled by the function itself...)
-		lexerState->disableMacroArgs = false;
-		if (std::shared_ptr<std::string> interpolation = readInterpolation(0); interpolation) {
-			appendExpandedString(str, *interpolation);
-		}
-		lexerState->disableMacroArgs = true;
-		break;
-
-	default: // Regular characters will just get copied
-		str += c;
-		break;
-	}
 }
 
 static void readString(std::string &str, bool rawString) {
@@ -1583,8 +1586,17 @@ static void readString(std::string &str, bool rawString) {
 			continue;
 		}
 
+		if (c != '"') {
+			// Append the character or handle special ones
+			if (rawString) {
+				str += c;
+			} else {
+				appendCharInLiteral(str, c);
+			}
+			continue;
+		}
+
 		// Close the string and return if it's terminated
-		if (c == '"') {
 		if (!multiline) {
 			if (rawMode) {
 				str += c;
@@ -1607,14 +1619,6 @@ static void readString(std::string &str, bool rawString) {
 		}
 		return;
 	}
-
-		// Append the character or handle special ones
-		if (rawString) {
-			str += c;
-		} else {
-			appendCharInLiteral(str, c);
-		}
-	}
 }
 
 static void readCharacter(std::string &str) {
@@ -1629,29 +1633,27 @@ static void readCharacter(std::string &str) {
 	}
 
 	for (;;) {
-		int c = peek();
-
+		switch (int c = peek(); c) {
+		case '\r':
+		case '\n':
+		case EOF:
 			// '\r', '\n' or EOF ends a character early
-		if (c == EOF || c == '\r' || c == '\n') {
 			error("Unterminated character");
 			return;
-		}
-
-		// We'll be staying in the character, so we can safely consume the char
-		shiftChar();
-
+		case '\'':
 			// Close the character and return if it's terminated
-		if (c == '\'') {
+			shiftChar();
 			if (rawMode) {
 				str += c;
 			}
 			return;
-		}
-
+		default:
 			// Append the character or handle special ones
+			shiftChar();
 			appendCharInLiteral(str, c);
 		}
 	}
+}
 
 // Lexer core
 
@@ -2347,14 +2349,7 @@ static Token yylex_SKIP_TO_ENDR() {
 			}
 		}
 
-		// Skip whitespace
-		for (;;) {
-			c = peek();
-			if (!isWhitespace(c)) {
-				break;
-			}
-			shiftChar();
-		}
+		c = skipChars(isWhitespace);
 
 		if (!startsIdentifier(c)) {
 			continue;
@@ -2489,19 +2484,18 @@ Capture lexer_CaptureRept() {
 			case T_(POP_REPT):
 			case T_(POP_FOR):
 				depth++;
-				// Ignore the rest of that line
-				break;
+				break; // Ignore the rest of that line
 
 			case T_(POP_ENDR):
-				if (!depth) {
+				if (depth) {
+					depth--;
+					break; // Ignore the rest of that line
+				}
 				endCapture(capture);
 				// The final ENDR has been captured, but we don't want it!
 				// We know we have read exactly "ENDR", not e.g. an EQUS
 				capture.span.size -= literal_strlen("ENDR");
 				return capture;
-				}
-				depth--;
-				break;
 
 			default:
 				break;

src/fix/main.cpp

@@ -1032,8 +1032,7 @@ static void
 		// This should be guaranteed from the size cap...
 		static_assert(0x10000 * BANK_SIZE <= SSIZE_MAX, "Max input file size too large for OS");
 		// Compute number of banks and ROMX len from file size
-		nbBanks = (fileSize + (BANK_SIZE - 1)) / BANK_SIZE;
-		//      = ceil(totalRomxLen / BANK_SIZE)
+		nbBanks = (fileSize + (BANK_SIZE - 1)) / BANK_SIZE; // ceil(fileSize / BANK_SIZE)
 		totalRomxLen = fileSize >= BANK_SIZE ? fileSize - BANK_SIZE : 0;
 	} else if (rom0Len == BANK_SIZE) {
 		// Copy ROMX when reading a pipe, and we're not at EOF yet

src/gfx/pal_packing.cpp

@@ -20,8 +20,8 @@
 
 // The solvers here are picked from the paper at https://arxiv.org/abs/1605.00558:
 // "Algorithms for the Pagination Problem, a Bin Packing with Overlapping Items"
-// Their formulation of the problem consists in packing "tiles" into "pages"; here is a
-// correspondence table for our application of it:
+// Their formulation of the problem consists in packing "tiles" into "pages".
+// Here is a correspondence table for our application of it:
 // Paper | RGBGFX
 // ------+-------
 // Tile  | Proto-palette