v2: optionals fixes

vlib/v/ast/scope.v

@@ -20,13 +20,23 @@ pub fn new_scope(parent &Scope, start_pos int) &Scope {
 	}
 }
 
-pub fn (s &Scope) find_scope_and_var(name string) ?(&Scope,Var) {
+pub struct ScopeVar {
+pub:
+	scope &Scope
+	var   Var
+}
+
+// pub fn (s &Scope) find_scope_and_var(name string) ?(&Scope,Var) {
+pub fn (s &Scope) find_scope_and_var(name string) ?ScopeVar {
 	if name in s.vars {
-		return s,s.vars[name]
+		// return s,s.vars[name]
+		return ScopeVar{
+			s,s.vars[name]}
 	}
 	for sc := s; !isnil(sc.parent); sc = sc.parent {
 		if name in sc.vars {
-			return sc,sc.vars[name]
+			return ScopeVar{
+				sc,sc.vars[name]}
 		}
 	}
 	return none
@@ -141,4 +151,3 @@ pub fn (sc &Scope) show(level int) string {
 pub fn (sc &Scope) str() string {
 	return sc.show(0)
 }
-

vlib/v/checker/checker.v

@@ -820,11 +820,14 @@ pub fn (c mut Checker) ident(ident mut ast.Ident) table.Type {
 		mut found := true
 		mut var_scope := &ast.Scope(0)
 		mut var := ast.Var{}
-		var_scope,var = start_scope.find_scope_and_var(ident.name) or {
+		// var_scope,var = start_scope.find_scope_and_var(ident.name) or {
+		mr := start_scope.find_scope_and_var(ident.name) or {
 			found = false
 			c.error('not found: $ident.name - POS: $ident.pos.pos', ident.pos)
 			panic('')
 		}
+		var_scope = mr.scope
+		var = mr.var
 		if found {
 			// update the variable
 			// we need to do this here instead of var_decl since some

vlib/v/gen/cgen.v

@@ -508,9 +508,9 @@ fn (g mut Gen) expr_with_cast(expr ast.Expr, got_type table.Type, exp_type table
 }
 
 fn (g mut Gen) gen_assign_stmt(assign_stmt ast.AssignStmt) {
-	// multi return
 	// g.write('/*assign_stmt*/')
 	if assign_stmt.left.len > assign_stmt.right.len {
+		// multi return
 		mut return_type := table.void_type
 		match assign_stmt.right[0] {
 			ast.CallExpr {
@@ -524,6 +524,7 @@ fn (g mut Gen) gen_assign_stmt(assign_stmt ast.AssignStmt) {
 			}
 	}
 		mr_var_name := 'mr_$assign_stmt.pos.pos'
+		g.expr_var_name = mr_var_name
 		if table.type_is_optional(return_type) {
 			return_type = table.type_clear_extra(return_type)
 			mr_styp := g.typ(return_type)
@@ -606,11 +607,11 @@ fn (g mut Gen) gen_assign_stmt(assign_stmt ast.AssignStmt) {
 						g.expr(val)
 					}
 				}
-				g.expr_var_name = ''
 			}
 			g.writeln(';')
 		}
 	}
+	g.expr_var_name = ''
 }
 
 fn (g mut Gen) gen_fn_decl(it ast.FnDecl) {