From adb379dd63c1a4bc3951fe65e817129b6473e035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20D=C3=A4schle?= <daniel.daeschle@gmail.com>
Date: Fri, 10 Apr 2020 14:40:52 +0200
Subject: [PATCH] parser: fix string position

---
 vlib/v/checker/checker.v                      |  4 ++--
 vlib/v/checker/tests/inout/left_shift_err.out |  6 ++++++
 vlib/v/checker/tests/inout/left_shift_err.vv  |  4 ++++
 vlib/v/parser/parser.v                        | 14 +-------------
 4 files changed, 13 insertions(+), 15 deletions(-)
 create mode 100644 vlib/v/checker/tests/inout/left_shift_err.out
 create mode 100644 vlib/v/checker/tests/inout/left_shift_err.vv

diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v
index 48ffeb8778..09f6b32b52 100644
--- a/vlib/v/checker/checker.v
+++ b/vlib/v/checker/checker.v
@@ -164,7 +164,7 @@ pub fn (c mut Checker) infix_expr(infix_expr mut ast.InfixExpr) table.Type {
 	if infix_expr.op == .left_shift {
 		if left.kind != .array && !left.is_int() {
 			// c.error('<< can only be used with numbers and arrays', infix_expr.pos)
-			c.error('incompatible types: $left.name << $right.name', infix_expr.pos)
+			c.error('cannot shift type $right.name into $left.name', expr_pos(infix_expr.right))
 			return table.void_type
 		}
 		if left.kind == .array {
@@ -178,7 +178,7 @@ pub fn (c mut Checker) infix_expr(infix_expr mut ast.InfixExpr) table.Type {
 				// []T << []T
 				return table.void_type
 			}
-			c.error('incompatible types: $left.name << $right.name', infix_expr.pos)
+			c.error('cannot shift type $right.name into $left.name', expr_pos(infix_expr.right))
 			return table.void_type
 		}
 	}
diff --git a/vlib/v/checker/tests/inout/left_shift_err.out b/vlib/v/checker/tests/inout/left_shift_err.out
new file mode 100644
index 0000000000..9a0eb17bef
--- /dev/null
+++ b/vlib/v/checker/tests/inout/left_shift_err.out
@@ -0,0 +1,6 @@
+vlib/v/checker/tests/inout/left_shift_err.v:3:7: error: cannot shift type string into array_int
+    1| fn main() {
+    2|     l := []int
+    3|     l << 'test'
+                ~~~~~~
+    4| }
\ No newline at end of file
diff --git a/vlib/v/checker/tests/inout/left_shift_err.vv b/vlib/v/checker/tests/inout/left_shift_err.vv
new file mode 100644
index 0000000000..59a6652e24
--- /dev/null
+++ b/vlib/v/checker/tests/inout/left_shift_err.vv
@@ -0,0 +1,4 @@
+fn main() {
+	l := []int
+	l << 'test'
+}
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
index 252d24ba79..b26846b658 100644
--- a/vlib/v/parser/parser.v
+++ b/vlib/v/parser/parser.v
@@ -1229,7 +1229,6 @@ fn (p mut Parser) if_expr() ast.IfExpr {
 }
 
 fn (p mut Parser) string_expr() ast.Expr {
-	first_pos := p.tok.position()
 	is_raw := p.tok.kind == .name && p.tok.lit == 'r'
 	is_cstr := p.tok.kind == .name && p.tok.lit == 'c'
 	if is_raw || is_cstr {
@@ -1237,14 +1236,9 @@ fn (p mut Parser) string_expr() ast.Expr {
 	}
 	mut node := ast.Expr{}
 	val := p.tok.lit
+	pos := p.tok.position()
 	if p.peek_tok.kind != .str_dollar {
 		p.next()
-		last_pos := p.tok.position()
-		pos := token.Position{
-			line_nr: first_pos.line_nr
-			pos: first_pos.pos
-			len: last_pos.pos - first_pos.pos
-		}
 		node = ast.StringLiteral{
 			val: val
 			is_raw: is_raw
@@ -1286,12 +1280,6 @@ fn (p mut Parser) string_expr() ast.Expr {
 		}
 		efmts << efmt.join('')
 	}
-	last_pos := p.tok.position()
-	pos := token.Position{
-		line_nr: first_pos.line_nr
-		pos: first_pos.pos
-		len: last_pos.pos - first_pos.pos
-	}
 	node = ast.StringInterLiteral{
 		vals: vals
 		exprs: exprs