coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-07 01:06:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use readsome instead of reading the stream byte-by-byte to

Browse Source 
detect BOM in processed file.
This commit is contained in:
Alek Mosingiewicz 2018-05-24 22:04:10 +02:00
parent ac10575b5f
commit edadb7aa98
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/chaiscript/language/chaiscript_engine.hpp
View File

@ -206,14 +206,11 @@ namespace chaiscript
/// Skip BOM at the beginning of file /// Skip BOM at the beginning of file
static bool skip_bom(std::ifstream &infile) { static bool skip_bom(std::ifstream &infile) {
size_t bytes_needed = 3; std::streamsize bytes_needed = 3;
size_t bytes_read = 0; std::streamsize bytes_read = 0;
char buffer[256]; char buffer[3];
while (bytes_read < bytes_needed) { bytes_read = infile.readsome(buffer, bytes_needed);
infile >> buffer;
bytes_read++;
}
if (bytes_needed == bytes_read if (bytes_needed == bytes_read
&& (buffer[0] == '\xef') && (buffer[0] == '\xef')
@ -242,7 +239,7 @@ namespace chaiscript
assert(size >= 0); assert(size >= 0);
if (size >= 3 && skip_bom(infile)) { if (skip_bom(infile)) {
size-=3; // decrement the BOM size from file size, otherwise we'll get parsing errors size-=3; // decrement the BOM size from file size, otherwise we'll get parsing errors
assert(size >=0 ); //and check if there's more text assert(size >=0 ); //and check if there's more text
} }