From c1aba95d7d06a69a78ac14f988b1f6daccb26d8a Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Sat, 11 Apr 2020 20:06:26 +0800
Subject: [PATCH] parser: refactor script & repl handling

---
 vlib/v/parser/parser.v   | 7 ++-----
 vlib/v/scanner/scanner.v | 8 ++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
index e4bbb7c0b5..4840ba6e4c 100644
--- a/vlib/v/parser/parser.v
+++ b/vlib/v/parser/parser.v
@@ -324,11 +324,8 @@ pub fn (p mut Parser) top_stmt() ast.Stmt {
 		}
 		else {
 			if p.pref.is_script && !p.pref.is_test {
-				p.scanner.text = 'fn main() {' + p.scanner.text + '}'
-				p.scanner.is_started = false
-				p.scanner.pos = 0
-				p.next()
-				p.next()
+				p.scanner.add_fn_main_and_rescan()
+				p.read_first_token()
 				return p.top_stmt()
 			} else {
 				p.error('bad top level statement ' + p.tok.str())
diff --git a/vlib/v/scanner/scanner.v b/vlib/v/scanner/scanner.v
index 3411e3a914..75ccbbf7d4 100644
--- a/vlib/v/scanner/scanner.v
+++ b/vlib/v/scanner/scanner.v
@@ -77,6 +77,14 @@ pub fn new_scanner(text string, comments_mode CommentsMode) &Scanner {
 	}
 }
 
+pub fn (s &Scanner) add_fn_main_and_rescan() {
+	s.text = 'fn main() {' + s.text + '}'
+	s.is_started = false
+	s.pos = 0
+	s.line_nr = 0
+	s.last_nl_pos = 0
+}
+
 fn (s &Scanner) new_token(tok_kind token.Kind, lit string, len int) token.Token {
 	return token.Token{
 		kind: tok_kind