From 03c165b11846933ac7adcb2ef4edbaa2aeddd076 Mon Sep 17 00:00:00 2001
From: Sam Vervaeck <vervaeck.sam@skynet.be>
Date: Mon, 25 May 2020 17:46:23 +0200
Subject: [PATCH] Fix some compile errors in standard library

---
 stdlib/io.bolt        |  4 +++-
 stdlib/lang/bolt.bolt | 13 ++++++++-----
 stdlib/lib.bolt       |  5 +++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/stdlib/io.bolt b/stdlib/io.bolt
index fae35db12..b07193133 100644
--- a/stdlib/io.bolt
+++ b/stdlib/io.bolt
@@ -1,5 +1,5 @@
 
-mod IO {
+pub mod IO {
 
   pub type Result<T> = Either<Error, T>;
 
@@ -7,6 +7,8 @@ mod IO {
     process.stdout.write(message);
   }
 
+  pub struct File;
+
   pub trait Read {
     fn read(self, count: usize, target: Vec<u8>) -> Result<usize>;
   }
diff --git a/stdlib/lang/bolt.bolt b/stdlib/lang/bolt.bolt
index 53b59801d..d96f8a48e 100644
--- a/stdlib/lang/bolt.bolt
+++ b/stdlib/lang/bolt.bolt
@@ -1,6 +1,9 @@
 
-import "../option"
-import "../numbers"
+import "../option";
+import "../numbers";
+import "../vec";
+import "../string";
+import "../io";
 
 mod Bolt::Lang {
 
@@ -11,9 +14,9 @@ mod Bolt::Lang {
   }
 
   pub struct Span {
-    file: File,
-    start: TextPos,
-    end: TextPos,
+    file: IO::File,
+    start: Pos,
+    end: Pos,
   }
 
   pub struct Identifier {
diff --git a/stdlib/lib.bolt b/stdlib/lib.bolt
index 0f5da39d0..5765dd392 100644
--- a/stdlib/lib.bolt
+++ b/stdlib/lib.bolt
@@ -2,7 +2,8 @@
 pub import "./option"
 pub import "./either"
 pub import "./string"
-pub import "./math.bolt"
-pub import "./vec.bolt"
+pub import "./math"
+pub import "./vec"
+pub import "./vec"
 pub import "./lang/bolt"