Changeset 505 for trunk/src/engine/program_manager.cc

Timestamp:

07/12/16 20:22:23 (9 years ago)

Author:

epyon

Message:

• several STL updates
• several minor fixes

File:

• trunk/src/engine/program_manager.cc (modified) (4 diffs)

trunk/src/engine/program_manager.cc

@@ -45 +45 @@
 }
 
+nv::const_string nv::program_manager::file_to_string( const string_view& path )
+{
+        c_file_system fs;
+        stream* fstream = open_stream( fs, path );
+        if ( !fstream ) return const_string();
+        uint32 size = fstream->size();
+        const_string result( nullptr, size );
+        fstream->read( const_cast<char*>( result.data() ), size, 1 );
+        delete fstream;
+        return result;
+}
+
 nv::string_buffer nv::program_manager::load_source( lua::table_guard& table, const string_view& append )
 {
@@ -51 +63 @@
         if ( table.is_string( "files" ) )
         {
-                out.append( fs.slurp( table.get_string( "files" ) ) );
+                out.append( file_to_string( table.get_string( "files" ) ) );
         }
         else if ( table.is_table( "files" ) )
@@ -61 +73 @@
                         const_string include( inctable.get<const_string,uint32>(i) );
                         if ( i == count ) out.append( "#line 1\n" );
-                        out.append( fs.slurp( include ) );
+                        out.append( file_to_string( include ) );
                 }
         }
@@ -67 +79 @@
         if ( table.is_string( "file" ) )
         {
-                const_string data = fs.slurp( table.get_string( "file" ) );
+                const_string data = file_to_string( table.get_string( "file" ) );
                 out.append( "#line 1\n" + data );
         }