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

run vfmt on cc, cgen, comptime, if_match

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-12-19 23:36:18 +03:00
parent ce86626ec2
commit d38687f893
6 changed files with 353 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
vlib/compiler/comptime.v
View File

@ -1,11 +1,10 @@
// Copyright (c) 2019 Alexander Medvednikov. All rights reserved.
// Use of this source code is governed by an MIT license
// that can be found in the LICENSE file.
module compiler
import (
vweb.tmpl // for `$vweb_html()`
vweb.tmpl // for `$vweb_html()`
os
strings
)
@ -34,10 +33,7 @@ fn (p mut Parser) comp_time() {
}
p.check(.lcbr)
os := os_from_string(name)
if ((!not && os != p.os) || (not && os == p.os)) &&
!p.scanner.is_fmt &&
!p.pref.output_cross_c
{
if ((!not && os != p.os) || (not && os == p.os)) && !p.scanner.is_fmt && !p.pref.output_cross_c {
// `$if os {` for a different target, skip everything inside
// to avoid compilation errors (like including <windows.h>
// on non-Windows systems)
@ -48,23 +44,25 @@ fn (p mut Parser) comp_time() {
}
if p.tok == .lcbr {
stack++
} else if p.tok == .rcbr {
}
else if p.tok == .rcbr {
stack--
}
if p.tok == .eof {
break
}
if stack <= 0 && p.tok == .rcbr {
//p.warn('exiting $stack')
// p.warn('exiting $stack')
p.next()
break
}
p.next()
}
} else {
}
else {
p.statements_no_rcbr()
}
if ! (p.tok == .dollar && p.peek() == .key_else) {
if !(p.tok == .dollar && p.peek() == .key_else) {
p.genln('#endif')
}
}
@ -108,7 +106,7 @@ fn (p mut Parser) comp_time() {
}
if_returns := p.returns
p.returns = false
//p.gen('/* returns $p.returns */')
// p.gen('/* returns $p.returns */')
if p.tok == .dollar && p.peek() == .key_else {
p.fspace()
p.next()
@ -120,8 +118,9 @@ fn (p mut Parser) comp_time() {
p.genln('#endif')
else_returns := p.returns
p.returns = if_returns && else_returns
//p.gen('/* returns $p.returns */')
} else if p.tok == .key_else {
// p.gen('/* returns $p.returns */')
}
else if p.tok == .key_else {
p.error('use `$' + 'else` instead of `else` in comptime if statements')
}
}
@ -134,7 +133,7 @@ fn (p mut Parser) comp_time() {
p.check(.key_in)
p.check_name()
p.check(.dot)
p.check_name()// fields
p.check_name() // fields
p.check(.lcbr)
// for p.tok != .rcbr && p.tok != .eof {
res_name := p.check_name()
@ -143,9 +142,9 @@ fn (p mut Parser) comp_time() {
p.check(.dollar)
p.check(.name)
p.check(.assign)
_, val := p.tmp_expr()
//p.bool_expression()
//val := p.cgen.end_tmp()
_,val := p.tmp_expr()
// p.bool_expression()
// val := p.cgen.end_tmp()
p.check(.rcbr)
// }
}
@ -166,7 +165,7 @@ fn (p mut Parser) comp_time() {
p.error('vweb HTML template "$path" not found')
}
}
p.check(.name) // skip `vweb.html()` TODO
p.check(.name) // skip `vweb.html()` TODO
p.check(.dot)
p.check(.name)
p.check(.lpar)
@ -209,9 +208,9 @@ fn (p mut Parser) chash() {
flag = flag.replace('@VPATH', p.pref.vpath)
flag = flag.replace('@VLIB_PATH', p.pref.vlib_path)
flag = flag.replace('@VMOD', v_modules_path)
//p.log('adding flag "$flag"')
// p.log('adding flag "$flag"')
_ = p.table.parse_cflag(flag, p.mod) or {
p.error_with_token_index(err, p.cur_tok_index()-1)
p.error_with_token_index(err, p.cur_tok_index() - 1)
return
}
}
@ -226,7 +225,7 @@ fn (p mut Parser) chash() {
}
*/
if p.file_pcguard.len != 0 {
//println('p: $p.file_platform $p.file_pcguard')
// println('p: $p.file_platform $p.file_pcguard')
p.cgen.includes << '$p.file_pcguard\n#$hash\n#endif'
return
}
@ -236,11 +235,13 @@ fn (p mut Parser) chash() {
}
// TODO remove after ui_mac.m is removed
else if hash.contains('embed') {
pos := hash.index('embed') or { return }
file := hash[pos+5..]
//if p.pref.build_mode != .default_mode {
p.genln('#include $file')
//}
pos := hash.index('embed') or {
return
}
file := hash[pos + 5..]
// if p.pref.build_mode != .default_mode {
p.genln('#include $file')
// }
}
else if hash.contains('define') {
// Move defines on top
@ -248,8 +249,8 @@ fn (p mut Parser) chash() {
p.cgen.includes << '#$hash'
}
}
//// Don't parse a non-JS V file (`#-js` flag)
else if hash == '-js' {
// // Don't parse a non-JS V file (`#-js` flag)
else if hash == '-js' {
$if js {
for p.tok != .eof {
p.next()
@ -262,7 +263,11 @@ fn (p mut Parser) chash() {
$if !js {
if !p.can_chash {
println('hash="$hash"')
if hash.starts_with('include') { println("include") } else {}
if hash.starts_with('include') {
println('include')
}
else {
}
p.error('bad token `#` (embedding C code is no longer supported)')
}
}
@ -278,7 +283,6 @@ fn (p mut Parser) comptime_method_call(typ Type) {
mut j := 0
for method in typ.methods {
if method.typ != 'void' {
continue
}
receiver := method.args[0]
@ -289,8 +293,7 @@ fn (p mut Parser) comptime_method_call(typ Type) {
if j > 0 {
p.gen(' else ')
}
p.genln('if ( string_eq($var, _STR("$method.name")) ) ' +
'${typ.name}_$method.name ($amp $p.expr_var.name);')
p.genln('if ( string_eq($var, _STR("$method.name")) ) ' + '${typ.name}_$method.name ($amp $p.expr_var.name);')
j++
}
p.check(.lpar)
@ -310,7 +313,10 @@ fn (p mut Parser) gen_array_str(typ Type) {
p.add_method(typ.name, Fn{
name: 'str'
typ: 'string'
args: [Var{typ: typ.name, is_arg:true}]
args: [Var{
typ: typ.name
is_arg: true
}]
is_method: true
is_public: true
receiver_typ: typ.name
@ -320,8 +326,8 @@ fn (p mut Parser) gen_array_str(typ Type) {
is_array := elm_type.starts_with('array_')
if is_array {
p.gen_array_str(elm_type2)
} else if p.typ_to_fmt(elm_type, 0) == '' &&
!p.table.type_has_method(elm_type2, 'str') {
}
else if p.typ_to_fmt(elm_type, 0) == '' && !p.table.type_has_method(elm_type2, 'str') {
p.error('cant print ${elm_type}[], unhandled print of ${elm_type}')
}
p.v.vgen_buf.writeln('
@ -346,12 +352,14 @@ fn (p mut Parser) gen_struct_str(typ Type) {
p.add_method(typ.name, Fn{
name: 'str'
typ: 'string'
args: [Var{typ: typ.name, is_arg:true}]
args: [Var{
typ: typ.name
is_arg: true
}]
is_method: true
is_public: true
receiver_typ: typ.name
})
mut sb := strings.new_builder(typ.fields.len * 20)
sb.writeln('pub fn (a $typ.name) str() string {\nreturn')
sb.writeln("'{")
@ -373,7 +381,8 @@ fn (p mut Parser) gen_varg_str(typ Type) {
is_array := elm_type.starts_with('array_')
if is_array {
p.gen_array_str(elm_type2)
} else if elm_type2.cat == .struct_ {
}
else if elm_type2.cat == .struct_ {
p.gen_struct_str(elm_type2)
}
p.v.vgen_buf.writeln('
@ -407,7 +416,7 @@ fn (p mut Parser) gen_array_filter(str_typ string, method_ph int) {
}
array_int b = tmp2;
*/
val_type:=str_typ[6..]
val_type := str_typ[6..]
p.open_scope()
p.register_var(Var{
name: 'it'
@ -418,14 +427,14 @@ fn (p mut Parser) gen_array_filter(str_typ string, method_ph int) {
p.cgen.resetln('')
tmp := p.get_tmp()
a := p.expr_var.name
p.cgen.set_placeholder(method_ph,'\n$str_typ $tmp = new_array(0, $a .len,sizeof($val_type));\n')
p.cgen.set_placeholder(method_ph, '\n$str_typ $tmp = new_array(0, $a .len,sizeof($val_type));\n')
p.genln('for (int i = 0; i < ${a}.len; i++) {')
p.genln('$val_type it = (($val_type*)${a}.data)[i];')
p.gen('if (')
p.bool_expression()
p.genln(') array_push(&$tmp, &it);')
//p.genln(') array_push(&$tmp, &((($val_type*)${a}.data)[i]));')
//p.genln(') array_push(&$tmp, ${a}.data + i * ${a}.element_size);')
// p.genln(') array_push(&$tmp, &((($val_type*)${a}.data)[i]));')
// p.genln(') array_push(&$tmp, ${a}.data + i * ${a}.element_size);')
p.genln('}')
p.gen(tmp) // TODO why does this `gen()` work?
p.check(.rpar)
@ -447,7 +456,7 @@ fn (p mut Parser) gen_array_map(str_typ string, method_ph int) string {
}
array_int b = tmp2;
*/
val_type:=str_typ[6..]
val_type := str_typ[6..]
p.open_scope()
p.register_var(Var{
name: 'it'
@ -459,9 +468,8 @@ fn (p mut Parser) gen_array_map(str_typ string, method_ph int) string {
tmp := p.get_tmp()
tmp_elm := p.get_tmp()
a := p.expr_var.name
map_type, expr := p.tmp_expr()
p.cgen.set_placeholder(method_ph,'\narray $tmp = new_array(0, $a .len, ' +
'sizeof($map_type));\n')
map_type,expr := p.tmp_expr()
p.cgen.set_placeholder(method_ph, '\narray $tmp = new_array(0, $a .len, ' + 'sizeof($map_type));\n')
p.genln('for (int i = 0; i < ${a}.len; i++) {')
p.genln('$val_type it = (($val_type*)${a}.data)[i];')
p.genln('_PUSH(&$tmp, $expr, $tmp_elm, $map_type)')
@ -476,7 +484,7 @@ fn (p mut Parser) comptime_if_block(name string) {
p.genln('#ifdef $name')
p.check(.lcbr)
p.statements_no_rcbr()
if ! (p.tok == .dollar && p.peek() == .key_else) {
if !(p.tok == .dollar && p.peek() == .key_else) {
p.genln('#endif')
}
}
@ -484,9 +492,16 @@ fn (p mut Parser) comptime_if_block(name string) {
fn (p mut Parser) gen_enum_flag_methods(typ mut Type) {
for method in ['set', 'clear', 'toggle', 'has'] {
typ.methods << Fn{
name: method,
name: method
typ: if method == 'has' { 'bool' } else { 'void' }
args: [Var{typ: typ.name, is_mut: true, is_arg:true}, Var{typ: typ.name, is_arg: true}]
args: [Var{
typ: typ.name
is_mut: true
is_arg: true
}, Var{
typ: typ.name
is_arg: true
}]
is_method: true
is_public: true
receiver_typ: typ.name
@ -496,10 +511,10 @@ fn (p mut Parser) gen_enum_flag_methods(typ mut Type) {
pub fn (e mut $typ.name) set(flag $typ.name) { *e = int(*e) | (1 << int(flag)) }
pub fn (e mut $typ.name) clear(flag $typ.name) { *e = int(*e) &~ (1 << int(flag)) }
pub fn (e mut $typ.name) toggle(flag $typ.name) { *e = int(*e) ^ (1 << int(flag)) }
pub fn (e &$typ.name) has(flag $typ.name) bool { return int(*e)&(1 << int(flag)) != 0 }'
)
pub fn (e &$typ.name) has(flag $typ.name) bool { return int(*e)&(1 << int(flag)) != 0 }')
p.cgen.fns << 'void ${typ.name}_set($typ.name *e, $typ.name flag);'
p.cgen.fns << 'void ${typ.name}_clear($typ.name *e, $typ.name flag);'
p.cgen.fns << 'void ${typ.name}_toggle($typ.name *e, $typ.name flag);'
p.cgen.fns << 'bool ${typ.name}_has($typ.name *e, $typ.name flag);'
}