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

require ++ instead of += 1

pull/3011/head
Alexander Medvednikov 2019-12-08 14:11:19 +03:00
parent 8bc94947e5
commit cc682eafe1
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/compiler/fn.v
View File

@ -756,7 +756,7 @@ fn (p mut Parser) fn_call(f mut Fn, method_ph int, receiver_var, receiver_type s
// probably a typo, do not concern the user with the above error message // probably a typo, do not concern the user with the above error message
break break
} }
i += 1 i++
} }
} }
// if p.pref.is_prof { // if p.pref.is_prof {
@ -1271,7 +1271,7 @@ fn (p mut Parser) extract_type_inst(f &Fn, args_ []string) TypeInst {
if fa == tp { if fa == tp {
r.inst[tp] = fa r.inst[tp] = fa
found = true found = true
i += 1 i++
break break
} }
} }
@ -1287,7 +1287,7 @@ fn (p mut Parser) extract_type_inst(f &Fn, args_ []string) TypeInst {
} }
// println("extracted $tp => $ti") // println("extracted $tp => $ti")
r.inst[tp] = ti r.inst[tp] = ti
i += 1 i++
if i >= f.type_pars.len { break } if i >= f.type_pars.len { break }
} }
if r.inst[f.typ] == '' && f.typ in f.type_pars { if r.inst[f.typ] == '' && f.typ in f.type_pars {

4
vlib/compiler/parser.v
View File

@ -1385,6 +1385,10 @@ fn ($v.name mut $v.typ) $p.cur_fn.name (...) {
p.gen('= ustring_add($v.name, ') p.gen('= ustring_add($v.name, ')
} }
else { else {
next := p.peek_token()
if next.tok == .number && next.lit== '1' {
p.warn('use ++ instead of += 1')
}
p.gen(' += ') p.gen(' += ')
} }
} }

3
vlib/compiler/scanner.v
View File

@ -644,8 +644,7 @@ fn (s mut Scanner) scan() ScanRes {
return s.end_of_file() return s.end_of_file()
} }
} }
mut msg := 'invalid character `${c.str()}`' s.error('invalid character `${c.str()}`')
s.error(msg)
return s.end_of_file() return s.end_of_file()
} }

6
vlib/strings/builder_c.v
View File

@ -19,14 +19,14 @@ pub fn new_builder(initial_size int) Builder {
pub fn (b mut Builder) write_b(data byte) { pub fn (b mut Builder) write_b(data byte) {
b.buf << data b.buf << data
b.len += 1 b.len++
} }
pub fn (b mut Builder) write(s string) { pub fn (b mut Builder) write(s string) {
b.buf.push_many(s.str, s.len) b.buf.push_many(s.str, s.len)
//for c in s { //for c in s {
//b.buf << c //b.buf << c
//} //}
//b.buf << []byte(s) // TODO //b.buf << []byte(s) // TODO
b.len += s.len b.len += s.len
} }
@ -34,7 +34,7 @@ pub fn (b mut Builder) write(s string) {
pub fn (b mut Builder) writeln(s string) { pub fn (b mut Builder) writeln(s string) {
//for c in s { //for c in s {
//b.buf << c //b.buf << c
//} //}
b.buf.push_many(s.str, s.len) b.buf.push_many(s.str, s.len)
//b.buf << []byte(s) // TODO //b.buf << []byte(s) // TODO
b.buf << `\n` b.buf << `\n`