stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2025-01-19 15:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

ZScript parser: fixed a bug where included files where parsed when the #include directive was encountered, and not after the rest of the file was parsed. Fixes #641

Browse source
This commit is contained in:
biwa 2021-10-23 20:02:40 +02:00
parent ca264c71b1
commit 161e5ed5b5
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Source/Core/ZDoom/ZScriptParser.cs
View file

@ -826,6 +826,8 @@ namespace CodeImp.DoomBuilder.ZDoom
// Cannot process?
if (!base.Parse(data, clearerrors)) return false;
List<string> includes = new List<string>();
// [ZZ] For whatever reason, the parser is closely tied to the tokenizer, and to the general scripting lumps framework (see scripttype).
// For this reason I have to still inherit the old tokenizer while only using the new one.
//ReportError("found zscript? :)");
@ -843,8 +845,17 @@ namespace CodeImp.DoomBuilder.ZDoom
ZScriptTokenType.BlockComment, ZScriptTokenType.LineComment,
ZScriptTokenType.Preprocessor);
if (token == null) // EOF reached, whatever.
break;
if (token == null) // EOF reached
{
// Now parse all included files
foreach(string include in includes)
{
if (!ParseInclude(include))
return false;
}
break;
}
if (!token.IsValid)
{
@ -895,8 +906,8 @@ namespace CodeImp.DoomBuilder.ZDoom
return false;
}
if (!ParseInclude(include_name.Value))
return false;
// GZDoom parses includes *after* the rest of the file is parsed, so just store the files to include and parse them later
includes.Add(include_name.Value);
}
else if (d_value == "region")
{