Sancaros/phantasmal-world
1
0
Fork 0
mirror of https://github.com/DaanVandenBosch/phantasmal-world.git synced 2025-04-05 15:28:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed unit tests.

Browse Source
This commit is contained in:
Daan Vanden Bosch 2019-10-02 20:20:59 +02:00
parent 6396eb1bdf
commit bffd8f51d9
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/quest_editor/scripting/assembly.test.ts
View File

@ -37,27 +37,37 @@ test("basic script", () => {
expect(segment_0.instructions.length).toBe(9);
expect(segment_0.instructions[0].opcode).toBe(OP_SET_EPISODE);
expect(segment_0.instructions[0].args).toEqual([{ value: 0, size: 4 }]);
expect(segment_0.instructions[0].args).toEqual([
{ value: 0, size: 4, asm: { col: 22, len: 1 } },
]);
expect(segment_0.instructions[1].opcode).toBe(OP_BB_MAP_DESIGNATE);
expect(segment_0.instructions[1].args).toEqual([
{ value: 1, size: 1 },
{ value: 2, size: 2 },
{ value: 3, size: 1 },
{ value: 4, size: 1 },
{ value: 1, size: 1, asm: { col: 27, len: 1 } },
{ value: 2, size: 2, asm: { col: 30, len: 1 } },
{ value: 3, size: 1, asm: { col: 33, len: 1 } },
{ value: 4, size: 1, asm: { col: 36, len: 1 } },
]);
expect(segment_0.instructions[2].opcode).toBe(OP_ARG_PUSHL);
expect(segment_0.instructions[2].args).toEqual([{ value: 0, size: 4 }]);
expect(segment_0.instructions[2].args).toEqual([
{ value: 0, size: 4, asm: { col: 28, len: 1 } },
]);
expect(segment_0.instructions[3].opcode).toBe(OP_ARG_PUSHW);
expect(segment_0.instructions[3].args).toEqual([{ value: 150, size: 2 }]);
expect(segment_0.instructions[3].args).toEqual([
{ value: 150, size: 2, asm: { col: 31, len: 3 } },
]);
expect(segment_0.instructions[4].opcode).toBe(OP_SET_FLOOR_HANDLER);
expect(segment_0.instructions[4].args).toEqual([]);
expect(segment_0.instructions[5].opcode).toBe(OP_ARG_PUSHL);
expect(segment_0.instructions[5].args).toEqual([{ value: 1, size: 4 }]);
expect(segment_0.instructions[5].args).toEqual([
{ value: 1, size: 4, asm: { col: 28, len: 1 } },
]);
expect(segment_0.instructions[6].opcode).toBe(OP_ARG_PUSHW);
expect(segment_0.instructions[6].args).toEqual([{ value: 151, size: 2 }]);
expect(segment_0.instructions[6].args).toEqual([
{ value: 151, size: 2, asm: { col: 31, len: 3 } },
]);
expect(segment_0.instructions[7].opcode).toBe(OP_SET_FLOOR_HANDLER);
expect(segment_0.instructions[7].args).toEqual([]);
@ -70,7 +80,9 @@ test("basic script", () => {
expect(segment_1.instructions.length).toBe(3);
expect(segment_1.instructions[0].opcode).toBe(OP_ARG_PUSHL);
expect(segment_1.instructions[0].args).toEqual([{ value: 1, size: 4 }]);
expect(segment_1.instructions[0].args).toEqual([
{ value: 1, size: 4, asm: { col: 23, len: 1 } },
]);
expect(segment_1.instructions[1].opcode).toBe(OP_SET_MAINWARP);
expect(segment_1.instructions[1].args).toEqual([]);
@ -107,7 +119,9 @@ test("pass the value of a register via the stack", () => {
expect(segment_0.instructions.length).toBe(4);
expect(segment_0.instructions[1].opcode).toBe(OP_ARG_PUSHR);
expect(segment_0.instructions[1].args).toEqual([{ value: 255, size: 1 }]);
expect(segment_0.instructions[1].args).toEqual([
{ value: 255, size: 1, asm: { col: 14, len: 4 } },
]);
});
test("pass a register reference via the stack", () => {
@ -130,8 +144,12 @@ test("pass a register reference via the stack", () => {
expect(segment_0.instructions.length).toBe(4);
expect(segment_0.instructions[0].opcode).toBe(OP_ARG_PUSHB);
expect(segment_0.instructions[0].args).toEqual([{ value: 200, size: 1 }]);
expect(segment_0.instructions[0].args).toEqual([
{ value: 200, size: 1, asm: { col: 19, len: 4 } },
]);
expect(segment_0.instructions[1].opcode).toBe(OP_ARG_PUSHL);
expect(segment_0.instructions[1].args).toEqual([{ value: 3, size: 4 }]);
expect(segment_0.instructions[1].args).toEqual([
{ value: 3, size: 4, asm: { col: 25, len: 1 } },
]);
});

12
src/quest_editor/scripting/instructions.ts
View File

@ -30,14 +30,10 @@ export type Instruction = {
/**
* Dimensions of the opcode's mnemonic in the related asm code.
*/
readonly asm: AsmToken;
readonly asm?: AsmToken;
};
export function new_instruction(
opcode: Opcode,
args: Arg[],
asm: AsmToken = { col: 0, len: 0 },
): Instruction {
export function new_instruction(opcode: Opcode, args: Arg[], asm?: AsmToken): Instruction {
const len = Math.min(opcode.params.length, args.length);
const param_to_args: Arg[][] = [];
let arg_size = 0;
@ -85,10 +81,10 @@ function instructions_equal(a: Instruction, b: Instruction): boolean {
export type Arg = {
readonly value: any;
readonly size: number;
readonly asm: AsmToken;
readonly asm?: AsmToken;
};
export function new_arg(value: any, size: number, asm: AsmToken = { col: 0, len: 0 }): Arg {
export function new_arg(value: any, size: number, asm?: AsmToken): Arg {
return {
value,
size,