--- a/trunk/src/dil/Parser.d	Sun Aug 26 13:44:01 2007 +0000
+++ b/trunk/src/dil/Parser.d	Sun Aug 26 15:59:02 2007 +0000
@@ -4087,19 +4087,6 @@
     require(tok);
   }
 
-  string requireIdentifier()
-  {
-    string identifier;
-    if (token.type == T.Identifier)
-    {
-      identifier = token.identifier;
-      nT();
-    }
-    else
-      error(MID.ExpectedButFound, "Identifier", token.srcText);
-    return identifier;
-  }
-
   Token* requireId()
   {
     if (token.type == T.Identifier)

--- a/trunk/src/dil/Settings.d	Sun Aug 26 13:44:01 2007 +0000
+++ b/trunk/src/dil/Settings.d	Sun Aug 26 15:59:02 2007 +0000
@@ -5,6 +5,7 @@
 module dil.Settings;
 import dil.Messages;
 import dil.Parser, dil.SyntaxTree, dil.Declarations, dil.Expressions;
+import dil.File;
 import std.metastrings;
 
 template Pad(char[] str, uint amount)
@@ -49,7 +50,7 @@
   void load()
   {
     auto fileName = "config.d"[];
-    auto sourceText = cast(char[]) std.file.read(fileName);
+    auto sourceText = loadFile(fileName);
     auto parser = new Parser(sourceText, fileName);
     parser.start();
     auto root = parser.parseModule();
@@ -78,7 +79,7 @@
     }
 
     // Load messages
-    sourceText = cast(char[]) std.file.read(fileName);
+    sourceText = loadFile(fileName);
     parser = new Parser(sourceText, fileName);
     parser.start();
     root = parser.parseModule();

--- a/trunk/src/main.d	Sun Aug 26 13:44:01 2007 +0000
+++ b/trunk/src/main.d	Sun Aug 26 15:59:02 2007 +0000
@@ -4,7 +4,6 @@
 +/
 module main;
 import std.stdio;
-import std.file;
 import dil.Parser;
 import dil.Lexer;
 import dil.Token;
@@ -94,7 +93,7 @@
 
 void parse(string fileName)
 {
-  auto sourceText = cast(char[]) std.file.read(fileName);
+  auto sourceText = loadFile(fileName);
   auto parser = new Parser(sourceText, fileName);
   parser.start();
   auto root = parser.parseModule();
@@ -335,7 +334,7 @@
 void syntaxToDoc(string fileName, DocOption options)
 {
   auto tags = options & DocOption.HTML ? html_tags : xml_tags;
-  auto sourceText = cast(char[]) std.file.read(fileName);
+  auto sourceText = loadFile(fileName);
   auto parser = new Parser(sourceText, fileName);
   parser.start();
   auto root = parser.parseModule();
@@ -435,7 +434,7 @@
 void tokensToDoc(string fileName, DocOption options)
 {
   auto tags = options & DocOption.HTML ? html_tags : xml_tags;
-  auto sourceText = cast(char[]) std.file.read(fileName);
+  auto sourceText = loadFile(fileName);
   auto lx = new Lexer(sourceText, fileName);
 
   auto token = lx.getTokens();