mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

checker, parser, orm: remove redundant & for sum type value arguments to functions with expr &ast.Expr parameters (#17482)

Browse Source
This commit is contained in:
walking devel 2023-03-03 12:35:12 +00:00 committed by GitHub
parent 9c9adb125b
commit 5454562d2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vlib/v/checker/orm.v
View File

@ -369,7 +369,7 @@ fn (mut c Checker) check_sql_expr_type_is_int(expr &ast.Expr, sql_keyword string
return return
} else if expr is ast.ParExpr { } else if expr is ast.ParExpr {
c.check_sql_expr_type_is_int(&expr.expr, sql_keyword) c.check_sql_expr_type_is_int(expr.expr, sql_keyword)
return return
} }
@ -407,10 +407,10 @@ fn (mut c Checker) check_expr_has_no_fn_calls_with_non_orm_return_type(expr &ast
expr.pos) expr.pos)
} }
} else if expr is ast.ParExpr { } else if expr is ast.ParExpr {
c.check_expr_has_no_fn_calls_with_non_orm_return_type(&expr.expr) c.check_expr_has_no_fn_calls_with_non_orm_return_type(expr.expr)
} else if expr is ast.InfixExpr { } else if expr is ast.InfixExpr {
c.check_expr_has_no_fn_calls_with_non_orm_return_type(&expr.left) c.check_expr_has_no_fn_calls_with_non_orm_return_type(expr.left)
c.check_expr_has_no_fn_calls_with_non_orm_return_type(&expr.right) c.check_expr_has_no_fn_calls_with_non_orm_return_type(expr.right)
} }
} }
@ -437,19 +437,19 @@ fn (mut c Checker) check_where_expr_has_no_pointless_exprs(table_type_symbol &as
} else if expr.left is ast.InfixExpr || expr.left is ast.ParExpr } else if expr.left is ast.InfixExpr || expr.left is ast.ParExpr
|| expr.left is ast.PrefixExpr { || expr.left is ast.PrefixExpr {
c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names, c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names,
&expr.left) expr.left)
} else { } else {
c.orm_error(has_no_field_error, expr.left.pos()) c.orm_error(has_no_field_error, expr.left.pos())
} }
if expr.right is ast.InfixExpr || expr.right is ast.ParExpr || expr.right is ast.PrefixExpr { if expr.right is ast.InfixExpr || expr.right is ast.ParExpr || expr.right is ast.PrefixExpr {
c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names, c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names,
&expr.right) expr.right)
} }
} else if expr is ast.ParExpr { } else if expr is ast.ParExpr {
c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names, &expr.expr) c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names, expr.expr)
} else if expr is ast.PrefixExpr { } else if expr is ast.PrefixExpr {
c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names, &expr.right) c.check_where_expr_has_no_pointless_exprs(table_type_symbol, field_names, expr.right)
} else { } else {
c.orm_error('`where` expression must have at least one comparison for filtering rows', c.orm_error('`where` expression must have at least one comparison for filtering rows',
expr.pos()) expr.pos())

10
vlib/v/parser/sql.v
View File

@ -318,7 +318,7 @@ fn (p &Parser) has_sql_where_expr_with_comparison_with_id(expr &ast.Expr) bool {
return expr.left.name == 'id' return expr.left.name == 'id'
} }
} else if expr is ast.ParExpr { } else if expr is ast.ParExpr {
return p.has_sql_where_expr_with_comparison_with_id(&expr.expr) return p.has_sql_where_expr_with_comparison_with_id(expr.expr)
} }
return false return false
@ -334,12 +334,12 @@ fn (mut p Parser) check_sql_where_expr_has_no_undefined_variables(expr &ast.Expr
} }
} else if expr is ast.InfixExpr { } else if expr is ast.InfixExpr {
if expr.left is ast.Ident && expr.right is ast.Ident { if expr.left is ast.Ident && expr.right is ast.Ident {
return p.check_sql_where_expr_has_no_undefined_variables(&expr.right, [ return p.check_sql_where_expr_has_no_undefined_variables(expr.right, [
expr.left.str(), expr.left.str(),
]) ])
} }
left_check_result := p.check_sql_where_expr_has_no_undefined_variables(&expr.left, left_check_result := p.check_sql_where_expr_has_no_undefined_variables(expr.left,
[]) [])
if left_check_result is ast.NodeError { if left_check_result is ast.NodeError {
@ -347,14 +347,14 @@ fn (mut p Parser) check_sql_where_expr_has_no_undefined_variables(expr &ast.Expr
} }
variable_names := if expr.left is ast.Ident { [expr.left.str()] } else { []string{} } variable_names := if expr.left is ast.Ident { [expr.left.str()] } else { []string{} }
right_check_result := p.check_sql_where_expr_has_no_undefined_variables(&expr.right, right_check_result := p.check_sql_where_expr_has_no_undefined_variables(expr.right,
variable_names) variable_names)
if right_check_result is ast.NodeError { if right_check_result is ast.NodeError {
return right_check_result return right_check_result
} }
} else if expr is ast.ParExpr { } else if expr is ast.ParExpr {
return p.check_sql_where_expr_has_no_undefined_variables(&expr.expr, []) return p.check_sql_where_expr_has_no_undefined_variables(expr.expr, [])
} }
return ast.empty_expr return ast.empty_expr