Skip to content

Commit ff10959

Browse files
committed
vlib: fmt files
1 parent 63c05d6 commit ff10959

6 files changed

Lines changed: 311 additions & 304 deletions

File tree

‎vlib/v2/builder/builder.v‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ fn sanitize_staged_c_source(c_source string) string {
111111
// Emit the struct, global instance, and accessor function so .m files can link.
112112
if source.contains('ui__webview__DarwinWebViewState')
113113
&& !source.contains('struct ui__webview__DarwinWebViewState {') {
114-
source = source + '
114+
source = source +
115+
'
115116
struct ui__webview__DarwinWebViewState { string cookie_val; };
116117
static ui__webview__DarwinWebViewState _g_darwin_webview_state;
117118
ui__webview__DarwinWebViewState* ui__webview__darwin_webview_state(void) { return &_g_darwin_webview_state; }

‎vlib/v2/gen/cleanc/assign.v‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,7 @@ fn (mut g Gen) gen_assign_stmt(node ast.AssignStmt) {
371371
init_type := g.expr_type_to_c(rhs.typ)
372372
is_generic_rhs := rhs.typ is ast.Ident
373373
&& is_generic_placeholder_type_name(rhs.typ.name)
374-
if init_type != '' && init_type != 'void'
375-
&& (init_type != 'int' || is_generic_rhs) {
374+
if init_type != '' && init_type != 'void' && (init_type != 'int' || is_generic_rhs) {
376375
typ = init_type
377376
generic_type_resolved = true
378377
}
@@ -578,8 +577,7 @@ fn (mut g Gen) gen_assign_stmt(node ast.AssignStmt) {
578577
// But NOT if the type was already correctly resolved from the
579578
// RHS expression type annotation (InitExpr/CallExpr).
580579
generic_type_mismatch := g.active_generic_types.len > 0
581-
&& !generic_type_resolved
582-
&& scoped_type != typ && scoped_type != 'f64'
580+
&& !generic_type_resolved && scoped_type != typ && scoped_type != 'f64'
583581
if (typ == '' || typ == 'int' || typ == 'int_literal' || typ == 'void*'
584582
|| typ == 'voidptr' || generic_container_fallback
585583
|| generic_type_mismatch) && scoped_type != ''

‎vlib/v2/gen/cleanc/expr.v‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,11 @@ fn (mut g Gen) expr(node ast.Expr) {
16171617
// @STRUCT returns the name of the enclosing struct for methods
16181618
struct_name := if g.cur_fn_name.contains('__') {
16191619
parts := g.cur_fn_name.split('__')
1620-
if parts.len >= 2 { parts[parts.len - 2] } else { '' }
1620+
if parts.len >= 2 {
1621+
parts[parts.len - 2]
1622+
} else {
1623+
''
1624+
}
16211625
} else {
16221626
''
16231627
}
@@ -2038,16 +2042,16 @@ fn (mut g Gen) expr(node ast.Expr) {
20382042
// we need to emit the correct comparison for the actual type.
20392043
if g.active_generic_types.len > 0 && node.lhs is ast.Ident
20402044
&& node.lhs.name in ['string__eq', 'string__ne', 'string__lt', 'string__compare']
2041-
&& node.args.len == 2
2042-
&& (!g.generic_operand_is_string(node.args[0])
2045+
&& node.args.len == 2 && (!g.generic_operand_is_string(node.args[0])
20432046
|| !g.generic_operand_is_string(node.args[1])) {
20442047
cmp_type := g.get_expr_type(node.args[0])
20452048
if cmp_type != '' && cmp_type != 'string' {
20462049
is_eq := node.lhs.name == 'string__eq'
20472050
is_ne := node.lhs.name == 'string__ne'
20482051
is_lt := node.lhs.name == 'string__lt'
20492052
// Primitive types: use == / != / < directly
2050-
if cmp_type in ['int', 'i8', 'i16', 'i32', 'i64', 'u8', 'u16', 'u32', 'u64', 'f32', 'f64', 'byte', 'rune', 'bool', 'usize', 'isize'] {
2053+
if cmp_type in ['int', 'i8', 'i16', 'i32', 'i64', 'u8', 'u16', 'u32', 'u64',
2054+
'f32', 'f64', 'byte', 'rune', 'bool', 'usize', 'isize'] {
20512055
g.sb.write_string('(')
20522056
g.expr(node.args[0])
20532057
if is_eq {

‎vlib/v2/transformer/types.v‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,9 +1405,8 @@ fn (t &Transformer) type_expr_name_full(expr ast.Expr) string {
14051405
fn (t &Transformer) type_expr_name_qualified(expr ast.Expr) string {
14061406
if expr is ast.Ident {
14071407
name := expr.name
1408-
if name in ['int', 'i8', 'i16', 'i32', 'i64', 'u8', 'u16', 'u32', 'u64',
1409-
'byte', 'rune', 'f32', 'f64', 'usize', 'isize', 'bool', 'string',
1410-
'voidptr', 'charptr', 'byteptr'] {
1408+
if name in ['int', 'i8', 'i16', 'i32', 'i64', 'u8', 'u16', 'u32', 'u64', 'byte', 'rune',
1409+
'f32', 'f64', 'usize', 'isize', 'bool', 'string', 'voidptr', 'charptr', 'byteptr'] {
14111410
return name
14121411
}
14131412
if t.cur_module != '' && t.cur_module != 'main' && t.cur_module != 'builtin' {

‎vlib/v2/types/checker.v‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2185,8 +2185,7 @@ fn (mut c Checker) stmt(stmt ast.Stmt) {
21852185
fn (c &Checker) is_comptime_for_loop(stmt ast.Stmt) bool {
21862186
if stmt is ast.ForStmt && stmt.init is ast.ForInStmt {
21872187
if stmt.init.expr is ast.SelectorExpr {
2188-
return stmt.init.expr.rhs.name == 'methods'
2189-
|| stmt.init.expr.rhs.name == 'fields'
2188+
return stmt.init.expr.rhs.name == 'methods' || stmt.init.expr.rhs.name == 'fields'
21902189
}
21912190
}
21922191
return false

0 commit comments

Comments
 (0)