Deprecate DEF-less definitions

src/asm/parser.y

@@ -956,29 +956,58 @@ compoundeq	: T_POP_ADDEQ { $$ = RPN_ADD; }
 		| T_POP_SHREQ { $$ = RPN_SHR; }
 ;
 
-equ		: T_LABEL T_POP_EQU const { sym_AddEqu($1, $3); }
+equ		: T_LABEL T_POP_EQU const {
+			warning(WARNING_OBSOLETE, "`%s EQU` is deprecated; use `DEF %s EQU`\n", $1, $1);
+			sym_AddEqu($1, $3);
+		}
 ;
 
-assignment	: T_LABEL T_POP_EQUAL const { sym_AddVar($1, $3); }
-		| T_LABEL compoundeq const { compoundAssignment($1, $2, $3); }
+assignment	: T_LABEL T_POP_EQUAL const {
+			warning(WARNING_OBSOLETE, "`%s =` is deprecated; use `DEF %s =`\n", $1, $1);
+			sym_AddVar($1, $3);
+		}
+		| T_LABEL compoundeq const {
+			static const char *compoundEqOperators[] = {
+				[RPN_ADD] = "+=",
+				[RPN_SUB] = "-=",
+				[RPN_MUL] = "*=",
+				[RPN_DIV] = "/=",
+				[RPN_MOD] = "%=",
+				[RPN_XOR] = "^=",
+				[RPN_OR] = "|=",
+				[RPN_AND] = "&=",
+				[RPN_SHL] = "<<=",
+				[RPN_SHR] = ">>=",
+			};
+
+			warning(WARNING_OBSOLETE, "`%s %s` is deprecated; use `DEF %s %s`\n",
+				$1, compoundEqOperators[$2], $1, compoundEqOperators[$2]);
+			compoundAssignment($1, $2, $3);
+		}
 ;
 
-equs		: T_LABEL T_POP_EQUS string { sym_AddString($1, $3); }
+equs		: T_LABEL T_POP_EQUS string {
+			warning(WARNING_OBSOLETE, "`%s EQUS` is deprecated; use `DEF %s EQUS`\n", $1, $1);
+			sym_AddString($1, $3);
+		}
 ;
 
 rb		: T_LABEL T_POP_RB rs_uconst {
+			warning(WARNING_OBSOLETE, "`%s RB` is deprecated; use `DEF %s RB`\n", $1, $1);
 			sym_AddEqu($1, sym_GetConstantValue("_RS"));
 			sym_AddVar("_RS", sym_GetConstantValue("_RS") + $3);
 		}
 ;
 
 rw		: T_LABEL T_POP_RW rs_uconst {
+			warning(WARNING_OBSOLETE, "`%s RW` is deprecated; use `DEF %s RW`\n", $1, $1);
 			sym_AddEqu($1, sym_GetConstantValue("_RS"));
 			sym_AddVar("_RS", sym_GetConstantValue("_RS") + 2 * $3);
 		}
 ;
 
 rl		: T_LABEL T_Z80_RL rs_uconst {
+			warning(WARNING_OBSOLETE, "`%s RL` is deprecated; use `DEF %s RL`\n", $1, $1);
 			sym_AddEqu($1, sym_GetConstantValue("_RS"));
 			sym_AddVar("_RS", sym_GetConstantValue("_RS") + 4 * $3);
 		}

test/asm/bracketed-macro-args.asm

@@ -10,9 +10,9 @@ ENDM
 
 MACRO mac
 	println \<2__> + \<1_2> + \<\1>
-x = 2
+	def x = 2
 	println \<{d:x}> + \<1_{d:x}> + \<\<\<13>>>
-y equs "NARG"
+	def y equs "NARG"
 	println \<x> + \<1_{d:x}_> + \<\<\<_{y}>>>
 ENDM
 

test/asm/bracketed-symbols.asm

@@ -1,18 +1,18 @@
-X = 42
+DEF X = 42
 PRINTLN "{X}"
 PRINTLN "{x:X}"
 PRINTLN "{X:X}"
 PRINTLN "{d:X}"
 PRINTLN "{b:X}"
 
-Y equ 1337
+DEF Y EQU 1337
 PRINTLN "{b:Y}"
 
 rsreset
-R rb 0
+DEF R RB 0
 PRINTLN "{d:R}"
 
-S equs "You can't format me!"
+DEF S EQUS "You can't format me!"
 PRINTLN "{X:S}"
 
 SECTION "Test", ROM0

test/asm/builtin-overwrite.asm

@@ -2,17 +2,6 @@ macro tickle
 ; There once was a bug where overwriting worked only on the second try, so
 ; try everything twice for good measure
 
-; Skip this syntax for EQUS, as it is invalid
-IF \2
-\1 = 0
-\1 = 0
-PRINTLN \1
-
-\1 EQU 0
-\1 EQU 0
-PRINTLN \1
-ENDC
-
 PURGE \1
 PURGE \1
 PRINTLN \1

test/asm/builtin-overwrite.err

