all: super_batch7 fixes

Author: medvednikov

vlib/builtin/array_notd_gcboehm_opt.v

@@ -4,6 +4,15 @@
 
 module builtin
 
+// these are needed for calls inside `$if gcboehm_opt ? { ... }` in array.v
+fn alloc_array_data_noscan(total_size u64) voidptr {
+	return alloc_array_data(total_size)
+}
+
+fn alloc_array_data_noscan_uninit(total_size u64) voidptr {
+	return alloc_array_data_uninit(total_size)
+}
+
 // this is needed in `string.v`
 fn __new_array_noscan(mylen int, cap int, elm_size int) array {
 	return __new_array(mylen, cap, elm_size)

vlib/builtin/builtin_nix.c.v

@@ -25,3 +25,10 @@ pub fn panic_lasterr(base string) {
 	// TODO: use strerror_r and errno
 	panic(base + ' unknown')
 }
+
+// write_buf_to_console is a Windows-only helper; on non-Windows platforms
+// it is a no-op stub so that callers guarded by `$if windows { ... }` still
+// type-check on other targets.
+fn write_buf_to_console(fd int, buf &u8, buf_len int) bool {
+	return false
+}

vlib/encoding/README.md

@@ -1,4 +1,4 @@
 ## Description
 
 `encoding` is a namespace for different formats/protocols encoding/decoding,
-like `csv`, `utf8`, `base64`, and legacy text encodings such as `windows1252`.
+like `csv`, `utf8`, `base64` etc.

vlib/encoding/iconv/iconv.v

@@ -1,7 +1,6 @@
 module iconv
 
 // Module iconv provides functions to convert between vstring(UTF8) and other encodings.
-import encoding.windows1252
 import os
 
 @[inline]
@@ -28,9 +27,6 @@ pub fn vstring_to_encoding(str string, tocode string) ![]u8 {
 			encoding_name = 'UTF-8'
 		}
 	}
-	if is_windows_1252_encoding(encoding_name) {
-		return windows1252.encode(str)
-	}
 	return conv(encoding_name, 'UTF-8', str.str, str.len)
 }
 
@@ -48,19 +44,11 @@ pub fn encoding_to_vstring(bytes []u8, fromcode string) !string {
 			encoding_name = 'UTF-8'
 		}
 	}
-	if is_windows_1252_encoding(encoding_name) {
-		return windows1252.decode(bytes)
-	}
 	mut dst := conv('UTF-8', encoding_name, bytes.data, bytes.len)!
 	dst << 0 // add a tail zero, to build a vstring
 	return unsafe { cstring_to_vstring(dst.data) }
 }
 
-@[inline]
-fn is_windows_1252_encoding(encoding_name string) bool {
-	return encoding_name in ['CP1252', 'MS-ANSI', 'WINDOWS-1252', 'WINDOWS1252']!
-}
-
 // create_utf_string_with_bom will create a utf8/utf16/utf32 string with BOM header
 // for utf8, it will prepend 0xEFBBBF to the `src`
 // for utf16le, it will prepend 0xFFFE to the `src`

vlib/encoding/iconv/iconv_test.v

@@ -78,16 +78,6 @@ fn test_encoding_to_vstring() {
 	}
 }
 
