* config/tc-arm.c (make_mapping_symbol): Add braces to avoid empty body

[binutils.git] / gas / macro.h

diff --git a/gas/macro.h b/gas/macro.h
index 9c61acd89a97bc4ca306228ce5e536dbaa1cc081..edc1b6bf2fe93e4851ff9be32c4f623de73329a2 100644 (file)
--- a/gas/macro.h
+++ b/gas/macro.h
@@ -1,5 +1,6 @@
-/* macro.h - header file for macro support for gas and gasp
-   Copyright (C) 1994, 95, 96, 97, 1998 Free Software Foundation, Inc.
+/* macro.h - header file for macro support for gas
+   Copyright 1994, 1995, 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006,
+   2007 Free Software Foundation, Inc.
 
    Written by Steve and Judy Chamberlain of Cygnus Support,
       [email protected]
@@ -8,7 +9,7 @@
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GAS is distributed in the hope that it will be useful,
@@ -18,51 +19,56 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
 
 #ifndef MACRO_H
 
 #define MACRO_H
 
-#include "ansidecl.h"
-#include "sb.h"
-
-/* Structures used to store macros. 
+/* Structures used to store macros.
 
    Each macro knows its name and included text.  It gets built with a
    list of formal arguments, and also keeps a hash table which points
    into the list to speed up formal search.  Each formal knows its
    name and its default value.  Each time the macro is expanded, the
-   formals get the actual values attatched to them. */
-
-/* describe the formal arguments to a macro */
+   formals get the actual values attached to them.  */
 
-typedef struct formal_struct
+enum formal_type
   {
-    struct formal_struct *next;        /* next formal in list */
-    sb name;                   /* name of the formal */
-    sb def;                    /* the default value */
-    sb actual;                 /* the actual argument (changed on each expansion) */
-    int index;                 /* the index of the formal 0..formal_count-1 */
-  }
-formal_entry;
+    FORMAL_OPTIONAL,
+    FORMAL_REQUIRED,
+    FORMAL_VARARG
+  };
+
+/* Describe the formal arguments to a macro.  */
+
+typedef struct formal_struct {
+  struct formal_struct *next;  /* Next formal in list.  */
+  sb name;                     /* Name of the formal.  */
+  sb def;                      /* The default value.  */
+  sb actual;                   /* The actual argument (changed on each expansion).  */
+  int index;                   /* The index of the formal 0..formal_count - 1.  */
+  enum formal_type type;       /* The kind of the formal.  */
+} formal_entry;
 
 /* Other values found in the index field of a formal_entry.  */
 #define QUAL_INDEX (-1)
 #define NARG_INDEX (-2)
 #define LOCAL_INDEX (-3)
 
-/* describe the macro. */
+/* Describe the macro.  */
 
 typedef struct macro_struct
-  {
-    sb sub;                    /* substitution text. */
-    int formal_count;          /* number of formal args. */
-    formal_entry *formals;     /* pointer to list of formal_structs */
-    struct hash_control *formal_hash; /* hash table of formals. */
-  }
-macro_entry;
+{
+  sb sub;                              /* Substitution text.  */
+  int formal_count;                    /* Number of formal args.  */
+  formal_entry *formals;               /* Pointer to list of formal_structs.  */
+  struct hash_control *formal_hash;    /* Hash table of formals.  */
+  const char *name;                    /* Macro name.  */
+  char *file;                          /* File the macro was defined in.  */
+  unsigned int line;                   /* Line number of definition.  */
+} macro_entry;
 
 /* Whether any macros have been defined.  */
 
@@ -72,19 +78,19 @@ extern int macro_defined;
 
 extern int macro_nest;
 
-extern int buffer_and_nest
-  PARAMS ((const char *, const char *, sb *, int (*) PARAMS ((sb *))));
+/* The macro hash table.  */
+
+extern struct hash_control *macro_hash;
+
+extern int buffer_and_nest (const char *, const char *, sb *, int (*) (sb *));
 extern void macro_init
-  PARAMS ((int alternate, int mri, int strip_at,
-          int (*) PARAMS ((const char *, int, sb *, int *))));
-extern void macro_mri_mode PARAMS ((int));
+  (int, int, int, int (*) (const char *, int, sb *, int *));
+extern void macro_set_alternate (int);
+extern void macro_mri_mode (int);
 extern const char *define_macro
-  PARAMS ((int idx, sb *in, sb *label, int (*get_line) PARAMS ((sb *)),
-          const char **namep));
-extern int check_macro PARAMS ((const char *, sb *, int, const char **, 
-                                macro_entry **));
-extern void delete_macro PARAMS ((const char *));
-extern const char *expand_irp
-  PARAMS ((int, int, sb *, sb *, int (*) PARAMS ((sb *)), int));
+  (int, sb *, sb *, int (*) (sb *), char *, unsigned int, const char **);
+extern int check_macro (const char *, sb *, const char **, macro_entry **);
+extern void delete_macro (const char *);
+extern const char *expand_irp (int, int, sb *, sb *, int (*) (sb *));
 
 #endif