Skip to content

fix: rebuild UnicodeCLib on toolchain changes and drop ntohl/htonl #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fgdorais merged 2 commits into from
Nov 9, 2026
Merged

fix: rebuild UnicodeCLib on toolchain changes and drop ntohl/htonl #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37442b6
fix: build UnicodeCLib with Lean's bundled C compiler
claude Nov 9, 2026
835348a
chore: go back to buildO with the system cc, tracking the Lean toolchain
claude Nov 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions UnicodeCLib/basic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
#include <lean/lean.h>
#ifdef _WIN32
#include <winsock2.h>
#else
#include <arpa/inet.h>
#endif
#include "basic.h"

static inline int unicode_script_is_valid(uint32_t c) {
Expand All @@ -19,16 +14,19 @@ static inline int unicode_script_is_valid(uint32_t c) {
}

uint32_t unicode_script_of_abbrev(b_lean_obj_arg abbr) {
lean_string_object * str = lean_to_string(abbr);
assert(str->m_size > 4);
uint32_t val = *((uint32_t*)(str->m_data));
return ntohl(val);
assert(lean_string_size(abbr) > 4);
const unsigned char * s = (const unsigned char *)lean_string_cstr(abbr);
return (uint32_t)s[0] << 24 | (uint32_t)s[1] << 16 | (uint32_t)s[2] << 8 | (uint32_t)s[3];
}

lean_obj_res unicode_script_to_abbrev(uint32_t scr) {
assert(unicode_script_is_valid(scr));
lean_object * abbr = lean_alloc_string(5, 5, 4);
lean_to_string(abbr)->m_data[4] = 0;
*((uint32_t*)lean_to_string(abbr)->m_data) = htonl(scr);
char * s = lean_to_string(abbr)->m_data;
s[0] = (char)(scr >> 24 & 0xff);
s[1] = (char)(scr >> 16 & 0xff);
s[2] = (char)(scr >> 8 & 0xff);
s[3] = (char)(scr & 0xff);
s[4] = 0;
return abbr;
}
2 changes: 1 addition & 1 deletion lakefile.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ target UnicodeCLib pkg : FilePath := do
let obj := pkg.buildDir / "UnicodeCLib" / ((file.fileName.dropSuffix ".c" |>.copy) ++ ".o")
let src ← inputTextFile file.path
let weakArgs := #["-I", (← getLeanIncludeDir).toString, "-I", (pkg.dir / "UnicodeCLib").toString, "-O", "-fPIC"]
oFiles := oFiles.push <| ← buildO obj src weakArgs
oFiles := oFiles.push <| ← buildO obj src weakArgs (extraDepTrace := getLeanTrace)
let name := nameToStaticLib "unicodeclib"
buildStaticLib (pkg.sharedLibDir / name) oFiles

Expand Down
Loading