resolve conflicts

Author: Casper64

GNUmakefile

@@ -101,8 +101,8 @@ ifdef WIN32
 	$(CC) $(CFLAGS) -std=c99 -municode -w -o v1.exe $(VC)/$(VCFILE) $(LDFLAGS) -lws2_32
 	v1.exe -no-parallel -o v2.exe $(VFLAGS) cmd/v
 	v2.exe -o $(VEXE) $(VFLAGS) cmd/v
-	del v1.exe
-	del v2.exe
+	$(RM) v1.exe
+	$(RM) v2.exe
 else
 ifdef LEGACY
 	$(MAKE) -C $(TMPLEGACY)

cmd/tools/vast/vast.v

@@ -448,6 +448,7 @@ fn (t Tree) stmt(node ast.Stmt) &Node {
 fn (t Tree) import_module(node ast.Import) &Node {
 	mut obj := new_object()
 	obj.add_terse('ast_type', t.string_node('Import'))
+	obj.add_terse('source_name', t.string_node(node.source_name))
 	obj.add_terse('mod', t.string_node(node.mod))
 	obj.add_terse('alias', t.string_node(node.alias))
 	obj.add_terse('syms', t.array_node_import_symbol(node.syms))

examples/xvweb/todo/main.v

@@ -95,7 +95,7 @@ pub fn (app &App) complete_todo(mut ctx Context, id int) vweb.Result {
 	} or { return ctx.server_error('could not update TODO') }
 
 	// redirect client to the home page and tell the browser to sent a GET request
-	return ctx.redirect('/', .see_other)
+	return ctx.redirect('/', typ: .see_other)
 }
 
 @['/todo/:id/delete'; post]
@@ -122,7 +122,7 @@ pub fn (app &App) delete_todo(mut ctx Context, id int) vweb.Result {
 	} or { return ctx.server_error('could not delete TODO') }
 
 	// redirect client to the home page and tell the browser to sent a GET request
-	return ctx.redirect('/', .see_other)
+	return ctx.redirect('/', typ: .see_other)
 }
 
 fn main() {

vlib/log/default.v

@@ -53,3 +53,8 @@ pub fn info(s string) {
 pub fn debug(s string) {
 	default_logger.debug(s)
 }
+
+// set_always_flush called with true, will make the log flush after every single .fatal(), .error(), .warn(), .info(), .debug() call.
+pub fn set_always_flush(should_flush_on_every_message bool) {
+	default_logger.set_always_flush(should_flush_on_every_message)
+}

vlib/log/file_log_test.v

@@ -40,3 +40,27 @@ fn test_reopen() {
 
 	os.rmdir_all(lfolder) or {}
 }
+
+fn test_set_always_flush() {
+	lfolder := os.join_path(os.vtmp_dir(), rand.ulid())
+	lpath1 := os.join_path(lfolder, 'current.log')
+	os.mkdir_all(lfolder)!
+	defer {
+		os.rmdir_all(lfolder) or {}
+	}
+	dump(lfolder)
+	mut l := log.Log{
+		level: .info
+	}
+	l.set_full_logpath(lpath1)
+	l.set_always_flush(true)
+	l.warn('one warning')
+	l.info('one info message')
+	l.error('one error')
+	l.close()
+	lcontent1 := os.read_file(lpath1)!
+	assert lcontent1.len > 0
+	assert lcontent1.contains('one warning')
+	assert lcontent1.contains('one error')
+	assert lcontent1.contains('one info message')
+}

vlib/log/log.v

@@ -34,6 +34,7 @@ mut:
 	time_format        TimeFormat
 	custom_time_format string = 'MMMM Do YY N kk:mm:ss A' // timestamp with custom format
 	short_tag          bool
+	always_flush       bool   // flush after every single .fatal(), .error(), .warn(), .info(), .debug() call
 pub mut:
 	output_file_name string // log output to this file
 }
@@ -118,13 +119,19 @@ fn (mut l Log) log_file(s string, level Level) {
 	timestamp := l.time_format(time.now())
 	e := tag_to_file(level, l.short_tag)
 	l.ofile.writeln('${timestamp} [${e}] ${s}') or { panic(err) }
+	if l.always_flush {
+		l.flush()
+	}
 }
 
 // log_cli writes log line `s` with `level` to stdout.
 fn (l &Log) log_cli(s string, level Level) {
 	timestamp := l.time_format(time.now())
 	e := tag_to_cli(level, l.short_tag)
 	println('${timestamp} [${e}] ${s}')
+	if l.always_flush {
+		flush_stdout()
+	}
 }
 
 // send_output writes log line `s` with `level` to either the log file or the console
@@ -244,6 +251,12 @@ pub fn (mut l Log) set_time_format(f TimeFormat) {
 	l.time_format = f
 }
 
+// set_always_flush called with true, will make the log flush after every single .fatal(), .error(), .warn(), .info(), .debug() call.
+// That can be much slower, if you plan to do lots of frequent calls, but if your program exits early or crashes, your logs will be more complete.
+pub fn (mut l Log) set_always_flush(should_flush_every_time bool) {
+	l.always_flush = should_flush_every_time
+}
+
 // get_time_format will get the log time format
 pub fn (l Log) get_time_format() TimeFormat {
 	return l.time_format

vlib/log/logger_interface.v

@@ -11,5 +11,6 @@ mut:
 	debug(s string)
 	// utility methods:
 	set_level(level Level)
+	set_always_flush(should_flush bool)
 	free()
 }

vlib/log/safe_log.v

@@ -37,6 +37,14 @@ pub fn (mut x ThreadSafeLog) set_level(level Level) {
 	x.mu.unlock()
 }
 
+// set_always_flush called with true, will make the log flush after every single .fatal(), .error(), .warn(), .info(), .debug() call.
+// That can be much slower, if you plan to do lots of frequent calls, but if your program exits early or crashes, your logs will be more complete.
+pub fn (mut x ThreadSafeLog) set_always_flush(should_flush bool) {
+	x.mu.@lock()
+	x.Log.set_always_flush(should_flush)
+	x.mu.unlock()
+}
+
 // debug logs a debug message
 pub fn (mut x ThreadSafeLog) debug(s string) {
 	x.mu.@lock()

vlib/os/os.c.v

@@ -153,18 +153,18 @@ pub fn truncate(path string, len u64) ! {
 		C.open(&char(path.str), o_wronly | o_trunc, 0)
 	}
 	if fp < 0 {
-		return error_with_code(posix_get_error_msg(C.errno), C.errno)
+		return error_posix()
 	}
 	defer {
 		C.close(fp)
 	}
 	$if windows {
 		if C._chsize_s(fp, len) != 0 {
-			return error_with_code(posix_get_error_msg(C.errno), C.errno)
+			return error_posix()
 		}
 	} $else {
 		if C.ftruncate(fp, len) != 0 {
-			return error_with_code(posix_get_error_msg(C.errno), C.errno)
+			return error_posix()
 		}
 	}
 }
@@ -263,8 +263,7 @@ pub fn cp(src string, dst string) ! {
 		w_src := src.replace('/', '\\')
 		w_dst := dst.replace('/', '\\')
 		if C.CopyFile(w_src.to_wide(), w_dst.to_wide(), false) == 0 {
-			result := C.GetLastError()
-			return error_with_code('failed to copy ${src} to ${dst}', int(result))
+			return error_win32(msg: 'failed to copy ${src} to ${dst}')
 		}
 	} $else {
 		fp_from := C.open(&char(src.str), C.O_RDONLY, 0)
@@ -320,7 +319,7 @@ pub fn vfopen(path string, mode string) !&C.FILE {
 		fp = C.fopen(&char(path.str), &char(mode.str))
 	}
 	if isnil(fp) {
-		return error('failed to open file "${path}"')
+		return error_posix(msg: 'failed to open file "${path}"')
 	} else {
 		return fp
 	}
@@ -515,7 +514,7 @@ pub fn rm(path string) ! {
 		rc = C.remove(&char(path.str))
 	}
 	if rc == -1 {
-		return error('Failed to remove "${path}": ' + posix_get_error_msg(C.errno))
+		return error_posix(msg: 'Failed to remove "${path}": ' + posix_get_error_msg(C.errno))
 	}
 	// C.unlink(path.cstr())
 }
@@ -526,12 +525,14 @@ pub fn rmdir(path string) ! {
 		rc := C.RemoveDirectory(path.to_wide())
 		if !rc {
 			// https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-removedirectorya - 0 == false, is failure
-			return error('Failed to remove "${path}": ' + posix_get_error_msg(C.errno))
+			return error_win32(
+				msg: 'Failed to remove "${path}": ' + get_error_msg(int(C.GetLastError()))
+			)
 		}
 	} $else {
 		rc := C.rmdir(&char(path.str))
 		if rc == -1 {
-			return error(posix_get_error_msg(C.errno))
+			return error_posix()
 		}
 	}
 }
