Skip to content

Commit 646fbd7

Browse files
committed
Allow expression-sized new arrays
1 parent c4bd908 commit 646fbd7

2 files changed

Lines changed: 20 additions & 5 deletions

File tree

‎Preagonal.Scripting.GS2Compiler.UnitTests/InterfaceTests.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,22 @@ function onCreated() {
128128
Assert.NotEmpty(result.ByteCode);
129129
}
130130

131+
[Fact]
132+
public void Given_new_array_with_expression_dimension_When_compiling_Then_success_is_true_and_bytecode_is_not_empty()
133+
{
134+
const string scriptText =
135+
"""
136+
function onCreated() {
137+
this.tilemap = new[64*64];
138+
}
139+
""";
140+
141+
var result = Interface.CompileCode(scriptText);
142+
143+
Assert.True(result.Success);
144+
Assert.NotEmpty(result.ByteCode);
145+
}
146+
131147
[Fact]
132148
public void Given_script_with_power_assign_When_compiling_Then_success_is_true_and_bytecode_is_not_empty()
133149
{

‎Preagonal.Scripting.GS2Compiler/GS2Compiler.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,11 @@ private Expr ParsePrimary()
469469
{
470470
if (_current.Type == TokenType.LeftBracket)
471471
{
472-
List<int> dimensions = [];
472+
List<Expr> dimensions = [];
473473
do
474474
{
475475
Expect(TokenType.LeftBracket);
476-
dimensions.Add(int.Parse(Expect(TokenType.Number).Text, NumberStyles.Integer, CultureInfo.InvariantCulture));
476+
dimensions.Add(ParseExpression());
477477
Expect(TokenType.RightBracket);
478478
}
479479
while (_current.Type == TokenType.LeftBracket);
@@ -1516,8 +1516,7 @@ private void Emit(Expr expr, bool copyAssignmentTarget, bool logicalInline, int
15161516
case NewArrayExpr array:
15171517
for (var i = 0; i < array.Dimensions.Count; ++i)
15181518
{
1519-
_bytecode.Emit(Op.TypeNumber);
1520-
_bytecode.EmitDynamicNumber(array.Dimensions[i]);
1519+
Emit(array.Dimensions[i]);
15211520
_bytecode.Emit(i == 0 ? Op.ArrayNew : Op.ArrayNewMultiDim);
15221521
}
15231522
break;
@@ -2152,7 +2151,7 @@ private sealed record ChainedCallExpr(CallExpr Call, List<Expr> Args) : Expr;
21522151
private sealed record MethodCallExpr(Expr Object, string Name, List<Expr> Args) : Expr;
21532152
private sealed record DynamicMethodCallExpr(Expr Object, Expr Name, List<Expr> Args) : Expr;
21542153
private sealed record NewObjectExpr(string TypeName, List<Expr> Args) : Expr;
2155-
private sealed record NewArrayExpr(List<int> Dimensions) : Expr;
2154+
private sealed record NewArrayExpr(List<Expr> Dimensions) : Expr;
21562155
private sealed record LambdaExpr(string Name, List<Expr> Args, List<Stmt> Body) : Expr;
21572156
private sealed record ArrayLiteralExpr(List<Expr> Values) : Expr;
21582157
private sealed record FunctionEntry(string Name, int OpIndex, int JmpLoc);

0 commit comments

Comments
 (0)