Skip to content
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

Fix two compilation errors on i686-w64-mingw32 #68

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix two compilation errors on i686-w64-mingw32 #68

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
c15d8d5
use proper type for hs_compile_lit's argument
starius Dec 31, 2024
93058c6
fix cgo array to slice casting
starius Dec 31, 2024
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
6 changes: 3 additions & 3 deletions internal/ch/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,13 @@ func CompileExtMulti(p Patterns, mode CompileMode, info *hs.PlatformInfo,
patterns := p.Patterns()

cexprs := (**C.char)(C.calloc(C.size_t(len(patterns)), C.size_t(unsafe.Sizeof(uintptr(0)))))
exprs := (*[1 << 30]*C.char)(unsafe.Pointer(cexprs))[:len(patterns):len(patterns)]
exprs := unsafe.Slice(cexprs, len(patterns))

cflags := (*C.uint)(C.calloc(C.size_t(len(patterns)), C.size_t(unsafe.Sizeof(C.uint(0)))))
flags := (*[1 << 30]C.uint)(unsafe.Pointer(cflags))[:len(patterns):len(patterns)]
flags := unsafe.Slice(cflags, len(patterns))

cids := (*C.uint)(C.calloc(C.size_t(len(patterns)), C.size_t(unsafe.Sizeof(C.uint(0)))))
ids := (*[1 << 30]C.uint)(unsafe.Pointer(cids))[:len(patterns):len(patterns)]
ids := unsafe.Slice(cids, len(patterns))

for i, pattern := range patterns {
exprs[i] = C.CString(pattern.Expression)
Expand Down
8 changes: 4 additions & 4 deletions internal/hs/compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,16 +404,16 @@ func CompileMulti(input Patterns, mode ModeFlag, info *PlatformInfo) (Database,
count := len(patterns)

cexprs := (**C.char)(C.calloc(C.size_t(count), C.size_t(unsafe.Sizeof(uintptr(0)))))
exprs := (*[1 << 30]*C.char)(unsafe.Pointer(cexprs))[:count:count]
exprs := unsafe.Slice(cexprs, count)

cflags := (*C.uint)(C.calloc(C.size_t(count), C.size_t(unsafe.Sizeof(C.uint(0)))))
flags := (*[1 << 30]C.uint)(unsafe.Pointer(cflags))[:count:count]
flags := unsafe.Slice(cflags, count)

cids := (*C.uint)(C.calloc(C.size_t(count), C.size_t(unsafe.Sizeof(C.uint(0)))))
ids := (*[1 << 30]C.uint)(unsafe.Pointer(cids))[:count:count]
ids := unsafe.Slice(cids, count)

cexts := (**C.hs_expr_ext_t)(C.calloc(C.size_t(count), C.size_t(unsafe.Sizeof(uintptr(0)))))
exts := (*[1 << 30]*C.hs_expr_ext_t)(unsafe.Pointer(cexts))[:count:count]
exts := unsafe.Slice(cexts, count)

for i, pattern := range patterns {
exprs[i] = C.CString(pattern.Expr)
Expand Down
10 changes: 5 additions & 5 deletions internal/hs/compile_v52.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func CompileLit(expression string, flags CompileFlag, mode ModeFlag, info *Platf

defer C.free(unsafe.Pointer(expr))

ret := C.hs_compile_lit(expr, C.uint(flags), C.ulong(len(expression)), C.uint(mode), platform, &db, &err)
ret := C.hs_compile_lit(expr, C.uint(flags), C.size_t(len(expression)), C.uint(mode), platform, &db, &err)

if err != nil {
defer C.hs_free_compile_error(err)
Expand Down Expand Up @@ -71,16 +71,16 @@ func CompileLitMulti(input Literals, mode ModeFlag, info *PlatformInfo) (Databas
count := len(literals)

cexprs := (**C.char)(C.calloc(C.size_t(len(literals)), C.size_t(unsafe.Sizeof(uintptr(0)))))
exprs := (*[1 << 30]*C.char)(unsafe.Pointer(cexprs))[:len(literals):len(literals)]
exprs := unsafe.Slice(cexprs, len(literals))

clens := (*C.size_t)(C.calloc(C.size_t(len(literals)), C.size_t(unsafe.Sizeof(uintptr(0)))))
lens := (*[1 << 30]C.size_t)(unsafe.Pointer(clens))[:len(literals):len(literals)]
lens := unsafe.Slice(clens, len(literals))

cflags := (*C.uint)(C.calloc(C.size_t(len(literals)), C.size_t(unsafe.Sizeof(C.uint(0)))))
flags := (*[1 << 30]C.uint)(unsafe.Pointer(cflags))[:len(literals):len(literals)]
flags := unsafe.Slice(cflags, len(literals))

cids := (*C.uint)(C.calloc(C.size_t(len(literals)), C.size_t(unsafe.Sizeof(C.uint(0)))))
ids := (*[1 << 30]C.uint)(unsafe.Pointer(cids))[:len(literals):len(literals)]
ids := unsafe.Slice(cids, len(literals))

for i, lit := range literals {
exprs[i] = C.CString(lit.Expr)
Expand Down
Loading