stjr/UltimateZoneBuilder
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/UltimateZoneBuilder.git synced 2024-11-23 04:12:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

ZScript: Added support for narrowed enums (#854)

Browse source
This commit is contained in:
Boondorl 2023-01-21 04:07:13 -05:00 committed by GitHub
parent d73a2173d7
commit 6d2a3b646d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -513,14 +513,14 @@ namespace CodeImp.DoomBuilder.ZDoom
return true;
}
internal List<ZScriptToken> ParseBlock(bool allowsingle)
internal List<ZScriptToken> ParseBlock(bool allowsingle, ZScriptToken skipRead = null)
{
List<ZScriptToken> ol = new List<ZScriptToken>();
//
int nestingLevel = 0;
//
long cpos = datastream.Position;
ZScriptToken token = tokenizer.ReadToken();
ZScriptToken token = skipRead ?? tokenizer.ReadToken();
if (token == null)
{
ReportError("Expected a code block, got <null>");
@ -630,7 +630,26 @@ namespace CodeImp.DoomBuilder.ZDoom
return false;
}
tokenizer.SkipWhitespace();
if (ParseBlock(false) == null) return false; // anything between { and }
token = tokenizer.ReadToken();
if (token == null)
{
ReportError("Expected a code block or integer type for enum, got <null>");
return false;
}
else if (token.Type == ZScriptTokenType.Colon)
{
tokenizer.SkipWhitespace();
token = tokenizer.ExpectToken(ZScriptTokenType.Identifier);
if (token == null || !token.IsValid)
{
ReportError("Expected an integer type, got " + ((Object)token ?? "<null>").ToString());
return false;
}
tokenizer.SkipWhitespace();
token = tokenizer.ReadToken();
}
if (ParseBlock(false, token) == null) return false; // anything between { and }
//LogWarning(string.Format("Parsed enum {0}", token.Value));
return true;
}