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

Updated ZScript parser for const array definition support (reported by SanyaWaffles)

Browse source
This commit is contained in:
ZZYZX 2017-12-25 02:45:21 +02:00
parent d428272fe1
commit 1d36d3fe6e
2 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -264,7 +264,8 @@ namespace CodeImp.DoomBuilder.ZDoom
// parse identifier or int (identifier is a constant, we don't parse this yet)
tokenizer.SkipWhitespace();
token = tokenizer.ExpectToken(ZScriptTokenType.Integer, ZScriptTokenType.Identifier);
long cpos = stream.Position;
token = tokenizer.ExpectToken(ZScriptTokenType.Integer, ZScriptTokenType.Identifier, ZScriptTokenType.CloseSquare);
if (token == null || !token.IsValid)
{
parser.ReportError("Expected integer or const, got " + ((Object)token ?? "<null>").ToString());
@ -274,12 +275,17 @@ namespace CodeImp.DoomBuilder.ZDoom
int arraylen = -1;
if (token.Type == ZScriptTokenType.Integer)
arraylen = token.ValueInt;
else if (token.Type == ZScriptTokenType.CloseSquare)
{
/* todo determine this somehow... not for now */
stream.Position = cpos; // code later expects close square
}
else
{
// we can have more identifiers (dotted)
while (true)
{
long cpos = stream.Position;
cpos = stream.Position;
token = tokenizer.ExpectToken(ZScriptTokenType.Dot);
if (token == null || !token.IsValid)
{
@ -472,7 +478,7 @@ namespace CodeImp.DoomBuilder.ZDoom
// try to read in a variable/method.
bool bmethod = false;
string[] availablemodifiers = new string[] { "static", "native", "action", "readonly", "protected", "private", "virtual", "override", "meta", "transient", "deprecated", "final", "play", "ui", "clearscope", "virtualscope", "version" };
string[] availablemodifiers = new string[] { "static", "native", "action", "readonly", "protected", "private", "virtual", "override", "meta", "transient", "deprecated", "final", "play", "ui", "clearscope", "virtualscope", "version", "const" };
string[] versionedmodifiers = new string[] { "version", "deprecated" };
string[] methodmodifiers = new string[] { "action", "virtual", "override", "final" };
HashSet<string> modifiers = new HashSet<string>();
@ -660,12 +666,31 @@ namespace CodeImp.DoomBuilder.ZDoom
tokenizer.SkipWhitespace();
token = tokenizer.ExpectToken(ZScriptTokenType.Semicolon, ZScriptTokenType.Comma);
ZScriptTokenType[] expectTokens;
if (modifiers.Contains("static"))
expectTokens = new ZScriptTokenType[] { ZScriptTokenType.Semicolon, ZScriptTokenType.Comma, ZScriptTokenType.OpAssign };
else expectTokens = new ZScriptTokenType[] { ZScriptTokenType.Semicolon, ZScriptTokenType.Comma };
token = tokenizer.ExpectToken(expectTokens);
if (token == null || !token.IsValid)
{
parser.ReportError("Expected ; or comma, got " + ((Object)token ?? "<null>").ToString());
parser.ReportError("Expected ;, =, or comma, got " + ((Object)token ?? "<null>").ToString());
return;
}
// "static int A[] = {1, 2, 3};"
if (token.Type == ZScriptTokenType.OpAssign)
{
// read in array data
tokenizer.SkipWhitespace();
parser.SkipBlock(false);
tokenizer.SkipWhitespace();
token = tokenizer.ExpectToken(ZScriptTokenType.Semicolon, ZScriptTokenType.Comma);
if (token == null || !token.IsValid)
{
parser.ReportError("Expected ; or comma, got " + ((Object)token ?? "<null>").ToString());
return;
}
}
}
}

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

@ -334,7 +334,7 @@ namespace CodeImp.DoomBuilder.ZDoom
}
}
internal bool SkipBlock()
internal bool SkipBlock(bool eatSemicolon = true)
{
List<ZScriptToken> ol = new List<ZScriptToken>();
//
@ -382,9 +382,9 @@ namespace CodeImp.DoomBuilder.ZDoom
}
// there is POTENTIALLY a semicolon after the class definition. it's not supposed to be there, but it's acceptable (GZDoom.pk3 has this)
ZScriptToken tailtoken = tokenizer.ReadToken();
cpos = datastream.Position;
if (tailtoken == null || tailtoken.Type != ZScriptTokenType.Semicolon)
ZScriptToken tailtoken = tokenizer.ReadToken();
if (tailtoken == null || !eatSemicolon || tailtoken.Type != ZScriptTokenType.Semicolon)
datastream.Position = cpos;
return true;