grammar updates

[mono.git] / mono / metadata / metadata.h

diff --git a/mono/metadata/metadata.h b/mono/metadata/metadata.h
index c708354fa134d905136b847a1f402a81686fdb8f..54e8bebb49348fc914a5039e330bedbec29288dd 100644 (file)
--- a/mono/metadata/metadata.h
+++ b/mono/metadata/metadata.h
@@ -171,6 +171,7 @@ typedef struct {
        } data;
 } MonoMarshalSpec;
 
+void         mono_metadata_init (void);
 
 void         mono_metadata_decode_row (MonoTableInfo         *t,
                                       int                    idx,
@@ -216,6 +217,7 @@ guint32     mono_metadata_properties_from_typedef (MonoImage *meta, guint32 tabl
 guint32     mono_metadata_methods_from_property   (MonoImage *meta, guint32 table_index, guint *end);
 guint32     mono_metadata_packing_from_typedef    (MonoImage *meta, guint32 table_index, guint32 *packing, guint32 *size);
 const char* mono_metadata_get_marshal_info        (MonoImage *meta, guint32 idx, gboolean is_field);
+guint32     mono_metadata_custom_attrs_from_index (MonoImage *meta, guint32 index);
 
 MonoMarshalSpec *mono_metadata_parse_marshal_spec (MonoImage *image, const char *ptr);
 
@@ -255,6 +257,7 @@ typedef struct {
 
 typedef struct _MonoType MonoType;
 typedef struct _MonoGenericInst MonoGenericInst;
+typedef struct _MonoGenericParam MonoGenericParam;
 typedef struct _MonoArrayType MonoArrayType;
 typedef struct _MonoMethodSignature MonoMethodSignature;
 
@@ -264,7 +267,7 @@ typedef struct {
 } MonoCustomMod;
 
 struct _MonoArrayType {
-       MonoType *type;
+       MonoClass *eklass;
        int rank;
        int numsizes;
        int numlobounds;
@@ -272,23 +275,14 @@ struct _MonoArrayType {
        int *lobounds;
 };
 
-/*
- * Generic instantiation data type encoding.
- */
-struct _MonoGenericInst {
-       MonoType *generic_type;
-       int type_argc;
-       MonoType **type_argv;
-};
-
 struct _MonoType {
        union {
                MonoClass *klass; /* for VALUETYPE and CLASS */
-               MonoType *type;   /* for PTR and SZARRAY */
+               MonoType *type;   /* for PTR */
                MonoArrayType *array; /* for ARRAY */
                MonoMethodSignature *method;
-               int type_param;
-               MonoGenericInst *generic_inst;
+               MonoGenericParam *generic_param; /* for VAR and MVAR */
+               MonoGenericInst *generic_inst; /* for GENERICINST */
        } data;
        unsigned int attrs    : 16; /* param attributes or field flags */
        unsigned int type     : 8;  /* ElementTypeEnum */
@@ -306,6 +300,7 @@ struct _MonoMethodSignature {
        unsigned int  ref_count : 23;
        guint16       param_count;
        guint16       sentinelpos;
+       guint16       generic_param_count;
        MonoType     *ret;
        MonoType     *params [MONO_ZERO_LEN_ARRAY];
 };
@@ -319,6 +314,8 @@ typedef struct {
        unsigned int init_locals : 1;
        guint16      num_locals;
        MonoExceptionClause *clauses;
+       MonoGenericParam *gen_params;
+       MonoGenericInst *geninst;
        MonoType    *locals [MONO_ZERO_LEN_ARRAY];
 } MonoMethodHeader;
 
@@ -394,7 +391,7 @@ mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec,
 /*
  * Makes a token based on a table and an index
  */
-#define mono_metadata_make_token(table,idx) (((table) << 24)| idx)
+#define mono_metadata_make_token(table,idx) (((table) << 24)| (idx))
 
 /*
  * Returns the table index that this token encodes.