From 2fab73983b1a03ebecaba168ddb0fd9080dc680a Mon Sep 17 00:00:00 2001
From: Joe Conigliaro <joe.conigliaro@gmail.com>
Date: Mon, 5 Aug 2019 13:54:16 +1000
Subject: [PATCH] add builtin import pass + use builder in map

---
 compiler/main.v    |  6 ++++++
 vlib/builtin/map.v | 14 +++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/compiler/main.v b/compiler/main.v
index 8158e0a918..466f90445c 100644
--- a/compiler/main.v
+++ b/compiler/main.v
@@ -948,6 +948,12 @@ fn (v mut V) add_v_files_to_compile() {
 	}
 	// import tables for user/lib files
 	mut file_imports := []FileImportTable
+	// Parse builtin imports
+	for file in v.files {
+		mut p := v.new_parser(file, Pass.imports)
+		p.parse()
+		file_imports << *p.import_table
+	}
 	// Parse user imports
 	for file in user_files {
 		mut p := v.new_parser(file, Pass.imports)
diff --git a/vlib/builtin/map.v b/vlib/builtin/map.v
index 7c8983183e..6710f4c677 100644
--- a/vlib/builtin/map.v
+++ b/vlib/builtin/map.v
@@ -249,15 +249,11 @@ pub fn (m map_string) str() string {
 		return '{}'
 	}
 	// TODO use bytes buffer
-	//mut sb := strings.new_builder(50)
-	//sb.writeln('{') 
-	mut s := '{\n' 
+	mut sb := strings.new_builder(50)
+	sb.writeln('{') 
 	for key, val  in m { 
-		//sb.writeln('  "$entry.key" => "$val"') 
-		s += '  "$key" => "$val"\n' 
+		sb.writeln('  "$key" => "$val"') 
 	}
-	s += '}\n' 
-	//sb.writeln('}') 
-	//return sb.str() 
-	return s 
+	sb.writeln('}') 
+	return sb.str() 
 }