From 7680f09850afed826adca25b9dbb3fcf973f95d5 Mon Sep 17 00:00:00 2001
From: Chris Pressey <cpressey@catseye.tc>
Date: Sun, 9 Sep 2018 15:31:35 +0100
Subject: [PATCH] More conversion. I think that's the last of it.

---
 eg/rudiments/conditional2.60p | 4 ++--
 eg/rudiments/example.60p      | 2 +-
 eg/rudiments/if.60p           | 1 +
 eg/rudiments/range-error.60p  | 2 +-
 eg/rudiments/vector-inc.60p   | 2 +-
 eg/rudiments/vector-table.60p | 8 ++++----
 eg/rudiments/vector.60p       | 8 ++++----
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/eg/rudiments/conditional2.60p b/eg/rudiments/conditional2.60p
index 444de48..6483cfd 100644
--- a/eg/rudiments/conditional2.60p
+++ b/eg/rudiments/conditional2.60p
@@ -1,9 +1,9 @@
-routine chrout
+define chrout routine
   inputs a
   trashes a
   @ 65490
 
-routine main
+define main routine
   trashes a, x, y, z, n, c, v
 {
     ld a, 0
diff --git a/eg/rudiments/example.60p b/eg/rudiments/example.60p
index 2845c60..c4475da 100644
--- a/eg/rudiments/example.60p
+++ b/eg/rudiments/example.60p
@@ -3,7 +3,7 @@ byte lives
 define main routine
   inputs lives
   outputs lives
-  trashes a, x
+  trashes a, x, z, n, c, v
   {
       ld a, 0
       st a, lives
diff --git a/eg/rudiments/if.60p b/eg/rudiments/if.60p
index 3900724..9b0b968 100644
--- a/eg/rudiments/if.60p
+++ b/eg/rudiments/if.60p
@@ -1,6 +1,7 @@
 define main routine
   inputs a
   outputs a
+  trashes z, n, c
 {
     cmp a, 42
     if z {
diff --git a/eg/rudiments/range-error.60p b/eg/rudiments/range-error.60p
index 32b61a1..87e1095 100644
--- a/eg/rudiments/range-error.60p
+++ b/eg/rudiments/range-error.60p
@@ -1,6 +1,6 @@
 byte table[8] message : "WHAT?"
 
-routine main
+define main routine
   inputs message
   outputs x, a, z, n
 {
diff --git a/eg/rudiments/vector-inc.60p b/eg/rudiments/vector-inc.60p
index ca15901..1e2bd8e 100644
--- a/eg/rudiments/vector-inc.60p
+++ b/eg/rudiments/vector-inc.60p
@@ -1,7 +1,7 @@
 // This will not compile on its own, because there is no `main`.
 // But this and `vector-main.60p` together will compile.
 
-routine chrout
+define chrout routine
   inputs a
   trashes a
   @ 65490
diff --git a/eg/rudiments/vector-table.60p b/eg/rudiments/vector-table.60p
index d1fd0d0..4362012 100644
--- a/eg/rudiments/vector-table.60p
+++ b/eg/rudiments/vector-table.60p
@@ -11,26 +11,26 @@ vector (routine
   trashes a, z, n)
     table[32] vectors
 
-routine chrout
+define chrout routine
   inputs a
   trashes a
   @ 65490
 
-routine printa
+define printa routine
   trashes a, z, n
 {
     ld a, 65
     call chrout
 }
 
-routine printb
+define printb routine
   trashes a, z, n
 {
     ld a, 66
     call chrout
 }
 
-routine main
+define main routine
   inputs vectors
   outputs vectors
   trashes print, a, x, z, n, c
diff --git a/eg/rudiments/vector.60p b/eg/rudiments/vector.60p
index fd86d93..7783165 100644
--- a/eg/rudiments/vector.60p
+++ b/eg/rudiments/vector.60p
@@ -2,26 +2,26 @@ vector routine
   trashes a, z, n
     print
 
-routine chrout
+define chrout routine
   inputs a
   trashes a
   @ 65490
 
-routine printa
+define printa routine
   trashes a, z, n
 {
     ld a, 65
     call chrout
 }
 
-routine printb
+define printb routine
   trashes a, z, n
 {
     ld a, 66
     call chrout
 }
 
-routine main
+define main routine
   trashes print, a, z, n
 {
     copy printa, print