From 8fc6b95bae923e30df2694fa5c72b1ae593c6901 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sat, 11 Oct 2008 22:37:02 +0000
Subject: [PATCH] cleanup

---
 msbasic.s | 147 +++++++++++++++++++++---------------------------------
 1 file changed, 57 insertions(+), 90 deletions(-)

diff --git a/msbasic.s b/msbasic.s
index 512b782..fd32fab 100644
--- a/msbasic.s
+++ b/msbasic.s
@@ -175,48 +175,72 @@ TOKEN_NAME_TABLE:
 .endif
 		keyrts "NEW", NEW
 
-;		keyrts "", 
-;		keyrts "", 
-;		keyrts "", 
-;		keyrts "", 
+		.segment "KEYWORDS"
+	htasc	"TAB("
+	htasc	"TO"
+	htasc	"FN"
+	htasc	"SPC("
+	htasc	"THEN"
+	htasc	"NOT"
+	htasc	"STEP"
+	htasc	"+"
+	htasc	"-"
+	htasc	"*"
+	htasc	"/"
+.ifdef KBD
+	htasc	"#"
+.else
+	htasc	"^"
+.endif
+	htasc	"AND"
+	htasc	"OR"
+	htasc	">"
+	htasc	"="
+	htasc	"<"
 
         .segment "VECTORS"
 UNFNC:
-        .addr   SGN
-        .addr   INT
-        .addr   ABS
+		keyvec "SGN", SGN
+		keyvec "INT", INT
+		keyvec "ABS", ABS
+.ifdef KBD
+		keyvec "VER", VER
+.else
 .ifdef KIM
-        .addr   IQERR
+		keyvec "USR", IQERR
 .else
+		keyvec "USR", USR
+.endif
+.endif
+		keyvec "FRE", FRE
+		keyvec "POS", POS
+		keyvec "SQR", SQR
+		keyvec "RND", RND
+		keyvec "LOG", LOG
+		keyvec "EXP", EXP
+		keyvec "COS", COS
+		keyvec "SIN", SIN
+		keyvec "TAN", TAN
+		keyvec "ATN", ATN
 .ifdef KBD
-        .addr   VER
+		keyvec "GETC", GETC
 .else
-        .addr   USR
+		keyvec "PEEK", PEEK
 .endif
+		keyvec "LEN", LEN
+		keyvec "STR$", STR
+		keyvec "VAL", VAL
+		keyvec "ASC", ASC
+		keyvec "CHR$", CHRSTR
+		keyvec "LEFT$", LEFTSTR
+		keyvec "RIGHT$", RIGHTSTR
+		keyvec "MID$", MIDSTR
+.ifdef CBM2_KBD
+	htasc	"GO"
 .endif
-        .addr   FRE
-        .addr   POS
-        .addr   SQR
-        .addr   RND
-        .addr   LOG
-        .addr   EXP
-        .addr   COS
-        .addr   SIN
-        .addr   TAN
-        .addr   ATN
-.ifdef KBD
-        .addr   GETC
-.else
-        .addr   PEEK
-.endif
-        .addr   LEN
-        .addr   STR
-        .addr   VAL
-        .addr   ASC
-        .addr   CHRSTR
-        .addr   LEFTSTR
-        .addr   RIGHTSTR
-        .addr   MIDSTR
+	.byte   0
+
+        .segment "VECTORS"
 MATHTBL:
         .byte   $79
         .word   FADDT-1
@@ -239,63 +263,6 @@ MATHTBL:
         .byte   $64
         .word   RELOPS-1
 
-        .segment "KEYWORDS"
-	htasc	"TAB("
-	htasc	"TO"
-	htasc	"FN"
-	htasc	"SPC("
-	htasc	"THEN"
-	htasc	"NOT"
-	htasc	"STEP"
-	htasc	"+"
-	htasc	"-"
-	htasc	"*"
-	htasc	"/"
-.ifdef KBD
-	htasc	"#"
-.else
-	htasc	"^"
-.endif
-	htasc	"AND"
-	htasc	"OR"
-	htasc	">"
-	htasc	"="
-	htasc	"<"
-	htasc	"SGN"
-	htasc	"INT"
-	htasc	"ABS"
-.ifdef KBD
-	htasc	"VER"
-.else
-	htasc	"USR"
-.endif
-	htasc	"FRE"
-	htasc	"POS"
-	htasc	"SQR"
-	htasc	"RND"
-	htasc	"LOG"
-	htasc	"EXP"
-	htasc	"COS"
-	htasc	"SIN"
-	htasc	"TAN"
-	htasc	"ATN"
-.ifdef KBD
-	htasc	"GETC"
-.else
-	htasc	"PEEK"
-.endif
-	htasc	"LEN"
-	htasc	"STR$"
-	htasc	"VAL"
-	htasc	"ASC"
-	htasc	"CHR$"
-	htasc	"LEFT$"
-	htasc	"RIGHT$"
-	htasc	"MID$"
-.ifdef CBM2_KBD
-	htasc	"GO"
-.endif
-	.byte   0
         .segment "CODE"
 ERROR_MESSAGES:
 .ifdef CONFIG_SMALL