Use mspio for all I/O operations

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 70410355652ab34cb7d522d0100ef62e30462eff..0fc6d696c2394776a10b7692b381f1dabcc9c2ec 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,13 +1,13 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <fstream>
-#include <iostream>
 #include <msp/fs/utils.h>
+#include <msp/io/except.h>
+#include <msp/io/print.h>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -17,15 +17,11 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
-       Target(b, c?&c->get_package():0, n),
+SourceFile::SourceFile(Builder &b, const Component *c, const FS::Path &p):
+       FileTarget(b, (c ? &c->get_package() : 0), p),
        comp(c)
 { }
 
-/**
-Parses include directives from the file and looks up the appropriate targets
-from Builder.
-*/
 void SourceFile::find_depends()
 {
        if(!comp)
@@ -48,28 +44,34 @@ void SourceFile::find_depends()
 
        if(!deps_found)
        {
-               ifstream in(name.c_str());
-               if(!in) return;
+               try
+               {
+                       IO::BufferedFile in(name);
 
-               if(builder.get_verbose()>=4)
-                       cout<<"Reading includes from "<<name<<'\n';
+                       if(builder.get_verbose()>=4)
+                               IO::print("Reading includes from %s\n", name);
 
-               Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+                       Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
-               string line;
-               while(getline(in, line))
-                       if(RegMatch match=r_include.match(line))
-                               includes.push_back(match[1].str);
+                       string line;
+                       while(in.getline(line))
+                               if(RegMatch match=r_include.match(line))
+                                       includes.push_back(match[1].str);
 
-               deps_cache.set_deps(relname, includes);
+                       deps_cache.set_deps(relname, includes);
+               }
+               catch(const IO::FileNotFound &)
+               {
+                       return;
+               }
        }
 
        const StringList &incpath=comp->get_build_info().incpath;
 
-       string path=name.substr(0, name.rfind('/'));
+       FS::Path dir=FS::dirname(path);
        for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
-               Target *hdr=builder.get_header(*i, path, incpath);
+               Target *hdr=builder.get_header(*i, dir, incpath);
                if(hdr)
                        add_depend(hdr);
        }