Reorder class members

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 70410355652ab34cb7d522d0100ef62e30462eff..6c2cb760d763a8d8f949b40526b67c1cb88036f9 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/strings/regex.h>
 #include "builder.h"
 #include "component.h"
@@ -22,10 +22,6 @@ SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
        comp(c)
 { }
 
-/**
-Parses include directives from the file and looks up the appropriate targets
-from Builder.
-*/
 void SourceFile::find_depends()
 {
        if(!comp)
@@ -48,20 +44,26 @@ 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)
+                               cout<<"Reading includes from "<<name<<'\n';
 
-               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;