From ee748cfe26f78634a4bfc5ea9d210b0041f17273 Mon Sep 17 00:00:00 2001
From: Sylvie <35663410+Rangi42@users.noreply.github.com>
Date: Tue, 18 Jun 2024 14:47:31 -0400
Subject: [PATCH] Miscellaneous refactoring of code and docs (#1411)

---
 README.md         | 20 ++++++++++----------
 man/rgbds.7       |  4 ++--
 src/asm/lexer.cpp |  4 ++--
 src/asm/main.cpp  |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index d56bf8d8..4772b2f8 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
 RGBDS (Rednex Game Boy Development System) is a free assembler/linker package
 for the Game Boy and Game Boy Color. It consists of:
 
-- rgbasm (assembler)
-- rgblink (linker)
-- rgbfix (checksum/header fixer)
-- rgbgfx (PNG‐to‐Game Boy graphics converter)
+- RGBASM (assembler)
+- RGBLINK (linker)
+- RGBFIX (checksum/header fixer)
+- RGBGFX (PNG‐to‐Game Boy graphics converter)
 
 This is a fork of the original RGBDS which aims to make the programs more like
 other UNIX tools.
@@ -16,11 +16,11 @@ This toolchain is maintained [on GitHub](https://github.com/gbdev/rgbds).
 
 The documentation of this toolchain can be [viewed online](https://rgbds.gbdev.io/docs/).
 It is generated from the man pages found in this repository.
-The source code of the website itself is on GitHub as well under the repo
+The source code of the website itself is on GitHub as well under the repository
 [rgbds-www](https://github.com/gbdev/rgbds-www).
 
-If you want to contribute or maintain RGBDS, and have questions regarding the code, its
-organisation, etc. you can find the maintainers [on the gbdev community channels](https://gbdev.io/chat)
+If you want to contribute or maintain RGBDS, or you have questions regarding the code, its
+organization, etc. you can find the maintainers [on the gbdev community channels](https://gbdev.io/chat)
 or via mail at `rgbds at gbdev dot io`.
 
 ## 1. Installing RGBDS
@@ -96,7 +96,7 @@ The RGBDS source code file structure is as follows:
 - `man/` - manual pages.
 - `src/` - source code of RGBDS.
   * Note that the code unique to each RGBDS tool is stored in its respective subdirectory
-    (rgbasm's code is in `src/asm/`, for example). `src/extern/` contains code imported from
+    (RGBASM's code is in `src/asm/`, for example). `src/extern/` contains code imported from
     external sources.
 - `test/` - testing framework used to verify that changes to the code don't break or
   modify the behavior of RGBDS.
@@ -121,9 +121,9 @@ The RGBDS source code file structure is as follows:
   this version as [rgbds-linux](https://github.com/vegard/rgbds-linux).
 - 2010-01-12: Anthony J. Bentley [forks](https://github.com/bentley) Nossum's
   repository. The fork becomes the reference implementation of RGBDS.
-- 2015-01-18: stag019 begins implementing [rgbgfx](https://github.com/stag019/rgbgfx),
+- 2015-01-18: stag019 begins implementing [RGBGFX](https://github.com/stag019/rgbgfx),
   a PNG‐to‐Game Boy graphics converter, for eventual integration into RGBDS.
-- 2016-09-05: rgbgfx is [integrated](https://github.com/gbdev/rgbds/commit/c3c31138ddbd8680d4e67957e387f2816798a71b)
+- 2016-09-05: RGBGFX is [integrated](https://github.com/gbdev/rgbds/commit/c3c31138ddbd8680d4e67957e387f2816798a71b)
   into Bentley's repository.
 - 2017-02-23: Bentley's repository is moved to the [rednex](https://github.com/rednex)
   organization.
diff --git a/man/rgbds.7 b/man/rgbds.7
index 33495e28..825c22b5 100644
--- a/man/rgbds.7
+++ b/man/rgbds.7
@@ -53,9 +53,9 @@ The fork becomes the reference implementation of RGBDS.
 .It
 2015-01-18:
 .An stag019
-begins implementing rgbgfx, a PNG‐to‐Game Boy graphics converter, for eventual integration into RGBDS.
+begins implementing RGBGFX, a PNG‐to‐Game Boy graphics converter, for eventual integration into RGBDS.
 .It
-2016-09-05: rgbgfx is integrated into Bentley's repository.
+2016-09-05: RGBGFX is integrated into Bentley's repository.
 .It
 2017-02-23: Bentley's repository is moved to the
 .Lk https://github.com/rednex/rgbds rednex
diff --git a/src/asm/lexer.cpp b/src/asm/lexer.cpp
index d58d04e5..2d04f78d 100644
--- a/src/asm/lexer.cpp
+++ b/src/asm/lexer.cpp
@@ -566,7 +566,7 @@ void lexer_CheckRecursionDepth() {
 }
 
 static bool isMacroChar(char c) {
-	return c == '@' || c == '#' || c == '<' || (c > '0' && c <= '9');
+	return c == '@' || c == '#' || c == '<' || (c >= '1' && c <= '9');
 }
 
 // forward declarations for readBracketedMacroArgNum
@@ -670,7 +670,7 @@ static std::shared_ptr<std::string> readMacroArg(char name) {
 		error("Invalid macro argument '\\0'\n");
 		return nullptr;
 	} else {
-		assume(name > '0' && name <= '9');
+		assume(name >= '1' && name <= '9');
 
 		MacroArgs *macroArgs = fstk_GetCurrentMacroArgs();
 		if (!macroArgs) {
diff --git a/src/asm/main.cpp b/src/asm/main.cpp
index e74f65a7..85164346 100644
--- a/src/asm/main.cpp
+++ b/src/asm/main.cpp
@@ -174,12 +174,12 @@ int main(int argc, char *argv[]) {
 		case 'M':
 			if (dependFile)
 				warnx("Overriding dependfile %s", dependFileName);
-			if (!strcmp("-", musl_optarg)) {
-				dependFile = stdout;
-				dependFileName = "<stdout>";
-			} else {
+			if (strcmp("-", musl_optarg)) {
 				dependFile = fopen(musl_optarg, "w");
 				dependFileName = musl_optarg;
+			} else {
+				dependFile = stdout;
+				dependFileName = "<stdout>";
 			}
 			if (dependFile == nullptr)
 				err("Failed to open dependfile \"%s\"", dependFileName);