zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-05-10 06:24:57 +00:00
Code Issues Packages Projects Wiki Activity

ZoneCodeGenerator: Replace OperandDynamics static array indices with Evaluations

Browse Source
This commit is contained in:
Jan 2019-12-23 23:46:04 +01:00
parent db8e4c987c
commit 62ac2e8aae
3 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ZoneCodeGenerator/Domain/Evaluation/OperandDynamic.cs
View File

@ -9,7 +9,7 @@ namespace ZoneCodeGenerator.Domain.Evaluation
{
public StructureInformation Structure { get; }
public IList<MemberInformation> ReferencedMemberChain { get; }
public IList<int> ArrayIndices { get; }
public IList<IEvaluation> ArrayIndices { get; }
public bool IsStatic => false;
@ -17,7 +17,7 @@ namespace ZoneCodeGenerator.Domain.Evaluation
{
Structure = structure;
ReferencedMemberChain = new List<MemberInformation>(memberChain);
ArrayIndices = new List<int>();
ArrayIndices = new List<IEvaluation>();
}
public int EvaluateNumeric()

6
src/ZoneCodeGenerator/Generating/Templates/Common.stg
View File

@ -34,9 +34,9 @@ $endif$
PrintOperandDynamic(op) ::= <%
$TypeVarName(op.Structure.Type)$
->$first(op.ReferencedMemberChain):{member | $member.Member.Name$}$
$rest(op.ReferencedMemberChain):{member | .$member.Member.Name$}$
$op.ArrayIndices:{ arrayIndex | [$arrayIndex$]}$
->$trunc(op.ReferencedMemberChain):{member | $member.Member.Name$$if(member.Computations.ContainsNonEmbeddedReference)$->$else$.$endif$}$
$last(op.ReferencedMemberChain):{member | $member.Member.Name$}$
$op.ArrayIndices:{ arrayIndex | [$PrintEvaluation(arrayIndex)$]}$
%>
PrintOperation(operation) ::= <%

37
src/ZoneCodeGenerator/Parsing/CommandFile/Tests/TestWithEvaluation.cs
View File

@ -25,19 +25,28 @@ namespace ZoneCodeGenerator.Parsing.CommandFile.Tests
// Operand Sub-Tags
private const string TagOperandNumber = "operandNumber";
private const string TagOperandTypename = "operandTypename";
private const string TagOperandArray = "operandArray";
private const string TokenOperandNumber = "operandNumberToken";
private const string TokenOperandTypename = "operandTypenameToken";
private const string TokenOperandArray = "operandArrayToken";
// OperandArray Sub-Tags
private const string TagOperandArray = "operandArray";
private const string TagOperandArrayEnd = "operandArrayEnd";
// Visible to children
protected const string TagEvaluation = "evaluation";
private static readonly TokenMatcher operandArray = new MatcherGroupAnd(
new MatcherLiteral("["),
new MatcherWithTag(TagEvaluation),
new MatcherLiteral("]").WithTag(TagOperandArrayEnd)
).WithTag(TagOperandArray);
// operand ::= <typename> <array>* | <number>
private static readonly TokenMatcher operand = new MatcherGroupOr(
new MatcherGroupAnd(
new MatcherTypename().WithName(TokenOperandTypename),
new MatcherGroupLoop(MatcherGroupLoop.LoopMode.ZeroOneMultiple, new MatcherArray().WithName(TokenOperandArray).WithTag(TagOperandArray))
new MatcherGroupLoop(MatcherGroupLoop.LoopMode.ZeroOneMultiple, new MatcherWithTag(TagOperandArray))
).WithTag(TagOperandTypename),
new MatcherNumber().WithName(TokenOperandNumber).WithTag(TagOperandNumber)
).WithTag(TagOperand);
@ -70,6 +79,7 @@ namespace ZoneCodeGenerator.Parsing.CommandFile.Tests
protected TestWithEvaluation(TokenMatcher[] matchers) : base(matchers)
{
AddTaggedMatcher(operandArray);
AddTaggedMatcher(operand);
AddTaggedMatcher(operationType);
AddTaggedMatcher(evaluation);
@ -86,17 +96,24 @@ namespace ZoneCodeGenerator.Parsing.CommandFile.Tests
private IEvaluation ProcessOperandTypename(ICommandParserState state)
{
var typenameString = NextMatch(TokenOperandTypename);
var arrayIndexStrings = new List<string>();
var arrayIndexEvaluations = new List<IEvaluation>();
while (PeekTag().Equals(TagOperandArray))
{
NextTag();
arrayIndexStrings.Add(NextMatch(TokenOperandArray));
if (NextTag() != TagEvaluation)
throw new Exception("Expected evaluation tag @ Operand");
arrayIndexEvaluations.Add(ProcessEvaluation(state));
if (NextTag() != TagOperandArrayEnd)
throw new Exception("Expected operand array end tag @ Operand");
}
var nameParts = typenameString.Split(new[] { "::" }, StringSplitOptions.None);
if (nameParts.Length == 1 && arrayIndexStrings.Count == 0)
if (nameParts.Length == 1 && arrayIndexEvaluations.Count == 0)
{
var enumMember = state.Repository.GetAllEnums().SelectMany(_enum => _enum.Members)
.FirstOrDefault(member => member.Name.Equals(nameParts[0]));
@ -127,10 +144,9 @@ namespace ZoneCodeGenerator.Parsing.CommandFile.Tests
}
var operandDynamic = new OperandDynamic(referencedType, referencedMemberChain);
foreach (var arrayIndexString in arrayIndexStrings)
foreach (var indexEvaluation in arrayIndexEvaluations)
{
operandDynamic.ArrayIndices.Add(int.Parse(arrayIndexString));
operandDynamic.ArrayIndices.Add(indexEvaluation);
}
return operandDynamic;
@ -187,7 +203,8 @@ namespace ZoneCodeGenerator.Parsing.CommandFile.Tests
while (true)
{
IEvaluation firstStatementPart;
switch (NextTag())
var tag = NextTag();
switch (tag)
{
case TagEvaluationParenthesis:
firstStatementPart = ProcessEvaluationInParenthesis(state);
@ -198,7 +215,7 @@ namespace ZoneCodeGenerator.Parsing.CommandFile.Tests
break;
default:
throw new Exception("Invalid followup tag @ Evaluation");
throw new Exception($"Invalid followup tag '{tag}' @ Evaluation");
}
operands.Add(firstStatementPart);