fmt: remove unnecessary parentheses after `return` (fix #11423) (#11435)

pull/11446/head
yuyi 2021-09-08 19:19:53 +08:00 committed by GitHub
parent bef3390f36
commit e5360e164a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 36 additions and 16 deletions

View File

@ -9,7 +9,7 @@ fn random_clamped() f64 {
pub fn activation(a f64) f64 { pub fn activation(a f64) f64 {
ap := (-a) / 1 ap := (-a) / 1
return (1 / (1 + math.exp(ap))) return 1 / (1 + math.exp(ap))
} }
fn round(a int, b f64) int { fn round(a int, b f64) int {

View File

@ -327,7 +327,7 @@ fn intersect(r Ray, spheres &Sphere, nspheres int) (bool, f64, int) {
id = i id = i
} }
} }
return (t < inf), t, id return t < inf, t, id
} }
// some casual random function, try to avoid the 0 // some casual random function, try to avoid the 0

View File

@ -15,7 +15,7 @@ import os
import strconv import strconv
fn evala(i int, j int) int { fn evala(i int, j int) int {
return ((i + j) * (i + j + 1) / 2 + i + 1) return (i + j) * (i + j + 1) / 2 + i + 1
} }
fn times(mut v []f64, u []f64) { fn times(mut v []f64, u []f64) {

View File

@ -150,7 +150,7 @@ pub fn ones_count_64(x u64) int {
pub fn rotate_left_8(x byte, k int) byte { pub fn rotate_left_8(x byte, k int) byte {
n := byte(8) n := byte(8)
s := byte(k) & (n - byte(1)) s := byte(k) & (n - byte(1))
return ((x << s) | (x >> (n - s))) return (x << s) | (x >> (n - s))
} }
// rotate_left_16 returns the value of x rotated left by (k mod 16) bits. // rotate_left_16 returns the value of x rotated left by (k mod 16) bits.
@ -161,7 +161,7 @@ pub fn rotate_left_8(x byte, k int) byte {
pub fn rotate_left_16(x u16, k int) u16 { pub fn rotate_left_16(x u16, k int) u16 {
n := u16(16) n := u16(16)
s := u16(k) & (n - u16(1)) s := u16(k) & (n - u16(1))
return ((x << s) | (x >> (n - s))) return (x << s) | (x >> (n - s))
} }
// rotate_left_32 returns the value of x rotated left by (k mod 32) bits. // rotate_left_32 returns the value of x rotated left by (k mod 32) bits.
@ -172,7 +172,7 @@ pub fn rotate_left_16(x u16, k int) u16 {
pub fn rotate_left_32(x u32, k int) u32 { pub fn rotate_left_32(x u32, k int) u32 {
n := u32(32) n := u32(32)
s := u32(k) & (n - u32(1)) s := u32(k) & (n - u32(1))
return ((x << s) | (x >> (n - s))) return (x << s) | (x >> (n - s))
} }
// rotate_left_64 returns the value of x rotated left by (k mod 64) bits. // rotate_left_64 returns the value of x rotated left by (k mod 64) bits.
@ -183,7 +183,7 @@ pub fn rotate_left_32(x u32, k int) u32 {
pub fn rotate_left_64(x u64, k int) u64 { pub fn rotate_left_64(x u64, k int) u64 {
n := u64(64) n := u64(64)
s := u64(k) & (n - u64(1)) s := u64(k) & (n - u64(1))
return ((x << s) | (x >> (n - s))) return (x << s) | (x >> (n - s))
} }
// --- Reverse --- // --- Reverse ---

View File

@ -28,9 +28,9 @@ pub fn (resp Response) bytes() []byte {
// Formats resp to a string suitable for HTTP response transmission // Formats resp to a string suitable for HTTP response transmission
pub fn (resp Response) bytestr() string { pub fn (resp Response) bytestr() string {
return ('HTTP/$resp.http_version $resp.status_code $resp.status_msg\r\n' + '${resp.header.render( return 'HTTP/$resp.http_version $resp.status_code $resp.status_msg\r\n' + '${resp.header.render(
version: resp.version() version: resp.version()
)}\r\n' + '$resp.text') )}\r\n' + '$resp.text'
} }
// Parse a raw HTTP response into a Response object // Parse a raw HTTP response into a Response object

View File

@ -215,7 +215,7 @@ pub fn (mut f File) writeln(s string) ?int {
if x < 0 { if x < 0 {
return error('could not add newline') return error('could not add newline')
} }
return (written + 1) return written + 1
} }
// write_string writes the string `s` into the file // write_string writes the string `s` into the file

View File

@ -426,7 +426,7 @@ pub fn is_executable(path string) bool {
// 04 Read-only // 04 Read-only
// 06 Read and write // 06 Read and write
p := real_path(path) p := real_path(path)
return (exists(p) && p.ends_with('.exe')) return exists(p) && p.ends_with('.exe')
} }
$if solaris { $if solaris {
statbuf := C.stat{} statbuf := C.stat{}

View File

@ -39,7 +39,7 @@ pub fn (mut rng PCG32RNG) u32() u32 {
rng.state = oldstate * (6364136223846793005) + rng.inc rng.state = oldstate * (6364136223846793005) + rng.inc
xorshifted := u32(((oldstate >> u64(18)) ^ oldstate) >> u64(27)) xorshifted := u32(((oldstate >> u64(18)) ^ oldstate) >> u64(27))
rot := u32(oldstate >> u64(59)) rot := u32(oldstate >> u64(59))
return ((xorshifted >> rot) | (xorshifted << ((-rot) & u32(31)))) return (xorshifted >> rot) | (xorshifted << ((-rot) & u32(31)))
} }
// u64 returns a pseudorandom 64-bit unsigned `u64`. // u64 returns a pseudorandom 64-bit unsigned `u64`.
@ -66,7 +66,7 @@ pub fn (mut rng PCG32RNG) u32n(max u32) u32 {
for { for {
r := rng.u32() r := rng.u32()
if r >= threshold { if r >= threshold {
return (r % max) return r % max
} }
} }
return u32(0) return u32(0)
@ -83,7 +83,7 @@ pub fn (mut rng PCG32RNG) u64n(max u64) u64 {
for { for {
r := rng.u64() r := rng.u64()
if r >= threshold { if r >= threshold {
return (r % max) return r % max
} }
} }
return u64(0) return u64(0)

View File

@ -128,7 +128,7 @@ fn is_digit(x byte) bool {
} }
fn is_space(x byte) bool { fn is_space(x byte) bool {
return (x == `\t` || x == `\n` || x == `\v` || x == `\f` || x == `\r` || x == ` `) return x == `\t` || x == `\n` || x == `\v` || x == `\f` || x == `\r` || x == ` `
} }
fn is_exp(x byte) bool { fn is_exp(x byte) bool {

View File

@ -1130,7 +1130,11 @@ pub fn (mut f Fmt) return_stmt(node ast.Return) {
f.write(' ') f.write(' ')
// Loop over all return values. In normal returns this will only run once. // Loop over all return values. In normal returns this will only run once.
for i, expr in node.exprs { for i, expr in node.exprs {
if expr is ast.ParExpr {
f.expr(expr.expr)
} else {
f.expr(expr) f.expr(expr)
}
if i < node.exprs.len - 1 { if i < node.exprs.len - 1 {
f.write(', ') f.write(', ')
} }

View File

@ -0,0 +1,8 @@
fn is_ascii_upper_alpha(char int) bool {
return char >= 65 && char <= 90
}
fn main() {
ret := is_ascii_upper_alpha(`a`)
println(ret)
}

View File

@ -0,0 +1,8 @@
fn is_ascii_upper_alpha(char int) bool {
return (char >= 65 && char <= 90)
}
fn main() {
ret := is_ascii_upper_alpha(`a`)
println(ret)
}