kprint massive rename
This commit is contained in:
@@ -1,29 +1,29 @@
|
||||
#include "../String/StringBuilder.h"
|
||||
#include "kprint.h"
|
||||
|
||||
ktid __typeFromFormat(kprint_format f){
|
||||
ktid typeId=kprint_format_ktid(f);
|
||||
ktid __typeFromFormat(kp_fmt f){
|
||||
ktid typeId=kp_fmt_ktid(f);
|
||||
if(typeId)
|
||||
return typeId;
|
||||
switch(kprint_format_dataFormat(f)){
|
||||
case kprint_fmtInt:
|
||||
case kprint_fmtHex:
|
||||
case kprint_fmtBin:
|
||||
switch(kp_fmt_dataFormat(f)){
|
||||
case kp_i:
|
||||
case kp_h:
|
||||
case kp_b:
|
||||
return ktid_name(int64);
|
||||
case kprint_fmtUInt:
|
||||
case kp_u:
|
||||
return ktid_name(uint64);
|
||||
case kprint_fmtFloat:
|
||||
case kp_f:
|
||||
return ktid_name(float64);
|
||||
case kprint_fmtChar:
|
||||
case kp_c:
|
||||
return ktid_char;
|
||||
case kprint_fmtString:
|
||||
case kp_s:
|
||||
return ktid_ptrName(char);
|
||||
default:
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
Maybe __next_toString(kprint_format f, __kprint_value_union* object){
|
||||
Maybe __next_toString(kp_fmt f, __kp_value_union* object){
|
||||
// detecting type
|
||||
ktid typeId=__typeFromFormat(f);
|
||||
if(typeId==-1)
|
||||
@@ -34,7 +34,7 @@ Maybe __next_toString(kprint_format f, __kprint_value_union* object){
|
||||
return SUCCESS(UniHeapPtr(char, typeDesc.toString(object, f)));
|
||||
}
|
||||
|
||||
Maybe __ksprint(uint8 n, kprint_format* formats, __kprint_value_union* objects){
|
||||
Maybe __ksprint(uint8 n, kp_fmt* formats, __kp_value_union* objects){
|
||||
n/=2;
|
||||
StringBuilder* strb=StringBuilder_create();
|
||||
for(uint8 i=0; i<n; i++){
|
||||
@@ -46,7 +46,7 @@ Maybe __ksprint(uint8 n, kprint_format* formats, __kprint_value_union* objects){
|
||||
return SUCCESS(UniHeapPtr(char, rezult));
|
||||
}
|
||||
|
||||
Maybe __kfprint(FILE* file, uint8 n, kprint_format* formats, __kprint_value_union* objects){
|
||||
Maybe __kfprint(FILE* file, uint8 n, kp_fmt* formats, __kp_value_union* objects){
|
||||
n/=2;
|
||||
for(uint8 i=0; i<n; i++){
|
||||
try(__next_toString(formats[i], &objects[i]),maybeStr,;);
|
||||
@@ -58,10 +58,10 @@ Maybe __kfprint(FILE* file, uint8 n, kprint_format* formats, __kprint_value_unio
|
||||
return MaybeNull;
|
||||
}
|
||||
|
||||
void __kprint(uint8 n, kprint_format* formats, __kprint_value_union* objects){
|
||||
void __kprint(uint8 n, kp_fmt* formats, __kp_value_union* objects){
|
||||
n/=2;
|
||||
for(uint8 i=0; i<n; i++){
|
||||
kprint_format fmt=formats[i];
|
||||
kp_fmt fmt=formats[i];
|
||||
kprint_setColor(fmt);
|
||||
tryLast(__next_toString(fmt, &objects[i]),maybeStr);
|
||||
if(fputs(maybeStr.value.VoidPtr, stdout)==EOF)\
|
||||
@@ -76,72 +76,72 @@ void __kprint(uint8 n, kprint_format* formats, __kprint_value_union* objects){
|
||||
#include <windows.h>
|
||||
#define FOREGROUND_YELLOW FOREGROUND_GREEN | FOREGROUND_RED
|
||||
|
||||
DWORD kprint_fgColor_toWin(kprint_fgColor f){
|
||||
DWORD kp_fgColor_toWin(kp_fgColor f){
|
||||
//kprintf("fg: %x\n", f);
|
||||
switch(f){
|
||||
case kprint_fgBlack: return 0;
|
||||
case kprint_fgDarkRed: return FOREGROUND_RED;
|
||||
case kprint_fgDarkGreen: return FOREGROUND_GREEN;
|
||||
case kprint_fgDarkYellow: return FOREGROUND_GREEN | FOREGROUND_RED;
|
||||
case kprint_fgDarkBlue: return FOREGROUND_BLUE;
|
||||
case kprint_fgDarkMagenta: return FOREGROUND_RED | FOREGROUND_BLUE;
|
||||
case kprint_fgDarkCyan: return FOREGROUND_BLUE | FOREGROUND_GREEN;
|
||||
case kprint_fgGray: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
|
||||
case kprint_fgDarkGray: return FOREGROUND_INTENSITY;
|
||||
case kprint_fgRed: return FOREGROUND_RED | FOREGROUND_INTENSITY;
|
||||
case kprint_fgGreen: return FOREGROUND_GREEN | FOREGROUND_INTENSITY;
|
||||
case kprint_fgYellow: return FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
|
||||
case kprint_fgBlue: return FOREGROUND_BLUE | FOREGROUND_INTENSITY;
|
||||
case kprint_fgMagenta: return FOREGROUND_BLUE | FOREGROUND_RED | FOREGROUND_INTENSITY;
|
||||
case kprint_fgCyan: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
|
||||
case kprint_fgWhite: return FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
|
||||
case kp_fgBlack: return 0;
|
||||
case kp_fgRedD: return FOREGROUND_RED;
|
||||
case kp_fgGreenD: return FOREGROUND_GREEN;
|
||||
case kp_fgYellowD: return FOREGROUND_GREEN | FOREGROUND_RED;
|
||||
case kp_fgBlueD: return FOREGROUND_BLUE;
|
||||
case kp_fgMagentaD: return FOREGROUND_RED | FOREGROUND_BLUE;
|
||||
case kp_fgCyanD: return FOREGROUND_BLUE | FOREGROUND_GREEN;
|
||||
case kp_fgGray: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED;
|
||||
case kp_fgGrayD: return FOREGROUND_INTENSITY;
|
||||
case kp_fgRed: return FOREGROUND_RED | FOREGROUND_INTENSITY;
|
||||
case kp_fgGreen: return FOREGROUND_GREEN | FOREGROUND_INTENSITY;
|
||||
case kp_fgYellow: return FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_INTENSITY;
|
||||
case kp_fgBlue: return FOREGROUND_BLUE | FOREGROUND_INTENSITY;
|
||||
case kp_fgMagenta: return FOREGROUND_BLUE | FOREGROUND_RED | FOREGROUND_INTENSITY;
|
||||
case kp_fgCyan: return FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
|
||||
case kp_fgWhite: return FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_INTENSITY;
|
||||
default: throw(ERR_FORMAT);
|
||||
}
|
||||
}
|
||||
|
||||
DWORD kprint_bgColor_toWin(kprint_bgColor f){
|
||||
DWORD kp_bgColor_toWin(kp_bgColor f){
|
||||
//kprintf("bg: %x\n", f);
|
||||
switch(f){
|
||||
case kprint_bgBlack: return 0;
|
||||
case kprint_bgDarkRed: return BACKGROUND_RED;
|
||||
case kprint_bgDarkGreen: return BACKGROUND_GREEN;
|
||||
case kprint_bgDarkYellow: return BACKGROUND_GREEN | BACKGROUND_RED;
|
||||
case kprint_bgDarkBlue: return BACKGROUND_BLUE;
|
||||
case kprint_bgDarkMagenta: return BACKGROUND_RED | BACKGROUND_BLUE;
|
||||
case kprint_bgDarkCyan: return BACKGROUND_BLUE | BACKGROUND_GREEN;
|
||||
case kprint_bgGray: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;
|
||||
case kprint_bgDarkGray: return BACKGROUND_INTENSITY;
|
||||
case kprint_bgRed: return BACKGROUND_RED | BACKGROUND_INTENSITY;
|
||||
case kprint_bgGreen: return BACKGROUND_GREEN | BACKGROUND_INTENSITY;
|
||||
case kprint_bgYellow: return BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY;
|
||||
case kprint_bgBlue: return BACKGROUND_BLUE | BACKGROUND_INTENSITY;
|
||||
case kprint_bgMagenta: return BACKGROUND_BLUE | BACKGROUND_RED | BACKGROUND_INTENSITY;
|
||||
case kprint_bgCyan: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY;
|
||||
case kprint_bgWhite: return BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY;
|
||||
case kp_bgBlack: return 0;
|
||||
case kp_bgRedD: return BACKGROUND_RED;
|
||||
case kp_bgGreenD: return BACKGROUND_GREEN;
|
||||
case kp_bgYellowD: return BACKGROUND_GREEN | BACKGROUND_RED;
|
||||
case kp_bgBlueD: return BACKGROUND_BLUE;
|
||||
case kp_bgMagentaD: return BACKGROUND_RED | BACKGROUND_BLUE;
|
||||
case kp_bgCyanD: return BACKGROUND_BLUE | BACKGROUND_GREEN;
|
||||
case kp_bgGray: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_RED;
|
||||
case kp_bgGrayD: return BACKGROUND_INTENSITY;
|
||||
case kp_bgRed: return BACKGROUND_RED | BACKGROUND_INTENSITY;
|
||||
case kp_bgGreen: return BACKGROUND_GREEN | BACKGROUND_INTENSITY;
|
||||
case kp_bgYellow: return BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_INTENSITY;
|
||||
case kp_bgBlue: return BACKGROUND_BLUE | BACKGROUND_INTENSITY;
|
||||
case kp_bgMagenta: return BACKGROUND_BLUE | BACKGROUND_RED | BACKGROUND_INTENSITY;
|
||||
case kp_bgCyan: return BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY;
|
||||
case kp_bgWhite: return BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_GREEN | BACKGROUND_INTENSITY;
|
||||
default: throw(ERR_FORMAT);
|
||||
}
|
||||
}
|
||||
|
||||
void kprint_setColor(kprint_format f){
|
||||
void kprint_setColor(kp_fmt f){
|
||||
DWORD color=0;
|
||||
if(!kprint_format_isFgColorChanged(f) & !kprint_format_isBgColorChanged(f))
|
||||
if(!kp_fmt_fgColorSet(f) & !kp_fmt_bgColorSet(f))
|
||||
return;
|
||||
if(kprint_format_isFgColorChanged(f))
|
||||
color+=kprint_fgColor_toWin(kprint_format_fgColor(f));
|
||||
if(kprint_format_isBgColorChanged(f))
|
||||
color+=kprint_bgColor_toWin(kprint_format_bgColor(f));
|
||||
if(kp_fmt_fgColorSet(f))
|
||||
color+=kp_fgColor_toWin(kp_fmt_fgColor(f));
|
||||
if(kp_fmt_bgColorSet(f))
|
||||
color+=kp_bgColor_toWin(kp_fmt_bgColor(f));
|
||||
HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||
SetConsoleTextAttribute(hConsole, color);
|
||||
}
|
||||
#else
|
||||
void kprint_setColor(kprint_format f){
|
||||
if(kprint_format_isFgColorChanged(f)){
|
||||
void kprint_setColor(kp_fmt f){
|
||||
if(kp_fmt_fgColorSet(f)){
|
||||
uint8 fg=(f&0x0f000000)>>24;
|
||||
if(fg<8) fg+=30;
|
||||
else fg+=90-8;
|
||||
printf("\e[%um", fg);
|
||||
}
|
||||
if(kprint_format_isBgColorChanged(f)){
|
||||
if(kp_fmt_bgColorSet(f)){
|
||||
uint8 bg=(f&0x00f00000)>>20;
|
||||
if(bg<8) bg+=40;
|
||||
else bg+=100-8;
|
||||
@@ -150,7 +150,7 @@ void kprint_setColor(kprint_format f){
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Maybe ksprint_ar(uint32 count, kprint_format format, ktid typeId, void* array){
|
||||
/* Maybe ksprint_ar(uint32 count, kp_fmt format, ktid typeId, void* array){
|
||||
ktDescriptor typeDesc=ktDescriptor_get(format.typeId);
|
||||
if(!typeDesc.toString)
|
||||
safethrow("type descriptor doesnt have toString() func",;);
|
||||
|
||||
Reference in New Issue
Block a user