cleanup

array.s

@@ -334,30 +334,28 @@ L3124:
         tay
         lda     STRNG2
 .else
-.ifndef CBM1_APPLE
+  .ifdef CONFIG_11A
         sta     STRNG2+1
-.endif
+  .endif
         ldx     #BYTES_FP
-.ifdef KBD
+  .ifdef KBD
         lda     VARNAM+1
-.else
+  .else
         lda     VARNAM
-.endif
+  .endif
         bpl     L3135
         dex
 L3135:
-.ifndef KBD
+  .ifdef KBD
+        stx     RESULT+1
+  .else
         lda     VARNAM+1
         bpl     L313B
         dex
         dex
 L313B:
-.endif
-.ifdef KBD
-        stx     RESULT+1
-.else
         stx     RESULT+2
-.endif
+  .endif
         lda     #$00
         jsr     MULTIPLY_SUBS1
         txa

defines_apple.s

@@ -2,7 +2,6 @@
 
 CONFIG_11 := 1
 CONFIG_SAFE_NAMENOTFOUND := 1
-CBM1_APPLE := 1
 .define CONFIG_SCRTCH_ORDER 3
 CONFIG_PRINT_CR := 1 ; print CR when line end reached
 CONFIG_IO_MSB := 1 ; all I/O has bit #7 set

defines_cbm.s

@@ -1,7 +1,6 @@
 .ifdef CBM1
 CONFIG_CBM_ALL := 1
 CONFIG_CBM1_PATCHES := 1 ; ** don't turn off! **
-CBM1_APPLE := 1
 CONFIG_DATAFLAG := 1
 CONFIG_BUG_GET_ERROR := 1; treat GET error like READ error
 CONFIG_PRINTNULLS := 1; whether PRINTNULLS does anything
@@ -16,7 +15,6 @@ CONFIG_2 := 1
 CONFIG_2A := 1
 CBM2_KBD := 1 ; 2 weird instances
 CONFIG_PEEK_SAVE_LINNUM := 1
-CBM2_KIM := 1
 CONFIG_DATAFLAG := 1
 CONFIG_EASTER_EGG := 1
 ; CONFIG_SMALL := 1 ; test :-)