From 2380fee2e8f1978f496712e871f7dfb5e9522da0 Mon Sep 17 00:00:00 2001
From: Michael Steil <mist64@mac.com>
Date: Sat, 18 Oct 2008 07:19:59 +0000
Subject: [PATCH] cleanup

---
 TODO.txt |  5 ++++-
 array.s  | 14 +++++++-------
 input.s  |  7 +------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 5e70ec4..9e8419c 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,4 +5,7 @@
 * add AppleSoft comments
 * look for all " $", i.e. (zeropage) constants, replace them
   with symbols
-* check all .ifdef OSI; they might be .ifdef CONFIG_SMALL
\ No newline at end of file
+* check all .ifdef OSI; they might be .ifdef CONFIG_SMALL
+* check for KBD whether it's CONFIG_2 && CONFIG_SMALL (float
+  etc.)
+* there must be no platform ifdefs in generic files
\ No newline at end of file
diff --git a/array.s b/array.s
index 439b7ec..39dfa55 100644
--- a/array.s
+++ b/array.s
@@ -185,7 +185,7 @@ MAKE_NEW_ARRAY:
         tay
         sta     STRNG2+1
         ldx     #BYTES_PER_ELEMENT
-.ifdef OSI
+.if .def(CONFIG_SMALL) && (!.def(CONFIG_2))
         stx     STRNG2
 .endif
         lda     VARNAM
@@ -198,12 +198,12 @@ L3078:
         iny
         lda     VARNAM+1
         sta     (LOWTR),y
-.ifndef OSI
+.if (!.def(CONFIG_SMALL)) || .def(CONFIG_2)
         bpl     L3081
         dex
-.ifndef KBD
+  .if !(.def(CONFIG_SMALL) && .def(CONFIG_2))
         dex
-.endif
+  .endif
 L3081:
         stx     STRNG2
 .endif
@@ -324,7 +324,7 @@ L3124:
         stx     STRNG2
         dec     EOLPNTR
         bne     L30F6
-.ifdef OSI
+.if .def(CONFIG_SMALL) && (!.def(CONFIG_2))
         asl     STRNG2
         rol     a
         bcs     GSE
@@ -338,7 +338,7 @@ L3124:
         sta     STRNG2+1
   .endif
         ldx     #BYTES_FP
-  .ifdef KBD
+  .if .def(CONFIG_SMALL) && (.def(CONFIG_2))
         lda     VARNAM+1
   .else
         lda     VARNAM
@@ -346,7 +346,7 @@ L3124:
         bpl     L3135
         dex
 L3135:
-  .ifdef KBD
+  .ifdef .def(CONFIG_SMALL) && (.def(CONFIG_2))
         stx     RESULT+1
   .else
         lda     VARNAM+1
diff --git a/input.s b/input.s
index f1cca3e..2330094 100644
--- a/input.s
+++ b/input.s
@@ -256,12 +256,7 @@ PROCESS_INPUT_ITEM:
         ldx     #<(INPUTBUFFER-1)
         ldy     #>(INPUTBUFFER-1)
   .endif
-  .ifndef CONFIG_NO_INPUTBUFFER_ZP
-    .ifdef CONFIG_2
-	  __BEQ = 1
-	.endif
-  .endif
-  .ifdef __BEQ
+  .if .def(CONFIG_2) && (!.def(CONFIG_NO_INPUTBUFFER_ZP))
         beq     L2AF8	; always
   .else
         bne     L2AF8	; always