From cce0b2425e73f77a1b1d73b559a0cf174d36a3d0 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Mon, 27 Jan 2020 21:26:07 +0200
Subject: [PATCH] compiler: prevent vars named 'char' to cause a C error

---
 vlib/compiler/aparser.v | 1 +
 vlib/compiler/table.v   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/vlib/compiler/aparser.v b/vlib/compiler/aparser.v
index 75158650e6..c75abbd6b2 100644
--- a/vlib/compiler/aparser.v
+++ b/vlib/compiler/aparser.v
@@ -91,6 +91,7 @@ const (
 		'i64': true,
 		'i128': true,
 		'byte': true,
+		'char': true,
 		'u16': true,
 		'u32': true,
 		'u64': true,
diff --git a/vlib/compiler/table.v b/vlib/compiler/table.v
index 0ea5e7a51e..e4ca5e1eb9 100644
--- a/vlib/compiler/table.v
+++ b/vlib/compiler/table.v
@@ -186,7 +186,7 @@ pub fn (t &Table) debug_fns() string {
 // fn (types array_Type) print_to_file(f string)  {
 // }
 const (
-	integer_types = ['int', 'i8', 'byte', 'i16', 'u16', 'u32', 'i64', 'u64']
+	integer_types = ['int', 'i8', 'char', 'byte', 'i16', 'u16', 'u32', 'i64', 'u64']
 	float_types = ['f32', 'f64']
 	reserved_type_param_names = ['R', 'S', 'T', 'U', 'W']
 )
@@ -233,6 +233,7 @@ fn new_table(obfuscate bool) &Table {
 	t.register_type_with_parent('i64', 'int')
 	t.register_type_with_parent('u64', 'u32')
 	t.register_builtin('byteptr')
+	t.register_builtin('charptr')
 	t.register_builtin('intptr')
 	t.register_builtin('f32')
 	t.register_builtin('f64')
@@ -240,7 +241,6 @@ fn new_table(obfuscate bool) &Table {
 	t.register_builtin('bool')
 	t.register_builtin('void')
 	t.register_builtin('voidptr')
-	t.register_builtin('charptr')
 	t.register_builtin('va_list')
 	for c in reserved_type_param_names {
 		t.register_builtin(c)
@@ -863,6 +863,9 @@ fn (table &Table) cgen_name_type_pair(name, typ string) string {
 fn is_valid_int_const(val, typ string) bool {
 	x := val.int()
 	return match typ {
+		'char'{
+			0 <= x && x <= 255
+		}
 		'byte'{
 			0 <= x && x <= 255
 		}
@@ -900,7 +903,7 @@ fn (p mut Parser) typ_to_fmt(typ string, level int) string {
 		'ustring' {
 			return '%.*s'
 		}
-		'byte', 'bool', 'int', 'char', 'byte', 'i16', 'i8' {
+		'byte', 'bool', 'int', 'char', 'i16', 'i8' {
 			return '%d'
 		}
 		'u16', 'u32' {