deavmi/birchwood
deavmi/birchwood
1
0
Fork 0
mirror of https://github.com/deavmi/birchwood synced 2024-09-20 14:03:05 +02:00
Code Issues Releases Activity

Exceptions

Browse Source 
- Added new `ErrorType` enum member `INVALID_FORMATTING`

Formatting

- All formatting functions will now throw a `BirchwoodException` instead of a `StringException` on invalid formatting parameters
This commit is contained in:
Tristan B. Velloza Kildaire 2023-03-19 12:19:32 +02:00
parent 1ca052978b
commit 51a04659c5
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/birchwood/client/exceptions.d
View File

@ -56,7 +56,13 @@ public enum ErrorType
* If the final encoded IRC message
* is too long to send to the server
*/
COMMAND_TOO_LONG
COMMAND_TOO_LONG,
/**
* If invalid parameters are passed
* to any of the text formatting functions
*/
INVALID_FORMATTING
}
/**

11
source/birchwood/protocol/formatting.d
View File

@ -3,8 +3,7 @@
*/
module birchwood.protocol.formatting;
// FIXME: Remove below import and start using BirchwoodException
import std.string;
import birchwood.client.exceptions;
// Reset character; resets all formatting
enum reset_code = '\x0F';
@ -52,7 +51,7 @@ char generate_color_control_char(string color) {
} else if (color.length == 2) {
return ascii_color_code;
} else {
throw new StringException("Invalid color code (must be either two ASCII digits or a hexadecimal code of the form RRGGBB)");
throw new BirchwoodException(ErrorType.INVALID_FORMATTING, "Invalid color code (must be either two ASCII digits or a hexadecimal code of the form RRGGBB)");
}
}
@ -64,7 +63,7 @@ string set_foreground(string color) {
} else if (color.length == 2) {
control_char[0] = ascii_color_code;
} else {
throw new StringException("Invalid color code (must be either two ASCII digits or a hexadecimal code of the form RRGGBB)");
throw new BirchwoodException(ErrorType.INVALID_FORMATTING, "Invalid color code (must be either two ASCII digits or a hexadecimal code of the form RRGGBB)");
}
return control_char.idup ~ color;
}
@ -73,14 +72,14 @@ string set_foreground(string color) {
string set_foreground_background(string fg, string bg) {
char[1] control_char;
if (fg.length != bg.length) {
throw new StringException("Invalid color code (cannot mix hex and ASCII)");
throw new BirchwoodException(ErrorType.INVALID_FORMATTING, "Invalid color code (cannot mix hex and ASCII)");
}
if (fg.length == 6) {
control_char[0] = hex_color_code;
} else if (fg.length == 2) {
control_char[0] = ascii_color_code;
} else {
throw new StringException("Invalid color code (must be either two ASCII digits or a hexadecimal code of the form RRGGBB)");
throw new BirchwoodException(ErrorType.INVALID_FORMATTING, "Invalid color code (must be either two ASCII digits or a hexadecimal code of the form RRGGBB)");
}
return control_char.idup ~ fg ~ "," ~ bg;
}