mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-12-26 00:10:27 +00:00
Code Issues 1 Releases Wiki Activity

Merge branch 'master' into bytecode_opt

Browse Source
This commit is contained in:
Calvin Rose 2023-05-30 18:13:02 -05:00
commit b099bd97f2
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/buffer.c
View File

@ -324,7 +324,8 @@ static void buffer_push_impl(JanetBuffer *buffer, Janet *argv, int32_t argc_offs
JANET_CORE_FN(cfun_buffer_push_at, JANET_CORE_FN(cfun_buffer_push_at,
"(buffer/push-at buffer index & xs)", "(buffer/push-at buffer index & xs)",
"Same as buffer/push, but inserts new data at index `index`.") { "Same as buffer/push, but copies the new data into the buffer "
" at index `index`.") {
janet_arity(argc, 2, -1); janet_arity(argc, 2, -1);
JanetBuffer *buffer = janet_getbuffer(argv, 0); JanetBuffer *buffer = janet_getbuffer(argv, 0);
int32_t index = janet_getinteger(argv, 1); int32_t index = janet_getinteger(argv, 1);

2
src/core/net.c
View File

@ -460,7 +460,7 @@ JANET_CORE_FN(cfun_net_connect,
if (binding) { if (binding) {
struct addrinfo *rp = NULL; struct addrinfo *rp = NULL;
int did_bind = 0; int did_bind = 0;
for (rp = ai; rp != NULL; rp = rp->ai_next) { for (rp = binding; rp != NULL; rp = rp->ai_next) {
if (bind(sock, rp->ai_addr, (int) rp->ai_addrlen) == 0) { if (bind(sock, rp->ai_addr, (int) rp->ai_addrlen) == 0) {
did_bind = 1; did_bind = 1;
break; break;

4
src/core/pp.c
View File

@ -846,7 +846,7 @@ void janet_formatbv(JanetBuffer *b, const char *format, va_list args) {
} }
case 'd': case 'd':
case 'i': { case 'i': {
int64_t n = va_arg(args, long); int64_t n = va_arg(args, int);
nb = snprintf(item, MAX_ITEM, form, n); nb = snprintf(item, MAX_ITEM, form, n);
break; break;
} }
@ -854,7 +854,7 @@ void janet_formatbv(JanetBuffer *b, const char *format, va_list args) {
case 'X': case 'X':
case 'o': case 'o':
case 'u': { case 'u': {
uint64_t n = va_arg(args, unsigned long); uint64_t n = va_arg(args, unsigned int);
nb = snprintf(item, MAX_ITEM, form, n); nb = snprintf(item, MAX_ITEM, form, n);
break; break;
} }

18
src/mainclient/shell.c
View File

@ -30,7 +30,6 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include <shlwapi.h> #include <shlwapi.h>
#include <versionhelpers.h>
#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
#endif #endif
@ -147,9 +146,8 @@ static void setup_console_output(void) {
HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE); HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
DWORD dwMode = 0; DWORD dwMode = 0;
GetConsoleMode(hOut, &dwMode); GetConsoleMode(hOut, &dwMode);
if (IsWindows10OrGreater()) { dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING; dwMode |= ENABLE_PROCESSED_OUTPUT;
}
SetConsoleMode(hOut, dwMode); SetConsoleMode(hOut, dwMode);
if (IsValidCodePage(65001)) { if (IsValidCodePage(65001)) {
SetConsoleOutputCP(65001); SetConsoleOutputCP(65001);
@ -165,10 +163,8 @@ static int rawmode(void) {
dwMode &= ~ENABLE_LINE_INPUT; dwMode &= ~ENABLE_LINE_INPUT;
dwMode &= ~ENABLE_INSERT_MODE; dwMode &= ~ENABLE_INSERT_MODE;
dwMode &= ~ENABLE_ECHO_INPUT; dwMode &= ~ENABLE_ECHO_INPUT;
if (IsWindows10OrGreater()) { dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
dwMode |= ENABLE_VIRTUAL_TERMINAL_INPUT; dwMode &= ~ENABLE_PROCESSED_INPUT;
dwMode &= ~ENABLE_PROCESSED_INPUT;
}
if (!SetConsoleMode(hOut, dwMode)) return 1; if (!SetConsoleMode(hOut, dwMode)) return 1;
gbl_israwmode = 1; gbl_israwmode = 1;
return 0; return 0;
@ -183,10 +179,8 @@ static void norawmode(void) {
dwMode |= ENABLE_LINE_INPUT; dwMode |= ENABLE_LINE_INPUT;
dwMode |= ENABLE_INSERT_MODE; dwMode |= ENABLE_INSERT_MODE;
dwMode |= ENABLE_ECHO_INPUT; dwMode |= ENABLE_ECHO_INPUT;
if (IsWindows10OrGreater()) { dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT;
dwMode &= ~ENABLE_VIRTUAL_TERMINAL_INPUT; dwMode |= ENABLE_PROCESSED_INPUT;
dwMode |= ENABLE_PROCESSED_INPUT;
}
SetConsoleMode(hOut, dwMode); SetConsoleMode(hOut, dwMode);
gbl_israwmode = 0; gbl_israwmode = 0;
} }