@@ -868,7 +869,7 @@ fn kind_of_existing_path(path string) PathKind {
 pub fn chdir(path string) ! {
 	ret := $if windows { C._wchdir(path.to_wide()) } $else { C.chdir(&char(path.str)) }
 	if ret == -1 {
-		return error_with_code(posix_get_error_msg(C.errno), C.errno)
+		return error_posix()
 	}
 }
 
@@ -1021,7 +1022,7 @@ pub fn flush() {
 // Octals like `0o600` can be used.
 pub fn chmod(path string, mode int) ! {
 	if C.chmod(&char(path.str), mode) != 0 {
-		return error_with_code('chmod failed: ' + posix_get_error_msg(C.errno), C.errno)
+		return error_posix(msg: 'chmod failed: ' + posix_get_error_msg(C.errno))
 	}
 }
 
@@ -1031,7 +1032,7 @@ pub fn chown(path string, owner int, group int) ! {
 		return error('os.chown() not implemented for Windows')
 	} $else {
 		if C.chown(&char(path.str), owner, group) != 0 {
-			return error_with_code(posix_get_error_msg(C.errno), C.errno)
+			return error_posix()
 		}
 	}
 }
@@ -1053,7 +1054,7 @@ pub fn open_append(path string) !File {
 		}
 	}
 	if isnil(file.cfile) {
-		return error('failed to create(append) file "${path}"')
+		return error_posix(msg: 'failed to create(append) file "${path}"')
 	}
 	file.is_opened = true
 	return file
