Improved implementation of OptPushPop

[cc65] / src / cc65 / macrotab.h

diff --git a/src/cc65/macrotab.h b/src/cc65/macrotab.h
index 3f5bbaba6959bf548eb09a05b00057225004fc8f..0a699bbfcbb57642c7e57f0efbb12d2942a03c36 100644 (file)
--- a/src/cc65/macrotab.h
+++ b/src/cc65/macrotab.h
@@ -44,21 +44,21 @@
 
 
 
-typedef struct Macro_ Macro;
-struct Macro_ {
-    Macro*      Next;          /* Next macro with same hash value */
-    int                 ArgCount;      /* Number of parameters, -1 = no parens */
+typedef struct Macro Macro;
+struct Macro {
+    Macro*      Next;          /* Next macro with same hash value */
+    int                 ArgCount;      /* Number of parameters, -1 = no parens */
     unsigned    MaxArgs;       /* Size of formal argument list */
     char**              FormalArgs;    /* Formal argument list */
     char const** ActualArgs;   /* Actual argument list */
     char*               Replacement;   /* Replacement text */
-    char        Name[1];       /* Name, dynamically allocated */
+    char        Name[1];       /* Name, dynamically allocated */
 };
 
 
 
 /*****************************************************************************/
-/*                                  code                                    */
+/*                                  code                                    */
 /*****************************************************************************/
 
 
@@ -73,11 +73,11 @@ void FreeMacro (Macro* M);
  * table, use UndefineMacro for that.
  */
 
-void AddNumericMacro (const char* Name, long Val);
-/* Add a macro for a numeric constant */
+void DefineNumericMacro (const char* Name, long Val);
+/* Define a macro for a numeric constant */
 
-void AddTextMacro (const char* Name, const char* Val);
-/* Add a macro for a textual constant */
+void DefineTextMacro (const char* Name, const char* Val);
+/* Define a macro for a textual constant */
 
 void InsertMacro (Macro* M);
 /* Insert the given macro into the macro table. This call will also allocate
@@ -109,6 +109,9 @@ const char* FindMacroArg (Macro* M, const char* Arg);
 void AddMacroArg (Macro* M, const char* Arg);
 /* Add a formal macro argument. */
 
+int MacroCmp (const Macro* M1, const Macro* M2);
+/* Compare two macros and return zero if both are identical. */
+
 void PrintMacroStats (FILE* F);
 /* Print macro statistics to the given text file. */
 
@@ -119,4 +122,3 @@ void PrintMacroStats (FILE* F);
 
 
 
-