preproc: massive cleanup of smacro expansion

The smacro expansion code was virtually impossible to understand, and
was leading to very strange failures. Clean it up, and do much better
handling of magic macros.  This should also allow for recursive
macros, but recursive macros are extremely tricky in that it is very
hard to keep them from recursing forever, unless there is at least one
argument which is never expanded. They are not currently implemented.

Even so, I believe token pasting makes it possible to create infinite
loops; e.g.:

%define foo foo %+

Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>

1 files changed, 0 insertions, 5 deletions

diff --git a/nasmlib/raa.c b/nasmlib/raa.c
index feb86970..038f97ac 100644
--- a/nasmlib/raa.c
+++ b/nasmlib/raa.c
@@ -50,11 +50,6 @@ typedef union RAA_UNION RAA_UNION;
 typedef struct RAA_LEAF RAA_LEAF;
 typedef struct RAA_BRANCH RAA_BRANCH;
 
-union intorptr {
-    int64_t i;
-    void *p;
-};
-
 struct RAA {
     /* Last position in this RAA */
     raaindex endposn;