@@ -1078,7 +1079,7 @@ pub fn execvp(cmdpath string, cmdargs []string) ! {
 		res = C.execvp(&char(cmdpath.str), cargs.data)
 	}
 	if res == -1 {
-		return error_with_code(posix_get_error_msg(C.errno), C.errno)
+		return error_posix()
 	}
 
 	// just in case C._execvp returned ... that happens on windows ...
@@ -1112,7 +1113,7 @@ pub fn execve(cmdpath string, cmdargs []string, envs []string) ! {
 	// Note: normally execve does not return at all.
 	// If it returns, then something went wrong...
 	if res == -1 {
-		return error_with_code(posix_get_error_msg(C.errno), C.errno)
+		return error_posix()
 	}
 }
 
@@ -1155,3 +1156,36 @@ pub fn last_error() IError {
 		return error_with_code(msg, code)
 	}
 }
+
+// Magic constant because zero is used explicitly at times
+const error_code_not_set = 0x7EFEFEFE
+
+@[params]
+struct SystemError {
+	msg  string
+	code int = os.error_code_not_set
+}
+
+// Return a POSIX error:
+// Code defaults to last error (from C.errno)
+// Message defaults to POSIX error message for the error code
+@[inline]
+pub fn error_posix(e SystemError) IError {
+	code := if e.code == os.error_code_not_set { C.errno } else { e.code }
+	message := if e.msg == '' { posix_get_error_msg(code) } else { e.msg }
+	return error_with_code(message, code)
+}
+
+// Return a Win32 API error:
+// Code defaults to last error (calling C.GetLastError())
+// Message defaults to Win 32 API error message for the error code
+@[inline]
+pub fn error_win32(e SystemError) IError {
+	$if windows {
+		code := if e.code == os.error_code_not_set { int(C.GetLastError()) } else { e.code }
+		message := if e.msg == '' { get_error_msg(code) } else { e.msg }
+		return error_with_code(message, code)
+	} $else {
+		panic('Win32 API not available on this platform.')
+	}
+}

vlib/os/os_test.c.v

@@ -642,6 +642,16 @@ fn test_rmdir_all() {
 	assert !os.exists('some')
 }
 
+fn test_rmdir_not_exist() ! {
+	dir := 'non_existing_dir'
+	assert !os.exists(dir)
+	os.rmdir(dir) or {
+		// 0x00000002 is both ENOENT in POSIX and ERROR_FILE_NOT_FOUND in Win32 API
+		assert err.code() == 0x00000002
+	}
+	assert !os.exists(dir)
+}
+
 fn test_dir() {
 	$if windows {
 		assert os.dir('C:\\a\\b\\c') == 'C:\\a\\b'