@@ -1,57 +1,49 @@
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(7):
-    '__UTC_YEAR__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(8):
-    '__UTC_YEAR__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(11):
-    '__UTC_YEAR__' already defined at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(12):
-    '__UTC_YEAR__' already defined at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(16):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(5):
     Built-in symbol '__UTC_YEAR__' cannot be purged
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(17):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(6):
     Built-in symbol '__UTC_YEAR__' cannot be purged
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(20):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(9):
     '__UTC_YEAR__' already defined at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(21):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(10):
     '__UTC_YEAR__' already defined at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(24):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(13):
     '__UTC_YEAR__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(25):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(14):
     '__UTC_YEAR__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(28):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(17):
     '__UTC_YEAR__' already defined at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(29):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(18):
     '__UTC_YEAR__' already defined at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(32):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(21):
     '__UTC_YEAR__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(33):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(22):
     '__UTC_YEAR__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(36):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(25):
     '__UTC_YEAR__' already defined as non-EQUS at <command-line>
-error: builtin-overwrite.asm(43) -> builtin-overwrite.asm::tickle(37):
+error: builtin-overwrite.asm(32) -> builtin-overwrite.asm::tickle(26):
     '__UTC_YEAR__' already defined as non-EQUS at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(16):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(5):
     Built-in symbol '__ISO_8601_UTC__' cannot be purged
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(17):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(6):
     Built-in symbol '__ISO_8601_UTC__' cannot be purged
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(20):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(9):
     '__ISO_8601_UTC__' already defined at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(21):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(10):
     '__ISO_8601_UTC__' already defined at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(24):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(13):
     '__ISO_8601_UTC__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(25):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(14):
     '__ISO_8601_UTC__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(28):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(17):
     '__ISO_8601_UTC__' already defined at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(29):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(18):
     '__ISO_8601_UTC__' already defined at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(32):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(21):
     '__ISO_8601_UTC__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(33):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(22):
     '__ISO_8601_UTC__' already defined as constant at <command-line>
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(36):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(25):
     Built-in symbol '__ISO_8601_UTC__' cannot be redefined
-error: builtin-overwrite.asm(44) -> builtin-overwrite.asm::tickle(37):
+error: builtin-overwrite.asm(33) -> builtin-overwrite.asm::tickle(26):
     Built-in symbol '__ISO_8601_UTC__' cannot be redefined
-error: Assembly aborted (28 errors)!
+error: Assembly aborted (24 errors)!

test/asm/builtin-overwrite.out

@@ -4,8 +4,6 @@ $7C5
 $7C5
 $7C5
 $7C5
-$7C5
-$7C5
 1989-04-21T12:34:56Z
 1989-04-21T12:34:56Z
 1989-04-21T12:34:56Z

test/asm/charlen-charsub.asm

@@ -7,7 +7,7 @@
 
 SECTION "test", ROM0
 
-S EQUS "XBold<NULL>ABC"
+DEF S EQUS "XBold<NULL>ABC"
 
 	assert CHARLEN("{S}") == 6
 	println CHARSUB("{S}", 2)

test/asm/compound-assignment.asm

@@ -30,8 +30,8 @@ endm
   try "def ", q
   try "redef ", r
 
-_RS += 100
+def _RS += 100
 println _RS
 
-UnDeFiNeD ^= 300
+def UnDeFiNeD ^= 300
 println UnDeFiNeD

test/asm/compound-assignment.err

@@ -1,3 +1,25 @@
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(4): [-Wobsolete]
+    `p =` is deprecated; use `DEF p =`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(6): [-Wobsolete]
+    `p +=` is deprecated; use `DEF p +=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(8): [-Wobsolete]
+    `p -=` is deprecated; use `DEF p -=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(10): [-Wobsolete]
+    `p *=` is deprecated; use `DEF p *=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(12): [-Wobsolete]
+    `p /=` is deprecated; use `DEF p /=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(14): [-Wobsolete]
+    `p %=` is deprecated; use `DEF p %=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(16): [-Wobsolete]
+    `p |=` is deprecated; use `DEF p |=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(18): [-Wobsolete]
+    `p ^=` is deprecated; use `DEF p ^=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(20): [-Wobsolete]
+    `p &=` is deprecated; use `DEF p &=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(22): [-Wobsolete]
+    `p <<=` is deprecated; use `DEF p <<=`
+warning: compound-assignment.asm(29) -> compound-assignment.asm::try(24): [-Wobsolete]
+    `p >>=` is deprecated; use `DEF p >>=`
 error: compound-assignment.asm(36):
     Expected constant expression: 'UnDeFiNeD' is not constant at assembly time
 error: Assembly aborted (1 error)!

test/asm/def.asm

@@ -28,3 +28,22 @@ redef string equs "there"
 
 redef constant equ 6*9
 	println constant
+
+old_constant EQU 42
+old_string EQUS "hello"
+
+old_variable = 2 + 2
+old_variable += 3
+old_variable *= 4
+old_variable -= 1
+old_variable /= 5
+old_variable %= 7
+old_variable &= $ffff
+old_variable |= %1010
+old_variable ^= &123
+old_variable <<= 2
+old_variable >>= 1
+
+old_byte rb
+old_word rw
+old_long rl

