Add semicolons separating the statements

1 files changed, 932 insertions, 900 deletions

diff --git a/boot/stage2.elna b/boot/stage2.elna
index 3cb2deb..366096e 100644
--- a/boot/stage2.elna
+++ b/boot/stage2.elna
@@ -1,5 +1,6 @@
 (*
 s1 - Contains the current position in the source text.
+s2 - Label counter.
 
 - The compiler expects valid input, otherwise it will generate invalid
 assembly or hang. There is no error checking, no semantic analysis, no
@@ -17,6 +18,8 @@ hexadecimal format).
 
 - Return can be used only as the last statement of a procedure. It
 doesn't actually return, but sets a0 to the appropriate value.
+
+- The lvalue of an assignment can only be an identifier.
 *)
 program
 
@@ -32,9 +35,9 @@ var
 proc _compile_import()
 var loca0: Word
 begin
-	_advance(6)
-	_skip_spaces()
-	loca0 := _read_token()
+	_advance(6);
+	_skip_spaces();
+	loca0 := _read_token();
 	_advance(loca0) (* Skip the imported module name. *)
 end
 
@@ -44,188 +47,193 @@ var
 	loca12: ^Byte
 	loca24: Bool
 begin
-	_build_expression(0)
+	_build_expression(0);
 
-	loca4 := 0x2c306120 (* _a0, *)
-	loca8 := 0x0a316120 (* _a1\n *)
+	loca4 := 0x2c306120 (* _a0, *);
+	loca8 := 0x0a316120 (* _a1\n *);
 
-	_skip_spaces()
-	loca20 := _read_token()
-	loca12 := _current()
+	_skip_spaces();
+	loca20 := _read_token();
+	loca12 := _current();
 
-	loca16 := 0x26 (* & *)
-	loca24 := _token_compare(loca12, loca20, @loca16)
+	loca16 := 0x26 (* & *);
+	loca24 := _token_compare(loca12, loca20, @loca16);
 	if loca24 = 0 then
 		goto .L_build_binary_expression_and
-	end
+	end;
 
-	loca16 := 0x726f (* or *)
-	loca24 := _token_compare(loca12, loca20, @loca16)
+	loca16 := 0x726f (* or *);
+	loca24 := _token_compare(loca12, loca20, @loca16);
 	if loca24 = 0 then
 		goto .L_build_binary_expression_or
-	end
+	end;
 
-	loca16 := 0x3d (* = *)
-	loca24 := _token_compare(loca12, loca20, @loca16)
+	loca16 := 0x3d (* = *);
+	loca24 := _token_compare(loca12, loca20, @loca16);
 	if loca24 = 0 then
 		goto .L_build_binary_expression_equal
-	end
+	end;
 
-	loca16 := 0x2b (* + *)
-	loca24 := _token_compare(loca12, loca20, @loca16)
+	loca16 := 0x2b (* + *);
+	loca24 := _token_compare(loca12, loca20, @loca16);
 	if loca24 = 0 then
 		goto .L_build_binary_expression_plus
-	end
+	end;
 
-	loca16 := 0x2d (* - *)
-	loca24 := _token_compare(loca12, loca20, @loca16)
+	loca16 := 0x2d (* - *);
+	loca24 := _token_compare(loca12, loca20, @loca16);
 	if loca24 = 0 then
 		goto .L_build_binary_expression_minus
 	end
 
-	loca16 := 0x2a (* * *)
-	loca24 := _token_compare(loca12, loca20, @loca16)
+	loca16 := 0x2a (* * *);
+	loca24 := _token_compare(loca12, loca20, @loca16);
 	if loca24 = 0 then
 		goto .L_build_binary_expression_product
-	end
-
-	goto .Lbuild_binary_expression_end
-
-	.L_build_binary_expression_equal
-	_advance(1) (* Skip =. *)
-	_build_expression(1)
-
-	loca0 := 0x627573(* sub *)
-	_write_out(@loca0, 3)
-	_write_out(@loca4, 4)
-	_write_out(@loca4, 4)
-	_write_out(@loca8, 4)
-
-	loca0 := 0x7a716573 (* seqz *)
-	_write_out(@loca0, 4)
-	_write_out(@loca4, 4)
-	_write_out(@loca4, 3)
-	_put_char(0x0a) (* \n *)
-
-	goto .Lbuild_binary_expression_end
-
-	.L_build_binary_expression_and
-	_advance(1) (* Skip &. *)
-	_build_expression(1)
-	loca0 := 0x646e61 (* and *)
-	_write_out(@loca0, 3)
-	_write_out(@loca4, 4)
-	_write_out(@loca4, 4)
-	_write_out(@loca8, 4)
-
-	goto .Lbuild_binary_expression_end
-
-	.L_build_binary_expression_or
-	_advance(2) (* Skip or. *)
-	_build_expression(1)
-	loca0 := 0x726f (* or *)
-	_write_out(@loca0, 2)
-	_write_out(@loca4, 4)
-	_write_out(@loca4, 4)
-	_write_out(@loca8, 4)
-
-	goto .Lbuild_binary_expression_end
-
-	.L_build_binary_expression_plus
-	_advance(1) (* Skip +. *)
-	_build_expression(1)
-	loca0 := 0x646461 (* add *)
-	_write_out(@loca0, 3)
-	_write_out(@loca4, 4)
-	_write_out(@loca4, 4)
-	_write_out(@loca8, 4)
-
-	goto .Lbuild_binary_expression_end
-
-	.L_build_binary_expression_minus
-	_advance(1) (* Skip -. *)
-	_build_expression(1)
-	loca0 := 0x627573 (* sub *)
-	_write_out(@loca0, 3)
-	_write_out(@loca4, 4)
-	_write_out(@loca4, 4)
-	_write_out(@loca8, 4)
-
-	goto .Lbuild_binary_expression_end
-
-	.L_build_binary_expression_product
-	_advance(1) (* Skip *. *)
-	_build_expression(1)
-	loca0 := 0x6c756d (* mul *)
-	_write_out(@loca0, 3)
-	_write_out(@loca4, 4)
-	_write_out(@loca4, 4)
-	_write_out(@loca8, 4)
-
-	goto .Lbuild_binary_expression_end
+	end;
+
+	goto .Lbuild_binary_expression_end;
+
+	.L_build_binary_expression_equal;
+	_advance(1) (* Skip =. *);
+	_build_expression(1);
+
+	loca0 := 0x627573(* sub *);
+	_write_out(@loca0, 3);
+	_write_out(@loca4, 4);
+	_write_out(@loca4, 4);
+	_write_out(@loca8, 4);
+
+	loca0 := 0x7a716573 (* seqz *);
+	_write_out(@loca0, 4);
+	_write_out(@loca4, 4);
+	_write_out(@loca4, 3);
+	_put_char(0x0a) (* \n *);
+
+	goto .Lbuild_binary_expression_end;
+
+	.L_build_binary_expression_and;
+	_advance(1) (* Skip &. *);
+	_build_expression(1);
+	loca0 := 0x646e61 (* and *);
+	_write_out(@loca0, 3);
+	_write_out(@loca4, 4);
+	_write_out(@loca4, 4);
+	_write_out(@loca8, 4);
+
+	goto .Lbuild_binary_expression_end;
+
+	.L_build_binary_expression_or;
+	_advance(2) (* Skip or. *);
+	_build_expression(1);
+	loca0 := 0x726f (* or *);
+	_write_out(@loca0, 2);
+	_write_out(@loca4, 4);
+	_write_out(@loca4, 4);
+	_write_out(@loca8, 4);
+
+	goto .Lbuild_binary_expression_end;
+
+	.L_build_binary_expression_plus;
+	_advance(1) (* Skip +. *);
+	_build_expression(1);
+	loca0 := 0x646461 (* add *);
+	_write_out(@loca0, 3);
+	_write_out(@loca4, 4);
+	_write_out(@loca4, 4);
+	_write_out(@loca8, 4);
+
+	goto .Lbuild_binary_expression_end;
+
+	.L_build_binary_expression_minus;
+	_advance(1) (* Skip -. *);
+	_build_expression(1);
+	loca0 := 0x627573 (* sub *);
+	_write_out(@loca0, 3);
+	_write_out(@loca4, 4);
+	_write_out(@loca4, 4);
+	_write_out(@loca8, 4);
+
+	goto .Lbuild_binary_expression_end;
+
+	.L_build_binary_expression_product;
+	_advance(1) (* Skip *. *);
+	_build_expression(1);
+	loca0 := 0x6c756d (* mul *);
+	_write_out(@loca0, 3);
+	_write_out(@loca4, 4);
+	_write_out(@loca4, 4);
+	_write_out(@loca8, 4);
+
+	goto .Lbuild_binary_expression_end;
 
 	.Lbuild_binary_expression_end
 end
 
-proc _build_identifier_expression(loca84: Word, loca80: Byte)
+(*
+Parameters:
+a0 - Identifier length.
+a1 - Register number as character.
+*)
+proc _compile_identifier_expression(loca84: Word, loca80: Byte)
 begin
-	loca24 := _current()
-	loca0 := 0x61636f6c (* loca *)
-	loca0 := _memcmp(@loca0, loca24, 4)
+	loca24 := _current();
+	loca0 := 0x61636f6c (* loca *);
+	loca0 := _memcmp(@loca0, loca24, 4);
 
 	if loca0 = 0 then
