Replace procedure end with return

20 files changed, 34 insertions, 81 deletions

diff --git a/testsuite/compilable/assign_record_to_base.elna b/testsuite/compilable/assign_record_to_base.elna
index 7583c70..fb28e7b 100644
--- a/testsuite/compilable/assign_record_to_base.elna
+++ b/testsuite/compilable/assign_record_to_base.elna
@@ -12,5 +12,4 @@ var
 
 begin
   x := y;
-  return 0
 end.
diff --git a/testsuite/compilable/empty_proc.elna b/testsuite/compilable/empty_proc.elna
index fb07285..bf3bd84 100644
--- a/testsuite/compilable/empty_proc.elna
+++ b/testsuite/compilable/empty_proc.elna
@@ -1,4 +1,4 @@
 proc f()
-end
+return
 
 end.
diff --git a/testsuite/compilable/empty_statements_in_a_row.elna b/testsuite/compilable/empty_statements_in_a_row.elna
index 3cc283c..7cf723c 100644
--- a/testsuite/compilable/empty_statements_in_a_row.elna
+++ b/testsuite/compilable/empty_statements_in_a_row.elna
@@ -1,6 +1,6 @@
 proc f()
 begin
   ;
-end
+return
 
 end.
diff --git a/testsuite/compilable/float_literals.elna b/testsuite/compilable/float_literals.elna
index 1ce914d..ed23989 100644
--- a/testsuite/compilable/float_literals.elna
+++ b/testsuite/compilable/float_literals.elna
@@ -4,6 +4,6 @@ const
   y := 1e10
   z := 4.567e8
   t := 2.5E-3
-end
+return
 
 end.
diff --git a/testsuite/compilable/pointer_cast.elna b/testsuite/compilable/pointer_cast.elna
index 64b99ca..ab4b071 100644
--- a/testsuite/compilable/pointer_cast.elna
+++ b/testsuite/compilable/pointer_cast.elna
@@ -5,6 +5,4 @@ var
 begin
   p := c;
   c := p;
-
-  return 0
 end.
diff --git a/testsuite/compilable/pointer_subtraction.elna b/testsuite/compilable/pointer_subtraction.elna
index 400d4f1..c268113 100644
--- a/testsuite/compilable/pointer_subtraction.elna
+++ b/testsuite/compilable/pointer_subtraction.elna
@@ -1,4 +1,4 @@
 proc test(a, b: ^Char): Int
-  return a - b
-end
+return a - b
+
 end.
diff --git a/testsuite/compilable/semicolon_parameter_separator.elna b/testsuite/compilable/semicolon_parameter_separator.elna
index 36c8f29..229fde0 100644
--- a/testsuite/compilable/semicolon_parameter_separator.elna
+++ b/testsuite/compilable/semicolon_parameter_separator.elna
@@ -1,4 +1,4 @@
 proc f(a: Int; b: Word)
-end
+return
 
 end.
diff --git a/testsuite/fail_compilation/local_const_exported.elna b/testsuite/fail_compilation/local_const_exported.elna
index c914af5..1c6c728 100644
--- a/testsuite/fail_compilation/local_const_exported.elna
+++ b/testsuite/fail_compilation/local_const_exported.elna
@@ -1,6 +1,6 @@
 proc test_local_export()
 const
   c* := 42 (* @Error Local symbol 'c' cannot be exported *)
-begin
-end
+return
+
 end.
diff --git a/testsuite/fail_compilation/local_var_exported.elna b/testsuite/fail_compilation/local_var_exported.elna
index 77b408c..5323e5e 100644
--- a/testsuite/fail_compilation/local_var_exported.elna
+++ b/testsuite/fail_compilation/local_var_exported.elna
@@ -1,6 +1,6 @@
 proc test_local_export()
 var
   v* : Int (* @Error Local symbol 'v' cannot be exported *)
-begin
-end
+return
+
 end.
diff --git a/testsuite/fail_compilation/module_without_return.elna b/testsuite/fail_compilation/module_without_return.elna
deleted file mode 100644
index f2ece07..0000000
--- a/testsuite/fail_compilation/module_without_return.elna
+++ /dev/null
@@ -1,6 +0,0 @@
-var (* @Error Procedure 'module' is expected to return, but does not have a return statement *)
-  x: Int
-
-begin
-  x := 42
-end.
diff --git a/testsuite/runnable/aggregate_argument.elna b/testsuite/runnable/aggregate_argument.elna
index b92e460..89059db 100644
--- a/testsuite/runnable/aggregate_argument.elna
+++ b/testsuite/runnable/aggregate_argument.elna
@@ -4,18 +4,9 @@ type
     b: Int
   end
 
-proc f(r: R): Int
-var
-  result: Int
-begin
-  if r.a = 1 & r.b = 2 then
-    result := 0
-  else
-    result := 1
-  end;
-  return result
-end
-
-return f(R(1, 2))
+proc f(r: R): Bool
+return r.a = 1 & r.b = 2
 
+begin
+  assert(f(R(1, 2)))
 end.
