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

orm: bool support; vweb fixes

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-12-09 17:10:44 +03:00
parent 32b0225079
commit 6f49d4c1d2
6 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/compiler/expression.v
View File

@@ -51,14 +51,19 @@ fn (p mut Parser) bterm() string {
is_ustr := typ=='ustring'
is_float := typ[0] == `f` && (typ in ['f64', 'f32']) &&
!(p.cur_fn.name in ['f64_abs', 'f32_abs']) &&
!(p.cur_fn.name == 'eq')
is_array := typ.contains('array_')
p.cur_fn.name != 'eq'
is_array := typ.starts_with('array_')
expr_type := typ
tok := p.tok
/*
if tok == .assign {
p.error('no = ')
}
*/
if tok in [.eq, .gt, .lt, .le, .ge, .ne] {
//TODO: remove when array comparing is supported
if is_array {
p.error('array comparing is not supported yet')
p.error('array comparison is not supported yet')
}
p.fspace()
@@ -161,14 +166,11 @@ fn (p mut Parser) name_expr() string {
}
return temp_type
}
mut name := p.lit
// generic type check
if name in p.cur_fn.dispatch_of.inst.keys() {
name = p.cur_fn.dispatch_of.inst[name]
}
// Raw string (`s := r'hello \n ')
if name == 'r' && p.peek() == .str && p.prev_tok != .str_dollar {
p.string_expr()