|
@@ -5,17 +5,14 @@
|
|
|
|
|
|
namespace aFunit {
|
|
namespace aFunit {
|
|
inline StringReader::StringReader(std::string str_, const aFuntool::FilePath &path_)
|
|
inline StringReader::StringReader(std::string str_, const aFuntool::FilePath &path_)
|
|
- : Reader{path_, 0}, str{std::move(str_)} {
|
|
|
|
- index = 0;
|
|
|
|
- len = str.size();
|
|
|
|
|
|
+ : Reader{path_, 0}, str{std::move(str_)}, index{0}, len{str.size()} {
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
inline FileReader::FileReader(const aFuntool::FilePath &path_)
|
|
inline FileReader::FileReader(const aFuntool::FilePath &path_)
|
|
- : Reader{path_, 0} {
|
|
|
|
- file = aFuntool::fileOpen(path_, "rb");
|
|
|
|
|
|
+ : Reader{path_, 0}, file{aFuntool::fileOpen(path_, "rb")}, no_first{false} {
|
|
if (file == nullptr)
|
|
if (file == nullptr)
|
|
throw readerFileOpenError(path_);
|
|
throw readerFileOpenError(path_);
|
|
- no_first = false;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|