From 4470252913a0624f581f3059bf23f715c16191b7 Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Wed, 11 Mar 2020 18:52:51 +0100
Subject: [PATCH] parser: fix import's position

---
 vlib/compiler/aparser.v  | 2 --
 vlib/compiler/scanner.v  | 9 ---------
 vlib/v/parser/parser.v   | 3 ++-
 vlib/v/scanner/scanner.v | 8 --------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/vlib/compiler/aparser.v b/vlib/compiler/aparser.v
index 157b7568cb..87e261ab9d 100644
--- a/vlib/compiler/aparser.v
+++ b/vlib/compiler/aparser.v
@@ -1744,7 +1744,6 @@ fn (p mut Parser) var_decl() {
 	mut var_token_idxs := [p.cur_tok_index()]
 	mut var_mut := [is_mut] // add first var mut
 	mut var_names := [p.check_name()] // add first variable
-	p.scanner.validate_var_name(var_names[0])
 	mut new_vars := 0
 	if var_names[0] != '_' && !p.known_var(var_names[0]) {
 		new_vars++
@@ -1762,7 +1761,6 @@ fn (p mut Parser) var_decl() {
 		}
 		var_token_idxs << p.cur_tok_index()
 		var_name := p.check_name()
-		p.scanner.validate_var_name(var_name)
 		if var_name != '_' && !p.known_var(var_name) {
 			new_vars++
 		}
diff --git a/vlib/compiler/scanner.v b/vlib/compiler/scanner.v
index cfe6781068..83d968cf14 100644
--- a/vlib/compiler/scanner.v
+++ b/vlib/compiler/scanner.v
@@ -999,12 +999,3 @@ fn good_type_name(s string) bool {
 	return true
 }
 
-// registration_date good
-// registrationdate  bad
-fn (s &Scanner) validate_var_name(name string) {
-	/*
-	if name.len > 15 && !name.contains('_') {
-		s.error('bad variable name `$name`\n' + 'looks like you have a multi-word name without separating them with `_`' + '\nfor example, use `registration_date` instead of `registrationdate` ')
-	}
-	*/
-}
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
index 7d46f140d4..0d13464794 100644
--- a/vlib/v/parser/parser.v
+++ b/vlib/v/parser/parser.v
@@ -1282,6 +1282,7 @@ fn (p mut Parser) module_decl() ast.Module {
 }
 
 fn (p mut Parser) parse_import() ast.Import {
+	pos := p.tok.position()
 	mut mod_name := p.check_name()
 	mut mod_alias := mod_name
 	for p.tok.kind == .dot {
@@ -1299,7 +1300,7 @@ fn (p mut Parser) parse_import() ast.Import {
 	return ast.Import{
 		mod: mod_name
 		alias: mod_alias
-		pos: p.tok.position()
+		pos: pos
 	}
 }
 
diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v
index 9a43f2f144..3c25abe238 100644
--- a/vlib/v/scanner/scanner.v
+++ b/vlib/v/scanner/scanner.v
@@ -1011,14 +1011,6 @@ fn good_type_name(s string) bool {
 	return true
 }
 
-// registration_date good
-// registrationdate  bad
-fn (s &Scanner) validate_var_name(name string) {
-	if name.len > 15 && !name.contains('_') {
-		s.error('bad variable name `$name`\n' + 'looks like you have a multi-word name without separating them with `_`' + '\nfor example, use `registration_date` instead of `registrationdate` ')
-	}
-}
-
 pub fn (s &Scanner) error(msg string) {
 	println('$s.line_nr : $msg')
 	exit(1)