Skip to content

Fix errors in the test programs. #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bairyn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix errors in the test programs. #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fdd6d9
Fix some errors in the test programs.
bairyn Jun 16, 2020
ff1aa0b
Fix the implementation of checkers.
bairyn Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TestFiles/binary_tree.cpsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ begin
read(a);
while (a <> 0) & (nodeCount < TABLEN) do
nodelist[nodeCount] := a;
makeNode(a);
makeNode();
addNode(); $ add node to tree
read(a);
nodeCount := nodeCount + 1;
Expand All @@ -70,7 +70,7 @@ begin
nodeCount := nodeCount - 1;
else
nodelist[nodeCount] := a;
makeNode(a);
makeNode();
addNode(); $ add node to tree
end;
end;
Expand Down
99 changes: 68 additions & 31 deletions TestFiles/checkers.cpsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ procedure init_board();
var i : integer;
begin
for i := 0 to 23 do
if ((i % 8) + (i % 2)) = 0 then
if (i / 8) % 2 = (i % 2) then
game_board[i] := 'x';
else
game_board[i] := ' ';
end;
end;

for i := 24 to 39 do
gameBoard[i] := ' ';
game_board[i] := ' ';
end;

for i := 40 to 63 do
if ((i % 8) + (i % 2)) = 0 then
game_board[i] := 'x';
if (i / 8) % 2 = (i % 2) then
game_board[i] := 'o';
else
game_board[i] := ' ';
end;
Expand All @@ -31,24 +31,24 @@ end;
function pieces_remaining(label : char) : integer;
var i, count : integer;
begin
remain := 0;
count := 0;
for i := 0 to 63 do
if (game_board[i] = label) then
remain := remain + 1;
count := count + 1;
end;
end;
return remain;
return count;
end;

procedure print_board();
var i : integer;
begin
$ write(' ', gameBoard[1], " | ", gameBoard[2], " | ", gameBoard[3], ' ', gameBoard[4], " | ", gameBoard[5], " | ", gameBoard[6], ' ', gameBoard[7], '\n');
$ write(' ', game_board[1], " | ", game_board[2], " | ", game_board[3], ' ', game_board[4], " | ", game_board[5], " | ", game_board[6], ' ', game_board[7], '\n');
$ write("-----------\n");

i := 0;
for i := 7 downto 0 do
write(gameBoard[8*i], gameBoard[8*i + 1], gameBoard[8*i + 2], gameBoard[8*i + 3], gameBoard[8*i + 4], gameBoard[8*i + 5], gameBoard[8*i + 6], gameBoard[8*i + 7], '\n');
write(game_board[8*i], game_board[8*i + 1], game_board[8*i + 2], game_board[8*i + 3], game_board[8*i + 4], game_board[8*i + 5], game_board[8*i + 6], game_board[8*i + 7], " ", 8*i, "-", 8*i+7, '\n');
end;
end;

Expand All @@ -59,25 +59,36 @@ begin
adj := 0;

if dir = 0 then
adj := -7;
elseif dir = 1 then
adj := 9;
elseif dir = 1 then
adj := -7;
elseif dir = 2 then
adj := 7;
elseif dir = 3 then
adj := -9;
elseif dir = 3 then
adj := 7;
end;
new := new + adj;
if new >= 64 then
return -3;
end;

$ This logic implements a cylinder shaped board.
if game_board[new] = game_board[cell] then
new := -1;
elseif game_board[new] <> ' ' then
new := new + adj;

if new >= 64 then
return -4;
end;

if game_board[new] <> ' ' then
new := -2;
end;

if new >= 0 then
game_board[new - adj] := ' ';
end;
end;

return new;
Expand All @@ -90,20 +101,33 @@ begin
dir := -1;
new := -1;

while ~((cell > -1) & (cell < 64) & (new < 0)) do
while ~((cell > -1) & (cell < 64) & (new >= 0)) do
write("\nEnter the number of a square with an x: ");
read(cell);
write('\n');

write("\n3 0\n");
write(" x \n");
write("2 1\n");
if ~((cell > -1) & (cell < 64)) then
print_board();
write("Invalid cell.\n");
elseif game_board[cell] <> 'x' then
print_board();
write("Invalid cell.\n");
else
write("\n3 0\n");
write(" x \n");
write("2 1\n");

write("\nPick a direction: \n");
read(dir);
write('\n');
write("\nPick a direction: \n");
read(dir);
write('\n');

new := move_cell(cell, dir);

new := move_cell(cel, dir);
if new < 0 then
print_board();
write("Invalid move.\n");
end;
end;
end;

game_board[cell] := ' ';
Expand All @@ -122,20 +146,33 @@ begin
dir := -1;
new := -1;

while ~((cell > -1) & (cell < 64) & (new < 0)) do
while ~((cell > -1) & (cell < 64) & (new >= 0)) do
write("\nEnter the number of a square with an o: ");
read(cell);
write('\n');

write("\n3 0\n");
write(" x \n");
write("2 1\n");
if ~((cell > -1) & (cell < 64)) then
print_board();
write("Invalid cell.\n");
elseif game_board[cell] <> 'o' then
print_board();
write("Invalid cell.\n");
else
write("\n3 0\n");
write(" x \n");
write("2 1\n");

write("\nPick a direction: \n");
read(dir);
write('\n');
write("\nPick a direction: \n");
read(dir);
write('\n');

new := move_cell(cel, dir);
new := move_cell(cell, dir);

if new < 0 then
print_board();
write("Invalid move.\n");
end;
end;
end;

game_board[cell] := ' ';
Expand Down Expand Up @@ -164,7 +201,7 @@ end;
begin
init_board();

while (pieces_remaing('x') > 0) & (pieces_remaining('o') > 0) do
while (pieces_remaining('x') > 0) & (pieces_remaining('o') > 0) do
print_board();

if (turn = 0) then
Expand All @@ -183,4 +220,4 @@ begin
end;

write("\nGame Over.\n");
end.
end.
7 changes: 4 additions & 3 deletions TestFiles/game_form.cpsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ var
begin
write("Enter ManchesterUnited score: \n");
read(hscore.score1);
Write("Enter Away team score \n");
write("Enter Away team score \n");
read(hscore.score2);
if hscore.score1 > hscore.score2 then
bool1 := true;
hscore.bool1 := true;
else
bool1 := false;
hscore.bool1 := false;
end;
return hscore
end;


Expand Down
2 changes: 1 addition & 1 deletion TestFiles/hanoi.cpsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var disks : integer;

procedure moveTower(var disk: integer; source,dest,spare: character);
procedure moveTower(var disk: integer; source,dest,spare: char);
begin
if(disk=1) then
write("Move ",disk," from ",source," to ",dest,'\n');
Expand Down
6 changes: 3 additions & 3 deletions TestFiles/repeat.cpsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ i := 0;
repeat
write("i: ", i, " \n");
i := i+1;
until i < 5;
until i >= 5;

repeat
write("should only happen once ", i, " \n");
i := i+1;
until i < 5;
until i >= 5;

while (i < 5) do
write("should not happen");
end;

END.
END.
Loading