-fn test_windows_1252_encoding_support() ! {
-	pound := iconv.encoding_to_vstring([u8(0xa3)], 'WINDOWS-1252')!
-	assert pound == '£'
-	assert pound.runes() == [rune(0x00a3)]
-
-	smart_quotes := iconv.encoding_to_vstring([u8(0x93), 0x56, 0x94], 'CP1252')!
-	assert smart_quotes == '“V”'
-	assert iconv.vstring_to_encoding(smart_quotes, 'WINDOWS-1252')! == [u8(0x93), 0x56, 0x94]
-}
-
 fn test_create_utf_string_with_bom() {
 	// bug ? vfmt create strange format here
 	// vfmt off

vlib/os/os_nix.c.v

@@ -9,6 +9,13 @@ module os
 #include <utime.h>
 #insert "@VEXEROOT/vlib/os/execute_capture_nix.h"
 
+// short_path is a Windows-only helper that returns the DOS 8.3 short path.
+// On non-Windows platforms it simply returns the given path unchanged,
+// so that callers guarded by `$if windows { ... }` type-check on other targets.
+pub fn short_path(path string) string {
+	return path
+}
+
 // path_separator is the platform specific separator string, used between the folders and filenames in a path. It is '/' on POSIX, and '\\' on Windows.
 pub const path_separator = '/'
 

vlib/v/ast/ast.v

@@ -3247,16 +3247,10 @@ pub fn (expr Expr) is_reference() bool {
 }
 
 // remove_par removes all parenthesis and gets the innermost Expr
-pub fn (mut expr Expr) remove_par() Expr {
+pub fn (expr Expr) remove_par() Expr {
 	mut e := expr
-	for {
-		mut next_expr := Expr(EmptyExpr{})
-		if mut e is ParExpr {
-			next_expr = e.expr
-		} else {
-			break
-		}
-		e = next_expr
+	for e is ParExpr {
+		e = (e as ParExpr).expr
 	}
 	return e
 }

vlib/v/builder/cc.v

@@ -1075,7 +1075,15 @@ fn (mut v Builder) setup_output_name() {
 }
 
 pub fn (mut v Builder) tcc_quoted_path(p string) string {
-	return os.quoted_path(v.tcc_windows_path(p))
+	wp := v.tcc_windows_path(p)
+	if v.ccoptions.cc == .tcc && !v.pref.no_rsp {
+		// tcc has a bug that prevents it from parsing names quoted with `'` in .rsp files,
+		// so force double-quoted, backslash-escaped paths for tcc rsp mode.
+		mut escaped := wp.replace('\\', '\\\\')
+		escaped = escaped.replace('"', '\\"')
+		return '"${escaped}"'
+	}
+	return os.quoted_path(wp)
 }
 
 fn looks_like_windows_path(value string) bool {
@@ -1496,6 +1504,10 @@ pub fn (mut v Builder) cc() {
 					if v.pref.ccompiler != '' && v.pref.ccompiler != ccompiler {
 						if v.pref.is_verbose {
 							eprintln('Compilation with tcc failed. Retrying with ${v.pref.ccompiler} ...')
+						} else {
+							$if macos {
+								eprintln(term.red('warning: tcc compilation failed, falling back to ${v.pref.ccompiler} (this is much slower)'))
+							}
 						}
 						continue
 					}

vlib/v/builder/cflags.v

@@ -12,7 +12,8 @@ fn (mut v Builder) get_os_cflags() []cflag.CFlag {
 		ctimedefines << v.pref.compile_defines
 	}
 	for mut flag in v.table.cflags {
-		if ext := os.file_ext(flag.value); ext in ['.o', '.obj'] {
+		ext := os.file_ext(flag.value)
+		if ext in ['.o', '.obj'] {
 			flag.cached = v.pref.cache_manager.mod_postfix_with_key2cpath(flag.mod, ext,
 				os.real_path(flag.value))
 		}

vlib/v/checker/struct.v

@@ -143,8 +143,8 @@ fn (mut c Checker) struct_decl(mut node ast.StructDecl) {
 						c.error('field ${err_desc} reference but default value ${val_desc} reference',
 							default_pos)
 					} else if field.default_expr is ast.StructInit
-						|| (field.typ.is_ptr()
-						&& (field.default_expr is ast.Ident || field.default_expr is ast.SelectorExpr)) {
+						|| (field.typ.is_ptr() && (field.default_expr is ast.Ident
+						|| field.default_expr is ast.SelectorExpr)) {
 						c.error('reference field must be initialized with reference', default_pos)
 					}
 				}