-		loca8 := 0x6120776c (* lw a *)
-		_write_out(@loca8, 4)
-		loca8 := 0x00202c00 or loca80 (* \0,_ *)
-		_write_out(@loca8, 3)
-
-		loca4 := loca24 + 4
-		loca0 := loca84 - 4
-		_write_out(loca4, loca0) (* Skip the "loca" variable prefix. *)
-
-		loca8 := 0x29707328 (* (sp) *)
-		_write_out(@loca8, 4)
-		_put_char(0x0a) (* \n *)
-
-		goto .Lbuild_identifier_expression_end
-	end
-	loca0 := _front(loca24)
-	loca8 := loca84 = 2
-	loca12 := loca0 = 0x73
+		loca8 := 0x6120776c (* lw a *);
+		_write_out(@loca8, 4);
+		loca8 := 0x00202c00 or loca80 (* \0,_ *);
+		_write_out(@loca8, 3);
+
+		loca4 := loca24 + 4;
+		loca0 := loca84 - 4;
+		_write_out(loca4, loca0) (* Skip the "loca" variable prefix. *);
+
+		loca8 := 0x29707328 (* (sp) *);
+		_write_out(@loca8, 4);
+		_put_char(0x0a) (* \n *);
+
+		goto .Lcompile_identifier_expression_end
+	end;
+	loca0 := _front(loca24);
+	loca8 := loca84 = 2;
+	loca12 := loca0 = 0x73;
 	if loca8 & loca12 then
-		loca8 := 0x6120766d (* mv a *)
-		_write_out(@loca8, 4)
-		loca8 := 0x00202c00 or loca80 (* \0,_ *)
-		_write_out(@loca8, 3)
-		_write_out(loca24, loca84)
-		_put_char(0x0a) (* \n *)
-
-		goto .Lbuild_identifier_expression_end
+		loca8 := 0x6120766d (* mv a *);
+		_write_out(@loca8, 4);
+		loca8 := 0x00202c00 or loca80 (* \0,_ *);
+		_write_out(@loca8, 3);
+		_write_out(loca24, loca84);
+		_put_char(0x0a) (* \n *);
+
+		goto .Lcompile_identifier_expression_end
 	end
 
-	(* Global identifier. *)
-	loca8 := 0x6120616c (* la a *)
-	_write_out(@loca8, 4)
-	loca8 := 0x00202c00 or loca80
-	_write_out(@loca8, 3)
+	(* Global identifier. *);
+	loca8 := 0x6120616c (* la a *);
+	_write_out(@loca8, 4);
+	loca8 := 0x00202c00 or loca80;
+	_write_out(@loca8, 3);
 
-	_write_out(loca24, loca84)
-	_put_char(0x0a)
+	_write_out(loca24, loca84);
+	_put_char(0x0a);
 
 	if _is_upper(loca0) then
