CPunch/Cosmo
1
0
Fork 0
mirror of https://github.com/CPunch/Cosmo.git synced 2026-01-02 13:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactored cosmo_pushFString

Browse Source 
- remove %t support
- added length specifier to %s
This commit is contained in:
CPunch
2021-02-06 16:01:59 -06:00
parent 2f9ff08cd3
commit 8151cde6f3
3 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/cobj.c
View File

@@ -245,34 +245,38 @@ CObjString *cosmoO_allocateString(CState *state, const char *str, size_t sz, uin
CObjString *cosmoO_pushVFString(CState *state, const char *format, va_list args) {
StkPtr start = state->top;
const char *end;
char c;
int len;
while (true) {
const char *end = strchr(format, '%'); // grab the next occurrence of '%'
end = strchr(format, '%'); // grab the next occurrence of '%'
len = -1; // -1 means no length specified
if (end == NULL) // the end, no '%' found
break;
// push the string before '%'
cosmoV_pushLString(state, format, (end - format));
char c = *(end+1); // the character right after '%'
reentry:
c = end[1]; // the character right after '%'
switch (c) {
case 'd': { // int
case 'd': // int
cosmoV_pushNumber(state, va_arg(args, int));
break;
}
case 'f': { // double
case 'f': // double
cosmoV_pushNumber(state, va_arg(args, double));
break;
}
case 's': { // const char *
cosmoV_pushString(state, va_arg(args, char *));
case 's': // char *
if (len >= 0) // the length is specified
cosmoV_pushLString(state, va_arg(args, char *), len);
else
cosmoV_pushString(state, va_arg(args, char *));
break;
}
case 't': { // CToken *
CToken *token = va_arg(args, CToken *);
cosmoV_pushLString(state, token->start, token->length);
break;
}
case '*': // length specifier
len = va_arg(args, int);
end++; // skip '*'
goto reentry;
default: {
char temp[2];
temp[0] = '%';