mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2024-11-28 02:59:54 +00:00
Code Issues 1 Releases Wiki Activity

More work on setting locale for extended locale support.

Browse Source
This commit is contained in:
Calvin Rose 2024-05-18 15:20:22 -05:00
parent ea5d4fd3af
commit 0b03ddb21b
1 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/core/os.c
View File

@ -43,14 +43,22 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
#if defined(JANET_BSD) || defined(JANET_APPLE) #if defined(__FreeBSD__) || defined(__DragonFly__) || defined(JANET_APPLE)
/* It seems only some bsds use this header for xlocale */
#include <xlocale.h> #include <xlocale.h>
#define JANET_EXTENDED_LOCALE
#else #else
#include <locale.h> #include <locale.h>
#endif #endif
#ifdef JANET_LINUX #ifdef JANET_LINUX
#include <sched.h> #include <sched.h>
#define JANET_EXTENDED_LOCALE
#endif
/* OpenBSD works here with extended locale support, just in the usual headers */
#if defined(__OpenBSD__)
#define JANET_EXTENDED_LOCALE
#endif #endif
#ifdef JANET_WINDOWS #ifdef JANET_WINDOWS
@ -1904,28 +1912,7 @@ JANET_CORE_FN(os_setlocale,
janet_arity(argc, 1, 2); janet_arity(argc, 1, 2);
const char *locale_name = janet_optcstring(argv, argc, 1, NULL); const char *locale_name = janet_optcstring(argv, argc, 1, NULL);
int category_int = 0; int category_int = 0;
#ifdef JANET_WINDOWS #ifdef JANET_EXTENDED_LOCALE
if (janet_keyeq(argv[0], "all")) {
category_int = LC_ALL;
} else if (janet_keyeq(argv[0], "collate")) {
category_int = LC_COLLATE;
} else if (janet_keyeq(argv[0], "ctype")) {
category_int = LC_CTYPE;
} else if (janet_keyeq(argv[0], "monetary")) {
category_int = LC_MONETARY;
} else if (janet_keyeq(argv[0], "numeric")) {
category_int = LC_NUMERIC;
} else if (janet_keyeq(argv[0], "time")) {
category_int = LC_TIME;
} else {
janet_panicf("expected one of :all, :collate, :ctype, :monetary, :numeric, or :time, got %v", argv[0]);
}
const char *old = setlocale(category_int, locale_name);
if (old == NULL) {
janet_panicf("failed to set locale - %s", strerror(errno));
}
return janet_wrap_nil();
#else
if (janet_keyeq(argv[0], "all")) { if (janet_keyeq(argv[0], "all")) {
category_int = LC_ALL_MASK; category_int = LC_ALL_MASK;
} else if (janet_keyeq(argv[0], "collate")) { } else if (janet_keyeq(argv[0], "collate")) {
@ -1959,6 +1946,27 @@ JANET_CORE_FN(os_setlocale,
freelocale(old_locale); freelocale(old_locale);
} }
return janet_wrap_nil(); return janet_wrap_nil();
#else
if (janet_keyeq(argv[0], "all")) {
category_int = LC_ALL;
} else if (janet_keyeq(argv[0], "collate")) {
category_int = LC_COLLATE;
} else if (janet_keyeq(argv[0], "ctype")) {
category_int = LC_CTYPE;
} else if (janet_keyeq(argv[0], "monetary")) {
category_int = LC_MONETARY;
} else if (janet_keyeq(argv[0], "numeric")) {
category_int = LC_NUMERIC;
} else if (janet_keyeq(argv[0], "time")) {
category_int = LC_TIME;
} else {
janet_panicf("expected one of :all, :collate, :ctype, :monetary, :numeric, or :time, got %v", argv[0]);
}
const char *old = setlocale(category_int, locale_name);
if (old == NULL) {
janet_panicf("failed to set locale - %s", strerror(errno));
}
return janet_wrap_nil();
#endif #endif
} }
@ -2816,7 +2824,7 @@ void janet_lib_os(JanetTable *env) {
#endif #endif
JANET_REG_END JANET_REG_END
}; };
#ifdef JANET_WINDOWS #if defined(JANET_WINDOWS) && !defined(JANET_REDUCED_OS)
_configthreadlocale(_ENABLE_PER_THREAD_LOCALE); _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
#endif #endif
janet_core_cfuns_ext(env, NULL, os_cfuns); janet_core_cfuns_ext(env, NULL, os_cfuns);