v2: transformer fixes; cgen: auto str fixes

Author: medvednikov

vlib/v/gen/c/auto_str_methods.v

@@ -1133,18 +1133,17 @@ fn (mut g Gen) gen_str_for_struct(info ast.Struct, lang ast.Language, styp strin
 				caller_should_free = false
 			}
 		} else if ftyp_noshared.is_ptr() {
-			// reference types can be "nil"
 			if ftyp_noshared.has_flag(.option) {
-				funcprefix += '${it_field_name}.state != 0'
+				// optional pointer types: let the option auto-str function handle the none case
 			} else {
+				// reference types can be "nil"
 				funcprefix += 'builtin__isnil(${it_field_name})'
-			}
-			funcprefix += ' ? _S("nil") : '
-			// struct, floats and ints have a special case through the _str function
-			if !ftyp_noshared.has_flag(.option)
-				&& sym.kind !in [.struct, .alias, .enum, .sum_type, .map, .interface, .bool]
-				&& !field.typ.is_int_valptr() && !field.typ.is_float_valptr() {
-				funcprefix += '*'
+				funcprefix += ' ? _S("nil") : '
+				// struct, floats and ints have a special case through the _str function
+				if sym.kind !in [.struct, .alias, .enum, .sum_type, .map, .interface, .bool]
+					&& !field.typ.is_int_valptr() && !field.typ.is_float_valptr() {
+					funcprefix += '*'
+				}
 			}
 		}
 		mut is_field_array := false

vlib/v/gen/c/infix.v

@@ -1541,7 +1541,7 @@ fn (mut g Gen) infix_expr_and_or_op(node ast.InfixExpr) {
 		cur_line := g.go_before_last_stmt().trim_space()
 		g.empty_line = true
 		if g.infix_left_var_name.len > 0 {
-			g.write('bool ${tmp} = ((${g.infix_left_var_name}) ${node.op.str()} ')
+			g.write('bool ${tmp} = ((${g.infix_left_var_name}) && ')
 		} else {
 			g.write('bool ${tmp} = (')
 		}
@@ -1558,7 +1558,11 @@ fn (mut g Gen) infix_expr_and_or_op(node ast.InfixExpr) {
 		tmp := g.new_tmp_var()
 		cur_line := g.go_before_last_stmt().trim_space()
 		g.empty_line = true
-		g.write('bool ${tmp} = (')
+		if g.infix_left_var_name.len > 0 {
+			g.write('bool ${tmp} = ((${g.infix_left_var_name}) && ')
+		} else {
+			g.write('bool ${tmp} = (')
+		}
 		g.expr(node.left)
 		g.writeln(');')
 		g.set_current_pos_as_last_stmt_pos()

vlib/v2/transformer/fn.v

@@ -1442,10 +1442,6 @@ fn (mut t Transformer) transform_call_expr(expr ast.CallExpr) ast.Expr {
 	// specialization suffix so cleanc can later substitute concrete types.
 	if expr.lhs is ast.GenericArgOrIndexExpr {
 		gai := expr.lhs as ast.GenericArgOrIndexExpr
-		if t.cur_fn_name_str == 'get' || t.cur_fn_name_str == 'get_or_panic' {
-			is_sel := gai.lhs is ast.SelectorExpr
-			eprintln('[DBG GAOI in call] fn=${t.cur_fn_name_str} gai.lhs_name=${gai.lhs.name()} is_sel=${is_sel} gai.expr=${gai.expr.name()}')
-		}
 		if gai.lhs is ast.SelectorExpr {
 			sel := gai.lhs as ast.SelectorExpr
 			is_module_call := sel.lhs is ast.Ident && t.lookup_var_type(sel.lhs.name) == none