gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-21 18:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently format type qualifiers like const on the right (#1347)

Browse Source
This commit is contained in:
Sylvie
2024-03-10 12:21:52 -04:00
committed by GitHub
parent d982d47c56
commit 820f6b5b3c
22 changed files with 103 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/asm/fstack.cpp
View File

@@ -38,7 +38,7 @@ size_t maxRecursionDepth;
// The first include path for `fstk_FindFile` to try is none at all
static std::vector<std::string> includePaths = {""};
static const char *preIncludeName;
static char const *preIncludeName;
std::vector<uint32_t> &FileStackNode::iters() {
assert(std::holds_alternative<std::vector<uint32_t>>(data));
@@ -60,7 +60,7 @@ std::string const &FileStackNode::name() const {
return std::get<std::string>(data);
}
static const char *dumpNodeAndParents(FileStackNode const &node) {
static char const *dumpNodeAndParents(FileStackNode const &node) {
char const *name;
if (node.type == NODE_REPT) {

4
src/asm/main.cpp
View File

@@ -77,7 +77,7 @@ static std::string make_escape(std::string &str) {
}
// Short options
static const char *optstring = "b:D:Eg:Hhi:I:LlM:o:P:p:Q:r:VvW:wX:";
static char const *optstring = "b:D:Eg:Hhi:I:LlM:o:P:p:Q:r:VvW:wX:";
// Variables for the long-only options
static int depType; // Variants of `-M`
@@ -279,7 +279,7 @@ int main(int argc, char *argv[]) {
break;
unsigned long precision;
const char *precisionArg;
char const *precisionArg;
case 'Q':
precisionArg = musl_optarg;
if (precisionArg[0] == '.')

2
src/asm/opt.cpp
View File

@@ -106,7 +106,7 @@ void opt_Parse(char const *s) {
}
break;
const char *precisionArg;
char const *precisionArg;
case 'Q':
precisionArg = &s[1];
if (precisionArg[0] == '.')

4
src/asm/output.cpp
View File

@@ -29,7 +29,7 @@ struct Assertion {
std::string message;
};
const char *objectName;
char const *objectName;
// List of symbols to put in the object file
static std::vector<Symbol *> objectSymbols;
@@ -159,7 +159,7 @@ static uint32_t getSymbolID(Symbol &sym) {
return sym.ID;
}
static void writerpn(std::vector<uint8_t> &rpnexpr, const std::vector<uint8_t> &rpn) {
static void writerpn(std::vector<uint8_t> &rpnexpr, std::vector<uint8_t> const &rpn) {
std::string symName;
size_t rpnptr = 0;

26
src/asm/parser.y
View File

@@ -38,7 +38,7 @@
StrFmtArgList(StrFmtArgList &&) = default;
#ifdef _MSC_VER
// MSVC and WinFlexBison won't build without this...
StrFmtArgList(const StrFmtArgList &) = default;
StrFmtArgList(StrFmtArgList const &) = default;
#endif
StrFmtArgList &operator=(StrFmtArgList &&) = default;
@@ -73,7 +73,7 @@
static void upperstring(char *dest, char const *src);
static void lowerstring(char *dest, char const *src);
static uint32_t str2int2(std::vector<uint8_t> const &s);
static const char *strrstr(char const *s1, char const *s2);
static char const *strrstr(char const *s1, char const *s2);
static void errorInvalidUTF8Byte(uint8_t byte, char const *functionName);
static size_t strlenUTF8(char const *s);
static void strsubUTF8(char *dest, size_t destLen, char const *src, uint32_t pos, uint32_t len);
@@ -84,10 +84,12 @@
char *dest, size_t destLen, char const *src, char const *old, char const *rep
);
static void strfmt(
char *dest, size_t destLen, char const *spec,
char *dest,
size_t destLen,
char const *spec,
std::vector<std::variant<uint32_t, std::string>> &args
);
static void compoundAssignment(const char *symName, RPNCommand op, int32_t constValue);
static void compoundAssignment(char const *symName, RPNCommand op, int32_t constValue);
static void failAssert(AssertionType type);
static void failAssertMsg(AssertionType type, char const *msg);
@@ -628,7 +630,7 @@ assignment:
sym_AddVar($1.c_str(), $3);
}
| LABEL compoundeq const {
const char *compoundEqOperator = nullptr;
char const *compoundEqOperator = nullptr;
switch ($2) {
case RPN_ADD: compoundEqOperator = "+="; break;
case RPN_SUB: compoundEqOperator = "-="; break;
@@ -2471,7 +2473,8 @@ static uint32_t str2int2(std::vector<uint8_t> const &s) {
if (length > 4)
warning(
WARNING_NUMERIC_STRING_1,
"Treating string as a number ignores first %" PRIu32 " character%s\n", length - 4,
"Treating string as a number ignores first %" PRIu32 " character%s\n",
length - 4,
length == 5 ? "" : "s"
);
else if (length > 1)
@@ -2489,7 +2492,7 @@ static uint32_t str2int2(std::vector<uint8_t> const &s) {
return r;
}
static const char *strrstr(char const *s1, char const *s2) {
static char const *strrstr(char const *s1, char const *s2) {
size_t len1 = strlen(s1);
size_t len2 = strlen(s2);
@@ -2605,7 +2608,8 @@ static void charsubUTF8(char *dest, char const *src, uint32_t pos) {
if (!charmap_ConvertNext(src, nullptr))
warning(
WARNING_BUILTIN_ARG, "CHARSUB: Position %" PRIu32 " is past the end of the string\n",
WARNING_BUILTIN_ARG,
"CHARSUB: Position %" PRIu32 " is past the end of the string\n",
pos
);
@@ -2672,7 +2676,9 @@ static void strrpl(char *dest, size_t destLen, char const *src, char const *old,
}
static void strfmt(
char *dest, size_t destLen, char const *spec,
char *dest,
size_t destLen,
char const *spec,
std::vector<std::variant<uint32_t, std::string>> &args
) {
size_t a = 0;
@@ -2748,7 +2754,7 @@ static void strfmt(
dest[i] = '\0';
}
static void compoundAssignment(const char *symName, RPNCommand op, int32_t constValue) {
static void compoundAssignment(char const *symName, RPNCommand op, int32_t constValue) {
Expression oldExpr, constExpr, newExpr;
int32_t newValue;

6
src/asm/rpn.cpp
View File

@@ -232,7 +232,7 @@ void rpn_CheckRST(Expression &expr) {
}
// Checks that an RPN expression's value fits within N bits (signed or unsigned)
void rpn_CheckNBit(const Expression &expr, uint8_t n) {
void rpn_CheckNBit(Expression const &expr, uint8_t n) {
assert(n != 0); // That doesn't make sense
assert(n < CHAR_BIT * sizeof(int)); // Otherwise `1 << n` is UB
@@ -324,7 +324,7 @@ static int32_t tryConstMask(Expression const &lhs, Expression const &rhs) {
return (symbolOfs + sect.alignOfs) & ~unknownBits;
}
void rpn_BinaryOp(RPNCommand op, Expression &expr, Expression &&src1, const Expression &src2) {
void rpn_BinaryOp(RPNCommand op, Expression &expr, Expression &&src1, Expression const &src2) {
initExpression(expr);
expr.isSymbol = false;
int32_t constMaskVal;
@@ -570,7 +570,7 @@ void rpn_LOW(Expression &expr, Expression &&src) {
}
}
void rpn_ISCONST(Expression &expr, const Expression &src) {
void rpn_ISCONST(Expression &expr, Expression const &src) {
initExpression(expr);
expr.val = src.isKnown;
expr.isKnown = true;

4
src/asm/symbol.cpp
View File

@@ -589,7 +589,7 @@ void sym_Init(time_t now) {
now = 0;
}
const tm *time_local = localtime(&now);
tm const *time_local = localtime(&now);
strftime(savedTIME, sizeof(savedTIME), "\"%H:%M:%S\"", time_local);
strftime(savedDATE, sizeof(savedDATE), "\"%d %B %Y\"", time_local);
@@ -600,7 +600,7 @@ void sym_Init(time_t now) {
time_local
);
const tm *time_utc = gmtime(&now);
tm const *time_utc = gmtime(&now);
strftime(
savedTIMESTAMP_ISO8601_UTC,

2
src/asm/warning.cpp
View File

@@ -67,7 +67,7 @@ static WarningState warningState(WarningID id) {
return state;
}
static const char * const warningFlags[NB_WARNINGS] = {
static char const * const warningFlags[NB_WARNINGS] = {
"assert",
"backwards-for",
"builtin-args",