Timerix/kerep
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all printf calls replaced with kprintf

Browse Source
This commit is contained in:
timerix
2022-10-24 18:33:43 +06:00
parent c70544ff97
commit 4785023126
27 changed files with 189 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/kprint/README.md
View File

@@ -1,3 +1,6 @@
# kprintf
It is just my variant of printf.
# kprint
I don't really like printf function (and its variants), so i made safer and more convinient replacement.

65
src/kprint/kprint.c
View File

@@ -1,6 +1,5 @@
#include "../String/StringBuilder.h"
#include "kprint.h"
#include "../base/type_system/base_toString.h"
ktId __typeFromFormat(kprint_format f){
ktId typeId=kprint_format_ktId(f);
@@ -78,7 +77,7 @@ void __kprint(uint8 n, kprint_format* formats, __kprint_value_union* objects){
#define FOREGROUND_YELLOW FOREGROUND_GREEN | FOREGROUND_RED
DWORD kprint_fgColor_toWin(kprint_fgColor f){
//printf("fg: %x\n", f);
//kprintf("fg: %x\n", f);
switch(f){
case kprint_fgBlack: return 0;
case kprint_fgDarkRed: return FOREGROUND_RED;
@@ -101,7 +100,7 @@ DWORD kprint_fgColor_toWin(kprint_fgColor f){
}
DWORD kprint_bgColor_toWin(kprint_bgColor f){
//printf("bg: %x\n", f);
//kprintf("bg: %x\n", f);
switch(f){
case kprint_bgBlack: return 0;
case kprint_bgDarkRed: return BACKGROUND_RED;
@@ -140,13 +139,13 @@ void kprint_setColor(kprint_format f){
uint8 fg=(f&0x0f000000)>>24;
if(fg<8) fg+=30;
else fg+=90-8;
printf("\e[%um", fg);
kprintf("\e[%um", fg);
}
if(kprint_format_bgColorChanged(f)){
uint8 bg=(f&0x00f00000)>>20;
if(bg<8) bg+=40;
else bg+=100-8;
printf("\e[%um", bg);
kprintf("\e[%um", bg);
}
}
#endif
@@ -167,59 +166,3 @@ void kprint_setColor(kprint_format f){
StringBuilder_append_char(strb, ' ');
StringBuilder_append_char(strb, ']');
} */
void kprintf(char* format, ...){
va_list vl;
va_start(vl, format);
char c;
while((c=*format++)){
if(c=='%'){
c=*format++;
switch (c) {
case 'u':
toString_uint(va_arg(vl, uint64),0,0);
break;
case 'i':
toString_int(va_arg(vl, uint64));
break;
case 'f':
toString_float(va_arg(vl, float64),0,0);
break;
/* case 'l':
c=*format++;
switch (c) {
case 'u':
toString_uint(va_arg(vl, uint64),0,0);
break;
case 'i':
toString_int(va_arg(vl, uint64));
break;
case 'f':
toString_float(va_arg(vl, float64),0,0);
break;
default:
throw(ERR_FORMAT);
}
break; */
case 'p':
case 'x':
uint64 px=va_arg(vl, uint64);
toString_hex(&px,sizeof(px),1,0);
break;
default:
throw(ERR_FORMAT);
}
} else if(c=='\e'){
IFWIN(
({
}),
putc(c,stdout);
)
} else {
putc(c,stdout);
}
}
va_end(vl);
}

3
src/kprint/kprint.h
View File

@@ -65,9 +65,6 @@ Maybe __kfprint(FILE* fd, uint8 n, kprint_format* formats, __kprint_value_union*
void __kprint(uint8 n, kprint_format* formats, __kprint_value_union* objects);
#define kprint(ARGS...) __kprint(count_args(ARGS), __kprint_argsToArrs(count_args(ARGS),ARGS, __32zeroes))
// cross-platform printf analog
void kprintf(char* format, ...);
// can take (bgColor | fgColor)
void kprint_setColor(kprint_format f);

73
src/kprint/kprintf.c Normal file
View File

@@ -0,0 +1,73 @@
#include "kprintf.h"
#include "../base/base.h"
#include "../base/type_system/base_toString.h"
void kprintf(const char* format, ...){
va_list vl;
va_start(vl, format);
char c;
while((c=*format++)){
if(c=='%'){
char* argstr=NULL;
c=*format++;
format_escape_seq:
switch (c) {
case 'u':
argstr=toString_uint(va_arg(vl, uint64),0,0);
break;
case 'i':
argstr=toString_int(va_arg(vl, uint64));
break;
case 'f':
argstr=toString_float(va_arg(vl, float64),0,0);
break;
case 'l':
c=*format++;
goto format_escape_seq;
// switch (c) {
// case 'u':
// argstr=toString_uint(va_arg(vl, uint64),0,0);
// break;
// case 'i':
// argstr=toString_int(va_arg(vl, uint64));
// break;
// case 'f':
// argstr=toString_float(va_arg(vl, float64),0,0);
// break;
// default:
// throw(ERR_FORMAT);
// }
// break;
case 'p':
case 'x':
uint64 px=va_arg(vl, uint64);
argstr=toString_hex(&px,sizeof(px),1,0);
break;
case 's':
fputs(va_arg(vl,char*), stdout);
break;
case 'c':
argstr=malloc(2);
argstr[0]=va_arg(vl,char);
argstr[1]=0;
break;
default:
throw(ERR_FORMAT);
}
if(argstr){
fputs(argstr, stdout);
free(argstr);
}
} else if(c=='\e'){
IFWIN(
({
}),
putc(c,stdout);
)
} else {
putc(c,stdout);
}
}
va_end(vl);
}

12
src/kprint/kprintf.h Normal file
View File

@@ -0,0 +1,12 @@
#pragma once
#if __cplusplus
extern "C" {
#endif
// cross-platform kprintf analog
void kprintf(const char* format, ...);
#if __cplusplus
}
#endif