ssa: split optimizer.v into a separate module; v2: parser fixes, make v2 hello.v work

Author: medvednikov

cmd/v2/test.v

@@ -236,6 +236,9 @@ fn print_str(s string) {
 	C.puts(s.str)
 }
 
+// C function with keyword name (tests parser allowing keywords after C.)
+fn C.select(ndfs int, readfds voidptr, writefds voidptr, exceptfds voidptr, timeout voidptr) int
+
 fn nested_return(x int) int {
 	if x < 10 {
 		return 100
@@ -288,6 +291,18 @@ fn defer_order_test() {
 	}
 }
 
+// Helper function to test defer(fn) - function-level defer
+fn defer_fn_test() int {
+	mut x := 0
+	for i := 0; i < 3; i++ {
+		defer(fn) {
+			x += 100
+		}
+		x += 1
+	}
+	return x // returns 3, but defer(fn) adds 300 at function end
+}
+
 // ===================== IF-GUARD HELPERS =====================
 
 // Returns the value if positive, none otherwise
@@ -1980,6 +1995,9 @@ fn main() {
 	// 38.5 Test defer order in function
 	defer_order_test() // Should print: Third, Second, First
 
+	// 38.6 Test defer(fn) - function-level defer
+	print_int(defer_fn_test()) // 303 (3 from loop + 300 from function-level defers)
+
 	// ==================== 39. ENUMS ====================
 	print_str('--- 39. Enums ---')
 

cmd/v2/test_ssa_backends.v

@@ -9,6 +9,7 @@ import v2.parser
 import v2.token
 import v2.pref
 import v2.ssa
+import v2.ssa.optimize
 import v2.transform
 import v2.gen.x64
 import v2.gen.arm64
@@ -112,7 +113,7 @@ fn main() {
 	builder.build_all(all_files)
 	// Optimize
 	println('[*] Optimizing SSA...')
-	mod.optimize()
+	optimize.optimize(mut mod)
 	// Backend selection: default to native, use 'cleanc' or 'c' arg to switch
 	use_cleanc := os.args.contains('cleanc')
 	use_ssa_c := os.args.contains('c') && !use_cleanc

vlib/os/filepath.v

@@ -297,8 +297,7 @@ fn is_normal_path(path string) bool {
 	if plen == 0 {
 		return false
 	}
-	return (plen == 1 && is_slash(path[0])) || (plen >= 2 && is_slash(path[0])
-		&& !is_slash(path[1]))
+	return (plen == 1 && is_slash(path[0])) || (plen >= 2 && is_slash(path[0]) && !is_slash(path[1]))
 }
 
 // is_curr_dir_ref returns `true` if the 3 given integer construct

vlib/os/os.c.v

@@ -951,8 +951,7 @@ fn normalize_drive_letter(path string) {
 	// a path like c:\nv\.bin (note the small `c`) in %PATH,
 	// is NOT recognized by cmd.exe (and probably other programs too)...
 	// Capital drive letters do work fine.
-	if path.len > 2 && path[0] >= `a` && path[0] <= `z` && path[1] == `:`
-		&& path[2] == path_separator[0] {
+	if path.len > 2 && path[0] >= `a` && path[0] <= `z` && path[1] == `:` && path[2] == path_separator[0] {
 		unsafe {
 			x := &path.str[0]
 			(*x) = *x - 32

vlib/v2/ast/ast.v

@@ -226,6 +226,11 @@ pub fn (lang Language) str() string {
 	}
 }
 
+pub enum DeferMode {
+	scoped   // default: defer to end of current scope
+	function // defer(fn): defer to end of function
+}
+
 // Expressions
 pub struct ArrayInitExpr {
 pub:
@@ -675,6 +680,7 @@ pub:
 
 pub struct DeferStmt {
 pub:
+	mode  DeferMode
 	stmts []Stmt
 }
 

vlib/v2/builder/builder.v

@@ -12,15 +12,17 @@ import v2.gen.v as gen_v
 import v2.gen.x64
 import v2.pref
 import v2.ssa
+import v2.ssa.optimize
 import v2.token
 import v2.transform
 import time
 
 struct Builder {
 	pref &pref.Preferences
 mut:
-	files    []ast.File
-	file_set &token.FileSet = token.FileSet.new()
+	files      []ast.File
+	user_files []string // original user-provided files (for output name)
+	file_set   &token.FileSet = token.FileSet.new()
 }
 
 pub fn new_builder(prefs &pref.Preferences) &Builder {
@@ -32,6 +34,7 @@ pub fn new_builder(prefs &pref.Preferences) &Builder {
 }
 
 pub fn (mut b Builder) build(files []string) {
+	b.user_files = files
 	mut sw := time.new_stopwatch()
 	b.files = if b.pref.no_parallel {
 		b.parse_files(files)
@@ -117,7 +120,7 @@ fn (mut b Builder) gen_ssa_c() {
 	}
 	// Build all files together with proper multi-file ordering
 	ssa_builder.build_all(transformed_files)
-	mod.optimize()
+	optimize.optimize(mut mod)
 
 	mut gen := c.Gen.new(mod)
 	c_source := gen.gen()
@@ -132,8 +135,8 @@ fn (mut b Builder) gen_ssa_c() {
 	// Compile C to binary
 	output_binary := if b.pref.output_file != '' {
 		b.pref.output_file
-	} else if b.files.len > 0 {
-		os.file_name(b.files.last().name).all_before_last('.v')
+	} else if b.user_files.len > 0 {
+		os.file_name(b.user_files.last()).all_before_last('.v')
 	} else {
 		'out'
 	}
@@ -165,13 +168,13 @@ fn (mut b Builder) gen_native(backend_arch pref.Arch) {
 	}
 	// Build all files together with proper multi-file ordering
 	ssa_builder.build_all(transformed_files)
-	mod.optimize()
+	optimize.optimize(mut mod)
 
 	// Determine output binary name from the last user file
 	output_binary := if b.pref.output_file != '' {
 		b.pref.output_file
-	} else if b.files.len > 0 {
-		os.file_name(b.files.last().name).all_before_last('.v')
+	} else if b.user_files.len > 0 {
+		os.file_name(b.user_files.last()).all_before_last('.v')
 	} else {
 		'out'
 	}

vlib/v2/builder/parse.v

@@ -11,9 +11,21 @@ fn (mut b Builder) parse_files(files []string) []ast.File {
 	mut ast_files := []ast.File{}
 	skip_builtin := b.pref.skip_builtin
 	if !skip_builtin {
+		// Parse builtin
 		ast_files << parser_reused.parse_files(get_v_files_from_dir(b.pref.get_vlib_module_path('builtin')), mut
 			b.file_set)
-		// ast_files << parser_reused.parse_files(get_v_files_from_dir(b.pref.get_vlib_module_path('sync')), mut b.file_set)
+		// Parse strconv (used by builtin for string formatting)
+		ast_files << parser_reused.parse_files(get_v_files_from_dir(b.pref.get_vlib_module_path('strconv')), mut
+			b.file_set)
+		// Parse strings (used by builtin for string building)
+		ast_files << parser_reused.parse_files(get_v_files_from_dir(b.pref.get_vlib_module_path('strings')), mut
+			b.file_set)
+		// Parse hash (used by maps for wyhash)
+		ast_files << parser_reused.parse_files(get_v_files_from_dir(b.pref.get_vlib_module_path('hash')), mut
+			b.file_set)
+		// Parse math.bits (used by strconv for bit operations)
+		ast_files << parser_reused.parse_files(get_v_files_from_dir(b.pref.get_vlib_module_path('math.bits')), mut
+			b.file_set)
 	}
 	// parse user files
 	ast_files << parser_reused.parse_files(files, mut b.file_set)

vlib/v2/builder/parse_parallel.v

@@ -65,7 +65,18 @@ fn (mut b Builder) parse_files_parallel(files []string) []ast.File {
 	}
 	skip_builtin := b.pref.skip_builtin
 	if !skip_builtin {
+		// Parse builtin and its dependencies
+		// Mark them as parsed first to prevent re-parsing via imports
+		pstate.mark_module_as_parsed('builtin')
+		pstate.mark_module_as_parsed('strconv')
+		pstate.mark_module_as_parsed('strings')
+		pstate.mark_module_as_parsed('hash')
+		pstate.mark_module_as_parsed('math.bits')
 		worker_pool.queue_jobs(get_v_files_from_dir(b.pref.get_vlib_module_path('builtin')))
+		worker_pool.queue_jobs(get_v_files_from_dir(b.pref.get_vlib_module_path('strconv')))
+		worker_pool.queue_jobs(get_v_files_from_dir(b.pref.get_vlib_module_path('strings')))
+		worker_pool.queue_jobs(get_v_files_from_dir(b.pref.get_vlib_module_path('hash')))
+		worker_pool.queue_jobs(get_v_files_from_dir(b.pref.get_vlib_module_path('math.bits')))
 	}
 	// parse user files
 	worker_pool.queue_jobs(files)

vlib/v2/builder/util.v

@@ -9,17 +9,18 @@ pub fn get_v_files_from_dir(dir string) []string {
 	mod_files := os.ls(dir) or { panic('error getting ls from ${dir}') }
 	mut v_files := []string{}
 	for file in mod_files {
-		if !file.ends_with('.v') || file.ends_with('.js.v') || file.ends_with('.c.v')
-			|| file.contains('_test.') {
+		// Include .v files (including .c.v), exclude .js.v and test files
+		if !file.ends_with('.v') || file.ends_with('.js.v') || file.contains('_test.') {
 			continue
 		}
 		// skip platform-specific files
 		if file.contains('.arm64.') || file.contains('.arm32.') || file.contains('.amd64.') {
 			continue
 		}
 		// skip OS-specific files for other platforms
+		// Note: _nix files are for Unix-like systems including macOS and Linux
 		$if macos {
-			if file.contains('_windows.') || file.contains('_linux.') || file.contains('_nix.') {
+			if file.contains('_windows.') || file.contains('_linux.') {
 				continue
 			}
 		} $else $if linux {

vlib/v2/parser/parser.v

@@ -248,9 +248,22 @@ fn (mut p Parser) stmt() ast.Stmt {
 		}
 		.key_defer {
 			p.next()
+			mut defer_mode := ast.DeferMode.scoped
+			if p.tok == .lpar {
+				p.next()
+				if p.tok == .key_fn {
+					defer_mode = .function
+					p.next()
+				} else {
+					mode := p.expect_name()
+					p.error('unknown `defer` mode: `${mode}`')
+				}
+				p.expect(.rpar)
+			}
 			stmts := p.block()
 			p.expect(.semicolon)
 			return ast.DeferStmt{
+				mode:  defer_mode
 				stmts: stmts
 			}
 		}
@@ -1250,6 +1263,18 @@ fn (mut p Parser) expect_name() string {
 	return name
 }
 
+// expect `.name` or keyword & return `p.lit` & go to next token
+// used for C/JS function names where keywords are allowed (e.g. `C.select`)
+@[inline]
+fn (mut p Parser) expect_name_or_keyword() string {
+	if p.tok != .name && !p.tok.is_keyword() {
+		p.error_expected(.name, p.tok)
+	}
+	name := p.lit
+	p.next()
+	return name
+}
+
 // return `p.lit` & go to next token
 @[inline]
 fn (mut p Parser) lit() string {
@@ -1778,7 +1803,8 @@ fn (mut p Parser) fn_decl(is_public bool, attributes []ast.Attribute) ast.FnDecl
 		}
 	}
 	language := p.decl_language()
-	name_ident := p.ident()
+	// use ident_or_keyword() for C/JS functions to allow keywords as names (e.g. `C.select`)
+	name_ident := if language == .v { p.ident() } else { p.ident_or_keyword() }
 	mut name := name_ident.name
 	mut is_static := false
 	if p.tok == .dot {
@@ -1793,11 +1819,12 @@ fn (mut p Parser) fn_decl(is_public bool, attributes []ast.Attribute) ast.FnDecl
 			}
 		}
 		// eg. `Promise.resolve` in `JS.Promise.resolve`
+		// use expect_name_or_keyword() to allow keywords as names (e.g. `C.select`)
 		else {
-			name += '.' + p.expect_name()
+			name += '.' + p.expect_name_or_keyword()
 			for p.tok == .dot {
 				p.next()
-				name += '.' + p.expect_name()
+				name += '.' + p.expect_name_or_keyword()
 			}
 		}
 	}
@@ -2390,6 +2417,15 @@ fn (mut p Parser) ident() ast.Ident {
 	}
 }
 
+// like ident() but allows keywords as names (for C/JS function names like `C.select`)
+@[inline]
+fn (mut p Parser) ident_or_keyword() ast.Ident {
+	return ast.Ident{
+		pos:  p.pos
+		name: p.expect_name_or_keyword()
+	}
+}
+
 @[inline]
 fn (mut p Parser) ident_or_selector_expr() ast.Expr {
 	ident := p.ident()
@@ -2407,9 +2443,15 @@ fn (mut p Parser) ident_or_selector_expr() ast.Expr {
 				pos: p.pos
 			}
 		}
+		// for C/JS calls, allow keywords as names (e.g. `C.select`)
+		rhs := if ident.name == 'C' || ident.name == 'JS' {
+			p.ident_or_keyword()
+		} else {
+			p.ident()
+		}
 		return ast.SelectorExpr{
 			lhs: ident
-			rhs: p.ident()
+			rhs: rhs
 			pos: p.pos
 		}
 	}