From 93352a5d15dc24cb09fdf68109b9cf979d3f4e31 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Thu, 16 Oct 2008 08:02:15 +0000
Subject: [PATCH] cleanup

---
 NOTES.txt | 1 +
 eval.s    | 9 +++++----
 float.s   | 1 +
 flow.s    | 6 +-----
 token.s   | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/NOTES.txt b/NOTES.txt
index 46c1159..331e61a 100644
--- a/NOTES.txt
+++ b/NOTES.txt
@@ -4,5 +4,6 @@ OSI BASIC             1977     1.0 REV 3.2    Y      N          -
 AppleSoft I           1977     1.1            N      Y        Apple      CONFIG_11
 KIM BASIC             1977     1.1            N      Y          -        CONFIG_11A
 Commodore BASIC 2     1979                    Y      Y         CBM       CONFIG_2
+AppleSoft II          1978                    Y      Y        Apple
 KBD BASIC             1980                    Y      N         KBD
 MicroTAN              1980                    Y      Y          -
diff --git a/eval.s b/eval.s
index 21b02f3..f4de477 100644
--- a/eval.s
+++ b/eval.s
@@ -312,7 +312,7 @@ FRM_PERFORM2:
 .endif
         sta     ARGSIGN
         eor     FACSIGN
-        sta     STRNG1
+        sta     SGNCPR
 EXIT:
         lda     FAC
         rts
@@ -457,10 +457,10 @@ LCE3B:
         stx     $6D
         bit     $62
         bpl     LCE53
-        cmp     #$54
+        cmp     #$54	; T
         bne     LCE53
   .endif
-        cpy     #$C9
+        cpy     #$C9	; I$
         bne     LCE53
         jsr     LCE76
         sty     EXPON
@@ -473,7 +473,8 @@ LCE3B:
         jmp     LD353
 LCE53:
 .endif
-.ifdef KBD_MICROTAN
+.ifdef KBD_MICROTAN ; also AppleSoft 2
+; bugfix?
         ldx     #$00
         stx     STRNG1+1
 .endif
diff --git a/float.s b/float.s
index ead0b4c..b9c033c 100644
--- a/float.s
+++ b/float.s
@@ -170,6 +170,7 @@ L36C7:
         sty     FACEXTENSION
         adc     #$08
 .ifdef KBD_MICROTAN
+; bugfix? does not exist on AppleSoft 2
         cmp     #(MANTISSA_BYTES+1)*8
 .else
         cmp     #MANTISSA_BYTES*8
diff --git a/flow.s b/flow.s
index 2069349..6cd0419 100644
--- a/flow.s
+++ b/flow.s
@@ -179,11 +179,7 @@ SYNERR1:
 .endif
 .ifdef CONFIG_2
 LC721:
-.ifdef KBD_MICROTAN
-        cmp     #$45
-.else
-        cmp     #$4B
-.endif
+        cmp     #TOKEN_GO-$80
         bne     SYNERR1
         jsr     CHRGET
         lda     #TOKEN_TO
diff --git a/token.s b/token.s
index afd6ee7..699352b 100644
--- a/token.s
+++ b/token.s
@@ -143,7 +143,7 @@ UNFNC:
 		keyword_addr "RIGHT$", RIGHTSTR
 		keyword_addr "MID$", MIDSTR
 .ifdef CONFIG_2
-		keyword	"GO"
+		keyword	"GO", TOKEN_GO
 .endif
         .segment "KEYWORDS"
 		.byte   0