vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

checker: fix multiple assign immutable error

pull/5000/head
yuyi 2020-05-23 23:30:28 +08:00 committed by GitHub
parent 4271eb477c
commit 4608898bcd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
vlib/net/ftp/ftp.v
View File

@ -20,17 +20,17 @@ module ftp
import net import net
const ( const (
Connected = 220 connected = 220
SpecifyPassword = 331 specify_password = 331
LoggedIn = 230 logged_in = 230
LoginFirst = 503 login_first = 503
Anonymous = 530 anonymous = 530
OpenDataConnection = 150 open_data_connection = 150
CloseDataConnection = 226 close_data_connection = 226
CommandOk = 200 command_ok = 200
denied = 550 denied = 550
PassiveMode = 227 passive_mode = 227
complete = 226 complete = 226
) )
struct DTP { struct DTP {
@ -110,7 +110,7 @@ pub fn (mut ftp FTP) connect(ip string) bool {
} }
ftp.sock = sock ftp.sock = sock
code, _ := ftp.read() code, _ := ftp.read()
if code == Connected { if code == connected {
return true return true
} }
return false return false
@ -123,11 +123,11 @@ pub fn (ftp FTP) login(user, passwd string) bool {
} }
return false return false
} }
mut code, data := ftp.read() mut code, mut data := ftp.read()
if code == LoggedIn { if code == logged_in {
return true return true
} }
if code != SpecifyPassword { if code != specify_password {
return false return false
} }
ftp.write('PASS $passwd') or { ftp.write('PASS $passwd') or {
@ -139,7 +139,7 @@ pub fn (ftp FTP) login(user, passwd string) bool {
code, data = ftp.read() code, data = ftp.read()
// TODO Replace `data` with `_` // TODO Replace `data` with `_`
_ := data _ := data
if code == LoggedIn { if code == logged_in {
return true return true
} }
return false return false
@ -209,7 +209,7 @@ fn (ftp FTP) pasv() ?DTP {
$if debug { $if debug {
println('pass: $data') println('pass: $data')
} }
if code != PassiveMode { if code != passive_mode {
return error('pasive mode not allowed') return error('pasive mode not allowed')
} }
dtp := new_dtp(data) or { dtp := new_dtp(data) or {
@ -228,12 +228,12 @@ pub fn (ftp FTP) dir() ?[]string {
if code == denied { if code == denied {
return error('LIST denied') return error('LIST denied')
} }
if code != OpenDataConnection { if code != open_data_connection {
return error('data channel empty') return error('data channel empty')
} }
list_dir := dtp.read() list_dir := dtp.read()
result, _ := ftp.read() result, _ := ftp.read()
if result != CloseDataConnection { if result != close_data_connection {
println('LIST not ok') println('LIST not ok')
} }
dtp.close() dtp.close()
@ -258,7 +258,7 @@ pub fn (ftp FTP) get(file string) ?[]byte {
if code == denied { if code == denied {
return error('Permission denied') return error('Permission denied')
} }
if code != OpenDataConnection { if code != open_data_connection {
return error('Data connection not ready') return error('Data connection not ready')
} }
blob := dtp.read() blob := dtp.read()

1
vlib/v/checker/checker.v
View File

@ -1261,6 +1261,7 @@ pub fn (mut c Checker) assign_stmt(mut assign_stmt ast.AssignStmt) {
mut ident_var_info := ident.var_info() mut ident_var_info := ident.var_info()
// c.assigned_var_name = ident.name // c.assigned_var_name = ident.name
if assign_stmt.op == .assign { if assign_stmt.op == .assign {
c.fail_if_immutable(ident)
var_type := c.expr(ident) var_type := c.expr(ident)
assign_stmt.left_types << var_type assign_stmt.left_types << var_type
if !c.table.check(val_type, var_type) { if !c.table.check(val_type, var_type) {

7
vlib/v/checker/tests/assign_multi_immutable_err.out 100644
View File

@ -0,0 +1,7 @@
vlib/v/checker/tests/assign_multi_immutable_err.v:4:2: error: `a` is immutable, declare it with `mut` to make it mutable
2 | a := 10
3 | b := 20
4 | a, b = 1, 2
| ^
5 |
6 | println('$a, $b')

7
vlib/v/checker/tests/assign_multi_immutable_err.vv 100644
View File

@ -0,0 +1,7 @@
fn main() {
a := 10
b := 20
a, b = 1, 2
println('$a, $b')
}