-		loca8 := 0x6120776c (* lw a *)
-		_write_out(@loca8, 4)
-		loca8 := 0x28202c00 or loca28 (* \0, ( *)
-		_write_out(@loca8, 4)
-		_put_char(0x61) (* a *)
-		_put_char(loca28)
-		_put_char(0x29) (* ) *)
-		_put_char(0x0a) (* \n *)
-
-		goto .Lbuild_identifier_expression_end
-	end
-
-	.Lbuild_identifier_expression_end
+		loca8 := 0x6120776c (* lw a *);
+		_write_out(@loca8, 4);
+		loca8 := 0x28202c00 or loca28 (* \0, ( *);
+		_write_out(@loca8, 4);
+		_put_char(0x61) (* a *);
+		_put_char(loca28);
+		_put_char(0x29) (* ) *);
+		_put_char(0x0a) (* \n *);
+
+		goto .Lcompile_identifier_expression_end
+	end;
+
+	.Lcompile_identifier_expression_end
 end
 
 (*
@@ -239,98 +247,145 @@ var
 	loca24, loca4: ^Byte
 begin
 	(* Make the register number to a character and save it. *)
-	loca28 := loca84 + 0x30 (* 0 *)
+	loca28 := loca84 + 0x30 (* 0 *);
 
-	_skip_spaces()
-	loca20 := _read_token()
-	loca24 := _current()
-	loca0 := _front(loca24)
+	_skip_spaces();
+	loca20 := _read_token();
+	loca24 := _current();
+	loca0 := _front(loca24);
 
 	(* - *)
 	if loca0 = 0x2d then
 		goto .Lbuild_expression_negate
-	end
+	end;
 
 	(* @ *)
 	if loca0 = 0x40 then
 		goto .Lbuild_expression_address
-	end
+	end;
 
 	if _is_digit(loca0) then
 		goto .Lbuild_expression_literal
-	end
+	end;
 
 	(* _ *)
 	if loca0 = 0x5f then
 		goto .Lbuild_expression_call
-	end
-
-	_build_identifier_expression(loca20, loca28);
-	goto .Lbuild_expression_advance
-
-	.Lbuild_expression_negate
-	_advance(1) (* Skip the -. *)
-	_build_expression(0)
-
-	loca8 := 0x2067656e (* neg_ *)
-	_write_out(@loca8, 4)
-	loca8 := 0x202c3061 (* a0,_ *)
-	_write_out(@loca8, 4)
-	loca8 := 0x0a3061 (* a0,_ *)
-	_write_out(@loca8, 3)
-
-	goto .Lbuild_expression_advance
-
-	.Lbuild_expression_address
-	loca8 := 0x69646461 (* addi *)
-	_write_out(@loca8, 4)
-	loca8 := 0x6120 (* _a *)
-	_write_out(@loca8, 2)
-	_put_char(loca28)
-	loca8 := 0x7073202c (* , sp *)
-	_write_out(@loca8, 4)
-	loca8 := 0x202c (* ,_ *)
-	_write_out(@loca8, 2)
-
-	_advance(1) (* Skip @. *)
-	_skip_spaces()
-	loca24 := _current()
-	loca20 := _read_token()
+	end;
+
+	_compile_identifier_expression(loca20, loca28);
+	goto .Lbuild_expression_advance;
+
+	.Lbuild_expression_negate;
+	_advance(1) (* Skip the -. *);
+	_build_expression(0);
+
+	loca8 := 0x2067656e (* neg_ *);
+	_write_out(@loca8, 4);
+	loca8 := 0x202c3061 (* a0,_ *);
+	_write_out(@loca8, 4);
+	loca8 := 0x0a3061 (* a0,_ *);
+	_write_out(@loca8, 3);
+
+	goto .Lbuild_expression_advance;
+
+	.Lbuild_expression_address;
+	loca8 := 0x69646461 (* addi *);
+	_write_out(@loca8, 4);
+	loca8 := 0x6120 (* _a *);
+	_write_out(@loca8, 2);
+	_put_char(loca28);
+	loca8 := 0x7073202c (* , sp *);
+	_write_out(@loca8, 4);
+	loca8 := 0x202c (* ,_ *);
+	_write_out(@loca8, 2);
+
+	_advance(1) (* Skip @. *);
+	_skip_spaces();
+	loca24 := _current();
+	loca20 := _read_token();
 
 	(* Skip the "loca" variable prefix. *)
-	loca4 := loca24 + 4
-	loca0 := loca20 - 4
-	_write_out(loca4, loca0)
+	loca4 := loca24 + 4;
+	loca0 := loca20 - 4;
+	_write_out(loca4, loca0);
 
-	_put_char(0xa)
+	_put_char(0xa);
 
-	goto .Lbuild_expression_advance
+	goto .Lbuild_expression_advance;
 
-	.Lbuild_expression_call
-	_advance(loca20)
-	_advance(1)
-	_compile_call(loca24, loca20)
+	.Lbuild_expression_call;
+	_advance(loca20);
+	_advance(1);
+	_compile_call(loca24, loca20);
 
-	goto .Lbuild_expression_end
+	goto .Lbuild_expression_end;
 
-	.Lbuild_expression_literal
-	loca8 := 0x6120696c (* li a *)
-	_write_out(@loca8, 4)
-	loca8 := 0x00202c00 or loca28 (* \0,_ *)
-	_write_out(@loca8, 3)
+	.Lbuild_expression_literal;
+	loca8 := 0x6120696c (* li a *);
+	_write_out(@loca8, 4);
+	loca8 := 0x00202c00 or loca28 (* \0,_ *);
+	_write_out(@loca8, 3);
 
-	_write_out(loca24, loca20)
-	_put_char(0x0a) (* \n *)
+	_write_out(loca24, loca20);
+	_put_char(0x0a) (* \n *);
 
-	goto .Lbuild_expression_advance
+	goto .Lbuild_expression_advance;
 
-	.Lbuild_expression_advance
-	_advance(loca20)
+	.Lbuild_expression_advance;
+	_advance(loca20);
 
 	.Lbuild_expression_end
 end
 
 (*
+Compiles an lvalue.
+
+Parameters:
+a0 - Pointer to the identifier.
+a1 - Identifier length.
+*)
+proc _compile_designator_expression(loca84: ^Byte, loca80: Word)
+var
+	loca0: Word
+begin
+	loca0 := 0x61636f6c (* loca *);
+	loca4 := _memcmp(@loca0, loca84, 4);
+
+	if loca4 = 0 then
+		loca0 := 0x61207773 (* sw a *);
+		_write_out(@loca0, 4);
+		loca0 := 0x202c30 (* 0,_ *);
+		_write_out(@loca0, 3);
+
+		loca84 := loca84 + 4;
+		loca80 := loca80 - 4;
+		_write_out(loca84, loca80);
+
+		loca0 := 0x29707328 (* (sp) *);
+		_write_out(@loca0, 4);
+		_put_char(0x0a) (* \n *);
+
+		goto .Lcompile_designator_expression_end
+	end;
+	loca8 := _front(loca84);
+	loca12 := loca8 = 0x73 (* s *);
+	loca16 := loca80 = 2;
+	if loca12 & loca16 then
+		loca0 := 0x20766d (* mv_ *);
+		_write_out(@loca0, 3);
+		_write_out(loca84, loca80);
+		loca0 := 0x3061202c (* , a0 *);
+		_write_out(@loca0, 4);
+		_put_char(0x0a) (* \n *);
+
+		goto .Lcompile_designator_expression_end
+	end;
+
+	.Lcompile_designator_expression_end
+end
+
+(*
 Compiles a statement beginning with an identifier.
 
 Left values should be variables named "loca n", where n is the offset
@@ -343,53 +398,32 @@ var
 	loca4: Bool
 begin
 	(* Save the pointer to the identifier and its length on the stack. *)
-	loca20 := _current()
-	loca16 := _read_token()
+	loca20 := _current();
+	loca16 := _read_token();
 
-	_advance(loca16)
-	_skip_spaces()
+	_advance(loca16);
+	_skip_spaces();
 
 	(* Save the pointer and the length of the token following the identifier. *)
-	loca12 := _current()
-	loca8 := _read_token()
+	loca12 := _current();
+	loca8 := _read_token();
 
-	_advance(loca8) (* Skip that token. *)
-	_skip_spaces()
+	_advance(loca8) (* Skip that token. *);
+	_skip_spaces();
 
-	loca0 := 0x3d3a (* := *)
-	loca4 := _token_compare(loca12, loca8, @loca0)
+	loca0 := 0x3d3a (* := *);
+	loca4 := _token_compare(loca12, loca8, @loca0);
 	if loca4 = 0 then
-		goto .Lcompile_identifier_assign
-	end
+		_build_binary_expression();
+		_compile_designator_expression(loca20, loca16);
 
+		goto .Lcompile_identifier_end
+	end;
 	if _front(loca12) = 0x28 then
-		goto .Lcompile_identifier_call
-	end
-
-	goto .Lcompile_identifier_end
-
-	.Lcompile_identifier_call
-	_compile_call(loca20, loca16)
-
-	goto .Lcompile_identifier_end
-
-	.Lcompile_identifier_assign
-	_build_binary_expression()
-
-	loca0 := 0x61207773 (* sw a *)
-	_write_out(@loca0, 4)
-	loca0 := 0x202c30 (* 0,_ *)
-	_write_out(@loca0, 3)
-
-	loca20 := loca20 + 4
-	loca16 := loca16 - 4
-	_write_out(loca20, loca16)
+		_compile_call(loca20, loca16);
 
-	loca0 := 0x29707328 (* (sp) *)
-	_write_out(@loca0, 4)
-	_put_char(0x0a) (* \n *)
-
-	goto .Lcompile_identifier_end
+		goto .Lcompile_identifier_end
+	end;
 
 	.Lcompile_identifier_end
 end
@@ -406,118 +440,118 @@ var
 	loca0, loca4, loca12: Word
 	loca8: ^Byte
 begin
-	loca12 := 0 (* Argument count for a procedure call. *)
+	loca12 := 0 (* Argument count for a procedure call. *);
 
-	.Lcompile_call_paren
-	_skip_spaces()
-	loca8 := _current()
+	.Lcompile_call_paren;
+	_skip_spaces();
+	loca8 := _current();
 	if _front(loca8) = 0x29 then
 		goto .Lcompile_call_complete
-	end
+	end;
 
-	.Lcompile_call_argument
-	_build_expression(0)
+	.Lcompile_call_argument;
+	_build_expression(0);
 
-	loca0 := 0x61207773 (* sw a *)
-	_write_out(@loca0, 4)
-	loca0 := 0x202c30 (* 0,_ *)
-	_write_out(@loca0, 3)
+	loca0 := 0x61207773 (* sw a *);
+	_write_out(@loca0, 4);
+	loca0 := 0x202c30 (* 0,_ *);
+	_write_out(@loca0, 3);
 
 	(*
 	Only 6 arguments are supported with a0-a5.
 	Save all arguments on the stack so they aren't overriden afterwards.
 	*)
-	loca0 := -4 * loca12
-	loca0 := loca0 + 60
-	_printi(loca0)
+	loca0 := -4 * loca12;
+	loca0 := loca0 + 60;
+	_printi(loca0);
 
-	loca0 := 0x29707328 (* (sp) *)
-	_write_out(@loca0, 4)
-	_put_char(0x0a) (* \n *)
+	loca0 := 0x29707328 (* (sp) *);
+	_write_out(@loca0, 4);
+	_put_char(0x0a) (* \n *);
 
-	_skip_spaces()
-	loca8 := _current()
-	loca0 := _front(loca8) = 0x2c
+	_skip_spaces();
+	loca8 := _current();
+	loca0 := _front(loca8) = 0x2c;
 	if loca0 = 0 then
 		goto .Lcompile_call_paren
 	end
 
-	loca12 := loca12 + 1 (* Argument count for a procedure call. *)
+	loca12 := loca12 + 1 (* Argument count for a procedure call. *);
 
-	_advance(1) (* Skip the comma between the arguments. *)
-	goto .Lcompile_call_argument
+	_advance(1) (* Skip the comma between the arguments. *);
+	goto .Lcompile_call_argument;
 
-	.Lcompile_call_complete
-	loca12 := 0
+	.Lcompile_call_complete;
+	loca12 := 0;
 
-	.Lcompile_call_restore
+	.Lcompile_call_restore;
 	(*
 	Just go through all a0-a5 registers and read them from stack.
 	If this stack value contains garbage, the procedure just shouldn't use it.
 	*)
-	loca0 := 0x6120776c (* lw a *)
+	loca0 := 0x6120776c (* lw a *);
 	(* lw a0, 60(sp) *)
-	_write_out(@loca0, 4)
-	loca4 := 0x36202c30 (* 0, 6 *)
-	_write_out(@loca4, 4)
-	loca4 := 0x70732830 (* 0(sp *)
-	_write_out(@loca4, 4)
-	loca4 := 0x0a29 (* )\n *)
-	_write_out(@loca4, 2)
+	_write_out(@loca0, 4);
+	loca4 := 0x36202c30 (* 0, 6 *);
+	_write_out(@loca4, 4);
+	loca4 := 0x70732830 (* 0(sp *);
+	_write_out(@loca4, 4);
+	loca4 := 0x0a29 (* )\n *);
+	_write_out(@loca4, 2);
 
 	(* lw a1, 56(sp) *)
-	_write_out(@loca0, 4)
-	loca4 := 0x35202c31 (* 1, 5 *)
-	_write_out(@loca4, 4)
-	loca4 := 0x70732836 (* 6(sp *)
-	_write_out(@loca4, 4)
-	loca4 := 0x0a29 (* )\n *)
-	_write_out(@loca4, 2)
+	_write_out(@loca0, 4);
+	loca4 := 0x35202c31 (* 1, 5 *);
+	_write_out(@loca4, 4);
+	loca4 := 0x70732836 (* 6(sp *);
+	_write_out(@loca4, 4);
+	loca4 := 0x0a29 (* )\n *);
+	_write_out(@loca4, 2);
 
 	(* lw a2, 52(sp) *)
-	_write_out(@loca0, 4)
-	loca4 := 0x35202c32 (* 2, 5 *)
-	_write_out(@loca4, 4)
-	loca4 := 0x70732832 (* 2(sp *)
-	_write_out(@loca4, 4)
-	loca4 := 0x0a29 (* )\n *)
-	_write_out(@loca4, 2)
+	_write_out(@loca0, 4);
+	loca4 := 0x35202c32 (* 2, 5 *);
+	_write_out(@loca4, 4);
+	loca4 := 0x70732832 (* 2(sp *);
+	_write_out(@loca4, 4);
+	loca4 := 0x0a29 (* )\n *);
+	_write_out(@loca4, 2);
 
 	(* lw a3, 48(sp) *)
-	_write_out(@loca0, 4)
-	loca4 := 0x34202c33 (* 3, 4 *)
-	_write_out(@loca4, 4)
-	loca4 := 0x70732838 (* 8(sp *)
-	_write_out(@loca4, 4)
-	loca4 := 0x0a29 (* )\n *)
-	_write_out(@loca4, 2)
+	_write_out(@loca0, 4);
+	loca4 := 0x34202c33 (* 3, 4 *);
+	_write_out(@loca4, 4);
+	loca4 := 0x70732838 (* 8(sp *);
+	_write_out(@loca4, 4);
+	loca4 := 0x0a29 (* )\n *);
+	_write_out(@loca4, 2);
 
 	(* lw a4, 44(sp) *)
-	_write_out(@loca0, 4)
-	loca4 := 0x34202c34 (* 4, 4 *)
-	_write_out(@loca4, 4)
-	loca4 := 0x70732834 (* 4(sp *)
-	_write_out(@loca4, 4)
-	loca4 := 0x0a29 (* )\n *)
-	_write_out(@loca4, 2)
+	_write_out(@loca0, 4);
+	loca4 := 0x34202c34 (* 4, 4 *);
+	_write_out(@loca4, 4);
+	loca4 := 0x70732834 (* 4(sp *);
+	_write_out(@loca4, 4);
+	loca4 := 0x0a29 (* )\n *);
+	_write_out(@loca4, 2);
 
 	(* lw a5, 40(sp) *)
-	_write_out(@loca0, 4)
-	loca4 := 0x34202c35 (* 5, 4 *)
-	_write_out(@loca4, 4)
-	loca4 := 0x70732830 (* 0(sp *)
-	_write_out(@loca4, 4)
-	loca4 := 0x0a29 (* )\n *)
-	_write_out(@loca4, 2)
-
-	loca0 := 0x6c6c6163 (* call *)
-	_write_out(@loca0, 4)
-	_put_char(0x20) (* _ *)
-
-	_write_out(loca84, loca80)
-	_put_char(0x0a) (* \n *)
-
-	_skip_spaces()
+	_write_out(@loca0, 4);
+	loca4 := 0x34202c35 (* 5, 4 *);
+	_write_out(@loca4, 4);
+	loca4 := 0x70732830 (* 0(sp *);
+	_write_out(@loca4, 4);
+	loca4 := 0x0a29 (* )\n *);
+	_write_out(@loca4, 2);
+
+	loca0 := 0x6c6c6163 (* call *);
+	_write_out(@loca0, 4);
+	_put_char(0x20) (* _ *);
+
+	_write_out(loca84, loca80);
+	_put_char(0x0a) (* \n *);
+
+	_skip_spaces();
 	_advance(1) (* Skip the close paren. *)
 end
 
@@ -530,112 +564,109 @@ var
 	loca0, loca4: Word
 	loca8: ^Byte
 begin
-	loca8 := _current()
-	loca0 := _front(loca8) (* t0 = Current character. *)
-	loca4 := 0
+	loca8 := _current();
+	loca0 := _front(loca8) (* t0 = Current character. *);
+	loca4 := 0;
 
 	(* . *)
 	if loca0 = 0x2e then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* , *)
 	if loca0 = 0x2c then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* : *)
 	if loca0 = 0x3a then
 		goto .Ltoken_character_colon
