attempt at replxx-based printf

This commit is contained in:
dzaima 2023-01-12 17:13:42 +02:00
parent b25f83f3de
commit dbcd967e12
3 changed files with 53 additions and 47 deletions

View File

@ -161,6 +161,12 @@ typedef double f64;
#define JOIN0(A,B) A##B #define JOIN0(A,B) A##B
#define JOIN(A,B) JOIN0(A,B) #define JOIN(A,B) JOIN0(A,B)
#if USE_REPLXX_IO
#include <replxx.h>
extern Replxx* global_replxx;
#define printf(...) replxx_print(global_replxx, __VA_ARGS__)
#define fprintf(f, ...) replxx_print(global_replxx, __VA_ARGS__)
#endif
#if USZ_64 #if USZ_64
typedef u64 usz; typedef u64 usz;
#define USZ_MAX ((u64)(1ULL<<48)) #define USZ_MAX ((u64)(1ULL<<48))

View File

@ -15,6 +15,9 @@
#if __GNUC__ && __i386__ && !__clang__ #if __GNUC__ && __i386__ && !__clang__
#warning "CBQN is known to miscompile on GCC for 32-bit x86 builds; using clang instead is suggested" #warning "CBQN is known to miscompile on GCC for 32-bit x86 builds; using clang instead is suggested"
#endif #endif
#if USE_REPLXX_IO && !USE_REPLXX
#error "Cannot use USE_REPLXX_IO without USE_REPLXX"
#endif
static B replPath; static B replPath;
static Scope* gsc; static Scope* gsc;
@ -52,7 +55,7 @@ static bool isCmd(char* s, char** e, const char* cmd) {
#include <errno.h> #include <errno.h>
#include "utils/calls.h" #include "utils/calls.h"
#include "utils/cstr.h" #include "utils/cstr.h"
static Replxx* global_replxx; Replxx* global_replxx;
static char* global_histfile; static char* global_histfile;
static i8 themes[3][12][3] = { static i8 themes[3][12][3] = {
@ -453,6 +456,8 @@ static bool isCmd(char* s, char** e, const char* cmd) {
gc_add(sysvalNames); gc_add(sysvalNames);
gc_add(sysvalNamesNorm); gc_add(sysvalNamesNorm);
gc_addFn(replxx_gcFn); gc_addFn(replxx_gcFn);
global_replxx = replxx_init();
} }
#else #else
void before_exit() { } void before_exit() { }
@ -747,6 +752,10 @@ int main() {
#elif !CBQN_SHARED #elif !CBQN_SHARED
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
repl_init(); repl_init();
#if USE_REPLXX_IO
cbqn_init_replxx();
#endif
bool startREPL = argc==1; bool startREPL = argc==1;
bool silentREPL = false; bool silentREPL = false;
bool execStdin = false; bool execStdin = false;
@ -864,37 +873,37 @@ int main(int argc, char* argv[]) {
repl_init(); repl_init();
#if USE_REPLXX #if USE_REPLXX
if (!silentREPL) { if (!silentREPL) {
#if !USE_REPLXX_IO
cbqn_init_replxx(); cbqn_init_replxx();
Replxx* replxx = replxx_init(); #endif
B f = get_config_path(false, ".cbqn_repl_history"); B f = get_config_path(false, ".cbqn_repl_history");
char* histfile = toCStr(f); char* histfile = toCStr(f);
dec(f); dec(f);
gc_add(tag(TOBJ(histfile), OBJ_TAG)); gc_add(tag(TOBJ(histfile), OBJ_TAG));
replxx_history_load(replxx, histfile); replxx_history_load(global_replxx, histfile);
global_replxx = replxx;
global_histfile = histfile; global_histfile = histfile;
replxx_set_ignore_case(replxx, true); replxx_set_ignore_case(global_replxx, true);
replxx_set_highlighter_callback(replxx, highlighter_replxx, NULL); replxx_set_highlighter_callback(global_replxx, highlighter_replxx, NULL);
replxx_set_hint_callback(replxx, hint_replxx, NULL); replxx_set_hint_callback(global_replxx, hint_replxx, NULL);
replxx_set_completion_callback(replxx, complete_replxx, NULL); replxx_set_completion_callback(global_replxx, complete_replxx, NULL);
replxx_enable_bracketed_paste(replxx); replxx_enable_bracketed_paste(global_replxx);
replxx_bind_key(replxx, '\\', backslash_replxx, NULL); replxx_bind_key(global_replxx, '\\', backslash_replxx, NULL);
replxx_bind_key(replxx, REPLXX_KEY_ENTER, enter_replxx, NULL); replxx_bind_key(global_replxx, REPLXX_KEY_ENTER, enter_replxx, NULL);
replxx_set_modify_callback(replxx, modified_replxx, NULL); replxx_set_modify_callback(global_replxx, modified_replxx, NULL);
replxx_bind_key_internal(replxx, REPLXX_KEY_CONTROL('N'), "history_next"); replxx_bind_key_internal(global_replxx, REPLXX_KEY_CONTROL('N'), "history_next");
replxx_bind_key_internal(replxx, REPLXX_KEY_CONTROL('P'), "history_previous"); replxx_bind_key_internal(global_replxx, REPLXX_KEY_CONTROL('P'), "history_previous");
while(true) { while(true) {
const char* ln = replxx_input(replxx, " "); const char* ln = replxx_input(global_replxx, " ");
if (ln==NULL) { if (ln==NULL) {
if (errno==0) printf("\n"); if (errno==0) printf("\n");
break; break;
} }
replxx_history_add(replxx, ln); replxx_history_add(global_replxx, ln);
cbqn_runLine((char*)ln, strlen(ln)); cbqn_runLine((char*)ln, strlen(ln));
replxx_history_save(replxx, histfile); replxx_history_save(global_replxx, histfile);
} }
} }
else else

View File

@ -18,6 +18,14 @@ static u32 utf8_p(u8* p) {
case 4: return (0b111u &*p)<<18 | (0b111111u&p[3]) | (0b111111u&p[2])<<6 | (0b111111u&p[1])<<12; case 4: return (0b111u &*p)<<18 | (0b111111u&p[3]) | (0b111111u&p[2])<<6 | (0b111111u&p[1])<<12;
} }
} }
FORCE_INLINE void utf8_w(char** buf_i, u32 c) {
char* buf = *buf_i;
if (c<128) { *buf++ = c; }
else if (c<=0x07FF) { *buf++ = 0xC0| c>>6 ; *buf++ = 0x80|(c &0x3F); }
else if (c<=0xFFFF) { *buf++ = 0xE0| c>>12; *buf++ = 0x80|(c>>6 &0x3F); *buf++ = 0x80|(c &0x3F); }
else { *buf++ = 0xF0| c>>18; *buf++ = 0x80|(c>>12&0x3F); *buf++ = 0x80|(c>>6&0x3F); *buf++ = 0x80|(c&0x3F); }
*buf_i = buf;
}
B utf8Decode(const char* s, i64 len) { B utf8Decode(const char* s, i64 len) {
u64 sz = 0; u64 sz = 0;
@ -55,41 +63,30 @@ B utf8DecodeA(I8Arr* a) { // consumes a
// printing functions should avoid allocations, as they'll be used to print.. the out-of-memory message // printing functions should avoid allocations, as they'll be used to print.. the out-of-memory message
#if defined(_WIN32) || defined(_WIN64) #if defined(USE_REPLXX_IO)
#include <io.h>
#include <fcntl.h>
void fprintsU32(FILE* f, u32* s, usz len) { void fprintsU32(FILE* f, u32* s, usz len) {
_setmode(_fileno(f), _O_U16TEXT);
#define BUF_SZ 1024
wchar_t buf[BUF_SZ];
u32* s_e = s+len; u32* s_e = s+len;
#define BUF_SZ 1024
char buf[BUF_SZ];
while (s<s_e) { while (s<s_e) {
wchar_t* buf_c = buf; char* buf_c = buf;
wchar_t* buf_e = buf+BUF_SZ-10; char* buf_e = buf+BUF_SZ-10;
while (s<s_e && buf_c<buf_e) { while (s<s_e && buf_c<buf_e) {
u32 c = *s; u32 c = *s;
if (c<65536) {
if (c==0) break; // can't print null bytes into null-terminated buffer if (c==0) break; // can't print null bytes into null-terminated buffer
buf_c[0] = c; utf8_w(&buf_c, c);
buf_c++;
} else {
c-= 0x10000;
buf_c[0] = 0xD800 + (c >> 10);
buf_c[1] = 0xDC00 + (c & ((1<<10)-1));
buf_c+= 2;
}
s++; s++;
} }
buf_c[0] = 0; buf_c[0] = 0;
fwprintf(f, L"%ls", buf); fprintf(f, "%s", buf);
while (s<s_e && *s==0) { // handle printing of null bytes; does nothing? idk while (s<s_e && *s==0) {
fwprintf(f, L"%c", '\0'); fprintf(f, "%c", '\0');
s++; s++;
} }
} }
#undef BUF_SZ #undef BUF_SZ
_setmode(_fileno(f), _O_BINARY);
} }
void fprintCodepoint(FILE* f, u32 c) { void fprintCodepoint(FILE* f, u32 c) {
fprintsU32(f, (u32[1]){c}, 1); fprintsU32(f, (u32[1]){c}, 1);
@ -149,11 +146,5 @@ u64 utf8lenB(B x) { // doesn't consume; may error as it verifies whether is all
void toUTF8(B x, char* p) { void toUTF8(B x, char* p) {
SGetU(x) SGetU(x)
usz ia = IA(x); usz ia = IA(x);
for (usz i = 0; i < ia; i++) { for (usz i = 0; i < ia; i++) utf8_w(&p, o2cG(GetU(x,i)));
u32 c = o2cG(GetU(x,i));
if (c<128) { *p++ = c; }
else if (c<=0x07FF) { *p++ = 0xC0|c>>6 ; *p++ = 0x80|(c &0x3F); }
else if (c<=0xFFFF) { *p++ = 0xE0|c>>12; *p++ = 0x80|(c>>6 &0x3F);*p++ = 0x80|(c &0x3F); }
else { *p++ = 0xF0|c>>18; *p++ = 0x80|(c>>12&0x3F);*p++ = 0x80|(c>>6&0x3F); *p++ = 0x80|(c&0x3F); }
}
} }