v2: minor fixes

Author: medvednikov

vlib/v2/builder/builder.v

@@ -141,7 +141,12 @@ fn ensure_string_eq_impl(source string) string {
 
 fn replace_generated_c_fn(source string, signature string, replacement string) string {
 	needle := signature + ' {'
-	start := source.index(needle) or { return source }
+	// Search for the needle preceded by a newline to ensure we match an actual
+	// function definition at the start of a line, not an occurrence inside a
+	// string literal (e.g. when the compiler compiles itself).
+	full_needle := '\n' + needle
+	nl_pos := source.index(full_needle) or { return source }
+	start := nl_pos + 1 // skip the newline itself
 	body_start := start + needle.len - 1
 	if body_start < 0 || body_start >= source.len || source[body_start] != `{` {
 		return source

vlib/v2/gen/cleanc/assign.v

@@ -389,6 +389,11 @@ fn (mut g Gen) gen_assign_stmt(node ast.AssignStmt) {
 				scope_type := g.types_type_to_c(raw_type)
 				if scope_type != '' && scope_type != 'int' {
 					typ = scope_type
+					// Ensure result/option wrapper types are registered so their
+					// typedef and struct definitions get emitted in the C output.
+					if scope_type.starts_with('_result_') || scope_type.starts_with('_option_') {
+						g.register_alias_type(scope_type)
+					}
 				} else if scope_type == 'int' && typ == 'bool' {
 					// Fix: literal like `1` mistyped as bool in env
 					typ = 'int'