Deprecate DEF-less definitions (#1193)

test/link/all-instructions.asm

@@ -57,7 +57,7 @@ ENDM
     ; Bit Operations Instructions
 
 MACRO bitop_u3_instruction_list
-NBIT = 0
+    DEF NBIT = 0
     REPT 8
         \1 NBIT,a
         \1 NBIT,b
@@ -67,7 +67,7 @@ NBIT = 0
         \1 NBIT,h
         \1 NBIT,[hl]
         \1 NBIT,l
-NBIT = NBIT + 1
+        DEF NBIT = NBIT + 1
     ENDR
 ENDM
 

test/link/bank-const/a.asm

@@ -1,2 +1,2 @@
-CONSTANT equ 0
+def CONSTANT equ 0
 EXPORT CONSTANT

test/link/section-union/align-conflict.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-ATTRS equs ",ALIGN[2]"
+	def ATTRS equs ",ALIGN[2]"
 ELSE
-ATTRS equs "[$CAFE]"
+	def ATTRS equs "[$CAFE]"
 ENDC
 
 SECTION UNION "conflicting alignment", WRAM0 ATTRS

test/link/section-union/align-ofs-conflict.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-ATTRS equs ",ALIGN[3,7]"
+	def ATTRS equs ",ALIGN[3,7]"
 ELSE
-ATTRS equs ",ALIGN[4,14]"
+	def ATTRS equs ",ALIGN[4,14]"
 ENDC
 
 SECTION UNION "conflicting alignment", WRAM0 ATTRS

test/link/section-union/assert.asm

@@ -1,10 +1,10 @@
 IF !DEF(SECOND)
-OFS = 42
+	def OFS = 42
 ELSE
-OFS = 69
+	def OFS = 69
 ENDC
 
-BASE = $C0DE
+def BASE = $C0DE
 
 SECTION UNION "assertions in unions", WRAM0
 IF DEF(SECOND)

test/link/section-union/bad-types.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-TYPE equs "HRAM"
+	def TYPE equs "HRAM"
 ELSE
-TYPE equs "WRAM0"
+	def TYPE equs "WRAM0"
 ENDC
 
 SECTION UNION "conflicting types", TYPE

test/link/section-union/bank-conflict.asm

@@ -1,5 +1,5 @@
 IF !DEF(SECOND)
-SECOND equs "4"
+	def SECOND equs "4"
 ENDC
 
 SECTION UNION "conflicting banks", WRAMX, BANK[SECOND]

test/link/section-union/data-overlay.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-DATA equs "ds 4"
+	def DATA equs "ds 4"
 ELSE
-DATA equs "db $aa, $bb, $cc, $dd"
+	def DATA equs "db $aa, $bb, $cc, $dd"
 ENDC
 
 SECTION UNION "overlaid data", ROM0

test/link/section-union/different-data.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-DATA = 1
+	def DATA = 1
 ELSE
-DATA = 2
+	def DATA = 2
 ENDC
 
 SECTION UNION "different data", ROM0

test/link/section-union/different-ofs.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-ATTRS equs ",ALIGN[3,7]"
+	def ATTRS equs ",ALIGN[3,7]"
 ELSE
-ATTRS equs ",ALIGN[3,6]"
+	def ATTRS equs ",ALIGN[3,6]"
 ENDC
 
 SECTION UNION "conflicting alignment", WRAM0 ATTRS

test/link/section-union/different-size.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-SIZE = 69
+	def SIZE = 69
 ELSE
-SIZE = 420
+	def SIZE = 420
 ENDC
 
 SECTION UNION "different section sizes", ROM0

test/link/section-union/different-syntaxes.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-INSTR equs "sbc a"
+	def INSTR equs "sbc a"
 ELSE
-INSTR equs "db $9f"
+	def INSTR equs "db $9f"
 ENDC
 
 SECTION UNION "different syntaxes", ROM0

test/link/section-union/org-conflict.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-ADDR = $BEEF
+	def ADDR = $BEEF
 ELSE
-ADDR = $BABE
+	def ADDR = $BABE
 ENDC
 
 SECTION UNION "conflicting address", SRAM[ADDR]

test/link/section-union/split-data.asm

@@ -1,7 +1,7 @@
 IF !DEF(SECOND)
-DATA equs "ds 1\ndb $aa"
+	def DATA equs "ds 1\ndb $aa"
 ELSE
-DATA equs "db $bb\nds 1"
+	def DATA equs "db $bb\nds 1"
 ENDC
 
 SECTION UNION "mutually-overlaid data", ROM0

test/link/test.sh

@@ -177,7 +177,7 @@ for i in section-union/*.asm; do
 	fi
 	echo --- >> $outtemp
 	# Ensure RGBASM also errors out
-	cat $i - $i <<<'SECOND equs "1"' | $RGBASM - 2>> $outtemp
+	cat $i - $i <<<'def SECOND equs "1"' | $RGBASM - 2>> $outtemp
 	tryDiff ${i%.asm}.out $outtemp
 	rc=$(($? || $rc))
 done