diff --git a/testsuite/runnable/aggregate_equality.elna b/testsuite/runnable/aggregate_equality.elna
index 9f9e8fc..9cd9ab5 100644
--- a/testsuite/runnable/aggregate_equality.elna
+++ b/testsuite/runnable/aggregate_equality.elna
@@ -4,18 +4,9 @@ type
     b: Int
   end
 
-proc f(): Int
-var
-  result: Int
-begin
-  if R(1, 2) = R(1, 2) then
-    result := 0
-  else
-    result := 1
-  end;
-  return result
-end
-
-return f()
+proc f(): Bool
+return R(1, 2) = R(1, 2)
 
+begin
+  assert(f())
 end.
diff --git a/testsuite/runnable/array_constructor.elna b/testsuite/runnable/array_constructor.elna
index 2ce3578..feefbe7 100644
--- a/testsuite/runnable/array_constructor.elna
+++ b/testsuite/runnable/array_constructor.elna
@@ -8,5 +8,4 @@ begin
 
   a := [3]Int{5, 6, 7};
   assert(a[1] = 5 & a[2] = 6 & a[3] = 7)
-return 0
 end.
diff --git a/testsuite/runnable/define_multiple_local_variables.elna b/testsuite/runnable/define_multiple_local_variables.elna
index afae692..51b99ac 100644
--- a/testsuite/runnable/define_multiple_local_variables.elna
+++ b/testsuite/runnable/define_multiple_local_variables.elna
@@ -1,16 +1,8 @@
-proc f(): Int
+proc f(): Bool
 var
   a, b: Int := 5
-  result: Int
-begin
-  if a = 5 & b = 5 then
-    result := 0
-  else
-    result := 1
-  end;
-  return result
-end
-
-return f()
+return a = 5 & b = 5
 
+begin
+  assert(f())
 end.
diff --git a/testsuite/runnable/record_base_assignment.elna b/testsuite/runnable/record_base_assignment.elna
index c91383d..2a15d0f 100644
--- a/testsuite/runnable/record_base_assignment.elna
+++ b/testsuite/runnable/record_base_assignment.elna
@@ -6,17 +6,16 @@ type
     y: Word
   end
 
-proc f(): Int
+proc f()
 var
   r: R
 begin
   r.x := 3u;
   r.y := 2u;
 
-  assert(r.x = 3u & r.y = 2u);
+  assert(r.x = 3u & r.y = 2u)
+return
 
-  return 0
-end
-
-  return f()
+begin
+  f()
 end.
diff --git a/testsuite/runnable/record_construction.elna b/testsuite/runnable/record_construction.elna
index 00e60db..2bbc493 100644
--- a/testsuite/runnable/record_construction.elna
+++ b/testsuite/runnable/record_construction.elna
@@ -8,5 +8,4 @@ var
 
 begin
   assert(r.x = 1 & r.y = 2)
-return 0
 end.
diff --git a/testsuite/runnable/record_extension.elna b/testsuite/runnable/record_extension.elna
index 161361b..1aae5b3 100644
--- a/testsuite/runnable/record_extension.elna
+++ b/testsuite/runnable/record_extension.elna
@@ -14,6 +14,5 @@ begin
   current_token := @token_memory;
   cast(current_token: ^ElnaLexerStringToken)^.value := "Some string";
 
-  assert(token_memory.value = "Some string");
-  return 0
+  assert(token_memory.value = "Some string")
 end.
diff --git a/testsuite/runnable/return_aggregate.elna b/testsuite/runnable/return_aggregate.elna
index fc37565..820f72f 100644
--- a/testsuite/runnable/return_aggregate.elna
+++ b/testsuite/runnable/return_aggregate.elna
@@ -5,11 +5,8 @@ type
   end
 
 proc f(): R
-  return R(1, 2)
-end
+return R(1, 2)
 
 begin
-  assert(f() = R(1, 2));
-
-  return 0
+  assert(f() = R(1, 2))
 end.
diff --git a/testsuite/runnable/two_fields_same_type.elna b/testsuite/runnable/two_fields_same_type.elna
index b881dda..0ebcb4e 100644
--- a/testsuite/runnable/two_fields_same_type.elna
+++ b/testsuite/runnable/two_fields_same_type.elna
@@ -6,11 +6,9 @@ type
 proc f(): Int
 var
   r: R := R(3, 2)
+return r.x + r.y
 
-  return r.x + r.y
-end
 
 begin
-  assert(f() = 5);
-  return 0
+  assert(f() = 5)
 end.
diff --git a/testsuite/runnable/two_parameters_same_type.elna b/testsuite/runnable/two_parameters_same_type.elna
index 34e70eb..bd9b271 100644
--- a/testsuite/runnable/two_parameters_same_type.elna
+++ b/testsuite/runnable/two_parameters_same_type.elna
@@ -1,9 +1,6 @@
 proc f(x, y: Int): Int
-  return x + y
-end
+return x + y
 
 begin
-  assert(f(2, 3) = 5);
-  return 0
-
+  assert(f(2, 3) = 5)
 end.