From 905afd645180b21708362b83edade7573d8434a3 Mon Sep 17 00:00:00 2001
From: drmortalwombat <90205530+drmortalwombat@users.noreply.github.com>
Date: Wed, 8 Mar 2023 18:39:40 +0100
Subject: [PATCH] Fix preprocessor concat with macro argument

---
 oscar64/Scanner.cpp | 6 +++++-
 oscar64/Scanner.h   | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/oscar64/Scanner.cpp b/oscar64/Scanner.cpp
index 0fa48a3..90cbb4c 100644
--- a/oscar64/Scanner.cpp
+++ b/oscar64/Scanner.cpp
@@ -145,7 +145,8 @@ const char* TokenNames[] =
 	"'#assign'",
 	"'#repeat'",
 	"'#until'",
-	"'#embed'"
+	"'#embed'",
+	"'##'"
 };
 
 
@@ -806,6 +807,9 @@ void Scanner::NextToken(void)
 			}
 			else
 			{
+				while (mTokenChar == ' ')
+					NextChar();
+
 				while (mTokenChar == '#' && mLine[mOffset] == '#')
 				{
 					mOffset++;
diff --git a/oscar64/Scanner.h b/oscar64/Scanner.h
index 317485c..00a92c7 100644
--- a/oscar64/Scanner.h
+++ b/oscar64/Scanner.h
@@ -145,6 +145,8 @@ enum Token
 	TK_PREP_UNTIL,
 	TK_PREP_EMBED,
 
+	TK_PREP_CONCAT,
+
 	NUM_TOKENS
 };