Commit 232095bf authored by twanvl's avatar twanvl

Fixed: include files where not read with the same ignore_invalid settings

parent d24b1bda
...@@ -25,9 +25,9 @@ Reader::Reader(const InputStreamP& input, Packaged* package, const String& filen ...@@ -25,9 +25,9 @@ Reader::Reader(const InputStreamP& input, Packaged* package, const String& filen
handleAppVersion(); handleAppVersion();
} }
Reader::Reader(Packaged* pkg, const String& filename) Reader::Reader(Packaged* pkg, const String& filename, bool ignore_invalid)
: indent(0), expected_indent(0), state(OUTSIDE) : indent(0), expected_indent(0), state(OUTSIDE)
, ignore_invalid(false) , ignore_invalid(ignore_invalid)
, filename(filename), package(pkg), line_number(0), previous_line_number(0) , filename(filename), package(pkg), line_number(0), previous_line_number(0)
, input(package_manager.openFileFromPackage(package, filename)) , input(package_manager.openFileFromPackage(package, filename))
{ {
......
...@@ -42,7 +42,7 @@ class Reader { ...@@ -42,7 +42,7 @@ class Reader {
/** Used for "include file" keys. /** Used for "include file" keys.
* package can be nullptr * package can be nullptr
*/ */
Reader(Packaged* package, const String& filename); Reader(Packaged* package, const String& filename, bool ignore_invalid = false);
~Reader() { showWarnings(); } ~Reader() { showWarnings(); }
...@@ -182,7 +182,7 @@ class Reader { ...@@ -182,7 +182,7 @@ class Reader {
template <typename T> template <typename T>
void unknownKey(T& v) { void unknownKey(T& v) {
if (key == _("include file")) { if (key == _("include file")) {
Reader reader(package, value); Reader reader(package, value, ignore_invalid);
reader.handle_greedy(v); reader.handle_greedy(v);
moveNext(); moveNext();
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment