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

compiler: use the new optimized in

pull/2250/head
Alexander Medvednikov 2019-10-06 16:55:27 +03:00
parent 5acadbab32
commit 03bc5ab3d5
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/fn.v
View File

@ -296,11 +296,8 @@ fn (p mut Parser) fn_decl() {
} }
// Returns a type? // Returns a type?
mut typ := 'void' mut typ := 'void'
if p.tok == .name || p.tok == .mul || p.tok == .amp || p.tok == .lsbr || if p.tok in [Token.name, .mul, .amp, .lsbr, .question, .lpar] {
p.tok == .question || p.tok == .lpar {
p.fgen(' ') p.fgen(' ')
// TODO In
// if p.tok in [ .name, .mul, .amp, .lsbr ] {
typ = p.get_type() typ = p.get_type()
} }
// multiple returns // multiple returns

8
compiler/parser.v
View File

@ -1584,10 +1584,8 @@ fn (p mut Parser) bterm() string {
is_ustr := typ=='ustring' is_ustr := typ=='ustring'
is_float := typ=='f64' || typ=='f32' is_float := typ=='f64' || typ=='f32'
expr_type := typ expr_type := typ
tok := p.tok tok := p.tok
// if tok in [ .eq, .gt, .lt, .le, .ge, .ne] { if tok in [ .eq, .gt, .lt, .le, .ge, .ne] {
if tok == .eq || tok == .gt || tok == .lt || tok == .le || tok == .ge || tok == .ne {
p.fgen(' ${p.tok.str()} ') p.fgen(' ${p.tok.str()} ')
if (is_float || is_str || is_ustr) && !p.is_js { if (is_float || is_str || is_ustr) && !p.is_js {
p.gen(',') p.gen(',')
@ -2465,9 +2463,7 @@ fn (p mut Parser) expression() string {
return 'int' return 'int'
} }
// + - | ^ // + - | ^
for p.tok == .plus || p.tok == .minus || p.tok == .pipe || p.tok == .amp || for p.tok in [Token.plus, .minus, .pipe, .amp, .xor] {
p.tok == .xor {
// for p.tok in [.plus, .minus, .pipe, .amp, .xor] {
tok_op := p.tok tok_op := p.tok
if typ == 'bool' { if typ == 'bool' {
p.error('operator ${p.tok.str()} not defined on bool ') p.error('operator ${p.tok.str()} not defined on bool ')