Skip to content

Commit

Permalink
test: update test scripts for new array syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
@EmilyV99
EmilyV99 committed May 3, 2024
1 parent 85f871c commit 873e7ec
Show file tree
Hide file tree
Showing 19 changed files with 1,744 additions and 1,761 deletions.
206 changes: 103 additions & 103 deletions tests/scripts/armos_expected.txt
View file

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions tests/scripts/bumper_expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ SUBV D2 1
STORE D2 0.0003; if() #457 Body End
LOAD D2 0.0006
PUSHR D2
LOAD D2 0.0003; InlineFunc[untyped Floor(untyped)] Params Start
DIVV D2 4; InlineFunc[untyped Floor(untyped)] Params End
FLOOR D2; InlineFunc[untyped Floor(untyped)] Body
LOAD D2 0.0003; InlineFunc[int Floor(int)] Params Start
DIVV D2 4; InlineFunc[int Floor(int)] Params End
FLOOR D2; InlineFunc[int Floor(int)] Body
POP D3
ADDR D2 D3
PUSHR D2
Expand Down Expand Up @@ -746,12 +746,12 @@ GOTO 742; return End
ALLOCATEMEMV D2 60 0; Case block
STORE D2 0
WRITEPODSTRING D2 "Invalid direction %d passed to CanWalk(x,y,dir,step,bool) \n"
LOAD D2 0; InlineFunc[void printf(char32)] Params Start
LOAD D2 0; InlineFunc[void printf(char32[])] Params Start
PUSHR D2
LOAD D2 0.0006
PUSHVARGR D2; InlineFunc[void printf(char32)] Params End
PRINTFVARG; InlineFunc[void printf(char32)] Body Start
POP D5; InlineFunc[void printf(char32)] Body End
PUSHVARGR D2; InlineFunc[void printf(char32[])] Params End
PRINTFVARG; InlineFunc[void printf(char32[])] Body Start
POP D5; InlineFunc[void printf(char32[])] Body End
LOAD D3 0
DEALLOCATEMEMR D3
SETV D2 0; return Start
Expand Down
20 changes: 10 additions & 10 deletions tests/scripts/credits.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ namespace Credits //start
{
data[DATA_TEXT_COLOR] = color;
}
void output(char32 filepath)
void output(char32[] filepath)
{
bitmap tmp = create(256, data[DATA_CURRY]);
_bitmap->Blit(7, tmp, 0, 0, 256, data[DATA_CURRY], 0, 0, 256, data[DATA_CURRY], 0, 0, 0, BITDX_NORMAL, 0, false);
Expand All @@ -115,39 +115,39 @@ namespace Credits //start
resize(_bitmap->Height + EXP_Y_AMNT);
}
}
void addLine(char32 text)
void addLine(char32[] text)
{
addLine(text, data[DATA_FONT], TF_CENTERED, data[DATA_TEXT_COLOR], data[DATA_SPACING]);
}
void addLine(char32 text, int font)
void addLine(char32[] text, int font)
{
addLine(text, font, TF_CENTERED, data[DATA_TEXT_COLOR], data[DATA_SPACING]);
}
void addLine(char32 text, int font, int format)
void addLine(char32[] text, int font, int format)
{
addLine(text, font, format, data[DATA_TEXT_COLOR], data[DATA_SPACING]);
}
void addLine(char32 text, int font, int format, int font_color)
void addLine(char32[] text, int font, int format, int font_color)
{
addLine(text, font, format, font_color, data[DATA_SPACING]);
}
void addHeader(char32 text)
void addHeader(char32[] text)
{
addLine(text, data[DATA_FONT], TF_CENTERED, data[DATA_TEXT_COLOR], data[DATA_HEADER_SPACING]);
}
void addHeader(char32 text, int font)
void addHeader(char32[] text, int font)
{
addLine(text, font, TF_CENTERED, data[DATA_TEXT_COLOR], data[DATA_HEADER_SPACING]);
}
void addHeader(char32 text, int font, int format)
void addHeader(char32[] text, int font, int format)
{
addLine(text, font, format, data[DATA_TEXT_COLOR], data[DATA_HEADER_SPACING]);
}
void addHeader(char32 text, int font, int format, int font_color)
void addHeader(char32[] text, int font, int format, int font_color)
{
addLine(text, font, format, font_color, data[DATA_HEADER_SPACING]);
}
void addLine(char32 text, int font, int format, int font_color, int spc)
void addLine(char32[] text, int font, int format, int font_color, int spc)
{
int x;
switch(format)
Expand Down
94 changes: 47 additions & 47 deletions tests/scripts/credits_expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ Compile finished with exit code '0' (success)
=== METADATA (elided)
{
"currentFileSymbols": 56,
"symbols": 109,
"symbols": 108,
"identifiers": 302
}
PUSHR REFFFC; void run() Body Start
SETR D4 SP2
CALLFUNC 0.0546; UsrFunc[void runTestCredits()] Call AND [Opt:NeverRet] AND [Opt:NeverRet] AND void run() Body End
SETR D4 SP2; Func[void addHeader(char32)] Body Start
SETR D4 SP2; Func[void addHeader(char32[])] Body Start
PUSHR D4
LOAD D2 0; UsrFunc[void addLine(char32, int, int, int, int)] Params Start
LOAD D2 0; UsrFunc[void addLine(char32[], int, int, int, int)] Params Start
PUSHR D2
SETR D2 GD3
PUSHR D2
Expand All @@ -36,12 +36,12 @@ SETR D2 GD3
PUSHR D2
POP D0
READPODARRAYV D2 2
PUSHR D2; UsrFunc[void addLine(char32, int, int, int, int)] Params End
CALLFUNC 0.0028; UsrFunc[void addLine(char32, int, int, int, int)] Call
PUSHR D2; UsrFunc[void addLine(char32[], int, int, int, int)] Params End
CALLFUNC 0.0028; UsrFunc[void addLine(char32[], int, int, int, int)] Call
POP D4
POP D5
RETURNFUNC; Func[void addHeader(char32)] Body End
PUSHARGSV 0 0.0003; Func[void addLine(char32, int, int, int, int)] Body Start
RETURNFUNC; Func[void addHeader(char32[])] Body End
PUSHARGSV 0 0.0003; Func[void addLine(char32[], int, int, int, int)] Body Start
SETR D4 SP2
STOREV 0 0.0002
LOAD D2 0.0005; switch() #62 Key
Expand Down Expand Up @@ -106,7 +106,7 @@ CALLFUNC 0.0160; UsrFunc[void resize(int)] Call
POP D4
SETR D2 GD2
STORE_OBJECT D2 0; if() #448 Body End
LOAD D2 0; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32, int)] Params Start
LOAD D2 0; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32[], int)] Params Start
PUSHR D2
PUSHV 0
LOAD D2 0.0002
Expand All @@ -129,10 +129,10 @@ LOAD D2 0.0005
PUSHR D2
LOAD D2 0.0007
PUSHR D2
PUSHV 128; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32, int)] Params End
BMPDRAWSTRINGR; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32, int)] Body Start
PUSHV 128; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32[], int)] Params End
BMPDRAWSTRINGR; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32[], int)] Body Start
POPARGS D5 0.0009
POP D3; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32, int)] Body End
POP D3; InlineFunc[void bitmap::DrawString(int, int, int, int, int, int, int, char32[], int)] Body End
SETR D2 GD3
PUSHR D2
POP D0
Expand All @@ -151,10 +151,10 @@ SETR D0 D2
POP D2
WRITEPODARRAYVR 0 D2
POPARGS D5 0.0008
RETURNFUNC; Func[void addLine(char32, int, int, int, int)] Body End
SETR D4 SP2; Func[void addLine(char32, int)] Body Start
RETURNFUNC; Func[void addLine(char32[], int, int, int, int)] Body End
SETR D4 SP2; Func[void addLine(char32[], int)] Body Start
PUSHR D4
LOAD D2 0.0001; UsrFunc[void addLine(char32, int, int, int, int)] Params Start
LOAD D2 0.0001; UsrFunc[void addLine(char32[], int, int, int, int)] Params Start
PUSHR D2
LOAD D2 0
PUSHR D2
Expand All @@ -168,11 +168,11 @@ SETR D2 GD3
PUSHR D2
POP D0
READPODARRAYV D2 1
PUSHR D2; UsrFunc[void addLine(char32, int, int, int, int)] Params End
CALLFUNC 0.0028; UsrFunc[void addLine(char32, int, int, int, int)] Call
PUSHR D2; UsrFunc[void addLine(char32[], int, int, int, int)] Params End
CALLFUNC 0.0028; UsrFunc[void addLine(char32[], int, int, int, int)] Call
POP D4
POPARGS D5 0.0002
RETURNFUNC; Func[void addLine(char32, int)] Body End
RETURNFUNC; Func[void addLine(char32[], int)] Body End
PUSHARGSV 0 0.0002; Func[void resize(int)] Body Start
SETR D4 SP2
SETR D2 GD2; if() #454 Test
Expand All @@ -199,13 +199,13 @@ PUSHV 0; InlineFunc[void bitmap::Clear(int)] Params End
CLEARBITMAP; InlineFunc[void bitmap::Clear(int)] Body Start
POPARGS D5 0.0001
POP D3; InlineFunc[void bitmap::Clear(int)] Body End
SETR D2 GD2; InlineFunc[const int Min(const int, int)] Params Start
SETR D2 GD2; InlineFunc[const int Min(const int, const int)] Params Start
PUSHR D2
POP REFBITMAP
PUSHVARGR BITMAPHEIGHT
LOAD D2 0.0002
PUSHVARGR D2; InlineFunc[const int Min(const int, int)] Params End
MINVARG; InlineFunc[const int Min(const int, int)] Body
PUSHVARGR D2; InlineFunc[const int Min(const int, const int)] Params End
MINVARG; InlineFunc[const int Min(const int, const int)] Body
STORE D2 0
SETR D2 GD2; InlineFunc[void bitmap::Blit(int, untyped, int, int, int, int, int, int, int, int, int, int, int, int, int, bool)] Params Start
PUSHR D2
Expand Down Expand Up @@ -456,7 +456,7 @@ SETR D0 D2
POP D2
WRITEPODARRAYVR 5 D2
RETURNFUNC; Func[void init()] Body End
PUSHV 0; Func[void output(char32)] Body Start
PUSHV 0; Func[void output(char32[])] Body Start
SETR D4 SP2
PUSHR D4
PUSHV 256; UsrFunc[bitmap create(int, int)] Params Start
Expand Down Expand Up @@ -491,21 +491,21 @@ PUSHARGSV 0 0.0006; InlineFunc[void bitmap::Blit(int, untyped, int, int, int, in
BMPBLIT; InlineFunc[void bitmap::Blit(int, untyped, int, int, int, int, int, int, int, int, int, int, int, int, int, bool)] Body Start
POPARGS D5 0.0016
POP REFBITMAP; InlineFunc[void bitmap::Blit(int, untyped, int, int, int, int, int, int, int, int, int, int, int, int, int, bool)] Body End
LOAD D2 0; InlineFunc[void bitmap::Write(int, char32, bool)] Params Start
LOAD D2 0; InlineFunc[void bitmap::Write(int, char32[], bool)] Params Start
PUSHR D2
PUSHV 7
LOAD D2 0.0001
PUSHR D2
PUSHV 1; InlineFunc[void bitmap::Write(int, char32, bool)] Params End
WRITEBITMAP; InlineFunc[void bitmap::Write(int, char32, bool)] Body Start
PUSHV 1; InlineFunc[void bitmap::Write(int, char32[], bool)] Params End
WRITEBITMAP; InlineFunc[void bitmap::Write(int, char32[], bool)] Body Start
POPARGS D5 0.0003
POP D3; InlineFunc[void bitmap::Write(int, char32, bool)] Body End
POP D3; InlineFunc[void bitmap::Write(int, char32[], bool)] Body End
LOAD D2 0; InlineFunc[void bitmap::Free()] Params Start
SETR REFBITMAP D2; InlineFunc[void bitmap::Free()] Params End
BITMAPFREE; InlineFunc[void bitmap::Free()] Body
REF_REMOVE 0
POPARGS D5 0.0002
RETURNFUNC; Func[void output(char32)] Body End
RETURNFUNC; Func[void output(char32[])] Body End
PUSHARGSV 0 0.0002; Func[void rollCredits(int)] Body Start
SETR D4 SP2
STOREV -224 0.0001; for() #160 setup
Expand Down Expand Up @@ -568,72 +568,72 @@ ALLOCATEMEMV D2 7 0
STORE D2 0.0007
WRITEPODSTRING D2 "Author"
PUSHR D4
LOAD D2 0.0007; UsrFunc[void addHeader(char32)] Params Start
PUSHR D2; UsrFunc[void addHeader(char32)] Params End
CALLFUNC 0.0004; UsrFunc[void addHeader(char32)] Call
LOAD D2 0.0007; UsrFunc[void addHeader(char32[])] Params Start
PUSHR D2; UsrFunc[void addHeader(char32[])] Params End
CALLFUNC 0.0004; UsrFunc[void addHeader(char32[])] Call
POP D4
LOAD D3 0.0007
DEALLOCATEMEMR D3
ALLOCATEMEMV D2 6 0
STORE D2 0.0006
WRITEPODSTRING D2 "Emily"
PUSHR D4
LOAD D2 0.0006; UsrFunc[void addLine(char32, int)] Params Start
LOAD D2 0.0006; UsrFunc[void addLine(char32[], int)] Params Start
PUSHR D2
PUSHV 2; UsrFunc[void addLine(char32, int)] Params End
CALLFUNC 0.0139; UsrFunc[void addLine(char32, int)] Call
PUSHV 2; UsrFunc[void addLine(char32[], int)] Params End
CALLFUNC 0.0139; UsrFunc[void addLine(char32[], int)] Call
POP D4
LOAD D3 0.0006
DEALLOCATEMEMR D3
ALLOCATEMEMV D2 9 0
STORE D2 0.0005
WRITEPODSTRING D2 "Graphics"
PUSHR D4
LOAD D2 0.0005; UsrFunc[void addHeader(char32)] Params Start
PUSHR D2; UsrFunc[void addHeader(char32)] Params End
CALLFUNC 0.0004; UsrFunc[void addHeader(char32)] Call
LOAD D2 0.0005; UsrFunc[void addHeader(char32[])] Params Start
PUSHR D2; UsrFunc[void addHeader(char32[])] Params End
CALLFUNC 0.0004; UsrFunc[void addHeader(char32[])] Call
POP D4
LOAD D3 0.0005
DEALLOCATEMEMR D3
ALLOCATEMEMV D2 6 0
STORE D2 0.0004
WRITEPODSTRING D2 "Emily"
PUSHR D4
LOAD D2 0.0004; UsrFunc[void addLine(char32, int)] Params Start
LOAD D2 0.0004; UsrFunc[void addLine(char32[], int)] Params Start
PUSHR D2
PUSHV 2; UsrFunc[void addLine(char32, int)] Params End
CALLFUNC 0.0139; UsrFunc[void addLine(char32, int)] Call
PUSHV 2; UsrFunc[void addLine(char32[], int)] Params End
CALLFUNC 0.0139; UsrFunc[void addLine(char32[], int)] Call
POP D4
LOAD D3 0.0004
DEALLOCATEMEMR D3
ALLOCATEMEMV D2 8 0
STORE D2 0.0003
WRITEPODSTRING D2 "Scripts"
PUSHR D4
LOAD D2 0.0003; UsrFunc[void addHeader(char32)] Params Start
PUSHR D2; UsrFunc[void addHeader(char32)] Params End
CALLFUNC 0.0004; UsrFunc[void addHeader(char32)] Call
LOAD D2 0.0003; UsrFunc[void addHeader(char32[])] Params Start
PUSHR D2; UsrFunc[void addHeader(char32[])] Params End
CALLFUNC 0.0004; UsrFunc[void addHeader(char32[])] Call
POP D4
LOAD D3 0.0003
DEALLOCATEMEMR D3
ALLOCATEMEMV D2 6 0
STORE D2 0.0002
WRITEPODSTRING D2 "Emily"
PUSHR D4
LOAD D2 0.0002; UsrFunc[void addLine(char32, int)] Params Start
LOAD D2 0.0002; UsrFunc[void addLine(char32[], int)] Params Start
PUSHR D2
PUSHV 2; UsrFunc[void addLine(char32, int)] Params End
CALLFUNC 0.0139; UsrFunc[void addLine(char32, int)] Call
PUSHV 2; UsrFunc[void addLine(char32[], int)] Params End
CALLFUNC 0.0139; UsrFunc[void addLine(char32[], int)] Call
POP D4
LOAD D3 0.0002
DEALLOCATEMEMR D3
ALLOCATEMEMV D2 15 0
STORE D2 0.0001
WRITEPODSTRING D2 "CreditsBMP.png"
PUSHR D4
LOAD D2 0.0001; UsrFunc[void output(char32)] Params Start
PUSHR D2; UsrFunc[void output(char32)] Params End
CALLFUNC 0.0443; UsrFunc[void output(char32)] Call
LOAD D2 0.0001; UsrFunc[void output(char32[])] Params Start
PUSHR D2; UsrFunc[void output(char32[])] Params End
CALLFUNC 0.0443; UsrFunc[void output(char32[])] Call
POP D4
LOAD D3 0.0001
DEALLOCATEMEMR D3
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/errors/errors_3.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ global script Global
obj = number;
int numbers[] = {obj};
Object objects[] = numbers;
Object objects2[] = new Object(); // TODO: this should be invalid.
Object objects2[] = new Object();

// OK.
int numbers2[] = {obj, <untyped>1};
Expand Down
1 change: 1 addition & 0 deletions tests/scripts/errors/errors_3_expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ZQ_BUFFER Line 13 @ Columns 13-19 - Error T017: Cannot cast from Object to int.
ZQ_BUFFER Line 14 @ Columns 3-15 - Error T017: Cannot cast from int to Object.
ZQ_BUFFER Line 15 @ Columns 7-14 - Error T017: Cannot cast from Object[] to int[].
ZQ_BUFFER Line 16 @ Columns 10-17 - Error T017: Cannot cast from int[] to Object[].
ZQ_BUFFER Line 17 @ Columns 10-18 - Error T017: Cannot cast from Object to Object[].
ZQ_BUFFER Line 22 @ Columns 8-16 - Error T017: Cannot cast from Object[] to auto[].
ZQ_BUFFER Line 23 @ Columns 8-16 - Error T017: Cannot cast from int[] to auto[].
Failure!
Expand Down
13 changes: 2 additions & 11 deletions tests/scripts/errors/errors_4.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ global script Global
// Invalid.
Object n1 = ArrayPopBack(numbers);
ArrayPushBack(numbers, obj);
ArrayPushBack(numbers, ""); // TODO: this should be invalid (but requires a big change for strings, should add a string type).
ArrayPushBack(numbers, "");
ArrayPushBack(numbers, 1L); // TODO: this should be invalid (else: we perform an implicit cast and multiply by 10000...)
SizeOfArray(Hero); // TODO: this is currently allowed as a side effect of the "old ptr compat" in `applyTemplateTypes`
SizeOfArray(Hero);
Object choice_1 = Choose(1, 2, 3);
auto choice_2 = Choose(1, 2, obj);
auto max_1 = Max(1, 2, obj);
Expand All @@ -34,13 +34,4 @@ global script Global
max_2 = Max(1, 2, 3);
max_2 = Max(1, 2, 3, Max(3, 4));
}

// The template checking code explicitly allows char32 as an "array" type,
// for compat.
void old_ptrs(char32 ptr)
{
// OK
ArrayPushBack(ptr, 1);
ResizeArray(ptr, 1);
}
}
2 changes: 2 additions & 0 deletions tests/scripts/errors/errors_4_expected.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Pass 3: Registration
Pass 4: Analyzing Code
ZQ_BUFFER Line 14 @ Columns 10-12 - Error T017: Cannot cast from int to Object.
ZQ_BUFFER Line 15 @ Columns 3-30 - Error T021: Function ArrayPushBack(int[], Object) has not been declared.
ZQ_BUFFER Line 16 @ Columns 3-29 - Error T021: Function ArrayPushBack(int[], char32[]) has not been declared.
ZQ_BUFFER Line 18 @ Columns 3-20 - Error T021: Function SizeOfArray(const player) has not been declared.
ZQ_BUFFER Line 19 @ Columns 10-18 - Error T017: Cannot cast from int to Object.
ZQ_BUFFER Line 20 @ Columns 19-36 - Error T021: Function Choose(int, int, Object) has not been declared.
ZQ_BUFFER Line 21 @ Columns 16-30 - Error T021: Function Max(int, int, Object) has not been declared.
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/gc.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ ffc script GarbageCollection
int tests = 0;
int frames = 0;

void check(char32 context, int value, int expected)
void check(char32[] context, int value, int expected)
{
if (value != expected)
printf("[%s] ERROR: expected %l but got %l\n", context, expected, value);
Expand Down

0 comments on commit 873e7ec

Please sign in to comment.