From 5e89d684c41a735cb86d674f101d0a6c8d509098 Mon Sep 17 00:00:00 2001
From: John Tinnerholm <jtinnerholm@gmail.com>
Date: Thu, 7 Jan 2021 16:50:11 +0100
Subject: [PATCH] Untabified all tests
---
lab3-4/test/factorial_test.prog | 28 ++++----
lab3-4/test/fibonacci_test.prog | 39 ++++++-----
lab3-4/test/simple_array_test.prog | 36 +++++-----
lab3-4/test/sort_test.prog | 101 +++++++++++++++--------------
4 files changed, 108 insertions(+), 96 deletions(-)
diff --git a/lab3-4/test/factorial_test.prog b/lab3-4/test/factorial_test.prog
index 3229089..639e15b 100644
--- a/lab3-4/test/factorial_test.prog
+++ b/lab3-4/test/factorial_test.prog
@@ -3,22 +3,24 @@
Author: John Tinnerholm
*/
declare
- a : integer;
+ a : integer;
function fac (x : integer) : integer
begin
- if x == 0 then
- begin
- return 1;
- end
+ if x == 0 then
+ begin
+ return 1;
+ end
else
- begin
- return x * fac(x - 1);
- end if;
+ begin
+ return x * fac(x - 1);
+ end
+ if;
end;
+
begin
- a := 1+2;
- putint(a); //Should be 3
- putline();
- putint(fac(5)); //Should be 120
- putline();
+ a := 1+2;
+ putint(a); //Should be 3
+ putline();
+ putint(fac(5)); //Should be 120
+ putline();
end;
diff --git a/lab3-4/test/fibonacci_test.prog b/lab3-4/test/fibonacci_test.prog
index a6ebcc1..c4c000b 100644
--- a/lab3-4/test/fibonacci_test.prog
+++ b/lab3-4/test/fibonacci_test.prog
@@ -6,25 +6,28 @@ declare
a : integer;
function fib (x : integer) : integer
begin
- if x == 0 then
- begin
- return 0;
- end
- elseif x == 1 then
- begin
- return 1;
- end
- else
- begin
- return fib(x - 1) + fib(x-2);
- end if;
+ if x == 0 then
+ begin
+ return 0;
+ end
+ elseif x == 1 then
+ begin
+ return 1;
+ end
+ else
+ begin
+ return fib(x - 1) + fib(x-2);
+ end
+ if;
end;
+
begin
- a := 0;
- while a < 10 do
+ a := 0;
+ while a < 10 do
begin
- putint(fib(a));
- putline();
- a := a + 1;
- end while;
+ putint(fib(a));
+ putline();
+ a := a + 1;
+ end
+ while;
end;
diff --git a/lab3-4/test/simple_array_test.prog b/lab3-4/test/simple_array_test.prog
index 734c57d..2cd5539 100644
--- a/lab3-4/test/simple_array_test.prog
+++ b/lab3-4/test/simple_array_test.prog
@@ -4,24 +4,26 @@
Author: John Tinnerholm
*/
declare
- i : integer;
- ii : real;
- elements : array 5 of real;
+ i : integer;
+ ii : real;
+ elements : array 5 of real;
begin
- i := 0;
- ii := 0.;
- while i < 5 do
+ i := 0;
+ ii := 0.;
+ while i < 5 do
begin
- ii := 1.0 + ii;
- elements[i] := ii;
- i := i + 1;
- end while;
- /* Should print 1,2,3,4,5 */
- i := 0;
- while i < 5 do
+ ii := 1.0 + ii;
+ elements[i] := ii;
+ i := i + 1;
+ end
+ while;
+/* Should print 1,2,3,4,5 */
+ i := 0;
+ while i < 5 do
begin
- putreal(elements[i]);
- putline();
- i := i + 1;
- end while;
+ putreal(elements[i]);
+ putline();
+ i := i + 1;
+ end
+ while;
end;
\ No newline at end of file
diff --git a/lab3-4/test/sort_test.prog b/lab3-4/test/sort_test.prog
index 77b92d5..38356d3 100644
--- a/lab3-4/test/sort_test.prog
+++ b/lab3-4/test/sort_test.prog
@@ -4,60 +4,65 @@
Author: John Tinnerholm
*/
declare
- i : integer;
- j : integer;
- tmp1 : integer;
- current_min : integer;
- length_of_array : integer;
- array_to_be_sorted : array 10 of integer;
+ i : integer;
+ j : integer;
+ tmp1 : integer;
+ current_min : integer;
+ length_of_array : integer;
+ array_to_be_sorted : array 10 of integer;
begin
- i := 0;
- j := 0;
- length_of_array := 10;
+ i := 0;
+ j := 0;
+ length_of_array := 10;
- array_to_be_sorted[0] := 10;
- array_to_be_sorted[1] := 9;
- array_to_be_sorted[2] := 8;
- array_to_be_sorted[3] := 7;
- array_to_be_sorted[4] := 6;
- array_to_be_sorted[5] := 5;
- array_to_be_sorted[6] := 4;
- array_to_be_sorted[7] := 3;
- array_to_be_sorted[8] := 2;
- array_to_be_sorted[9] := 1;
+ array_to_be_sorted[0] := 10;
+ array_to_be_sorted[1] := 9;
+ array_to_be_sorted[2] := 8;
+ array_to_be_sorted[3] := 7;
+ array_to_be_sorted[4] := 6;
+ array_to_be_sorted[5] := 5;
+ array_to_be_sorted[6] := 4;
+ array_to_be_sorted[7] := 3;
+ array_to_be_sorted[8] := 2;
+ array_to_be_sorted[9] := 1;
//Print unsorted array
- while i < length_of_array do
+ while i < length_of_array do
begin
- putint(array_to_be_sorted[i]);
- putline();
- i := i + 1;
- end while;
-i := 0;
-j := 0;
- while i < length_of_array - 1 do
+ putint(array_to_be_sorted[i]);
+ putline();
+ i := i + 1;
+ end
+ while;
+ i := 0;
+ j := 0;
+ while i < length_of_array - 1 do
begin
- current_min := i;
- j := i + 1;
- while j < length_of_array do
- begin
- if array_to_be_sorted[current_min] > array_to_be_sorted[j] then
- begin
- current_min := j;
- end if;
- j := j + 1;
- end while;
- tmp1 := array_to_be_sorted[i];
- array_to_be_sorted[i] := array_to_be_sorted[current_min];
- array_to_be_sorted[current_min] := tmp1;
- i := i + 1;
- end while;
- putline();
+ current_min := i;
+ j := i + 1;
+ while j < length_of_array do
+ begin
+ if array_to_be_sorted[current_min] > array_to_be_sorted[j] then
+ begin
+ current_min := j;
+ end
+ if;
+ j := j + 1;
+ end
+ while;
+ tmp1 := array_to_be_sorted[i];
+ array_to_be_sorted[i] := array_to_be_sorted[current_min];
+ array_to_be_sorted[current_min] := tmp1;
+ i := i + 1;
+ end
+ while;
+putline();
/* Print the sorted array*/
i := 0;
while i < length_of_array do
- begin
- putint(array_to_be_sorted[i]);
- putline();
- i := i + 1;
- end while;
+ begin
+ putint(array_to_be_sorted[i]);
+ putline();
+ i := i + 1;
+ end
+ while;
end;
--
GitLab