From 7815a9c9504d879230a950318d434b411d045610 Mon Sep 17 00:00:00 2001
From: ggn <ggn.dbug@gmail.com>
Date: Thu, 15 Jul 2021 19:39:44 +0300
Subject: [PATCH] Remove all remaining traces of "as68_flag" from the codebase
 (issue #186)

---
 procln.c | 14 --------------
 rmac.c   |  2 --
 rmac.h   |  1 -
 symbol.c |  3 +--
 token.c  | 20 --------------------
 5 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/procln.c b/procln.c
index 4e5a846..77b7b50 100644
--- a/procln.c
+++ b/procln.c
@@ -222,23 +222,9 @@ loop1:										// Internal line processing loop
 	// Skip past label (but record it)
 	if (j == ':' || j == DCOLON)
 	{
-as68label:
 		label = string[tok[1]];				// Get label name
 		labtyp = tok[2];					// Get label type
 		tok += 3;							// Go to next line token
-
-		// AS68 MODE:
-		// Looks like another label follows the previous one, so handle
-		// the previous one until there aren't any more
-		if (as68_flag && (*tok == SYMBOL && tok[2] == ':'))
-		{
-			if (HandleLabel(label, labtyp) != 0)
-				goto loop;
-
-			label_defined = label;
-
-			goto as68label;
-		}
 	}
 
 	// EOL is legal here...
diff --git a/rmac.c b/rmac.c
index 4f78759..0e07052 100644
--- a/rmac.c
+++ b/rmac.c
@@ -29,7 +29,6 @@ int list_flag;					// "-l" listing flag on command line
 int list_pag = 1;				// Enable listing pagination by default
 int verb_flag;					// Be verbose about what's going on
 int m6502;						// 1, assembling 6502 code
-int as68_flag;					// as68 kludge mode
 int glob_flag;					// Assume undefined symbols are global
 int lsym_flag;					// Include local symbols in object file
 int optim_warn_flag;			// Warn about possible short branches
@@ -301,7 +300,6 @@ int Process(int argc, char ** argv)
 	listing = 0;					// Initialize listing level
 	list_flag = 0;					// Initialize listing flag
 	verb_flag = perm_verb_flag;		// Initialize verbose flag
-	as68_flag = 0;					// Initialize as68 kludge mode
 	glob_flag = 0;					// Initialize .globl flag
 	optim_warn_flag = 0;			// Initialize short branch flag
 	debug = 0;						// Initialize debug flag
diff --git a/rmac.h b/rmac.h
index e44574f..985d851 100644
--- a/rmac.h
+++ b/rmac.h
@@ -313,7 +313,6 @@ extern int regbank;
 extern char * firstfname;
 extern int list_fd;
 extern int list_pag;
-extern int as68_flag;
 extern int m6502;
 extern int list_flag;
 extern int glob_flag;
diff --git a/symbol.c b/symbol.c
index c2da09a..50d8379 100644
--- a/symbol.c
+++ b/symbol.c
@@ -257,8 +257,7 @@ uint32_t sy_assign(uint8_t * buf, uint8_t *(* construct)())
 		// Export vanilla labels (but don't make them global). An exception is
 		// made for equates, which are not exported unless they are referenced.
 		else if (sy->stype == LABEL && lsym_flag
-			&& (sy->sattr & (DEFINED | REFERENCED)) != 0
-			&& (!as68_flag || *sy->sname != 'L'))
+			&& (sy->sattr & (DEFINED | REFERENCED)) != 0)
 		{
 			sy->senv = scount++;
 
diff --git a/token.c b/token.c
index d642660..811ae85 100644
--- a/token.c
+++ b/token.c
@@ -1005,26 +1005,6 @@ DEBUG { printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n"); }
 		curlineno++;			// Bump line number
 		lntag = SPACE;
 
-		if (as68_flag)
-		{
-			// AS68 compatibility, throw away all lines starting with
-			// back-quotes, tildes, or '*'
-			// On other lines, turn the first '*' into a semi-colon.
-			if (*ln == '`' || *ln == '~' || *ln == '*')
-				*ln = ';';
-			else
-			{
-				for(p=ln; *p!=EOS; p++)
-				{
-					if (*p == '*')
-					{
-						*p = ';';
-						break;
-					}
-				}
-			}
-		}
-
 		break;
 
 	// Macro-block:
-- 
2.37.2