From 8d9a896166bee57c3ab851b9d18df0f053327531 Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Tue, 10 Mar 2020 13:42:59 +0100
Subject: [PATCH] Remove deprecated `IMPORT` symbol

It had a warning that it had no effect for a long while now; removing it so
the name can be re-used
---
 src/asm/asmy.y    | 20 +-------------------
 src/asm/globlex.c |  2 --
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/src/asm/asmy.y b/src/asm/asmy.y
index adac237a..627350e3 100644
--- a/src/asm/asmy.y
+++ b/src/asm/asmy.y
@@ -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_IF T_POP_ELIF T_POP_ELSE T_POP_ENDC
-%token	T_POP_IMPORT T_POP_EXPORT T_POP_GLOBAL
+%token	T_POP_EXPORT T_POP_GLOBAL
 %token	T_POP_DB T_POP_DS T_POP_DW T_POP_DL
 %token	T_POP_SECTION
 %token	T_POP_RB
@@ -734,7 +734,6 @@ simple_pseudoop : include
 		| elif
 		| else
 		| endc
-		| import
 		| export
 		| global
 		| { nPCOffset = 0; } db
@@ -951,23 +950,6 @@ purge_list_entry : scoped_id
 		}
 ;
 
-import		: T_POP_IMPORT import_list
-;
-
-import_list	: import_list_entry
-		| import_list_entry comma import_list
-;
-
-import_list_entry : scoped_id
-		{
-			/*
-			 * This is done automatically if the label isn't found
-			 * in the list of defined symbols.
-			 */
-			warning(WARNING_OBSOLETE, "IMPORT is a deprecated keyword with no effect: %s", $1);
-		}
-;
-
 export		: T_POP_EXPORT export_list
 ;
 
diff --git a/src/asm/globlex.c b/src/asm/globlex.c
index 768779c3..ca7c238e 100644
--- a/src/asm/globlex.c
+++ b/src/asm/globlex.c
@@ -477,8 +477,6 @@ const struct sLexInitString lexer_strings[] = {
 	{"printf", T_POP_PRINTF},
 	{"export", T_POP_EXPORT},
 	{"xdef", T_POP_EXPORT},
-	{"import", T_POP_IMPORT},
-	{"xref", T_POP_IMPORT},
 	{"global", T_POP_GLOBAL},
 	{"ds", T_POP_DS},
 	{"db", T_POP_DB},