From ca81442fac118297cd98e2d30bd86c0dddaf15c1 Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Wed, 20 May 2020 21:47:03 +0200
Subject: [PATCH] parser: fix a small bug with <

---
 vlib/net/socket_test.v           | 6 +++---
 vlib/v/parser/parser.v           | 4 ++--
 vlib/v/tests/inout/hello_devs.vv | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vlib/net/socket_test.v b/vlib/net/socket_test.v
index 4f42f6afd2..20d6373228 100644
--- a/vlib/net/socket_test.v
+++ b/vlib/net/socket_test.v
@@ -25,7 +25,7 @@ fn test_socket() {
 	received := tos(bytes, blen)
 	$if debug {	println('message received: $received')	}
 	$if debug {	println('client: $client.sockfd')	}
-	
+
 	assert message == received
 	cleanup(server, client, socket)
 }
@@ -39,7 +39,7 @@ fn test_socket_write() {
 	assert line1.trim_space() == message1
 	cleanup(server, client, socket)
 }
-  
+
 fn test_socket_write_fail_without_panic() {
 	server, client, socket := setup()
 	message2 := 'a message 2'
@@ -48,7 +48,7 @@ fn test_socket_write_fail_without_panic() {
 	// this test is important for a stable long standing server
 	client.close() or {}
 	$if solaris { return } // TODO: fix segfaulting on Solaris
-	for i:=0; i<3; i++{
+	for i:=0; i<3; i++ {
 		socket.write(message2) or {
 			println('write to a socket without a recipient should produce an option fail: $err | $message2')
 			assert true
diff --git a/vlib/v/parser/parser.v b/vlib/v/parser/parser.v
index d1d8b5acce..5dc6915862 100644
--- a/vlib/v/parser/parser.v
+++ b/vlib/v/parser/parser.v
@@ -803,8 +803,8 @@ pub fn (mut p Parser) name_expr() ast.Expr {
 	}
 	// p.warn('name expr  $p.tok.lit $p.peek_tok.str()')
 	// fn call or type cast
-	if p.peek_tok.kind == .lpar || (p.peek_tok.kind == .lt && p.peek_tok.pos == p.peek_tok2.pos -
-		1) { // foo() or foo<int>()
+	if p.peek_tok.kind == .lpar || (p.peek_tok.kind == .lt && p.peek_tok2.kind == .name &&
+		p.peek_tok.pos == p.peek_tok2.pos - 1) { // foo() or foo<int>()
 		mut name := p.tok.lit
 		if mod.len > 0 {
 			name = '${mod}.$name'
diff --git a/vlib/v/tests/inout/hello_devs.vv b/vlib/v/tests/inout/hello_devs.vv
index 683993db18..79c27edc3a 100644
--- a/vlib/v/tests/inout/hello_devs.vv
+++ b/vlib/v/tests/inout/hello_devs.vv
@@ -2,7 +2,7 @@ import os
 
 fn main() {
 	areas := ['game', 'web', 'tools', 'science', 'systems', 'embedded']
-	for i :=0;i<areas.len; i++{
+	for i :=0; i < areas.len; i++{
 		area:=areas[i]
 		println('Hello, $area developers!')
 	}