From ee2f1652b58e075e04190efb2d7aacb63c764467 Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Mon, 20 Apr 2020 08:30:42 +0200
Subject: [PATCH] fmt: add EOL

---
 vlib/v/fmt/fmt.v                |  3 ++-
 vlib/v/gen/cgen.v               |  9 ++++++---
 vlib/v/gen/x64/tests/x64_test.v |  1 +
 vlib/v/parser/parser.v          | 26 +++++++++++++-------------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v
index f99b8ced21..0e8232599f 100644
--- a/vlib/v/fmt/fmt.v
+++ b/vlib/v/fmt/fmt.v
@@ -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')	}
 	f.imports(f.file.imports) // now that we have all autoimports, handle them
 	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
 	// println('marking module $mod as used')
 }
+
diff --git a/vlib/v/gen/cgen.v b/vlib/v/gen/cgen.v
index a498968f54..ed05c7d9af 100644
--- a/vlib/v/gen/cgen.v
+++ b/vlib/v/gen/cgen.v
@@ -18,9 +18,11 @@ const (
 	'default'
 	'do'
 	'double'
-	'extern', 'float', 'inline', 'int', 'long', 'register', 'restrict', 'short', 'signed'
-	'sizeof'
-	'static', 'switch', 'typedef', 'union', 'unsigned', 'void', 'volatile', 'while']
+	'extern'
+	'float'
+	'inline', 'int', 'long', 'register', 'restrict', 'short', 'signed', 'sizeof', 'static'
+	'switch'
+	'typedef', 'union', 'unsigned', 'void', 'volatile', 'while']
 )
 
 fn foo(t token.Token) {
@@ -2930,3 +2932,4 @@ fn (g Gen) type_to_fmt(typ table.Type) string {
 	}
 	return '%d'
 }
+
diff --git a/vlib/v/gen/x64/tests/x64_test.v b/vlib/v/gen/x64/tests/x64_test.v
index 653523bf27..615c3c6c48 100644
--- a/vlib/v/gen/x64/tests/x64_test.v
+++ b/vlib/v/gen/x64/tests/x64_test.v
@@ -72,3 +72,4 @@ fn test_x64() {
 		exit(1)
 	}
 }
+
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
index 1d882fbf64..c68d5ba6bd 100644
--- a/vlib/v/parser/parser.v
+++ b/vlib/v/parser/parser.v
@@ -82,7 +82,7 @@ pub fn parse_file(path string, table &table.Table, comments_mode scanner.Comment
 	// comments_mode: comments_mode
 	p.read_first_token()
 	for p.tok.kind == .comment {
-		var stmt := ast.Stmt{}		// TODO sum type << bug
+		var stmt := ast.Stmt{} // TODO sum type << bug
 		com := p.comment()
 		stmt = com
 		stmts << stmt
@@ -419,9 +419,7 @@ pub fn (var p Parser) stmt() ast.Stmt {
 			expr := p.expr(0)
 			// mut call_expr := &ast.CallExpr(0) // TODO
 			match expr {
-				ast.CallExpr {
-					// call_expr = it
-				}
+				ast.CallExpr { // call_expr = it }
 				else {}
 			}
 			return ast.GoStmt{
@@ -602,7 +600,8 @@ pub fn (var p Parser) name_expr() ast.Expr {
 		// type cast. TODO: finish
 		// 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',
-			'C.sigaction']) {
+			'C.sigaction'
+		]) {
 			// TODO handle C.stat()
 			var to_typ := p.parse_type()
 			if p.is_amp {
@@ -617,7 +616,7 @@ pub fn (var p Parser) name_expr() ast.Expr {
 			// TODO, string(b, len)
 			if p.tok.kind == .comma && table.type_idx(to_typ) == table.string_type_idx {
 				p.check(.comma)
-				arg = p.expr(0)				// len
+				arg = p.expr(0) // len
 				has_arg = true
 			}
 			p.check(.rpar)
@@ -632,12 +631,12 @@ pub fn (var p Parser) name_expr() ast.Expr {
 		} else {
 			// fn call
 			// println('calling $p.tok.lit')
-			x := p.call_expr(is_c, is_js, mod)			// TODO `node,typ :=` should work
+			x := p.call_expr(is_c, is_js, mod) // TODO `node,typ :=` should work
 			node = x
 		}
 	} else if p.peek_tok.kind == .lcbr && !p.inside_match && !p.inside_match_case && !p.inside_if &&
 		!p.inside_for {
-		return p.struct_init(false)		// short_syntax: false
+		return p.struct_init(false) // short_syntax: false
 	} else if p.peek_tok.kind == .dot && (p.tok.lit[0].is_capital() && !known_var) {
 		// `Color.green`
 		var enum_name := p.check_name()
@@ -668,7 +667,7 @@ pub fn (var p Parser) name_expr() ast.Expr {
 
 fn (var p Parser) index_expr(left ast.Expr) ast.IndexExpr {
 	// left == `a` in `a[0]`
-	p.next()	// [
+	p.next() // [
 	var has_low := true
 	if p.tok.kind == .dotdot {
 		has_low = false
@@ -686,7 +685,7 @@ fn (var p Parser) index_expr(left ast.Expr) ast.IndexExpr {
 			}
 		}
 	}
-	expr := p.expr(0)	// `[expr]` or  `[expr..]`
+	expr := p.expr(0) // `[expr]` or  `[expr..]`
 	var has_high := false
 	if p.tok.kind == .dotdot {
 		// [start..end] or [start..]
@@ -955,7 +954,7 @@ fn (var p Parser) const_decl() ast.ConstDecl {
 	if p.tok.kind != .lpar {
 		p.error('consts must be grouped, e.g.\nconst (\n\ta = 1\n)')
 	}
-	p.next()	// (
+	p.next() // (
 	var fields := []ast.ConstField
 	for p.tok.kind != .rpar {
 		if p.tok.kind == .comment {
@@ -1116,7 +1115,7 @@ fn (var p Parser) type_decl() ast.TypeDecl {
 	name := p.check_name()
 	var sum_variants := []table.Type
 	if p.tok.kind == .assign {
-		p.next()		// TODO require `=`
+		p.next() // TODO require `=`
 	}
 	if p.tok.kind == .key_fn {
 		// function type: `type mycallback fn(string, int)`
@@ -1129,7 +1128,7 @@ fn (var p Parser) type_decl() ast.TypeDecl {
 			pos: decl_pos
 		}
 	}
-	first_type := p.parse_type()	// need to parse the first type before we can check if it's `type A = X | Y`
+	first_type := p.parse_type() // need to parse the first type before we can check if it's `type A = X | Y`
 	if p.tok.kind == .pipe {
 		p.check(.pipe)
 		sum_variants << first_type
@@ -1216,3 +1215,4 @@ fn (p &Parser) new_true_expr() ast.Expr {
 fn verror(s string) {
 	util.verror('parser error', s)
 }
+