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

ZScript: Added support for Map<type, type> structures (#853)

Browse source
This commit is contained in:
Boondorl 2023-01-20 18:44:30 -05:00 committed by GitHub
parent 5cf8ed914a
commit d73a2173d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Source/Core/ZDoom/ZScriptActorStructure.cs
View file

@ -249,13 +249,33 @@ namespace CodeImp.DoomBuilder.ZDoom
if (internal_type == null)
return null;
tokenizer.SkipWhitespace();
token = tokenizer.ExpectToken(ZScriptTokenType.OpGreaterThan);
if (token == null || !token.IsValid)
token = tokenizer.ReadToken();
if (token == null || (token.Type != ZScriptTokenType.OpGreaterThan && token.Type != ZScriptTokenType.Comma))
{
parser.ReportError("Expected >, got " + ((Object)token ?? "<null>").ToString());
parser.ReportError("Expected > or ,, got " + ((Object)token ?? "<null>").ToString());
return null;
}
return outs + "<" + internal_type + ">";
else if (token.Type == ZScriptTokenType.OpGreaterThan)
{
return outs + "<" + internal_type + ">";
}
else
{
tokenizer.SkipWhitespace();
string second_internal_type = ParseTypeName();
if (second_internal_type == null)
return null;
tokenizer.SkipWhitespace();
token = tokenizer.ExpectToken(ZScriptTokenType.OpGreaterThan);
if (token == null || !token.IsValid)
{
parser.ReportError("Expected >, got " + ((Object)token ?? "<null>").ToString());
return null;
}
return outs + "<" + internal_type + "," + second_internal_type + ">";
}
}
else
{