From dd5829850014822bd3cbbac1d3f56df60f0fe3bf Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Fri, 27 Sep 2019 20:59:12 +0300
Subject: [PATCH] compiler: fix interfaces after the recent tokens change

---
 compiler/parser.v  | 16 ++++++++++++++--
 compiler/scanner.v | 14 --------------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/compiler/parser.v b/compiler/parser.v
index 886c0b3a85..34bf1124eb 100644
--- a/compiler/parser.v
+++ b/compiler/parser.v
@@ -209,6 +209,15 @@ fn (p & Parser) peek() Token {
 	return tok.tok
 }
 
+// TODO remove dups
+fn (p &Parser) prev_token() Tok {
+	return p.tokens[p.token_idx - 2]
+}	
+
+fn (p &Parser) cur_tok() Tok {
+	return p.tokens[p.token_idx - 1]
+}	
+
 fn (p &Parser) peek_token() Tok {
 	if p.token_idx >= p.tokens.len - 2 {
 		return Tok{tok:Token.eof}
@@ -540,6 +549,7 @@ fn (p mut Parser) type_decl() {
 	p.register_type_with_parent(name, parent.name)
 }
 
+// current token is `(`
 fn (p mut Parser) interface_method(field_name, receiver string) &Fn {
 	mut method := &Fn {
 		name: field_name
@@ -549,8 +559,10 @@ fn (p mut Parser) interface_method(field_name, receiver string) &Fn {
 	}
 	//p.log('is interface. field=$field_name run=$p.pass')
 	p.fn_args(mut method)
-	if p.scanner.has_gone_over_line_end() {
-	//if p.prev_tok.line_nr != p.tok.line_nr {
+	prev_tok := p.prev_token()
+	cur_tok := p.cur_tok()
+	// No type on the same line, this method doesn't return a type, process next
+	if prev_tok.line_nr != cur_tok.line_nr {
 		method.typ = 'void'
 	} else {
 		method.typ = p.get_type()// method return type
diff --git a/compiler/scanner.v b/compiler/scanner.v
index e4244fe7f2..0331b6d192 100644
--- a/compiler/scanner.v
+++ b/compiler/scanner.v
@@ -228,20 +228,6 @@ fn (s mut Scanner) ident_number() string {
 	return s.ident_dec_number()
 }
 
-fn (s Scanner) has_gone_over_line_end() bool {
-	mut i := s.pos-1
-	for i >= 0 && !s.text[i].is_white() {
-		i--
-	}
-	for i >= 0 && s.text[i].is_white() {
-		if is_nl(s.text[i]) {
-			return true
-		}
-		i--
-	}
-	return false
-}
-
 fn (s mut Scanner) skip_whitespace() {
 	for s.pos < s.text.len && s.text[s.pos].is_white() {
 		// Count \r\n as one line