Skip to content

Commit 8fac656

Browse files
committed
literalvariableargument (name) -> existing variable
1 parent b6e1472 commit 8fac656

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Code/ArgumentSystem/Arguments/LiteralVariableArgument.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@
33
using SER.Code.Helpers.ResultSystem;
44
using SER.Code.TokenSystem.Tokens;
55
using SER.Code.TokenSystem.Tokens.VariableTokens;
6+
using SER.Code.VariableSystem.Variables;
67

78
namespace SER.Code.ArgumentSystem.Arguments;
89

910
public class LiteralVariableArgument(string name) : Argument(name)
1011
{
11-
public override string InputDescription => "A literal variable name (doesnt have to be real)";
12+
public override string InputDescription => "Any existing literal variable e.g. $text or $playerId";
1213

1314
[UsedImplicitly]
14-
public DynamicTryGet<LiteralVariableToken> GetConvertSolution(BaseToken token)
15+
public DynamicTryGet<LiteralVariable> GetConvertSolution(BaseToken token)
1516
{
1617
if (token is not LiteralVariableToken literalVariableToken)
1718
{
1819
return $"Value '{token.RawRep}' is not a syntactically valid literal variable.";
1920
}
2021

21-
return literalVariableToken;
22+
return new(() => literalVariableToken.TryGetVariable());
2223
}
2324
}

Code/ArgumentSystem/ProvidedArguments.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ public Elevator[] GetElevators(string argName)
7878
return GetValue<Elevator[], ElevatorsArgument>(argName);
7979
}
8080

81-
public LiteralVariableToken GetLiteralVariable(string argName)
81+
public LiteralVariable GetLiteralVariable(string argName)
8282
{
83-
return GetValue<LiteralVariableToken, LiteralVariableArgument>(argName);
83+
return GetValue<LiteralVariable, LiteralVariableArgument>(argName);
8484
}
8585

8686
public Item[] GetItems(string argName)

0 commit comments

Comments
 (0)