1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

checker: comptime if expr/stmts & type check fixes

This commit is contained in:
Joe Conigliaro
2020-03-22 23:36:27 +11:00
parent cf8776ac71
commit 043ea80fa9
5 changed files with 33 additions and 31 deletions

View File

@@ -69,7 +69,7 @@ fn print_backtrace_skipping_top_frames_nix(xskipframes int) bool {
fn print_backtrace_skipping_top_frames_mac(skipframes int) bool {
$if macos {
buffer := [100]byteptr
nr_ptrs := C.backtrace(buffer, 100)
nr_ptrs := backtrace(buffer, 100)
backtrace_symbols_fd(&buffer[skipframes], nr_ptrs - skipframes, 1)
}
return true
@@ -78,8 +78,8 @@ fn print_backtrace_skipping_top_frames_mac(skipframes int) bool {
fn print_backtrace_skipping_top_frames_freebsd(skipframes int) bool {
$if freebsd {
buffer := [100]byteptr
nr_ptrs := C.backtrace(buffer, 100)
C.backtrace_symbols_fd(&buffer[skipframes], nr_ptrs - skipframes, 1)
nr_ptrs := backtrace(buffer, 100)
backtrace_symbols_fd(&buffer[skipframes], nr_ptrs - skipframes, 1)
}
return true
}
@@ -93,11 +93,11 @@ fn print_backtrace_skipping_top_frames_linux(skipframes int) bool {
// backtrace is not available on Android.
$if glibc {
buffer := [100]byteptr
nr_ptrs := C.backtrace(buffer, 100)
nr_ptrs := backtrace(buffer, 100)
nr_actual_frames := nr_ptrs - skipframes
mut sframes := []string
//////csymbols := C.backtrace_symbols(*voidptr(&buffer[skipframes]), nr_actual_frames)
csymbols := C.backtrace_symbols(&buffer[skipframes], nr_actual_frames)
//////csymbols := backtrace_symbols(*voidptr(&buffer[skipframes]), nr_actual_frames)
csymbols := backtrace_symbols(&buffer[skipframes], nr_actual_frames)
for i in 0 .. nr_actual_frames {
sframes << tos2(csymbols[i])
}
@@ -131,7 +131,7 @@ fn print_backtrace_skipping_top_frames_linux(skipframes int) bool {
output = output.replace(' (discriminator', ': (d.')
println('${output:-46s} | ${addr:14s} | $beforeaddr')
}
// C.backtrace_symbols_fd(*voidptr(&buffer[skipframes]), nr_actual_frames, 1)
// backtrace_symbols_fd(*voidptr(&buffer[skipframes]), nr_actual_frames, 1)
return true
} $else {
println('backtrace_symbols_fd is missing, so printing backtraces is not available.\n')