amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #63: don't use reference arguments in openFileInPackage

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-27 22:16:48 +02:00
parent 279fdb0378
commit c9c708dfbe
7 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/parser.cpp
+2 -2
View File
@@ -683,10 +683,10 @@ ExprType parseExpr(TokenIterator& input, Script& script, Precedence minPrec) {
// include the file
// read the entire file, and start at the beginning of it
String const& filename = token.value;
auto stream = package_manager.openFileFromPackage(input.package, filename);
auto [stream,file_package] = package_manager.openFileFromPackage(input.package, filename);
eat_utf8_bom(*stream);
String included_input = read_utf8_line(*stream, true);
TokenIterator included_tokens(included_input, input.package, false, filename, input.errors);
TokenIterator included_tokens(included_input, file_package, false, filename, input.errors);
return parseTopLevel(included_tokens, script);
} else {
// variable