test/asm/def.err

@@ -1,3 +1,35 @@
 error: def.asm(23):
     'constant' already defined at def.asm(10)
+warning: def.asm(32): [-Wobsolete]
+    `old_constant EQU` is deprecated; use `DEF old_constant EQU`
+warning: def.asm(33): [-Wobsolete]
+    `old_string EQUS` is deprecated; use `DEF old_string EQUS`
+warning: def.asm(35): [-Wobsolete]
+    `old_variable =` is deprecated; use `DEF old_variable =`
+warning: def.asm(36): [-Wobsolete]
+    `old_variable +=` is deprecated; use `DEF old_variable +=`
+warning: def.asm(37): [-Wobsolete]
+    `old_variable *=` is deprecated; use `DEF old_variable *=`
+warning: def.asm(38): [-Wobsolete]
+    `old_variable -=` is deprecated; use `DEF old_variable -=`
+warning: def.asm(39): [-Wobsolete]
+    `old_variable /=` is deprecated; use `DEF old_variable /=`
+warning: def.asm(40): [-Wobsolete]
+    `old_variable %=` is deprecated; use `DEF old_variable %=`
+warning: def.asm(41): [-Wobsolete]
+    `old_variable &=` is deprecated; use `DEF old_variable &=`
+warning: def.asm(42): [-Wobsolete]
+    `old_variable |=` is deprecated; use `DEF old_variable |=`
+warning: def.asm(43): [-Wobsolete]
+    `old_variable ^=` is deprecated; use `DEF old_variable ^=`
+warning: def.asm(44): [-Wobsolete]
+    `old_variable <<=` is deprecated; use `DEF old_variable <<=`
+warning: def.asm(45): [-Wobsolete]
+    `old_variable >>=` is deprecated; use `DEF old_variable >>=`
+warning: def.asm(47): [-Wobsolete]
+    `old_byte RB` is deprecated; use `DEF old_byte RB`
+warning: def.asm(48): [-Wobsolete]
+    `old_word RW` is deprecated; use `DEF old_word RW`
+warning: def.asm(49): [-Wobsolete]
+    `old_long RL` is deprecated; use `DEF old_long RL`
 error: Assembly aborted (1 error)!

test/asm/endc-eof-newline.asm

@@ -1,8 +1,8 @@
 IF 1
-X = 0
+DEF X = 0
 INCLUDE "endc-eof-newline.inc"
 INCLUDE "endc-eof-newline-else.inc"
-X = 1
+DEF X = 1
 INCLUDE "endc-eof-newline.inc"
 INCLUDE "endc-eof-newline-else.inc"
-ENDC
+ENDC

test/asm/equ-charmap.asm

@@ -1,4 +1,4 @@
 	charmap "A", 1
 SECTION "sec", ROM0[0]
-_A_ EQU "A"
+DEF _A_ EQU "A"
 	db _A_

test/asm/equs-macrodef.asm

@@ -1,3 +1,3 @@
-DEFINE equs "MACRO mac\nPRINTLN \"Hello :D\"\nENDM"
+def DEFINE equs "MACRO mac\nPRINTLN \"Hello :D\"\nENDM"
 DEFINE
 	mac

test/asm/equs-nest.asm

@@ -1,4 +1,5 @@
-X1 equs "Y1 equs \"\\\"Success!\\\\n\\\"\""
-Y1 equs "Z1"
+; the nested EQUS can't use DEF because Y1 would not be expanded
+def X1 equs "Y1 equs \"\\\"Success!\\\\n\\\"\""
+def Y1 equs "Z1"
 X1
 	PRINT Z1

test/asm/equs-nest.err

@@ -0,0 +1,3 @@
+warning: equs-nest.asm(4): [-Wobsolete]
+    `Z1 EQUS` is deprecated; use `DEF Z1 EQUS`
+while expanding symbol "X1"

test/asm/equs-newline.asm

@@ -1,4 +1,4 @@
 
-ACT equs "WARN \"First\"\nWARN \"Second\""
+def ACT equs "WARN \"First\"\nWARN \"Second\""
 	ACT
 	WARN "Third"

test/asm/equs-purge.asm

@@ -1,2 +1,2 @@
-BYE equs "PURGE BYE\nWARN \"Crash?\"\n    \n"
+def BYE equs "PURGE BYE\nWARN \"Crash?\"\n    \n"
 BYE

test/asm/equs-recursion.asm

@@ -1,2 +1,2 @@
-recurse EQUS "recurse"
+DEF recurse EQUS "recurse"
 recurse

test/asm/expand-empty-string.asm

@@ -1,6 +1,6 @@
 MACRO test
-v equs "X"
-X equs "" ; should not be expanded
+def v equs "X"
+def X equs "" ; should not be expanded
 \1
 ENDM
 	test v 0

test/asm/ff00+c-label.asm

@@ -1,4 +1,4 @@
-CONSTANT equ 42
+def CONSTANT equ 42
 PRINTLN $ff00 + CONSTANT
 
 SECTION "Overreading much?", ROM0[0]