fix

vlang · Oct 11, 2024 · b95b34e · b95b34e
1 parent 5aa6eaf
commit b95b34e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/vlib/picoev/socket_util.c.v b/vlib/picoev/socket_util.c.v
@@ -123,10 +123,10 @@ fn listen(config Config) !int {
 		// epoll socket options
 		net.socket_error(C.setsockopt(fd, C.SOL_SOCKET, C.SO_REUSEPORT, &flag, sizeof(int)))!
 		net.socket_error(C.setsockopt(fd, C.IPPROTO_TCP, C.TCP_QUICKACK, &flag, sizeof(int)))!
-		net.socket_error(C.setsockopt(fd, C.IPPROTO_TCP, C.TCP_DEFER_ACCEPT, &config.timeout_secs,
-			sizeof(int)))!
-		queue_len := max_queue
-		net.socket_error(C.setsockopt(fd, C.IPPROTO_TCP, C.TCP_FASTOPEN, &queue_len, sizeof(int)))!
+		// net.socket_error(C.setsockopt(fd, C.IPPROTO_TCP, C.TCP_DEFER_ACCEPT, &config.timeout_secs,
+		// 	sizeof(int)))!
+		// queue_len := max_queue
+		// net.socket_error(C.setsockopt(fd, C.IPPROTO_TCP, C.TCP_FASTOPEN, &queue_len, sizeof(int)))!
 	}
 
 	// addr settings

diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
@@ -1241,7 +1241,7 @@ fn (mut c Checker) check_expr_option_or_result_call(expr ast.Expr, ret_type ast.
 						'a Result'
 					}
 					with_modifier := if expr.typ.has_flag(.option) { '?' } else { '!' }
-					if expr.typ.has_flag(.result) && expr.or_block.kind == .absent {
+					if expr.or_block.kind == .absent {
 						if c.inside_defer {
 							c.error('field `${expr.field_name}` is ${with_modifier_kind}, so it should have an `or {}` block at the end',
 								expr.pos)
@@ -1278,6 +1278,8 @@ fn (mut c Checker) check_expr_option_or_result_call(expr ast.Expr, ret_type ast.
 					c.check_or_expr(expr.or_expr, ret_type, ret_type.set_flag(.result),
 						expr)
 				}
+			} else if expr.left_type.has_option_or_result() {
+				c.check_expr_option_or_result_call(expr.left, ret_type)
 			}
 		}
 		ast.CastExpr {

diff --git a/vlib/v/checker/tests/option_map_err.out b/vlib/v/checker/tests/option_map_err.out
@@ -0,0 +1,6 @@
+vlib/v/checker/tests/option_map_err.vv:22:13: error: field `opmap` is an Option, so it should have either an `or {}` block, or `?` at the end
+   20 |         }
+   21 |     }
+   22 |     assert op2.opmap['1'] == 1.0
+      |                ~~~~~
+   23 | }
diff --git a/vlib/v/checker/tests/option_map_err.vv b/vlib/v/checker/tests/option_map_err.vv
@@ -0,0 +1,23 @@
+struct OptionalMap {
+	opmap ?map[string]f64
+}
+
+fn main() {
+	op := OptionalMap{
+		opmap: {
+			'1': 0.0
+		}
+	}
+	assert op.opmap or {
+		{
+			'1': 0.0
+		}
+	}['1'] == 0.0
+
+	op2 := OptionalMap{
+		opmap: {
+			'1': 1.0
+		}
+	}
+	assert op2.opmap['1'] == 1.0
+}