-	end
+	end;
 
 	(* ; *)
 	if loca0 = 0x3b then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* ( *)
 	if loca0 = 0x28 then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* ) *)
 	if loca0 = 0x29 then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* [ *)
 	if loca0 = 0x5b then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* ] *)
 	if loca0 = 0x5d then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* ^ *)
 	if loca0 = 0x5e then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* & *)
 	if loca0 = 0x26 then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* = *)
 	if loca0 = 0x3d then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* + *)
 	if loca0 = 0x2b then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* - *)
 	if loca0 = 0x2d then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* * *)
 	if loca0 = 0x2a then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* @ *)
 	if loca0 = 0x40 then
 		goto .Ltoken_character_single
-	end
+	end;
 
 	(* Expect an identifier or a number. *)
-	.Ltoken_character_loop_do
-	loca0 := loca8 + loca4
-	loca0 := _front(loca0)
-
-	if _is_alnum(loca0) = 0 then
-		goto .Ltoken_character_end
-	end
-	loca4 := loca4 + 1
-	goto .Ltoken_character_loop_do
-
-	.Ltoken_character_single
-	loca4 := loca4 + 1
-	goto .Ltoken_character_end
-
-	.Ltoken_character_colon
-	loca0 := loca8 + 1
-	loca0 := _front(loca0) (* t0 = The character after the colon. *)
-	loca4 := loca4 + 1
-
-	(* = *)
-	if loca0 = 0x3d then
-		goto  .Ltoken_character_single
-	end
-	goto .Ltoken_character_end
-
-	.Ltoken_character_end
+	.Ltoken_character_loop_do;
+	loca0 := loca8 + loca4;
+	loca0 := _front(loca0);
+
+	if _is_alnum(loca0) then
+		loca4 := loca4 + 1;
+		goto .Ltoken_character_loop_do;
+
+		.Ltoken_character_single;
+		loca4 := loca4 + 1;
+		goto .Ltoken_character_end;
+
+		.Ltoken_character_colon;
+		loca0 := loca8 + 1;
+		loca0 := _front(loca0) (* t0 = The character after the colon. *);
+		loca4 := loca4 + 1;
+
+		(* = *)
+		if loca0 = 0x3d then
+			goto  .Ltoken_character_single
+		end
+	end;
+	.Ltoken_character_end;
 	return loca4
 end
 
@@ -645,31 +676,31 @@ var
 	loca0: Byte
 	loca4: ^Byte
 begin
-	.Lspace_loop_do
-	loca4 := _current()
-	loca0 := _front(loca4) (* t0 = Current character. *)
+	.Lspace_loop_do;
+	loca4 := _current();
+	loca0 := _front(loca4) (* t0 = Current character. *);
 
 	(* _ *)
 	if loca0 = 0x20 then
 		goto .Lspace_loop_repeat
-	end
+	end;
 	(* \t *)
 	if loca0 = 0x09 then
 		goto .Lspace_loop_repeat
-	end
+	end;
 	(* \n *)
 	if loca0 = 0x0a then
 		goto .Lspace_loop_repeat
-	end
+	end;
 	(* \r *)
 	if loca0 = 0x0d then
 		goto .Lspace_loop_repeat
-	end
+	end;
 
-	goto .Lspace_loop_end
-	.Lspace_loop_repeat
-	_advance(1)
-	goto .Lspace_loop_do
+	goto .Lspace_loop_end;
+	.Lspace_loop_repeat;
+	_advance(1);
+	goto .Lspace_loop_do;
 
 	.Lspace_loop_end
 end
@@ -684,34 +715,34 @@ var
 	loca4: Word
 	loca8: Int
 begin
-	loca0 := _current()
+	loca0 := _current();
 
 	(* Check whether this is a comment. *)
