From d3a206d6db83c2991f95e7fab26980a44f15d84d Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sun, 13 Oct 2019 13:11:52 +0300
Subject: [PATCH] compiler: prepare for moving compiler to vlib/vcompiler
 (stage 1)

* compiler: prepare for moving under vlib/vcompiler .

* make: stabilize the Makefile (extract rules for freshly cloning vc and tccbin).
---
 Makefile         | 18 ++++++++++++------
 compiler/gen_c.v |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 8ed0d884a0..ad72ebaac1 100644
--- a/Makefile
+++ b/Makefile
@@ -8,17 +8,12 @@ ifneq ($(filter $(_SYS),MSYS MinGW),)
 WIN32:=1
 endif
 
-all:
-	rm -rf vc/
-	git clone --depth 1 --quiet https://github.com/vlang/vc
+all: fresh_vc fresh_tcc
 ifdef WIN32
 	$(CC) -std=c99 -w -o v0.exe vc/v_win.c
 	./v0.exe -o v.exe compiler
 	rm -f v0.exe
 else
-	rm -rf /var/tmp/tcc
-	git clone --depth 1 --quiet https://github.com/vmisc/tccbin /var/tmp/tcc
-
 	$(CC) -std=gnu11 -w -o v vc/v.c -lm
 	@(VC_V=`./v version | cut -f 3 -d " "`; \
 	V_V=`git rev-parse --short HEAD`; \
@@ -30,3 +25,14 @@ endif
 	rm -rf vc/
 	@echo "V has been successfully built"
 
+
+fresh_vc:
+	rm -rf vc/
+	git clone --depth 1 --quiet https://github.com/vlang/vc
+
+fresh_tcc:
+	rm -rf /var/tmp/tcc/
+	git clone --depth 1 --quiet https://github.com/vmisc/tccbin /var/tmp/tcc
+
+selfcompile:
+	./v -o v compiler
diff --git a/compiler/gen_c.v b/compiler/gen_c.v
index 1cca8c2254..6e842bb9ee 100644
--- a/compiler/gen_c.v
+++ b/compiler/gen_c.v
@@ -265,7 +265,7 @@ fn (p mut Parser) gen_method_call(receiver_type, ftyp string, cgen_name string,
 	if ftyp == 'void*' {
 		if receiver_type.starts_with('array_') {
 			// array_int => int
-			cast = receiver_type.all_after('_')
+			cast = receiver_type.all_after('array_')
 			cast = '*($cast*) '
 		}else{
 			cast = '(voidptr) '