Cleanup BASIC sources

rom/array.s

@@ -20,10 +20,7 @@ L2FAF:
 ; ----------------------------------------------------------------------------
 NEG32768:
         .byte   $90,$80,$00,$00
-
-.ifdef CONFIG_2C
-		.byte	$00; bugfix: short number
-.endif
+        .byte   $00; bugfix: short number
 
 ; ----------------------------------------------------------------------------
 ; EVALUATE NUMERIC FORMULA AT TXTPTR
@@ -32,20 +29,14 @@ NEG32768:
 ; ----------------------------------------------------------------------------
 MAKINT:
         jsr     CHRGET
-.ifdef CONFIG_2
         jsr     FRMEVL
-.else
-        jsr     FRMNUM
-.endif
 
 ; ----------------------------------------------------------------------------
 ; CONVERT FAC TO INTEGER
 ; MUST BE POSITIVE AND LESS THAN 32768
 ; ----------------------------------------------------------------------------
 MKINT:
-.ifdef CONFIG_2
         jsr     CHKNUM
-.endif
         lda     FACSIGN
         bmi     MI1
 
@@ -70,9 +61,7 @@ MI2:
 ; ----------------------------------------------------------------------------
 ARRAY:
         lda     DIMFLG
-.ifndef CONFIG_SMALL
         ora     VALTYP+1
-.endif
         pha
         lda     VALTYP
         pha
@@ -109,10 +98,8 @@ L2FDE:
         pla
         sta     VALTYP
         pla
-.ifndef CONFIG_SMALL
         sta     VALTYP+1
         and     #$7F
-.endif
         sta     DIMFLG
 ; ----------------------------------------------------------------------------
 ; SEARCH ARRAY TABLE FOR THIS ARRAY NAME
@@ -185,28 +172,19 @@ MAKE_NEW_ARRAY:
         tay
         sta     STRNG2+1
         ldx     #BYTES_PER_ELEMENT
-.if .def(CONFIG_SMALL) && (!.def(CONFIG_2))
-        stx     STRNG2
-.endif
         lda     VARNAM
         sta     (LOWTR),y
-.ifndef CONFIG_SMALL
         bpl     L3078
         dex
 L3078:
-.endif
         iny
         lda     VARNAM+1
         sta     (LOWTR),y
-.if (!.def(CONFIG_SMALL)) || .def(CONFIG_2)
         bpl     L3081
         dex
-  .if !(.def(CONFIG_SMALL) && .def(CONFIG_2))
         dex
-  .endif
 L3081:
         stx     STRNG2
-.endif
         lda     EOLPNTR
         iny
         iny
@@ -324,42 +302,21 @@ L3124:
         stx     STRNG2
         dec     EOLPNTR
         bne     L30F6
-.if .def(CONFIG_SMALL) && (!.def(CONFIG_2))
-        asl     STRNG2
-        rol     a
-        bcs     GSE
-        asl     STRNG2
-        rol     a
-        bcs     GSE
-        tay
-        lda     STRNG2
-.else
-  .ifdef CONFIG_11A
         sta     STRNG2+1
-  .endif
         ldx     #BYTES_FP
-  .ifdef CONFIG_SMALL
-        lda     VARNAM+1
-  .else
         lda     VARNAM
-  .endif
         bpl     L3135
         dex
 L3135:
-  .ifdef CONFIG_SMALL
-        stx     RESULT+1
-  .else
         lda     VARNAM+1
         bpl     L313B
         dex
         dex
 L313B:
         stx     RESULT+2
-  .endif
         lda     #$00
         jsr     MULTIPLY_SUBS1
         txa
-.endif
         adc     HIGHDS
         sta     VARPNT
         tya