-	loca4 := 0x2a28 (* ( and * *)
-	loca8 := _memcmp(loca0, @loca4, 2)
+	loca4 := 0x2a28 (* ( and * *);
+	loca8 := _memcmp(loca0, @loca4, 2);
 	if loca8 = 0 then
 		goto .Lskip_comment_continue
-	end
-	goto .Lskip_comment_end
+	end;
+	goto .Lskip_comment_end;
 
-	.Lskip_comment_continue
-	_advance(2) (* Skip (*. *)
+	.Lskip_comment_continue;
+	_advance(2) (* Skip (*. *);
 
-	loca4 := 0x292a (* ( and * *)
+	loca4 := 0x292a (* ( and * *);
 
-	.Lskip_comment_loop
-	loca0 := _current()
-	loca8 := _memcmp(loca0, @loca4, 2)
+	.Lskip_comment_loop;
+	loca0 := _current();
+	loca8 := _memcmp(loca0, @loca4, 2);
 	if loca8 = 0 then
 		goto .Lskip_comment_close
-	end
+	end;
 
-	_advance(1)
+	_advance(1);
 
-	goto .Lskip_comment_loop
+	goto .Lskip_comment_loop;
 
-	.Lskip_comment_close
-	_advance(2) (* Skip "*" and ")". *)
+	.Lskip_comment_close;
+	_advance(2) (* Skip "*" and ")". *);
 
 	.Lskip_comment_end
 end
@@ -724,12 +755,12 @@ proc _compile_assembly(loca84: Word)
 var loca0: ^Byte
 begin
 	(* Write the source to the standard output. *)
-	loca0 := _current()
+	loca0 := _current();
 
-	_write_out(loca0, loca84)
-	_advance(loca84)
+	_write_out(loca0, loca84);
+	_advance(loca84);
 
-	_put_char(0xa) (* \n *)
+	_put_char(0xa) (* \n *);
 
 	_advance(1) (* Skip the new line. *)
 end
@@ -738,14 +769,14 @@ proc _compile_program()
 var loca0: Word
 begin
 	(* .global _start *)
-	loca0 := 0x6f6c672e (* .glo *)
-	_write_out(@loca0, 4)
-	loca0 := 0x206c6162 (* bal_ *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6174735f (* _sta *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a7472 (* rt\n *)
-	_write_out(@loca0, 3)
+	loca0 := 0x6f6c672e (* .glo *);
+	_write_out(@loca0, 4);
+	loca0 := 0x206c6162 (* bal_ *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6174735f (* _sta *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a7472 (* rt\n *);
+	_write_out(@loca0, 3);
 
 	_advance(8) (* program\n. *)
 end
@@ -756,29 +787,27 @@ var
 	loca4: ^Byte
 begin
 	(* .section .rodata *)
-	loca0 := 0x6365732e (* .sec *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6e6f6974 (* tion *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6f722e20 (* _.ro *)
-	_write_out(@loca0, 4)
-	loca0 := 0x61746164 (* data *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a (* \n *)
-	_write_out(@loca0, 1)
-
-	_advance(6) (* const\n. *)
-
-	.Lcompile_constant_section_item
-	_skip_spaces()
-	loca4 := _current()
-	loca0 := _front(loca4)
-	if _is_upper(loca0) = 0 then
-		goto .Lcompile_constant_section_end
-	end
-
-	_compile_constant()
-	goto .Lcompile_constant_section_item
+	loca0 := 0x6365732e (* .sec *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6e6f6974 (* tion *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6f722e20 (* _.ro *);
+	_write_out(@loca0, 4);
+	loca0 := 0x61746164 (* data *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a (* \n *);
+	_write_out(@loca0, 1);
+
+	_advance(6) (* const\n. *);
+
+	.Lcompile_constant_section_item;
+	_skip_spaces();
+	loca4 := _current();
+	loca0 := _front(loca4);
+	if _is_upper(loca0) then
+		_compile_constant();
+		goto .Lcompile_constant_section_item
+	end;
 
 	.Lcompile_constant_section_end
 end
@@ -788,27 +817,27 @@ var
 	loca0, loca4: Word
 	loca8: ^Byte
 begin
-	loca4 := _read_token()
-	loca8 := _current() (* Save the identifier pointer before advancing it. *)
+	loca4 := _read_token();
+	loca8 := _current() (* Save the identifier pointer before advancing it. *);
 
-	_write_out(loca8, loca4)
-	_advance(loca4)
+	_write_out(loca8, loca4);
+	_advance(loca4);
 
-	_skip_spaces()
-	_advance(2) (* Skip the assignment sign. *)
+	_skip_spaces();
+	_advance(2) (* Skip the assignment sign. *);
 
 	(* : .long *)
-	loca0 := 0x6c2e203a (* : .l *)
-	_write_out(@loca0, 4)
-	loca0 := 0x20676e6f (* ong_ *)
-	_write_out(@loca0, 4)
+	loca0 := 0x6c2e203a (* : .l *);
+	_write_out(@loca0, 4);
+	loca0 := 0x20676e6f (* ong_ *);
+	_write_out(@loca0, 4);
 
-	_skip_spaces()
-	loca4 := _read_token()
-	loca8 := _current() (* Save the literal pointer before advancing it. *)
+	_skip_spaces();
+	loca4 := _read_token();
+	loca8 := _current() (* Save the literal pointer before advancing it. *);
 
-	_write_out(loca8, loca4)
-	_advance(loca4)
+	_write_out(loca8, loca4);
+	_advance(loca4);
 
 	_put_char(0x0a) (* \n *)
 end
@@ -819,27 +848,27 @@ var
 	loca4: ^Byte
 begin
 	(* .section .bss *)
-	loca0 := 0x6365732e (* .sec *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6e6f6974 (* tion *)
-	_write_out(@loca0, 4)
-	loca0 := 0x73622e20 (* _.bs *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a73 (* s\n *)
-	_write_out(@loca0, 2)
-
-	_advance(4) (* var\n. *)
-
-	.Lcompile_variable_section_item
-	_skip_spaces()
-	loca4 := _current()
-	loca0 := _front(loca4)
+	loca0 := 0x6365732e (* .sec *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6e6f6974 (* tion *);
+	_write_out(@loca0, 4);
+	loca0 := 0x73622e20 (* _.bs *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a73 (* s\n *);
+	_write_out(@loca0, 2);
+
+	_advance(4) (* var\n. *);
+
+	.Lcompile_variable_section_item;
+	_skip_spaces();
+	loca4 := _current();
+	loca0 := _front(loca4);
 
 	if _is_lower(loca0) = 0 then
 		goto .Lcompile_variable_section_end
-	end
-	_compile_variable()
-	goto .Lcompile_variable_section_item
+	end;
+	_compile_variable();
+	goto .Lcompile_variable_section_item;
 
 	.Lcompile_variable_section_end
 end
@@ -850,67 +879,67 @@ var
 	loca0, loca24, loca20: Word
 begin
 	(* Save the identifier on the stack since it should emitted multiple times. *)
-	loca24 := _read_token()
-	loca28 := _current()
+	loca24 := _read_token();
+	loca28 := _current();
 
-	_advance(loca24)
+	_advance(loca24);
 
-	_skip_spaces()
-	_advance(1) (* Skip the colon in front of the type. *)
+	_skip_spaces();
+	_advance(1) (* Skip the colon in front of the type. *);
 
-	_skip_spaces()
-	_advance(1) (* Skip the opening bracket. *)
+	_skip_spaces();
+	_advance(1) (* Skip the opening bracket. *);
 
 	(* Save the array size on the stack since it has to be emitted multiple times. *)
-	loca16 := _read_token()
-	loca20 := _current()
-	_advance(loca16)
+	loca16 := _read_token();
+	loca20 := _current();
+	_advance(loca16);
 
-	_skip_spaces()
-	_advance(1) (* Skip the closing bracket. *)
+	_skip_spaces();
+	_advance(1) (* Skip the closing bracket. *);
 
-	_skip_spaces()
-	loca0 := _read_token()
-	_advance(loca0) (* Skip the type. *)
+	_skip_spaces();
+	loca0 := _read_token();
+	_advance(loca0) (* Skip the type. *);
 
 	(* .type identifier, @object *)
-	loca0 := 0x7079742e (* .typ *)
-	_write_out(@loca0, 4)
-	loca0 := 0x2065 (* e_ *)
-	_write_out(@loca0, 2)
+	loca0 := 0x7079742e (* .typ *);
+	_write_out(@loca0, 4);
+	loca0 := 0x2065 (* e_ *);
+	_write_out(@loca0, 2);
 
-	_write_out(loca28, loca24)
+	_write_out(loca28, loca24);
 
-	loca0 := 0x6f40202c (* , @o *)
-	_write_out(@loca0, 4)
-	loca0 := 0x63656a62 (* bjec *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a74 (* t\n *)
-	_write_out(@loca0, 2)
+	loca0 := 0x6f40202c (* , @o *);
+	_write_out(@loca0, 4);
+	loca0 := 0x63656a62 (* bjec *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a74 (* t\n *);
+	_write_out(@loca0, 2);
 
-	(* .size identifier, size *)
-	loca0 := 0x7a69732e (* .siz *)
-	_write_out(@loca0, 4)
-	loca0 := 0x2065 (* e_ *)
-	_write_out(@loca0, 2)
+	(* .size identifier, size *);
+	loca0 := 0x7a69732e (* .siz *);
+	_write_out(@loca0, 4);
+	loca0 := 0x2065 (* e_ *);
+	_write_out(@loca0, 2);
 
-	_write_out(loca28, loca24)
+	_write_out(loca28, loca24);
 
-	loca0 := 0x202c (* ,_ *)
-	_write_out(@loca0, 2)
+	loca0 := 0x202c (* ,_ *);
+	_write_out(@loca0, 2);
 
-	_write_out(loca20, loca16)
-	_put_char(0x0a) (* \n *)
+	_write_out(loca20, loca16);
+	_put_char(0x0a) (* \n *);
 
 	(* identifier: .zero size *)
-	_write_out(loca28, loca24)
+	_write_out(loca28, loca24);
 
-	loca0 := 0x7a2e203a (* : .z *)
-	_write_out(@loca0, 4)
-	loca0 := 0x206f7265 (* ero_ *)
-	_write_out(@loca0, 4)
+	loca0 := 0x7a2e203a (* : .z *);
+	_write_out(@loca0, 4);
+	loca0 := 0x206f7265 (* ero_ *);
+	_write_out(@loca0, 4);
 
-	_write_out(loca20, loca16)
+	_write_out(loca20, loca16);
 
 	_put_char(0x0a) (* \n *)
 end
@@ -920,186 +949,186 @@ var
 	loca0, loca4, loca8, loca12, loca16: Word
 	loca20, loca24: ^Byte
 begin
-	_advance(5) (* Skip proc_ *)
-	loca16 := _read_token()
-	loca20 := _current()
-	_advance(loca16)
+	_advance(5) (* Skip proc_ *);
+	loca16 := _read_token();
+	loca20 := _current();
+	_advance(loca16);
 
-	(* .type identifier, @function *)
-	loca0 := 0x7079742e (* .typ *)
-	_write_out(@loca0, 4)
-	loca0 := 0x2065 (* e_ *)
-	_write_out(@loca0, 2)
+	(* .type identifier, @function *);
+	loca0 := 0x7079742e (* .typ *);
+	_write_out(@loca0, 4);
+	loca0 := 0x2065 (* e_ *);
+	_write_out(@loca0, 2);
 
-	_write_out(loca20, loca16)
+	_write_out(loca20, loca16);
 
-	loca0 := 0x6640202c (* , @f *)
-	_write_out(@loca0, 4)
-	loca0 := 0x74636e75 (* unct *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a6e6f69 (* ion\n *)
-	_write_out(@loca0, 4)
+	loca0 := 0x6640202c (* , @f *);
+	_write_out(@loca0, 4);
+	loca0 := 0x74636e75 (* unct *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a6e6f69 (* ion\n *);
+	_write_out(@loca0, 4);
 
-	_write_out(loca20, loca16)
+	_write_out(loca20, loca16);
 
-	loca0 := 0x0a3a (* :\n *)
-	_write_out(@loca0, 2)
+	loca0 := 0x0a3a (* :\n *);
+	_write_out(@loca0, 2);
 
-	_skip_spaces()
-	_advance(1) (* Skip opening argument paren. *)
-	_skip_spaces()
-	_advance(1) (* Skip closing argument paren. *)
+	_skip_spaces();
+	_advance(1) (* Skip opening argument paren. *);
+	_skip_spaces();
+	_advance(1) (* Skip closing argument paren. *);
 
-	loca12 := 0x6e (* n *)
-	loca8 := 0x69676562 (* begi *)
+	loca12 := 0x6e (* n *);
+	loca8 := 0x69676562 (* begi *);
 
 	(*
 	Skip all declarations until we find the "begin" keyword, denoting the
 	beginning of the procedure body.
 	*)
-	.Lcompile_procedure_begin
-	_skip_spaces()
-	loca0 := _read_token()
+	.Lcompile_procedure_begin;
+	_skip_spaces();
+	loca0 := _read_token();
 
-	loca24 := _current()
-	_advance(loca0)
-	loca0 := _token_compare(loca24, loca0, @loca8)
+	loca24 := _current();
+	_advance(loca0);
+	loca0 := _token_compare(loca24, loca0, @loca8);
 
 	if loca0 = 1 then
 		goto .Lcompile_procedure_begin
-	end
+	end;
 
 	(* Generate the procedure prologue with a predefined stack size. *)
-	loca0 := 0x69646461 (* addi *)
-	_write_out(@loca0, 4)
-
-	loca0 := 0x2c707320 (* _sp, *)
-	_write_out(@loca0, 4)
-	_write_out(@loca0, 4)
-
-	loca0 := 0x0a36392d (* -96\n *)
-	_write_out(@loca0, 4)
-
-	loca0 := 0x72207773 (* sw r *)
-	_write_out(@loca0, 4)
-	loca0 := 0x39202c61 (* a, 9 *)
-	_write_out(@loca0, 4)
-	loca0 := 0x70732832 (* 2(sp *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a29 (* )\n *)
-	_write_out(@loca0, 2)
-
-	loca0 := 0x73207773 (* sw s *)
-	_write_out(@loca0, 4)
-	loca0 := 0x38202c30 (* 0, 8 *)
-	_write_out(@loca0, 4)
-	loca0 := 0x70732838 (* 8(sp *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a29 (* )\n *)
-	_write_out(@loca0, 2)
-
-	loca0 := 0x69646461 (* addi *)
-	_write_out(@loca0, 4)
-	loca0 := 0x2c307320 (* _s0, *)
-	_write_out(@loca0, 4)
-	loca0 := 0x2c707320 (* _sp, *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a363920 (* _96\n *)
-	_write_out(@loca0, 4)
+	loca0 := 0x69646461 (* addi *);
+	_write_out(@loca0, 4);
+
+	loca0 := 0x2c707320 (* _sp, *);
+	_write_out(@loca0, 4);
+	_write_out(@loca0, 4);
+
+	loca0 := 0x0a36392d (* -96\n *);
+	_write_out(@loca0, 4);
+
+	loca0 := 0x72207773 (* sw r *);
+	_write_out(@loca0, 4);
+	loca0 := 0x39202c61 (* a, 9 *);
+	_write_out(@loca0, 4);
+	loca0 := 0x70732832 (* 2(sp *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a29 (* )\n *);
+	_write_out(@loca0, 2);
+
+	loca0 := 0x73207773 (* sw s *);
+	_write_out(@loca0, 4);
+	loca0 := 0x38202c30 (* 0, 8 *);
+	_write_out(@loca0, 4);
+	loca0 := 0x70732838 (* 8(sp *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a29 (* )\n *);
+	_write_out(@loca0, 2);
+
+	loca0 := 0x69646461 (* addi *);
+	_write_out(@loca0, 4);
+	loca0 := 0x2c307320 (* _s0, *);
+	_write_out(@loca0, 4);
+	loca0 := 0x2c707320 (* _sp, *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a363920 (* _96\n *);
+	_write_out(@loca0, 4);
 
 	(* Save passed arguments on the stack. *)
-	loca0 := 0x61207773 (* sw a *)
-	_write_out(@loca0, 4)
-	loca4 := 0x38202c30 (* 0, 8 *)
-	_write_out(@loca4, 4)
-	loca8 := 0x70732834 (* 4(sp *)
-	_write_out(@loca8, 4)
-	loca12 := 0x0a29 (* )\n *)
-	_write_out(@loca12, 2)
-
-	_write_out(@loca0, 4)
-	loca4 := 0x38202c31 (* 1, 8 *)
-	_write_out(@loca4, 4)
-	loca8 := 0x70732830 (* 0(sp *)
-	_write_out(@loca8, 4)
-	_write_out(@loca12, 2)
-
-	_write_out(@loca0, 4)
-	loca4 := 0x37202c32 (* 2, 7 *)
-	_write_out(@loca4, 4)
-	loca8 := 0x70732836 (* 6(sp *)
-	_write_out(@loca8, 4)
-	_write_out(@loca12, 2)
-
-	_write_out(@loca0, 4)
-	loca4 := 0x37202c33 (* 3, 7 *)
-	_write_out(@loca4, 4)
-	loca8 := 0x70732832 (* 2(sp *)
-	_write_out(@loca8, 4)
-	_write_out(@loca12, 2)
-
-	_write_out(@loca0, 4)
-	loca4 := 0x36202c34 (* 4, 6 *)
-	_write_out(@loca4, 4)
-	loca8 := 0x70732838 (* 8(sp *)
-	_write_out(@loca8, 4)
-	_write_out(@loca12, 2)
-
-	_write_out(@loca0, 4)
-	loca4 := 0x36202c35 (* 5, 6 *)
-	_write_out(@loca4, 4)
-	loca8 := 0x70732838 (* 4(sp *)
-	_write_out(@loca8, 4)
-	_write_out(@loca12, 2)
+	loca0 := 0x61207773 (* sw a *);
+	_write_out(@loca0, 4);
+	loca4 := 0x38202c30 (* 0, 8 *);
+	_write_out(@loca4, 4);
+	loca8 := 0x70732834 (* 4(sp *);
+	_write_out(@loca8, 4);
+	loca12 := 0x0a29 (* )\n *);
+	_write_out(@loca12, 2);
+
+	_write_out(@loca0, 4);
+	loca4 := 0x38202c31 (* 1, 8 *);
+	_write_out(@loca4, 4);
+	loca8 := 0x70732830 (* 0(sp *);
+	_write_out(@loca8, 4);
+	_write_out(@loca12, 2);
+
+	_write_out(@loca0, 4);
+	loca4 := 0x37202c32 (* 2, 7 *);
+	_write_out(@loca4, 4);
+	loca8 := 0x70732836 (* 6(sp *);
+	_write_out(@loca8, 4);
+	_write_out(@loca12, 2);
+
+	_write_out(@loca0, 4);
+	loca4 := 0x37202c33 (* 3, 7 *);
+	_write_out(@loca4, 4);
+	loca8 := 0x70732832 (* 2(sp *);
+	_write_out(@loca8, 4);
+	_write_out(@loca12, 2);
+
+	_write_out(@loca0, 4);
+	loca4 := 0x36202c34 (* 4, 6 *);
+	_write_out(@loca4, 4);
+	loca8 := 0x70732838 (* 8(sp *);
+	_write_out(@loca8, 4);
+	_write_out(@loca12, 2);
+
+	_write_out(@loca0, 4);
+	loca4 := 0x36202c35 (* 5, 6 *);
+	_write_out(@loca4, 4);
+	loca8 := 0x70732838 (* 4(sp *);
+	_write_out(@loca8, 4);
+	_write_out(@loca12, 2);
 
 	(* Generate the body of the procedure. *)
-	.Lcompile_procedure_body
-	_skip_spaces()
-	loca12 := _read_line()
-	loca8 := 0x0a646e65 (* end\n *)
-	loca24 := _current()
-	loca8 := _memcmp(loca24, @loca8, 4)
+	.Lcompile_procedure_body;
+	_skip_spaces();
+	loca12 := _read_line();
+	loca8 := 0x0a646e65 (* end\n *);
+	loca24 := _current();
+	loca8 := _memcmp(loca24, @loca8, 4);
 
 	if loca8 = 0 then
 		goto .Lcompile_procedure_end
-	end
+	end;
 
-	_compile_line(loca12)
-	goto .Lcompile_procedure_body
+	_compile_line(loca12);
+	goto .Lcompile_procedure_body;
 
-	.Lcompile_procedure_end
-	_advance(4) (* Skip end\n. *)
+	.Lcompile_procedure_end;
+	_advance(4) (* Skip end\n. *);
 
 	(* Generate the procedure epilogue with a predefined stack size. *)
-	loca0 := 0x7220776c (* lw r *)
-	_write_out(@loca0, 4)
-	loca0 := 0x39202c61 (* a, 9 *)
-	_write_out(@loca0, 4)
-	loca0 := 0x70732832 (* 2(sp *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a29 (* )\n *)
-	_write_out(@loca0, 2)
-
-	loca0 := 0x7320776c (* lw s *)
-	_write_out(@loca0, 4)
-	loca0 := 0x38202c30 (* 0, 8 *)
-	_write_out(@loca0, 4)
-	loca0 := 0x70732838 (* 8(sp *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a29 (* )\n *)
-	_write_out(@loca0, 2)
-
-	loca0 := 0x69646461 (* addi *)
-	_write_out(@loca0, 4)
-
-	loca0 := 0x2c707320 (* _sp, *)
-	_write_out(@loca0, 4)
-	_write_out(@loca0, 4)
-
-	loca0 := 0x0a3639 (* 96\n *)
-	_write_out(@loca0, 4)
-
-	loca0 := 0x0a746572 (* ret\n *)
+	loca0 := 0x7220776c (* lw r *);
+	_write_out(@loca0, 4);
+	loca0 := 0x39202c61 (* a, 9 *);
+	_write_out(@loca0, 4);
+	loca0 := 0x70732832 (* 2(sp *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a29 (* )\n *);
+	_write_out(@loca0, 2);
+
+	loca0 := 0x7320776c (* lw s *);
+	_write_out(@loca0, 4);
+	loca0 := 0x38202c30 (* 0, 8 *);
+	_write_out(@loca0, 4);
+	loca0 := 0x70732838 (* 8(sp *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a29 (* )\n *);
+	_write_out(@loca0, 2);
+
+	loca0 := 0x69646461 (* addi *);
+	_write_out(@loca0, 4);
+
+	loca0 := 0x2c707320 (* _sp, *);
+	_write_out(@loca0, 4);
+	_write_out(@loca0, 4);
+
+	loca0 := 0x0a3639 (* 96\n *);
+	_write_out(@loca0, 4);
+
+	loca0 := 0x0a746572 (* ret\n *);
 	_write_out(@loca0, 4)
 end
 
@@ -1118,44 +1147,44 @@ var
 	loca4, loca12: Byte
 	loca8: Word
 begin
-	.Ltoken_compare_loop
-	loca4 := _front(loca76)
+	.Ltoken_compare_loop;
+	loca4 := _front(loca76);
 
 	(*
 	Will only be 0 if the current character in the null terminated string is \0 and the remaining length of the
 	another string is 0.
 	*)
-	loca8 := loca4 or loca80
+	loca8 := loca4 or loca80;
 	if loca8 = 0 then
 		goto .Ltoken_compare_equal
-	end
+	end;
 	if loca80 = 0 then
 		goto .Ltoken_compare_not_equal
-	end
+	end;
 	if loca4 = 0 then
 		goto .Ltoken_compare_not_equal
-	end
-	loca12 := _front(loca84)
+	end;
+	loca12 := _front(loca84);
 	if loca4 = loca12 then
 		goto .Ltoken_compare_continue
-	end
-	goto .Ltoken_compare_not_equal
+	end;
+	goto .Ltoken_compare_not_equal;
 
-	.Ltoken_compare_continue
+	.Ltoken_compare_continue;
 
-	loca84 := loca84 + 1
-	loca80 := loca80 - 1
-	loca76 := loca76 + 1
-	goto .Ltoken_compare_loop
+	loca84 := loca84 + 1;
+	loca80 := loca80 - 1;
+	loca76 := loca76 + 1;
+	goto .Ltoken_compare_loop;
 
-	.Ltoken_compare_not_equal
-	loca0 := 1
-	goto .Ltoken_compare_end
+	.Ltoken_compare_not_equal;
+	loca0 := 1;
+	goto .Ltoken_compare_end;
 
-	.Ltoken_compare_equal
-	loca0 := 0
+	.Ltoken_compare_equal;
+	loca0 := 0;
 
-	.Ltoken_compare_end
+	.Ltoken_compare_end;
 	return loca0
 end
 
@@ -1164,21 +1193,21 @@ var
 	loca0: Word
 	loca8: ^Byte
 begin
-	_advance(4) (* Skip the goto keyword. *)
+	_advance(4) (* Skip the goto keyword. *);
 
-	loca0 := 0x206a (* j_ *)
-	_write_out(@loca0, 2)
+	loca0 := 0x206a (* j_ *);
+	_write_out(@loca0, 2);
 
-	_skip_spaces()
-	loca8 := _current() (* We should be on dot the label is beginning with. *)
-	_advance(1)
+	_skip_spaces();
+	loca8 := _current() (* We should be on dot the label is beginning with. *);
+	_advance(1);
 
-	loca0 := _read_token()
-	_advance(loca0)
-	loca0 := loca0 + 1 (* Label length and the dot. *)
-	_write_out(loca8, loca0)
+	loca0 := _read_token();
+	_advance(loca0);
+	loca0 := loca0 + 1 (* Label length and the dot. *);
+	_write_out(loca8, loca0);
 
-	_advance(1) (* Skip the new line. *)
+	_advance(1) (* Skip the new line. *);
 	_put_char(0x0a) (* \n *)
 end
 
@@ -1188,30 +1217,29 @@ var
 	loca0: Word
 begin
 	(* Write the whole line as is. *)
-	loca0 := _current()
-	_write_out(loca0, loca84)
-
-	loca0 := loca0 + loca84
-	loca0 := loca0 - 1 (* Last character on the line. *)
+	loca0 := _current();
 
-	loca0 := _front(loca0)
-	if loca0 = 0x3a then
-		goto .Lcompile_label_colon
-	end
+	loca0 := loca0 + loca84;
+	loca0 := loca0 - 1 (* Last character on the line. *);
+	loca4 := loca84;
 
-	_put_char(0x3a) (* : *)
+	loca0 := _front(loca0);
+	if loca0 = 0x3b then
+		loca4 := loca4 - 1
+	end;
+	_write_out(s1, loca4);
 
-	.Lcompile_label_colon
-	_put_char(0x0a) (* \n *)
+	_put_char(0x3a) (* : *);
+	_put_char(0x0a) (* \n *);
 
 	_advance(loca84)
 end
 
 proc _compile_return()
 begin
-	_advance(6) (* Skip return. *)
-	_skip_spaces()
-	_build_binary_expression()
+	_advance(6) (* Skip return. *);
+	_skip_spaces();
+	_build_binary_expression();
 end
 
 proc _compile_if()
@@ -1219,52 +1247,52 @@ var
 	loca8, loca12, loca16, loca20: Word
 	loca4: ^Byte
 begin
-	_advance(2) (* Skip the if. *)
-	_skip_spaces()
+	_advance(2) (* Skip the if. *);
+	_skip_spaces();
 
-	_build_binary_expression()
+	_build_binary_expression();
 
-	_skip_spaces()
-	_advance(4) (* Skip the then. *)
+	_skip_spaces();
+	_advance(4) (* Skip the then. *);
 
-	loca20 := 0x00646e65 (* if end marker and newline. *)
-	loca16 := 0x66694c2e (* Label prefix ".Lif". *)
+	loca20 := 0x00646e65 (* if end marker and newline. *);
+	loca16 := 0x66694c2e (* Label prefix ".Lif". *);
 
-	loca12 := 0x7a716562 (* beqz *)
-	_write_out(@loca12, 4)
-	loca12 := 0x2c306120 (* _a0, *)
-	_write_out(@loca12, 4)
-	_put_char(0x20) (* _ *)
+	loca12 := 0x7a716562 (* beqz *);
+	_write_out(@loca12, 4);
+	loca12 := 0x2c306120 (* _a0, *);
+	_write_out(@loca12, 4);
+	_put_char(0x20) (* _ *);
 
-	(* Write the label *)
-	_write_out(@loca16, 4)
-	_printi(s2)
+	(* Write the label *);
+	_write_out(@loca16, 4);
+	_printi(s2);
 
-	_put_char(0x0a) (* \n *)
+	_put_char(0x0a) (* \n *);
 
-	.Lcompile_if_loop
-	_skip_spaces()
-	loca12 := _read_token()
+	.Lcompile_if_loop;
+	_skip_spaces();
+	loca12 := _read_token();
 
-	loca4 := _current()
-	loca8 := _token_compare(loca4, loca12, @loca20)
+	loca4 := _current();
+	loca8 := _token_compare(loca4, loca12, @loca20);
 
 	if loca8 then
-		loca12 := _read_line()
-		_compile_line(loca12, 1)
+		loca12 := _read_line();
+		_compile_line(loca12, 1);
 
 		goto .Lcompile_if_loop
-	end
+	end;
 
 	(* Write the label *)
-	_write_out(@loca16, 4)
-	_printi(s2)
+	_write_out(@loca16, 4);
+	_printi(s2);
 
-	loca12 := 0x0a3a0a3a (* :\n:\n *)
-	_write_out(@loca12, 2)
+	loca12 := 0x0a3a0a3a (* :\n:\n *);
+	_write_out(@loca12, 2);
 
-	(* Increment the label counter. *)
-	addi s2, s2, 1
+	(* Increment the label counter. *);
+	s2 := s2 + 1;
 	_advance(4) (* Skip the end with newline. *)
 end
 
@@ -1287,171 +1315,175 @@ var
 begin
 	if loca84 = 0 then
 		goto .Lcompile_line_empty (* Skip an empty line. *)
-	end
+	end;
 
-	loca16 := _current()
-	loca0 := _front(loca16)
+	loca16 := _current();
+	loca0 := _front(loca16);
 	(* ( *)
 	if loca0 = 0x28 then
 		goto .Lcompile_line_comment
-	end
-	loca16 := _current()
+	end;
+	loca16 := _current();
 
-	loca12 := 0x676f7270 (* prog *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x676f7270 (* prog *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_program
-	end
+	end;
 
-	loca12 := 0x736e6f63 (* cons *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x736e6f63 (* cons *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_const
-	end
+	end;
 
-	loca12 := 0x0a726176 (* var\n *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x0a726176 (* var\n *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_var
-	end
+	end;
 
-	loca12 := 0x636f7270 (* proc *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x636f7270 (* proc *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_procedure
-	end
+	end;
 
-	loca12 := 0x69676562 (* begi *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x69676562 (* begi *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_begin
-	end
+	end;
 
-	loca12 := 0x2e646e65 (* end. *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x2e646e65 (* end. *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_exit
-	end
+	end;
 
-	loca12 := 0x61636f6c (* loca *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x61636f6c (* loca *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_identifier
-	end
+	end;
+	loca4 := _front(loca16);
+	if loca4 = 0x73 then
+		goto .Lcompile_line_identifier
+	end;
 
-	loca12 := 0x6f706d69 (* impo *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x6f706d69 (* impo *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_import
-	end
+	end;
 
-	loca12 := 0x6f746f67 (* goto *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x6f746f67 (* goto *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_goto
-	end
+	end;
 
-	loca12 := 0x75746572 (* retu *)
-	loca4 := _memcmp(loca16, @loca12, 4)
+	loca12 := 0x75746572 (* retu *);
+	loca4 := _memcmp(loca16, @loca12, 4);
 	if loca4 = 0 then
 		goto .Lcompile_line_return
-	end
+	end;
 
-	loca12 := 0x6669 (* if *)
-	loca4 := _memcmp(loca16, @loca12, 2)
+	loca12 := 0x6669 (* if *);
+	loca4 := _memcmp(loca16, @loca12, 2);
 	if loca4 = 0 then
 		goto .Lcompile_line_if
-	end
+	end;
 
 	(* . *)
 	if loca0 = 0x2e then
 		goto .Lcompile_line_label
-	end
+	end;
 	(* _ *)
 	if loca0 = 0x5f then
 		goto .Lcompile_line_identifier
-	end
-	goto .Lcompile_line_unchanged (* Else. *)
+	end;
+	goto .Lcompile_line_unchanged (* Else. *);
 
-	.Lcompile_line_if:
-	_compile_if()
-	goto .Lcompile_line_section
+	.Lcompile_line_if;
+	_compile_if();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_label
-	_compile_label(loca84)
-	goto .Lcompile_line_section
+	.Lcompile_line_label;
+	_compile_label(loca84);
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_return
-	_compile_return()
-	goto .Lcompile_line_section
+	.Lcompile_line_return;
+	_compile_return();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_goto
-	_compile_goto()
-	goto .Lcompile_line_section
+	.Lcompile_line_goto;
+	_compile_goto();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_import
-	_compile_import()
-	goto .Lcompile_line_section
+	.Lcompile_line_import;
+	_compile_import();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_identifier
-	_compile_identifier()
-	goto .Lcompile_line_section
+	.Lcompile_line_identifier;
+	_compile_identifier();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_exit
-	_compile_exit()
-	goto .Lcompile_line_section
+	.Lcompile_line_exit;
+	_compile_exit();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_begin
+	.Lcompile_line_begin;
 
 	if loca80 = 1 then
 		goto .Lcompile_line_compile_entry
-	end
-	_compile_text_section()
-	.Lcompile_line_compile_entry
-	_compile_entry_point()
-	loca8 := 1
-	goto .Lcompile_line_end
-
-	.Lcompile_line_const
-	_compile_constant_section()
-	goto .Lcompile_line_section
-
-	.Lcompile_line_procedure
+	end;
+	_compile_text_section();
+	.Lcompile_line_compile_entry;
+	_compile_entry_point();
+	loca8 := 1;
+	goto .Lcompile_line_end;
+
+	.Lcompile_line_const;
+	_compile_constant_section();
+	goto .Lcompile_line_section;
+
+	.Lcompile_line_procedure;
 	if loca80 = 1 then
 		goto .Lcompile_line_compile_procedure
-	end
-	_compile_text_section()
-	.Lcompile_line_compile_procedure
-	_compile_procedure()
-	loca8 := 1
-	goto .Lcompile_line_end
+	end;
+	_compile_text_section();
+	.Lcompile_line_compile_procedure;
+	_compile_procedure();
+	loca8 := 1;
+	goto .Lcompile_line_end;
 
-	.Lcompile_line_var
-	_compile_variable_section()
-	goto .Lcompile_line_section
+	.Lcompile_line_var;
+	_compile_variable_section();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_program
-	_compile_program()
-	goto .Lcompile_line_section
+	.Lcompile_line_program;
+	_compile_program();
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_comment
-	_skip_comment(loca84)
-	goto .Lcompile_line_section
+	.Lcompile_line_comment;
+	_skip_comment(loca84);
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_empty
-	_advance(1)
-	goto .Lcompile_line_section
+	.Lcompile_line_empty;
+	_advance(1);
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_unchanged
-	_compile_assembly(loca84)
-	goto .Lcompile_line_section
+	.Lcompile_line_unchanged;
+	_compile_assembly(loca84);
+	goto .Lcompile_line_section;
 
-	.Lcompile_line_section
-	loca8 := 0
+	.Lcompile_line_section;
+	loca8 := 0;
 
-	.Lcompile_line_end
-	_skip_spaces()
-	_skip_comment()
+	.Lcompile_line_end;
+	_skip_spaces();
+	_skip_comment();
 
 	return loca8
 end
@@ -1461,13 +1493,13 @@ proc _compile_text_section()
 var loca0: Word
 begin
 	(* .section .text *)
-	loca0 := 0x6365732e (* .sec *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6e6f6974 (* tion *)
-	_write_out(@loca0, 4)
-	loca0 := 0x65742e20 (* _.te *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a7478 (* xt\n *)
+	loca0 := 0x6365732e (* .sec *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6e6f6974 (* tion *);
+	_write_out(@loca0, 4);
+	loca0 := 0x65742e20 (* _.te *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a7478 (* xt\n *);
 	_write_out(@loca0, 3)
 end
 
@@ -1475,22 +1507,22 @@ proc _compile_entry_point()
 var loca0: Word
 begin
 	(* .type _start, @function *)
-	loca0 := 0x7079742e (* .typ *)
-	_write_out(@loca0, 4)
-	loca0 := 0x735f2065 (* e _s *)
-	_write_out(@loca0, 4)
-	loca0 := 0x74726174 (* tart *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6640202c (* , @f *)
-	_write_out(@loca0, 4)
-	loca0 := 0x74636e75 (* unct *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a6e6f69 (* ion\n *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6174735f (* _sta *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a3a7472 (* rt:\n *)
-	_write_out(@loca0, 4)
+	loca0 := 0x7079742e (* .typ *);
+	_write_out(@loca0, 4);
+	loca0 := 0x735f2065 (* e _s *);
+	_write_out(@loca0, 4);
+	loca0 := 0x74726174 (* tart *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6640202c (* , @f *);
+	_write_out(@loca0, 4);
+	loca0 := 0x74636e75 (* unct *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a6e6f69 (* ion\n *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6174735f (* _sta *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a3a7472 (* rt:\n *);
+	_write_out(@loca0, 4);
 
 	_advance(6) (* Skip begin\n. *)
 end
@@ -1501,22 +1533,22 @@ begin
 	(* li a0, 0 *)
 	(* li a7, SYS_EXIT *)
 	(* ecall *)
-	loca0 := 0x6120696c (* li a *)
-	_write_out(@loca0, 4)
-	loca0 := 0x30202c30 (* 0, 0 *)
-	_write_out(@loca0, 4)
-	loca0 := 0x20696c0a (* \nli_ *)
-	_write_out(@loca0, 4)
-	loca0 := 0x202c3761 (* a7,_ *)
-	_write_out(@loca0, 4)
-	loca0 := 0x650a3339 (* 93\ne *)
-	_write_out(@loca0, 4)
-	loca0 := 0x6c6c6163 (* call *)
-	_write_out(@loca0, 4)
-	loca0 := 0x0a (* \n *)
-	_write_out(@loca0, 1)
-
-	_advance(4) (* Skip end. *)
+	loca0 := 0x6120696c (* li a *);
+	_write_out(@loca0, 4);
+	loca0 := 0x30202c30 (* 0, 0 *);
+	_write_out(@loca0, 4);
+	loca0 := 0x20696c0a (* \nli_ *);
+	_write_out(@loca0, 4);
+	loca0 := 0x202c3761 (* a7,_ *);
+	_write_out(@loca0, 4);
+	loca0 := 0x650a3339 (* 93\ne *);
+	_write_out(@loca0, 4);
+	loca0 := 0x6c6c6163 (* call *);
+	_write_out(@loca0, 4);
+	loca0 := 0x0a (* \n *);
+	_write_out(@loca0, 1);
+
+	_advance(4) (* Skip end. *);
 	_skip_spaces() (* Read the possible new line at the end of the file. *)
 end
 
@@ -1526,21 +1558,21 @@ var
 	loca0: ^Byte
 	loca4: Byte
 begin
-	loca0 := _current() (* Local position in the source text. *)
+	loca0 := _current() (* Local position in the source text. *);
 
-	.Lread_line_do
-	loca4 := _front(loca0) (* t1 = Current character. *)
+	.Lread_line_do;
+	loca4 := _front(loca0) (* t1 = Current character. *);
 	if loca4 = 0 then
 		goto .Lread_line_end (* Exit the loop on the NUL character. *)
-	end
+	end;
 	if loca4 = 0x0a then
 		goto .Lread_line_end (* Exit the loop on the new line. *)
-	end
-	loca0 := loca0 + 1
-	goto .Lread_line_do
+	end;
+	loca0 := loca0 + 1;
+	goto .Lread_line_do;
 
-	.Lread_line_end
-	loca4 := _current()
+	.Lread_line_end;
+	loca4 := _current();
 	return loca0 - loca4 (* Return the line length. *)
 end
 
@@ -1551,27 +1583,27 @@ var
 	loca12: Char
 	loca16: ^Byte
 begin
-	loca4 := 0 (* Whether the text section header was already emitted. *)
+	loca4 := 0 (* Whether the text section header was already emitted. *);
 
-	.Lcompile_do
-	loca16 := _current()
-	loca12 := _front(loca16) (* t0 = Current character. *)
+	.Lcompile_do;
+	loca16 := _current();
+	loca12 := _front(loca16) (* t0 = Current character. *);
 
 	if loca12 = 0 then
 		goto .Lcompile_end (* Exit the loop on the NUL character. *)
-	end
+	end;
 
-	_skip_spaces()
-	loca0 := _read_line()
-	loca8 := _compile_line(loca0, loca4)
+	_skip_spaces();
+	loca0 := _read_line();
+	loca8 := _compile_line(loca0, loca4);
 
 	if loca8 = 0 then
 		goto .Lcompile_do
-	end
+	end;
 	(* Update whether the text section header was already emitted. *)
-	loca4 := loca4 or loca8
+	loca4 := loca4 or loca8;
 
-	goto .Lcompile_do
+	goto .Lcompile_do;
 	.Lcompile_end
 end
 
@@ -1584,7 +1616,7 @@ end
 (* a0 is the number of bytes to advance in the source text. *)
 proc _advance(loca84: Word)
 begin
-	add s1, s1, a0
+	s1 := s1 + loca84
 end
 
 (*
@@ -1600,13 +1632,13 @@ end
 proc _main()
 begin
 	(* Read the source from the standard input. *)
-	_read_file(source_code, SOURCE_BUFFER_SIZE)
+	_read_file(source_code, SOURCE_BUFFER_SIZE);
 
-	addi s2, zero, 1
+	s2 := 1
 end
 
 (* Entry point. *)
 begin
-	_main()
+	_main();
 	_compile()
 end.