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

fmt: add EOL

pull/4518/head
Alexander Medvednikov 2020-04-20 08:30:42 +02:00
parent 639dc02cc8
commit ee2f1652b5
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/fmt/fmt.v
View File

@ -54,7 +54,7 @@ pub fn fmt(file ast.File, table &table.Table) string {
// for comment in file.comments { println('$comment.line_nr $comment.text') } // for comment in file.comments { println('$comment.line_nr $comment.text') }
f.imports(f.file.imports) // now that we have all autoimports, handle them f.imports(f.file.imports) // now that we have all autoimports, handle them
res := f.out.str().trim_space() + '\n' res := f.out.str().trim_space() + '\n'
return res[..f.import_pos] + f.out_imports.str() + res[f.import_pos..] return res[..f.import_pos] + f.out_imports.str() + res[f.import_pos..] + '\n'
} }
/* /*
@ -933,3 +933,4 @@ fn (var f Fmt) mark_module_as_used(name string) {
f.used_imports << mod f.used_imports << mod
// println('marking module $mod as used') // println('marking module $mod as used')
} }

9
vlib/v/gen/cgen.v
View File

@ -18,9 +18,11 @@ const (
'default' 'default'
'do' 'do'
'double' 'double'
'extern', 'float', 'inline', 'int', 'long', 'register', 'restrict', 'short', 'signed' 'extern'
'sizeof' 'float'
'static', 'switch', 'typedef', 'union', 'unsigned', 'void', 'volatile', 'while'] 'inline', 'int', 'long', 'register', 'restrict', 'short', 'signed', 'sizeof', 'static'
'switch'
'typedef', 'union', 'unsigned', 'void', 'volatile', 'while']
) )
fn foo(t token.Token) { fn foo(t token.Token) {
@ -2930,3 +2932,4 @@ fn (g Gen) type_to_fmt(typ table.Type) string {
} }
return '%d' return '%d'
} }

1
vlib/v/gen/x64/tests/x64_test.v
View File

@ -72,3 +72,4 @@ fn test_x64() {
exit(1) exit(1)
} }
} }

8
vlib/v/parser/parser.v
View File

@ -419,9 +419,7 @@ pub fn (var p Parser) stmt() ast.Stmt {
expr := p.expr(0) expr := p.expr(0)
// mut call_expr := &ast.CallExpr(0) // TODO // mut call_expr := &ast.CallExpr(0) // TODO
match expr { match expr {
ast.CallExpr { ast.CallExpr { // call_expr = it }
// call_expr = it
}
else {} else {}
} }
return ast.GoStmt{ return ast.GoStmt{
@ -602,7 +600,8 @@ pub fn (var p Parser) name_expr() ast.Expr {
// type cast. TODO: finish // type cast. TODO: finish
// if name in table.builtin_type_names { // if name in table.builtin_type_names {
if (name in p.table.type_idxs || name_w_mod in p.table.type_idxs) && !(name in ['C.stat', if (name in p.table.type_idxs || name_w_mod in p.table.type_idxs) && !(name in ['C.stat',
'C.sigaction']) { 'C.sigaction'
]) {
// TODO handle C.stat() // TODO handle C.stat()
var to_typ := p.parse_type() var to_typ := p.parse_type()
if p.is_amp { if p.is_amp {
@ -1216,3 +1215,4 @@ fn (p &Parser) new_true_expr() ast.Expr {
fn verror(s string) { fn verror(s string) {
util.verror('parser error', s) util.verror('parser error', s)
} }