gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-24 20:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate GLOBAL and XDEF

Browse Source 
They're basically synonyms for `EXPORT`, and the latter isn't
even documented!
This commit is contained in:
ISSOtm
2020-03-10 13:49:55 +01:00
parent 8d9a896166
commit c7320a49a9
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/asm/asmy.y
View File

@@ -564,7 +564,7 @@ static void strsubUTF8(char *dest, const char *src, uint32_t pos, uint32_t len)
%token T_POP_INCLUDE T_POP_PRINTF T_POP_PRINTT T_POP_PRINTV T_POP_PRINTI %token T_POP_INCLUDE T_POP_PRINTF T_POP_PRINTT T_POP_PRINTV T_POP_PRINTI
%token T_POP_IF T_POP_ELIF T_POP_ELSE T_POP_ENDC %token T_POP_IF T_POP_ELIF T_POP_ELSE T_POP_ENDC
%token T_POP_EXPORT T_POP_GLOBAL %token T_POP_EXPORT T_POP_GLOBAL T_POP_XDEF
%token T_POP_DB T_POP_DS T_POP_DW T_POP_DL %token T_POP_DB T_POP_DS T_POP_DW T_POP_DL
%token T_POP_SECTION %token T_POP_SECTION
%token T_POP_RB %token T_POP_RB
@@ -735,7 +735,6 @@ simple_pseudoop : include
| else | else
| endc | endc
| export | export
| global
| { nPCOffset = 0; } db | { nPCOffset = 0; } db
| { nPCOffset = 0; } dw | { nPCOffset = 0; } dw
| { nPCOffset = 0; } dl | { nPCOffset = 0; } dl
@@ -950,7 +949,16 @@ purge_list_entry : scoped_id
} }
; ;
export : T_POP_EXPORT export_list export : export_token export_list
;
export_token : T_POP_EXPORT
| T_POP_GLOBAL {
warning(WARNING_OBSOLETE, "`GLOBAL` is a deprecated synonym for `EXPORT`");
}
| T_POP_XDEF {
warning(WARNING_OBSOLETE, "`XDEF` is a deprecated synonym for `EXPORT`");
}
; ;
export_list : export_list_entry export_list : export_list_entry
@@ -963,19 +971,6 @@ export_list_entry : scoped_id
} }
; ;
global : T_POP_GLOBAL global_list
;
global_list : global_list_entry
| global_list_entry comma global_list
;
global_list_entry : scoped_id
{
sym_Export($1);
}
;
equ : T_LABEL T_POP_EQU const equ : T_LABEL T_POP_EQU const
{ {
sym_AddEqu($1, $3); sym_AddEqu($1, $3);

2
src/asm/globlex.c
View File

@@ -476,7 +476,7 @@ const struct sLexInitString lexer_strings[] = {
{"printv", T_POP_PRINTV}, {"printv", T_POP_PRINTV},
{"printf", T_POP_PRINTF}, {"printf", T_POP_PRINTF},
{"export", T_POP_EXPORT}, {"export", T_POP_EXPORT},
{"xdef", T_POP_EXPORT}, {"xdef", T_POP_XDEF},
{"global", T_POP_GLOBAL}, {"global", T_POP_GLOBAL},
{"ds", T_POP_DS}, {"ds", T_POP_DS},
{"db", T_POP_DB}, {"db", T_POP_DB},