From ad250523cd05b2829826cb253a65254561748420 Mon Sep 17 00:00:00 2001
From: Alexander Medvednikov <alexander@medvednikov.com>
Date: Wed, 11 Dec 2019 21:42:22 +0300
Subject: [PATCH] fix parser.fileis()

---
 vlib/builtin/builtin.v | 1 +
 vlib/compiler/main.v   | 1 +
 vlib/compiler/parser.v | 5 ++---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vlib/builtin/builtin.v b/vlib/builtin/builtin.v
index 2e57cb86b6..1c2ede6a72 100644
--- a/vlib/builtin/builtin.v
+++ b/vlib/builtin/builtin.v
@@ -4,6 +4,7 @@
 
 module builtin
 
+__global g_m2_buf byteptr
 __global g_m2_ptr byteptr
 
 fn init() {
diff --git a/vlib/compiler/main.v b/vlib/compiler/main.v
index 67f1c097e1..f89a38ed73 100644
--- a/vlib/compiler/main.v
+++ b/vlib/compiler/main.v
@@ -526,6 +526,7 @@ pub fn (v mut V) generate_main() {
 			cgen.genln('  main__main();')
 			if !v.pref.is_bare {
 				cgen.genln('free(g_str_buf);')
+				cgen.genln('free(g_m2_ptr);')
 			}
 			v.gen_main_end('return 0')
 		}
diff --git a/vlib/compiler/parser.v b/vlib/compiler/parser.v
index f6cfd7770a..d84d3ba952 100644
--- a/vlib/compiler/parser.v
+++ b/vlib/compiler/parser.v
@@ -1352,7 +1352,6 @@ fn (p mut Parser) statement(add_semi bool) string {
 // this can be `user = ...`  or `user.field = ...`, in both cases `v` is `user`
 fn (p mut Parser) assign_statement(v Var, ph int, is_map bool) {
 	errtok := p.cur_tok_index()
-	//p.log('assign_statement() name=$v.name tok=')
 	is_vid := p.fileis('vid') // TODO remove
 	tok := p.tok
 	//if !v.is_mut && !v.is_arg && !p.pref.translated && !v.is_global{
@@ -1829,6 +1828,7 @@ fn (p mut Parser) dot(str_typ_ string, method_ph int) string {
 	if typ.name.len == 0 {
 		p.error('dot(): cannot find type `$str_typ`')
 	}
+	// foo.$action()
 	if p.tok == .dollar {
 		p.comptime_method_call(typ)
 		return 'void'
@@ -1841,7 +1841,6 @@ fn (p mut Parser) dot(str_typ_ string, method_ph int) string {
 	else if field_name == 'map' && str_typ.starts_with('array_') {
 		return p.gen_array_map(str_typ, method_ph)
 	}
-
 	fname_tidx := p.cur_tok_index()
 	//p.log('dot() field_name=$field_name typ=$str_typ')
 	//if p.fileis('main.v') {
@@ -2175,7 +2174,7 @@ struct IndexConfig {
 
 // for debugging only
 fn (p &Parser) fileis(s string) bool {
-	return p.scanner.file_path.contains(s)
+	return os.filename(p.scanner.file_path).contains(s)
 }
 
 // in and dot have higher priority than `!`