* ILParser.jay: New grammar that I haven't made a mess of, this
authorJackson Harper <jackson@novell.com>
Sun, 30 Mar 2003 22:43:55 +0000 (22:43 -0000)
committerJackson Harper <jackson@novell.com>
Sun, 30 Mar 2003 22:43:55 +0000 (22:43 -0000)
takes all the special cases into account much better.

svn path=/trunk/mcs/; revision=12939

mcs/ilasm/parser/ChangeLog
mcs/ilasm/parser/ILParser.jay

index 5db0fb884d706c29f400c368184eac040b5e0b35..58bd8ff346e5972c6b559e64ef6ff3472a9d56e7 100644 (file)
@@ -1,3 +1,8 @@
+2003-03-30 Jackson Harper <jackson@latitudegeo.com>
+
+       * ILParser.jay: New grammar that I haven't made a mess of, this
+       takes all the special cases into account much better.
+               
 2003-03-19 Jackson Harper <jackson@latitudegeo.com>
 
        * ILParser.jay: .hash algorithm can be followed by bytes
index b373ee75381c667886791e5d5a96a9137c657b5b..368a090456979994b97759e6d9cad9b645d2d595 100644 (file)
@@ -43,6 +43,8 @@ namespace Mono.ILASM {
 /* FLOAT64 - floating point number */\r
 %token FLOAT64\r
 \r
+/* HEXBYTE - two digit hex number */\r
+%token HEXBYTE\r
 \r
 \r
 /* Punctuation */\r
@@ -355,1303 +357,832 @@ namespace Mono.ILASM {
 %%\r
 \r
 il_file                        : decls\r
-                       ;      \r
-\r
-decls                   : /* EMPTY */\r
-                       | decls decl                                            \r
-                       ;\r
-\r
-decl                    : classAll\r
-                       | nameSpaceHead OPEN_BRACE decls CLOSE_BRACE { codegen.CurrentNameSpace = String.Empty; }\r
-                       | methodAll\r
-                       | fieldDecl\r
-                       | dataDecl\r
-                       | vtableDecl\r
-                       | vtfixupDecl\r
-                       | extSourceSpec\r
-                       | fileDecl\r
-                       | assemblyHead OPEN_BRACE assemblyDecls CLOSE_BRACE \r
-                       | assemblyRefHead OPEN_BRACE assemblyRefDecls CLOSE_BRACE \r
-                       | comtypeHead OPEN_BRACE comtypeDecls CLOSE_BRACE \r
-                       | manifestResHead OPEN_BRACE manifestResDecls CLOSE_BRACE \r
-                       | moduleHead\r
-                       | secDecl\r
-                       | customAttrDecl\r
-                       | D_SUBSYSTEM int32     \r
-                       | D_CORFLAGS int32      \r
-                       | D_FILE K_ALIGNMENT int32      \r
-                       | languageDecl\r
-                       ;\r
-\r
-compQstring             : QSTRING \r
-                       | compQstring PLUS QSTRING {$$ = ($1 as string) + ($3 as string);}\r
-                       ;\r
-\r
-languageDecl           : D_LANGUAGE SQSTRING   \r
-                       | D_LANGUAGE SQSTRING COMMA SQSTRING    \r
-                       | D_LANGUAGE SQSTRING COMMA SQSTRING COMMA SQSTRING     \r
-                       ;\r
-\r
-customAttrDecl          : D_CUSTOM customType \r
-                       | D_CUSTOM customType ASSIGN compQstring \r
-                       | customHead bytes CLOSE_PARENS \r
-                       | D_CUSTOM OPEN_PARENS customType CLOSE_PARENS customType \r
-                       | D_CUSTOM OPEN_PARENS customType CLOSE_PARENS customType ASSIGN compQstring \r
-                       | customHeadWithOwner bytes CLOSE_PARENS \r
-                       ;\r
-\r
-moduleHead              : D_MODULE \r
-                       | D_MODULE name1 \r
-                       | D_MODULE K_EXTERN name1       \r
-                       ;\r
-\r
-vtfixupDecl             : D_VTFIXUP OPEN_BRACKET int32 CLOSE_BRACKET vtfixupAttr K_AT id \r
-                       ;\r
-\r
-vtfixupAttr             : /* EMPTY */ \r
-                       | vtfixupAttr K_INT32 \r
-                       | vtfixupAttr K_INT64 \r
-                       | vtfixupAttr K_FROMUNMANAGED \r
-                       | vtfixupAttr K_CALLMOSTDERIVED \r
-                       ;\r
-\r
-vtableDecl              : vtableHead bytes CLOSE_PARENS \r
-                       ;\r
-\r
-vtableHead              : D_VTABLE ASSIGN OPEN_PARENS \r
-                       ;\r
-\r
-nameSpaceHead           : D_NAMESPACE name1 \r
-                       {\r
-                               codegen.CurrentNameSpace = (string) $2;\r
-                       }\r
-                       ;\r
-\r
-classHead               : D_CLASS type_attr id extendsClause implClause\r
-                       {\r
-                               if ($4 != null) {\r
-                                       codegen.AddClass ((TypeAttr) $2, (string) $3, \r
-                                               ((TypeRef)$4).Type as Class, null);\r
-                               } else {\r
-                                       codegen.AddClass ((TypeAttr)$2, (string) $3, null);\r
-                               }\r
-                               \r
-                               ArrayList impl_list = (ArrayList) $5;\r
-                               if (impl_list != null) {\r
-                                       foreach (TypeRef type_ref in impl_list)\r
-                                               codegen.CurrentClass.AddImplementedInterface (type_ref.Type as Class);\r
-                               }\r
-                       }\r
-                       ;\r
-\r
-type_attr               : /* EMPTY */                          { $$ = new TypeAttr (); }\r
-                       | type_attr K_PUBLIC                    { $$ = (TypeAttr)$1 | TypeAttr.Public; }\r
-                       | type_attr K_PRIVATE                   { $$ = (TypeAttr)$1 | TypeAttr.Private; }\r
-                       | type_attr K_INTERFACE                 { $$ = (TypeAttr)$1 | TypeAttr.Interface; }\r
-                       | type_attr K_SEALED                    { $$ = (TypeAttr)$1 | TypeAttr.Sealed; }\r
-                       | type_attr K_ABSTRACT                  { $$ = (TypeAttr)$1 | TypeAttr.Abstract; }\r
-                       | type_attr K_AUTO                      { /* */ }\r
-                       | type_attr K_SEQUENTIAL                { $$ = (TypeAttr)$1 | TypeAttr.SequentialLayout; }\r
-                       | type_attr K_EXPLICIT                  { $$ = (TypeAttr)$1 | TypeAttr.ExplicitLayout; }\r
-                       | type_attr K_ANSI                      { /*  */ }\r
-                       | type_attr K_UNICODE                   { $$ = (TypeAttr)$1 | TypeAttr.UnicodeClass; }\r
-                       | type_attr K_AUTOCHAR                  { $$ = (TypeAttr)$1 | TypeAttr.AutoClass; }\r
-                       | type_attr K_IMPORT                    { $$ = (TypeAttr)$1 | TypeAttr.Import; }\r
-                       | type_attr K_SERIALIZABLE              { $$ = (TypeAttr)$1 | TypeAttr.Serializable; }\r
-                       | type_attr K_NESTED K_PUBLIC           { $$ = (TypeAttr)$1 | TypeAttr.NestedPublic; }\r
-                       | type_attr K_NESTED K_PRIVATE          { $$ = (TypeAttr)$1 | TypeAttr.NestedPrivate; }\r
-                       | type_attr K_NESTED K_FAMILY           { $$ = (TypeAttr)$1 | TypeAttr.NestedFamily; }\r
-                       | type_attr K_NESTED K_ASSEMBLY         { $$ = (TypeAttr)$1 | TypeAttr.NestedAssembly; }\r
-                       | type_attr K_NESTED K_FAMANDASSEM      { $$ = (TypeAttr)$1 | TypeAttr.NestedFamAndAssem; }\r
-                       | type_attr K_NESTED K_FAMORASSEM       { $$ = (TypeAttr)$1 | TypeAttr.NestedFamOrAssem; }\r
-                       | type_attr K_BEFOREFIELDINIT           { $$ = (TypeAttr)$1 | TypeAttr.BeforeFieldInit; }\r
-                       | type_attr K_SPECIALNAME               { $$ = (TypeAttr)$1 | TypeAttr.SpecialName; }\r
-                       | type_attr K_RTSPECIALNAME             { $$ = (TypeAttr)$1 | TypeAttr.RTSpecialName; }\r
-                       ;\r
-\r
-classAttr               : /* EMPTY */ \r
-                       | classAttr K_PUBLIC                    { /* currentTypeAttrs |= TypeAttributes.Public; */}\r
-                       | classAttr K_PRIVATE                   { /* currentTypeAttrs &= ~TypeAttributes.Public; */}\r
-                       | classAttr K_VALUE                     { /* FIXME */ }\r
-                       | classAttr K_ENUM                      { /* FIXME */ }\r
-                       | classAttr K_INTERFACE                 { /* currentTypeAttrs |= TypeAttributes.Interface; */ }\r
-                       | classAttr K_SEALED                    { /* currentTypeAttrs |= TypeAttributes.Sealed; */ }\r
-                       | classAttr K_ABSTRACT                  { /* currentTypeAttrs |= TypeAttributes.Abstract; */ }\r
-                       | classAttr K_AUTO                      { /* currentTypeAttrs |= TypeAttributes.AutoLayout; */ }\r
-                       | classAttr K_SEQUENTIAL                { /* currentTypeAttrs |= TypeAttributes.SequentialLayout; */ }\r
-                       | classAttr K_EXPLICIT                  { /* currentTypeAttrs |= TypeAttributes.ExplicitLayout; */ }\r
-                       | classAttr K_ANSI                      { /* currentTypeAttrs |= TypeAttributes.AnsiClass; */ }\r
-                       | classAttr K_UNICODE                   { /* currentTypeAttrs |= TypeAttributes.UnicodeClass; */ }\r
-                       | classAttr K_AUTOCHAR                  { /* currentTypeAttrs |= TypeAttributes.AutoClass; */ }\r
-                       | classAttr K_IMPORT                    { /* currentTypeAttrs |= TypeAttributes.Import; */ }\r
-                       | classAttr K_SERIALIZABLE              { /* currentTypeAttrs |= TypeAttributes.Serializable; */ }\r
-                       | classAttr K_NESTED K_PUBLIC           { /* currentTypeAttrs |= TypeAttributes.NestedPublic; */ }\r
-                       | classAttr K_NESTED K_PRIVATE          { /* currentTypeAttrs |= TypeAttributes.NestedPrivate; */ }\r
-                       | classAttr K_NESTED K_FAMILY           { /* currentTypeAttrs |= TypeAttributes.NestedFamily; */ }\r
-                       | classAttr K_NESTED K_ASSEMBLY         { /* currentTypeAttrs |= TypeAttributes.NestedAssembly; */ }\r
-                       | classAttr K_NESTED K_FAMANDASSEM      { /* currentTypeAttrs |= TypeAttributes.NestedFamANDAssem; */ }\r
-                       | classAttr K_NESTED K_FAMORASSEM       { /* currentTypeAttrs |= TypeAttributes.NestedFamORAssem; */ }\r
-                       | classAttr K_BEFOREFIELDINIT           { /* currentTypeAttrs |= TypeAttributes.BeforeFieldInit; */ }\r
-                       | classAttr K_SPECIALNAME               { /* currentTypeAttrs |= TypeAttributes.SpecialName; */ }\r
-                       | classAttr K_RTSPECIALNAME             { /* currentTypeAttrs |= TypeAttributes.RTSpecialName; */ }\r
-                       ;\r
-\r
-extendsClause           : /* EMPTY */                                           \r
-                       | K_EXTENDS class_ref   {$$ = $2;}\r
-                       ;\r
-\r
-implClause              : /* EMPTY */\r
-                       | K_IMPLEMENTS classNames       {$$ = $2; }\r
-                       ;\r
-\r
-classNames              : classNames COMMA class_ref\r
-                         {\r
-                               ArrayList class_list = (ArrayList) $1;\r
-                               class_list.Add ($3);\r
-                         }\r
-                       | class_ref\r
-                         {\r
-                               ArrayList class_list = new ArrayList ();\r
-                               class_list.Add ($1);\r
-                               $$ = class_list;\r
-                         }\r
-                       ;\r
-\r
-classDecls              : /* EMPTY */\r
-                       | classDecls classDecl\r
-                       ;\r
-\r
-\r
-classAll               : classHead OPEN_BRACE classDecls CLOSE_BRACE\r
-                       {\r
-                               /*\r
-                               codegen.AddClass (currentClass);\r
-                               currentClass = null;\r
-                               */\r
-                       }\r
-                       ;\r
-\r
-\r
-classDecl               : methodAll\r
-                       | classAll\r
-                       | eventHead OPEN_BRACE eventDecls CLOSE_BRACE \r
-                       | propHead OPEN_BRACE propDecls CLOSE_BRACE \r
-                       | fieldDecl\r
-                       | dataDecl\r
-                       | secDecl\r
-                       | extSourceSpec\r
-                       | customAttrDecl\r
-                       | D_SIZE int32 \r
-                       | D_PACK int32 \r
-                       | exportHead OPEN_BRACE comtypeDecls CLOSE_BRACE \r
-                       | D_OVERRIDE typeSpec DOUBLE_COLON methodName K_WITH callConv type_ref typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | languageDecl\r
-                       ;\r
-\r
-fieldDecl               : D_FIELD repeatOpt fieldAttr type_ref id atOpt initOpt \r
-                         {\r
-                               codegen.AddField ((FieldAttr) $3, \r
-                                       (string) $5, (TypeRef) $4, null);\r
-                         }\r
-                       ;\r
-\r
-type_ref               : primative_type_ref\r
-                       | internal_type_ref\r
-                       | external_type_ref\r
-                       ;\r
-\r
-class_ref              : internal_type_ref\r
-                       | external_type_ref\r
-                       ;\r
-\r
-primative_type_ref     : K_CHAR                \r
-                         {$$ = new TypeRef (PrimitiveType.Char, "System.Char"); }\r
-                       | K_VOID                \r
-                         {$$ = new TypeRef (PrimitiveType.Void, "System.Void"); }\r
-                       | K_BOOL                \r
-                         {$$ = new TypeRef (PrimitiveType.Boolean, "System.Bool"); }\r
-                       | K_INT8                \r
-                         {$$ = new TypeRef (PrimitiveType.Int8, "System.Int8"); }\r
-                       | K_INT16               \r
-                         {$$ = new TypeRef (PrimitiveType.Int16, "System.Int16"); }\r
-                       | K_INT32               \r
-                         {$$ = new TypeRef (PrimitiveType.Int32, "System.Int32"); }\r
-                       | K_INT64               \r
-                         {$$ = new TypeRef (PrimitiveType.Int64, "System.Int64"); }\r
-                       | K_FLOAT32             \r
-                         {$$ = new TypeRef (PrimitiveType.Float32, "System.Float32"); }\r
-                       | K_FLOAT64             \r
-                         {$$ = new TypeRef (PrimitiveType.Float64, "System.Float64"); }\r
-                       | K_UNSIGNED K_INT8     \r
-                         {$$ = new TypeRef (PrimitiveType.UInt8, "System.UInt8"); }\r
-                       | K_UNSIGNED K_INT16    \r
-                         {$$ = new TypeRef (PrimitiveType.UInt16, "System.UInt16"); }\r
-                       | K_UNSIGNED K_INT32    \r
-                         {$$ = new TypeRef (PrimitiveType.UInt32, "System.UInt32"); }\r
-                       | K_UNSIGNED K_INT64    \r
-                         {$$ = new TypeRef (PrimitiveType.UInt64, "System.UInt64"); }\r
-                       | K_STRING              \r
-                         {$$ = new TypeRef (PrimitiveType.String, "System.String"); }\r
-                       | K_OBJECT \r
-                         { $$ = new TypeRef (PrimitiveType.Object, "System.Object"); }\r
-                       ;\r
-\r
-internal_type_ref      : name1\r
-                         {\r
-                               $$ = new TypeRef (codegen.ClassTable.GetReference ((string) $1, null),\r
-                                       (string) $1);\r
-                         }\r
-                       ;\r
-\r
-external_type_ref      : assembly_name namespace_name DOT id\r
-                         {\r
-                               $$ = new TypeRef (codegen.ExternTable.GetClass ($1 as string, \r
-                                       $2 as string, $4 as string), String.Format ("{0}.{1}", $2, $4));\r
-                         }\r
-                       ;\r
-\r
-namespace_name         : /* EMPTY */\r
-                       | id\r
-                       | namespace_name DOT id {$$ = String.Format ("{0}.{1}", $1, $3); }\r
                        ;\r
 \r
-atOpt                   : /* EMPTY */  \r
-                       | K_AT id \r
+decls                  : /* EMPTY */\r
+                       | decls decl\r
                        ;\r
 \r
-initOpt                 : /* EMPTY */ \r
-                       | ASSIGN fieldInit \r
+decl                   : class_all\r
+                       | namespace_all\r
+                       | method_all\r
+                       | field_decl\r
+                       | data_decl\r
+                       | vtfixup_decl\r
+                       | file_decl\r
+                       | assembly_all\r
+                       | assemblyref_all\r
+                       | exptype_all\r
+                       | manifestres_all\r
+                       | module_head\r
+                       | sec_decl\r
+                       | customattr_decl\r
+                       | D_SUBSYSTEM int32\r
+                       | D_CORFLAGS int32\r
+                       | D_FILE K_ALIGNMENT int32\r
+               /*      | D_IMAGEBASE int64     */\r
+                       | extsource_spec\r
+                       | language_decl\r
                        ;\r
 \r
-repeatOpt              : /* EMPTY */ \r
-                       | OPEN_BRACKET int32 CLOSE_BRACKET \r
+extsource_spec         : D_LINE int32 SQSTRING\r
+                       | D_LINE int32\r
+                       | D_LINE int32 COLON int32 SQSTRING\r
+                       | D_LINE int32 COLON int32\r
                        ;\r
 \r
-customHead              : D_CUSTOM customType ASSIGN OPEN_PARENS \r
+language_decl          : D_LANGUAGE SQSTRING\r
+                       | D_LANGUAGE SQSTRING COMMA SQSTRING\r
+                       | D_LANGUAGE SQSTRING COMMA SQSTRING COMMA SQSTRING\r
                        ;\r
 \r
-customHeadWithOwner     : D_CUSTOM OPEN_PARENS customType CLOSE_PARENS customType ASSIGN OPEN_PARENS \r
+vtfixup_decl           : D_VTFIXUP OPEN_BRACKET int32 CLOSE_BRACKET \r
+                         vtfixup_attr K_AT id\r
                        ;\r
 \r
-customType              : typeSpec \r
-                       | callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
+vtfixup_attr           : /* EMPTY */\r
+                       | vtfixup_attr int32\r
+                       | vtfixup_attr int64\r
+                       | vtfixup_attr K_FROMUNMANAGED\r
+                       | vtfixup_attr K_CALLMOSTDERIVED\r
                        ;\r
 \r
-eventHead               : D_EVENT eventAttr typeSpec id \r
-                       | D_EVENT eventAttr id \r
+namespace_all          : namespace_head OPEN_BRACE decls CLOSE_BRACE\r
                        ;\r
 \r
-\r
-eventAttr               : /* EMPTY */ \r
-                       | eventAttr K_RTSPECIALNAME /**/\r
-                       | eventAttr K_SPECIALNAME \r
+namespace_head         : D_NAMESPACE comp_name\r
                        ;\r
 \r
-eventDecls              : /* EMPTY */\r
-                       | eventDecls eventDecl\r
+class_all              : class_head OPEN_BRACE class_decls CLOSE_BRACE\r
                        ;\r
 \r
-eventDecl               : D_ADDON callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_ADDON callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_REMOVEON callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_REMOVEON callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_FIRE callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_FIRE callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_OTHER callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_OTHER callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | extSourceSpec\r
-                       | customAttrDecl\r
-                       | languageDecl\r
+class_head             : D_CLASS class_attr id extends_clause impl_clause\r
                        ;\r
 \r
-propHead                : D_PROPERTY propAttr callConv type id OPEN_PARENS sigArgs0 CLOSE_PARENS initOpt \r
+class_attrs            : class_attrs class_attr\r
                        ;\r
 \r
-propAttr                : /* EMPTY */ \r
-                       | propAttr K_RTSPECIALNAME /**/\r
-                       | propAttr K_SPECIALNAME \r
+class_attr             : /* EMPTY */ \r
+                       | class_attr K_PUBLIC\r
+                       | class_attr K_PRIVATE\r
+                       | class_attr K_NESTED K_PRIVATE\r
+                       | class_attr K_NESTED K_PUBLIC\r
+                       | class_attr K_NESTED K_FAMILY\r
+                       | class_attr K_NESTED K_ASSEMBLY\r
+                       | class_attr K_NESTED K_FAMANDASSEM\r
+                       | class_attr K_NESTED K_FAMORASSEM\r
+                       | class_attr K_VALUE\r
+                       | class_attr K_ENUM\r
+                       | class_attr K_INTERFACE\r
+                       | class_attr K_SEALED\r
+                       | class_attr K_ABSTRACT\r
+                       | class_attr K_AUTO\r
+                       | class_attr K_SEQUENTIAL\r
+                       | class_attr K_EXPLICIT\r
+                       | class_attr K_ANSI\r
+                       | class_attr K_UNICODE\r
+                       | class_attr K_AUTOCHAR\r
+                       | class_attr K_IMPORT\r
+                       | class_attr K_SERIALIZABLE\r
+                       | class_attr K_BEFOREFIELDINIT\r
+                       | class_attr K_SPECIALNAME\r
+                       | class_attr K_RTSPECIALNAME\r
                        ;\r
 \r
-propDecls               : /* EMPTY */\r
-                       | propDecls propDecl\r
+extends_clause         : /* EMPTY */\r
+                       | K_EXTENDS class_ref\r
                        ;\r
 \r
-\r
-propDecl                : D_SET callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_SET callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_GET callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_GET callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_OTHER callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | D_OTHER callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | customAttrDecl\r
-                       | extSourceSpec\r
-                       | languageDecl\r
+impl_clause            : /* EMPTY */\r
+                       | K_IMPLEMENTS class_refs\r
                        ;\r
 \r
-field_ref              : internal_field_ref\r
-                       | external_field_ref\r
+class_refs             : class_ref\r
+                       | class_refs COMMA class_ref\r
                        ;\r
 \r
-internal_field_ref     : type_ref internal_type_ref DOUBLE_COLON id\r
-                         {\r
-                               $$ = codegen.GetFieldRef ((TypeRef) $1, (TypeRef) $2, (string) $4, null);\r
-                         }\r
+slashed_name           : comp_name\r
+                       | slashed_name SLASH comp_name\r
                        ;\r
 \r
-external_field_ref     : type_ref external_type_ref DOUBLE_COLON id\r
-                         {\r
-                               ClassRef parent = ((TypeRef) $2).Type as ClassRef;\r
-                               TypeRef type = (TypeRef) $1;\r
-                                       \r
-                               $$ = parent.AddField ((string) $4, type.Type);\r
-                         }\r
+class_ref              : OPEN_BRACKET comp_name CLOSE_BRACKET slashed_name\r
+                       | OPEN_BRACKET D_MODULE comp_name CLOSE_BRACKET slashed_name\r
+                       | slashed_name\r
                        ;\r
 \r
-method_name            : name1\r
-                       | D_CTOR\r
-                       | D_CCTOR\r
+class_decls            : /* EMPTY */\r
+                       | class_decls class_decl\r
                        ;\r
 \r
-method_ref             : internal_method_ref\r
-                       | external_method_ref\r
-                       ;\r
-\r
-external_method_ref    : type_ref external_type_ref DOUBLE_COLON method_name OPEN_PARENS param_list CLOSE_PARENS\r
-                         {\r
-                               TypeRef ret_type = (TypeRef)$1;\r
-                               ClassRef parent = (ClassRef) ((TypeRef) $2).Type;\r
-                               PEAPI.Type[] type_array;\r
-                               if ($6 != null) {\r
-                                       ArrayList param_list = $6 as ArrayList;\r
-                                       int index = 0;\r
-                                       type_array = new PEAPI.Type[param_list.Count];\r
-                                       foreach (TypeRef type in param_list) {\r
-                                               type_array[index] = type.Type;\r
-                                               index++;\r
-                                       }\r
-                               } else {\r
-                                       type_array = new PEAPI.Type[0];\r
-                               }       \r
-                               $$ = parent.AddMethod ((string) $4, ret_type.Type, type_array);\r
-                               \r
-                         }\r
-                       ;  \r
-\r
-internal_method_ref    : type_ref internal_type_ref DOUBLE_COLON method_name OPEN_PARENS param_list CLOSE_PARENS\r
-                         {     \r
-                               TypeRef parent, return_type;\r
-                               parent = (TypeRef) $2;\r
-                               return_type = (TypeRef) $1;\r
-\r
-                               Param[] param_array;\r
-                               TypeRef[] typeref_array;\r
-                               if ($6 != null) {\r
-                                       ArrayList param_list = $6 as ArrayList;\r
-                                       int index = 0;\r
-                                       param_array = new Param[param_list.Count];\r
-                                       typeref_array = new TypeRef[param_list.Count];\r
-                                       foreach (TypeRef type in param_list) {\r
-                                               param_array[index] = new Param (ParamAttr.Default, \r
-                                                       String.Empty, type.Type);\r
-                                               typeref_array[index] = type;\r
-                                               index++;\r
-                                       }\r
-                               } else {\r
-                                       param_array = new Param[0];\r
-                                       typeref_array = new TypeRef[0];\r
-                               }\r
-                       \r
-                               $$ = codegen.GetMethodRef (parent, (string) $4, return_type, param_array, \r
-                                       typeref_array, null);\r
-                         }\r
-                       ;\r
-\r
-\r
-methodHead              : D_METHOD methAttr callConv type_ref methodName \r
-                               OPEN_PARENS arg_list CLOSE_PARENS implAttr OPEN_BRACE \r
-                       {\r
-                               Param[] param_array;\r
-                               TypeRef[] typeref_array;\r
-                               if ($7 != null) {\r
-                                       ArrayList param_list = $7 as ArrayList;\r
-                                       int index = 0;\r
-                                       param_array = new Param[param_list.Count];\r
-                                       typeref_array = new TypeRef[param_list.Count];\r
-                                       foreach (DictionaryEntry entry in param_list) {\r
-                                               param_array[index] = entry.Key as Param;\r
-                                               typeref_array[index] = entry.Value as TypeRef;\r
-                                               index++;\r
-                                       }\r
-                               } else {\r
-                                       param_array = new Param[0];\r
-                                       typeref_array = new TypeRef[0];\r
-                               }\r
-                               \r
-                               codegen.AddMethod ((MethAttr) $2, (ImplAttr) $9, (CallConv) $3, (string) $5, \r
-                                       (TypeRef) $4, param_array, typeref_array, null);\r
-                       }\r
-                       | D_METHOD methAttr callConv paramAttr type K_MARSHAL OPEN_PARENS nativeType CLOSE_PARENS methodName OPEN_PARENS sigArgs0 CLOSE_PARENS implAttr OPEN_BRACE\r
-                       ;\r
-\r
-\r
-methodAll              : methodHead methodDecls CLOSE_BRACE\r
-                       {\r
-                               /*\r
-                               // Console.WriteLine (method);\r
-                               currentClass.AddMethod (method);\r
-                               */\r
-                       }\r
-                       ;\r
-\r
-\r
-methAttr                : /* EMPTY */                  { $$ = new MethAttr (); }\r
-                       | methAttr K_STATIC             { $$ = (MethAttr) $1 | MethAttr.Static; }\r
-                       | methAttr K_PUBLIC             { $$ = (MethAttr) $1 | MethAttr.Public; }\r
-                       | methAttr K_PRIVATE            { $$ = (MethAttr) $1 | MethAttr.Private; }\r
-                       | methAttr K_FAMILY             { $$ = (MethAttr) $1 | MethAttr.Family; }\r
-                       | methAttr K_FINAL              { $$ = (MethAttr) $1 | MethAttr.Final; }\r
-                       | methAttr K_SPECIALNAME        { $$ = (MethAttr) $1 | MethAttr.SpecialName; }\r
-                       | methAttr K_VIRTUAL            { $$ = (MethAttr) $1 | MethAttr.Virtual; }\r
-                       | methAttr K_ABSTRACT           { $$ = (MethAttr) $1 | MethAttr.Abstract; }\r
-                       | methAttr K_ASSEMBLY           { $$ = (MethAttr) $1 | MethAttr.Assembly; }\r
-                       | methAttr K_FAMANDASSEM        { $$ = (MethAttr) $1 | MethAttr.FamAndAssem; }\r
-                       | methAttr K_FAMORASSEM         { $$ = (MethAttr) $1 | MethAttr.FamOrAssem; }\r
-                       | methAttr K_COMPILERCONTROLLED {/* FIXME */}\r
-                       | methAttr K_HIDEBYSIG          { $$ = (MethAttr) $1 | MethAttr.HideBySig; }\r
-                       | methAttr K_NEWSLOT            { $$ = (MethAttr) $1 | MethAttr.NewSlot; }\r
-                       | methAttr K_RTSPECIALNAME      { $$ = (MethAttr) $1 | MethAttr.RTSpecialName; }\r
-                       | methAttr K_UNMANAGEDEXP       {/* FIXME */}\r
-                       | methAttr K_REQSECOBJ          { $$ = (MethAttr) $1 | MethAttr.RequireSecObject; }\r
-                       /*\r
-                       | methAttr K_PINVOKEIMPL OPEN_PARENS compQstring K_AS compQstring pinvAttr CLOSE_PARENS { }\r
-                       | methAttr K_PINVOKEIMPL OPEN_PARENS compQstring  pinvAttr CLOSE_PARENS                 { }\r
-                       | methAttr K_PINVOKEIMPL OPEN_PARENS pinvAttr CLOSE_PARENS                              { }\r
-                       */\r
-                       ;\r
-\r
-pinvAttr                : /* EMPTY */ \r
-                       | pinvAttr K_NOMANGLE \r
-                       | pinvAttr K_ANSI \r
-                       | pinvAttr K_UNICODE \r
-                       | pinvAttr K_AUTOCHAR \r
-                       | pinvAttr K_LASTERR \r
-                       | pinvAttr K_WINAPI \r
-                       | pinvAttr K_CDECL \r
-                       | pinvAttr K_STDCALL \r
-                       | pinvAttr K_THISCALL \r
-                       | pinvAttr K_FASTCALL \r
-                       ;\r
-\r
-methodName              : D_CTOR\r
-                       | D_CCTOR\r
-                       | name1\r
-                       ;\r
-\r
-paramAttr               : /* EMPTY */                                  {$$ = ParamAttr.Default; }\r
-                       | paramAttr OPEN_BRACKET K_IN CLOSE_BRACKET     {$$ = (ParamAttr) $1 | ParamAttr.In; }\r
-                       | paramAttr OPEN_BRACKET K_OUT CLOSE_BRACKET    {$$ = (ParamAttr) $1 | ParamAttr.Out; }\r
-                       | paramAttr OPEN_BRACKET K_OPT CLOSE_BRACKET    {$$ = (ParamAttr) $1 | ParamAttr.Opt; }\r
-                       /* | paramAttr OPEN_BRACKET int32 CLOSE_BRACKET  */\r
-                       ;\r
-        \r
-fieldAttr               : /* EMPTY */                  {$$ = FieldAttr.Default; }\r
-                       | fieldAttr K_STATIC            {$$ = FieldAttr.Static; }\r
-                       | fieldAttr K_PUBLIC            {$$ = FieldAttr.Public; }\r
-                       | fieldAttr K_PRIVATE           {$$ = FieldAttr.Private; }\r
-                       | fieldAttr K_FAMILY            {$$ = FieldAttr.Family; }\r
-                       | fieldAttr K_INITONLY          {$$ = FieldAttr.Initonly; }\r
-                       | fieldAttr K_RTSPECIALNAME     {$$ = FieldAttr.RTSpecialName; }\r
-                       | fieldAttr K_SPECIALNAME       {$$ = FieldAttr.SpecialName; }\r
-                               /* commented out because PInvoke for fields is not supported by EE\r
-                       | fieldAttr K_PINVOKEIMPL OPEN_PARENS compQstring K_AS compQstring pinvAttr CLOSE_PARENS \r
-                       | fieldAttr K_PINVOKEIMPL OPEN_PARENS compQstring  pinvAttr CLOSE_PARENS \r
-                       | fieldAttr K_PINVOKEIMPL OPEN_PARENS pinvAttr CLOSE_PARENS \r
-                               \r
-                       | fieldAttr K_MARSHAL OPEN_PARENS nativeType CLOSE_PARENS \r
-                               */\r
-                       | fieldAttr K_ASSEMBLY          {$$ = FieldAttr.Assembly; }\r
-                       | fieldAttr K_FAMANDASSEM       {$$ = FieldAttr.FamAndAssem; }\r
-                       | fieldAttr K_FAMORASSEM        {$$ = FieldAttr.FamOrAssem; }\r
-               /*      | fieldAttr K_COMPILERCONTROLLED {$$ = FieldAttr. */\r
-                       | fieldAttr K_LITERAL           {$$ = FieldAttr.Literal; }\r
-                       | fieldAttr K_NOTSERIALIZED     {$$ = FieldAttr.Notserialized; }\r
-                       ;\r
-\r
-\r
-implAttr                : /* empty */          {$$ = new ImplAttr (); }\r
-                       | implAttr K_NATIVE     {$$ = (ImplAttr) $1 | ImplAttr.Native; }\r
-                       | implAttr K_IL         {$$ = (ImplAttr) $1 | ImplAttr.IL; }\r
-                       | implAttr K_CIL        { /* Do nothing */ }\r
-                       | implAttr K_OPTIL      {$$ = (ImplAttr) $1 | ImplAttr.Optil; }\r
-                       | implAttr K_MANAGED    { /* Do nothing */ }\r
-                       | implAttr K_UNMANAGED  {$$ = (ImplAttr) $1 | ImplAttr.Unmanaged; }\r
-                       | implAttr K_FORWARDREF {$$ = (ImplAttr) $1 | ImplAttr.ForwardRef; }\r
-                       | implAttr K_PRESERVESIG {$$ = (ImplAttr) $1 | ImplAttr.PreserveSig; }\r
-                       | implAttr K_RUNTIME    {$$ = (ImplAttr) $1 | ImplAttr.PreserveSig; }\r
-                       | implAttr K_INTERNALCALL {$$ = (ImplAttr) $1 | ImplAttr.InternalCall; }\r
-                       | implAttr K_SYNCHRONIZED {$$ = (ImplAttr) $1 | ImplAttr.Synchronized; }\r
-                       | implAttr K_NOINLINING {$$ = (ImplAttr) $1 | ImplAttr.NoInLining; }\r
-                       ;\r
-\r
-localsHead              : D_LOCALS\r
-                       ;\r
-\r
-local_list             : /* EMPTY */\r
-                       | type_ref name1\r
-                         { \r
-                               ArrayList local_list = new ArrayList ();\r
-                               TypeRef type = (TypeRef) $1;\r
-\r
-                               local_list.Add (new Local ((string) $2, type.Type));\r
-                               $$ = local_list; \r
-                         }\r
-                       | local_list COMMA type_ref name1\r
-                         {\r
-                               ArrayList local_list = (ArrayList) $1;\r
-                               TypeRef type = (TypeRef) $3;\r
-\r
-                               local_list.Add (new Local ((string) $4, type.Type));\r
-                         }\r
-                       ;\r
-\r
-init_flag              : /* EMPTY */   { $$ = false; }\r
-                       | K_INIT        { $$ = true; }\r
-\r
-                                       \r
-methodDecl              : D_EMITBYTE int32 \r
-                       | sehBlock \r
-                       | D_MAXSTACK int32 \r
-                         {\r
-                               codegen.CurrentMethod.SetMaxStack ((int) $2);\r
-                         }\r
-                       | localsHead init_flag OPEN_PARENS local_list CLOSE_PARENS  \r
-                               {\r
-                                       ArrayList arg_list = $4 as ArrayList;\r
-                                       Local[] local_list;\r
-\r
-                                       if (arg_list != null) {\r
-                                               local_list = new Local[arg_list.Count];\r
-                                               int index = 0;\r
-                                               foreach (Local local in arg_list) {\r
-                                                       local_list[index++] = local;\r
-                                               }\r
-                                       } else {\r
-                                               local_list = new Local[0];\r
-                                       }\r
-                                       \r
-                                       codegen.CurrentMethod.AddLocals (local_list, (bool) $2);\r
-                               }\r
-                       | D_ENTRYPOINT          \r
-                         { \r
-                               codegen.CurrentMethod.DeclareEntryPoint ();\r
-                         }\r
-                       | D_ZEROINIT \r
-                       | dataDecl\r
-                       | instr {\r
-                               /*      method.AddInstruction (currentInstr); */\r
-                               }\r
-                       | id COLON \r
-                       | secDecl\r
-                       | extSourceSpec\r
-                       | languageDecl\r
-                       | customAttrDecl\r
-                       | D_EXPORT OPEN_BRACKET int32 CLOSE_BRACKET     \r
-                       | D_EXPORT OPEN_BRACKET int32 CLOSE_BRACKET     K_AS id \r
-                       | D_VTENTRY int32 COLON int32 \r
-                       | D_OVERRIDE typeSpec DOUBLE_COLON methodName \r
-                       | scopeBlock\r
-                       | D_PARAM OPEN_BRACKET int32 CLOSE_BRACKET initOpt \r
+class_decl             : method_all\r
+                       | class_all\r
+                       | event_all\r
+                       | prop_all\r
+                       | field_decl\r
+                       | data_decl\r
+                       | sec_decl\r
+                       | extsource_spec\r
+                       | customattr_decl\r
+                       | D_SIZE int32\r
+                       | D_PACK int32\r
+                       | D_OVERRIDE type_spec DOUBLE_COLON method_name\r
+                         K_WITH call_conv type type_spec DOUBLE_COLON method_name\r
+                         OPEN_PARENS sig_args CLOSE_PARENS\r
+                       | language_decl\r
+                       ;\r
+                       \r
+type                   : K_CLASS class_ref\r
+                       | K_OBJECT\r
+                       | K_STRING\r
+                       | K_VALUE K_CLASS class_ref\r
+                       | K_VALUETYPE class_ref\r
+                       | type OPEN_BRACKET CLOSE_BRACKET\r
+                       | type OPEN_BRACKET bounds CLOSE_BRACKET\r
+                       | type AMPERSAND \r
+                       | type STAR\r
+                       | type K_PINNED\r
+                       | type K_MODREQ OPEN_PARENS class_ref CLOSE_PARENS\r
+                       | type K_MODOPT OPEN_PARENS class_ref CLOSE_PARENS\r
+                       | K_METHOD call_conv type STAR OPEN_PARENS sig_args CLOSE_PARENS\r
+                       | K_TYPEDREF\r
+                       | K_CHAR\r
+                       | K_VOID\r
+                       | K_BOOL\r
+                       | K_INT8\r
+                       | K_INT16\r
+                       | K_INT32\r
+                       | K_INT64\r
+                       | K_FLOAT32\r
+                       | K_FLOAT64\r
+                       | K_UNSIGNED K_INT8\r
+                       | K_UNSIGNED K_INT16\r
+                       | K_UNSIGNED K_INT32\r
+                       | K_UNSIGNED K_INT64\r
+                       | K_NATIVE K_INT\r
+                       | K_NATIVE K_UNSIGNED K_INT\r
+                       ;\r
+\r
+bounds                 : bound\r
+                       | bounds COMMA bound\r
+                       ;\r
+\r
+bound                  : /* EMPTY */\r
+                       | ELLIPSIS\r
+                       | int32\r
+                       | int32 ELLIPSIS int32\r
+                       | int32 ELLIPSIS\r
+                       ;\r
+\r
+call_conv              : K_INSTANCE call_conv\r
+                       | K_EXPLICIT call_conv\r
+                       | call_kind\r
+                       ;\r
+\r
+call_kind              : /* EMPTY */\r
+                       | K_DEFAULT\r
+                       | K_VARARG\r
+                       | K_UNMANAGED K_CDECL\r
+                       | K_UNMANAGED K_STDCALL\r
+                       | K_UNMANAGED K_THISCALL\r
+                       | K_UNMANAGED K_FASTCALL\r
+                       ;\r
+\r
+native_type            : /* EMPTY */\r
+                       | K_CUSTOM OPEN_PARENS comp_qstring COMMA comp_qstring CLOSE_PARENS\r
+                       | K_FIXED K_SYSSTRING OPEN_BRACKET int32 CLOSE_BRACKET\r
+                       | K_FIXED K_ARRAY OPEN_BRACKET int32 CLOSE_BRACKET\r
+                       | K_VARIANT\r
+                       | K_CURRENCY\r
+                       | K_SYSCHAR\r
+                       | K_VOID\r
+                       | K_BOOL\r
+                       | K_INT8\r
+                       | K_INT16\r
+                       | K_INT32\r
+                       | K_INT64\r
+                       | K_FLOAT32\r
+                       | K_FLOAT64\r
+                       | K_ERROR\r
+                       | K_UNSIGNED K_INT8\r
+                       | K_UNSIGNED K_INT16\r
+                       | K_UNSIGNED K_INT32\r
+                       | K_UNSIGNED K_INT64\r
+                       | native_type STAR\r
+                       | native_type OPEN_BRACKET CLOSE_BRACKET\r
+                       | native_type OPEN_BRACKET int32 CLOSE_BRACKET\r
+                       | native_type OPEN_BRACKET int32 PLUS int32 CLOSE_BRACKET\r
+                       | native_type OPEN_BRACKET PLUS int32 CLOSE_BRACKET\r
+                       | K_DECIMAL\r
+                       | K_DATE\r
+                       | K_BSTR\r
+                       | K_LPSTR\r
+                       | K_LPWSTR\r
+                       | K_LPTSTR\r
+                       | K_OBJECTREF\r
+                       | K_IUNKNOWN\r
+                       | K_IDISPATCH\r
+                       | K_STRUCT\r
+                       | K_INTERFACE\r
+                       | K_SAFEARRAY variant_type\r
+                       | K_SAFEARRAY variant_type COMMA comp_qstring\r
+                       | K_INT\r
+                       | K_UNSIGNED K_INT\r
+                       | K_NESTED K_STRUCT\r
+                       | K_BYVALSTR\r
+                       | K_ANSI K_BSTR\r
+                       | K_TBSTR\r
+                       | K_VARIANT K_BOOL\r
+                       | K_METHOD\r
+                       | K_AS K_ANY\r
+                       | K_LPSTRUCT\r
+                       ;\r
+\r
+variant_type           : /* EMPTY */\r
+                       | K_NULL\r
+                       | K_VARIANT\r
+                       | K_CURRENCY\r
+                       | K_VOID\r
+                       | K_BOOL\r
+                       | K_INT8\r
+                       | K_INT16\r
+                       | K_INT32\r
+                       | K_INT64\r
+                       | K_FLOAT32\r
+                       | K_FLOAT64\r
+                       | K_UNSIGNED K_INT8\r
+                       | K_UNSIGNED K_INT16\r
+                       | K_UNSIGNED K_INT32\r
+                       | K_UNSIGNED K_INT64\r
+                       | STAR\r
+                       | variant_type OPEN_BRACKET CLOSE_BRACKET\r
+                       | variant_type K_VECTOR\r
+                       | variant_type AMPERSAND\r
+                       | K_DECIMAL\r
+                       | K_DATE\r
+                       | K_BSTR\r
+                       | K_LPSTR\r
+                       | K_LPWSTR\r
+                       | K_IUNKNOWN\r
+                       | K_IDISPATCH\r
+                       | K_SAFEARRAY\r
+                       | K_INT\r
+                       | K_UNSIGNED K_INT\r
+                       | K_ERROR\r
+                       | K_HRESULT\r
+                       | K_CARRAY\r
+                       | K_USERDEFINED\r
+                       | K_RECORD\r
+                       | K_FILETIME\r
+                       | K_BLOB\r
+                       | K_STREAM\r
+                       | K_STORAGE\r
+                       | K_STREAMED_OBJECT\r
+                       | K_STORED_OBJECT\r
+                       | K_BLOB_OBJECT\r
+                       | K_CF\r
+                       | K_CLSID\r
+                       ;\r
+\r
+field_decl             : D_FIELD repeat_opt field_attr type id at_opt init_opt\r
+                       ;\r
+\r
+repeat_opt             : /* EMPTY */\r
+                       | OPEN_BRACKET int32 CLOSE_BRACKET\r
+                       ;\r
+\r
+field_attr             : /* EMPTY */\r
+                       | field_attr K_PUBLIC\r
+                       | field_attr K_PRIVATE\r
+                       | field_attr K_FAMILY\r
+                       | field_attr K_ASSEMBLY\r
+                       | field_attr K_FAMANDASSEM\r
+                       | field_attr K_FAMORASSEM\r
+                       | field_attr K_PRIVATESCOPE\r
+                       | field_attr K_STATIC\r
+                       | field_attr K_INITONLY\r
+                       | field_attr K_RTSPECIALNAME\r
+                       | field_attr K_SPECIALNAME\r
+                       | field_attr K_MARSHAL OPEN_PARENS native_type CLOSE_PARENS\r
+                       | field_attr K_LITERAL\r
+                       | field_attr K_NOTSERIALIZED\r
+                       ;\r
+\r
+at_opt                 : /* EMPTY */\r
+                       | K_AT id\r
+                       ;\r
+\r
+init_opt               : /* EMPTY */\r
+                       | ASSIGN field_init\r
+                       ;\r
+\r
+field_init             : K_FLOAT32 OPEN_PARENS float64 CLOSE_PARENS\r
+                       | K_FLOAT64 OPEN_PARENS float64 CLOSE_PARENS\r
+                       | K_FLOAT32 OPEN_PARENS int64 CLOSE_PARENS\r
+                       | K_FLOAT64 OPEN_PARENS int64 CLOSE_PARENS\r
+                       | K_INT64 OPEN_PARENS int64 CLOSE_PARENS\r
+                       | K_INT32 OPEN_PARENS int64 CLOSE_PARENS\r
+                       | K_INT16 OPEN_PARENS int64 CLOSE_PARENS\r
+                       | K_CHAR OPEN_PARENS int64 CLOSE_PARENS\r
+                       | K_INT8 OPEN_PARENS int64 CLOSE_PARENS\r
+                       | K_BOOL OPEN_PARENS truefalse CLOSE_PARENS\r
+                       | K_BYTEARRAY OPEN_PARENS bytes CLOSE_PARENS\r
+                       | comp_qstring                                          // ******** ADDED\r
+                       | K_NULLREF\r
+                       ;\r
+\r
+data_decl              : data_head data_body\r
+                       ;\r
+\r
+data_head              : D_DATA tls id ASSIGN \r
+                       | D_DATA tls\r
+                       ;\r
+\r
+tls                    : /* EMPTY */\r
+                       | K_TLS\r
+                       ;\r
+\r
+data_body              : OPEN_BRACE dataitem_list CLOSE_BRACE\r
+                       | dataitem\r
+                       ;\r
+\r
+dataitem_list          : dataitem\r
+                       | dataitem_list COMMA dataitem\r
+                       ;\r
+\r
+dataitem               : K_CHAR STAR OPEN_PARENS comp_qstring CLOSE_PARENS\r
+                       | AMPERSAND OPEN_PARENS id CLOSE_PARENS\r
+                       | K_BYTEARRAY ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
+                       | K_BYTEARRAY OPEN_PARENS bytes CLOSE_PARENS                    // ******** ADDED\r
+                       | K_FLOAT32 OPEN_PARENS float64 CLOSE_PARENS repeat_opt\r
+                       | K_FLOAT64 OPEN_PARENS float64 CLOSE_PARENS repeat_opt\r
+                       | K_INT64 OPEN_PARENS int64 CLOSE_PARENS repeat_opt\r
+                       | K_INT32 OPEN_PARENS int32 CLOSE_PARENS repeat_opt\r
+                       | K_INT16 OPEN_PARENS int32 CLOSE_PARENS repeat_opt\r
+                       | K_INT8 OPEN_PARENS int32 CLOSE_PARENS repeat_opt\r
+                       | K_FLOAT32 repeat_opt\r
+                       | K_FLOAT64 repeat_opt\r
+                       | K_INT64 repeat_opt\r
+                       | K_INT32 repeat_opt\r
+                       | K_INT16 repeat_opt\r
+                       | K_INT8 repeat_opt\r
+                       ;\r
+\r
+method_all             : method_head OPEN_BRACE method_decls CLOSE_BRACE\r
+                       ;\r
+\r
+method_head            : D_METHOD meth_attr call_conv param_attr type method_name\r
+                         OPEN_PARENS sig_args CLOSE_PARENS impl_attr\r
+                       | D_METHOD meth_attr call_conv param_attr type \r
+                         K_MARSHAL OPEN_PARENS native_type CLOSE_PARENS method_name\r
+                         OPEN_PARENS sig_args CLOSE_PARENS impl_attr\r
                        ;\r
 \r
-scopeBlock              : scopeOpen methodDecls CLOSE_BRACE \r
-                       ;\r
+meth_attr              : /* EMPTY */\r
+                       | meth_attr K_STATIC\r
+                       | meth_attr K_PUBLIC\r
+                       | meth_attr K_PRIVATE\r
+                       | meth_attr K_FAMILY\r
+                       | meth_attr K_ASSEMBLY\r
+                       | meth_attr K_FAMANDASSEM\r
+                       | meth_attr K_FAMORASSEM\r
+                       | meth_attr K_PRIVATESCOPE\r
+                       | meth_attr K_FINAL\r
+                       | meth_attr K_VIRTUAL\r
+                       | meth_attr K_ABSTRACT\r
+                       | meth_attr K_HIDEBYSIG\r
+                       | meth_attr K_NEWSLOT\r
+                       | meth_attr K_REQSECOBJ\r
+                       | meth_attr K_SPECIALNAME\r
+                       | meth_attr K_RTSPECIALNAME\r
+                       | meth_attr K_UNMANAGEDEXP\r
+                       | meth_attr K_PINVOKEIMPL OPEN_PARENS comp_qstring K_AS\r
+                               comp_qstring pinv_attr CLOSE_PARENS\r
+                       | meth_attr K_PINVOKEIMPL OPEN_PARENS comp_qstring pinv_attr CLOSE_PARENS\r
+                       | meth_attr K_PINVOKEIMPL OPEN_PARENS pinv_attr CLOSE_PARENS\r
+                       ;\r
 \r
-scopeOpen               : OPEN_BRACE \r
+pinv_attr              : /* EMPTY */\r
+                       | pinv_attr K_NOMANGLE\r
+                       | pinv_attr K_ANSI\r
+                       | pinv_attr K_UNICODE\r
+                       | pinv_attr K_AUTOCHAR\r
+                       | pinv_attr K_LASTERR\r
+                       | pinv_attr K_WINAPI\r
+                       | pinv_attr K_CDECL\r
+                       | pinv_attr K_STDCALL\r
+                       | pinv_attr K_THISCALL\r
+                       | pinv_attr K_FASTCALL\r
+                       ;\r
+\r
+method_name            : D_CTOR\r
+                       | D_CCTOR\r
+                       | comp_name\r
                        ;\r
 \r
-sehBlock                : tryBlock sehClauses\r
+param_attr             : /* EMPTY */\r
+                       | param_attr OPEN_BRACKET K_IN CLOSE_BRACKET\r
+                       | param_attr OPEN_BRACKET K_OUT CLOSE_BRACKET\r
+                       | param_attr OPEN_BRACKET K_OPT CLOSE_BRACKET\r
                        ;\r
 \r
-sehClauses              : sehClause sehClauses\r
-                       | sehClause\r
+impl_attr              : /* EMPTY */\r
+                       | impl_attr K_NATIVE\r
+                       | impl_attr K_CIL\r
+                       | impl_attr K_OPTIL\r
+                       | impl_attr K_MANAGED\r
+                       | impl_attr K_UNMANAGED\r
+                       | impl_attr K_FORWARDREF\r
+                       | impl_attr K_PRESERVESIG\r
+                       | impl_attr K_RUNTIME\r
+                       | impl_attr K_INTERNALCALL\r
+                       | impl_attr K_SYNCHRONIZED\r
+                       | impl_attr K_NOINLINING\r
                        ;\r
 \r
-tryBlock                : tryHead scopeBlock \r
-                       | tryHead id K_TO id \r
-                       | tryHead int32 K_TO int32 \r
+sig_args               : /* EMPTY */\r
+                       | sig_arg_list\r
                        ;\r
 \r
-tryHead                 : D_TRY \r
+sig_arg_list           : sig_arg\r
+                       | sig_arg_list COMMA sig_arg\r
                        ;\r
 \r
-\r
-sehClause               : catchClause handlerBlock \r
-                       | filterClause handlerBlock \r
-                       | finallyClause handlerBlock \r
-                       | faultClause handlerBlock \r
+sig_arg                        : param_attr type\r
+                       | param_attr type id\r
+                       | param_attr type K_MARSHAL OPEN_PARENS native_type CLOSE_PARENS\r
+                       | param_attr type K_MARSHAL OPEN_PARENS native_type CLOSE_PARENS id\r
                        ;\r
 \r
-         \r
-filterClause            : filterHead scopeBlock \r
-                       | filterHead id \r
-                       | filterHead int32 \r
+method_decls           : /* EMPTY */\r
+                       | method_decls method_decl\r
                        ;\r
 \r
-filterHead              : K_FILTER  \r
+method_decl            : D_EMITBYTE int32\r
+                       | D_MAXSTACK int32\r
+                       | D_LOCALS OPEN_PARENS sig_args CLOSE_PARENS\r
+                       | D_LOCALS K_INIT OPEN_PARENS sig_args CLOSE_PARENS\r
+                       | D_ENTRYPOINT\r
+                       | D_ZEROINIT\r
+                       | D_EXPORT OPEN_BRACKET int32 CLOSE_BRACKET\r
+                       | D_EXPORT OPEN_BRACKET int32 CLOSE_BRACKET K_AS id\r
+                       | D_VTENTRY int32 COLON int32 \r
+                       | D_OVERRIDE type_spec DOUBLE_COLON method_name\r
+                       | scope_block\r
+                       | D_PARAM OPEN_BRACKET int32 CLOSE_BRACKET init_opt\r
+                       | id COLON\r
+                       | seh_block\r
+                       | instr\r
+                       | sec_decl\r
+                       | extsource_spec\r
+                       | language_decl\r
+                       | customattr_decl\r
+                       | data_decl\r
+                       ;\r
+\r
+type_spec              : class_ref\r
+                       | OPEN_BRACKET comp_name CLOSE_BRACKET\r
+                       | OPEN_BRACKET D_MODULE comp_name CLOSE_BRACKET\r
+                       | type\r
                        ;\r
 \r
-catchClause             : K_CATCH className \r
+scope_block            : OPEN_BRACE method_decls CLOSE_BRACE\r
                        ;\r
 \r
-finallyClause           : K_FINALLY \r
+seh_block              : try_block seh_clauses\r
                        ;\r
 \r
-faultClause             : K_FAULT \r
+try_block              : D_TRY scope_block\r
+                       | D_TRY id K_TO id\r
+                       | D_TRY int32 K_TO int32\r
                        ;\r
 \r
-handlerBlock            : scopeBlock                  \r
-                       | K_HANDLER id K_TO id \r
-                       | K_HANDLER int32 K_TO int32 \r
+seh_clauses            : seh_clause\r
+                       | seh_clauses seh_clause\r
                        ;\r
 \r
-\r
-methodDecls             : /* EMPTY */\r
-                       | methodDecls methodDecl\r
+seh_clause             : K_CATCH class_ref handler_block\r
+                       | K_FINALLY handler_block\r
+                       | K_FAULT handler_block\r
+                       | filter_clause handler_block\r
                        ;\r
 \r
-dataDecl                : ddHead ddBody\r
+filter_clause          : K_FILTER scope_block\r
+                       | K_FILTER id\r
+                       | K_FILTER int32\r
                        ;\r
 \r
-ddHead                  : D_DATA tls id ASSIGN \r
-                       | D_DATA tls  \r
+handler_block          : scope_block\r
+                       | K_HANDLER id K_TO id\r
+                       | K_HANDLER int32 K_TO int32\r
                        ;\r
 \r
-tls                     : /* EMPTY */ \r
-                       | K_TLS \r
+instr                  : INSTR_NONE\r
+                       | INSTR_VAR int32\r
+                       | INSTR_I int32\r
+                       | INSTR_I id /* Allow variable names :p */\r
+                       | INSTR_I8 int64\r
+                       | INSTR_R float64\r
+                       | INSTR_R int64\r
+                       | INSTR_R OPEN_PARENS bytes CLOSE_PARENS\r
+                       | INSTR_BRTARGET int32\r
+                       | INSTR_BRTARGET id\r
+                       | INSTR_METHOD method_ref\r
+                       | INSTR_FIELD type type_spec DOUBLE_COLON id\r
+                       | INSTR_FIELD type id\r
+                       | INSTR_TYPE K_FIELD type type_spec DOUBLE_COLON id                     // ****** ADDED\r
+                       | INSTR_TYPE K_FIELD type id                                            // ****** ADDED\r
+                       | INSTR_TYPE type_spec\r
+                       | INSTR_STRING comp_qstring\r
+                       | INSTR_STRING K_BYTEARRAY ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
+                       | INSTR_STRING K_BYTEARRAY OPEN_PARENS bytes CLOSE_PARENS               // ****** ADDED\r
+                       | INSTR_SIG call_conv type OPEN_PARENS sig_args CLOSE_PARENS\r
+                       | INSTR_TOK owner_type\r
+                       | INSTR_SWITCH OPEN_PARENS labels CLOSE_PARENS\r
                        ;\r
 \r
-ddBody                  : OPEN_BRACE ddItemList CLOSE_BRACE\r
-                       | ddItem\r
+method_ref             : call_conv type type_spec DOUBLE_COLON method_name \r
+                         OPEN_PARENS sig_args CLOSE_PARENS\r
+                       | call_conv type method_name \r
+                         OPEN_PARENS sig_args CLOSE_PARENS\r
                        ;\r
 \r
-ddItemList              : ddItem COMMA ddItemList\r
-                       | ddItem\r
+labels                 : /* EMPTY */\r
+                       | id\r
+                       | int32\r
+                       | labels COMMA id\r
+                       | labels COMMA int32\r
                        ;\r
 \r
-ddItemCount             : /* EMPTY */ \r
-                       | OPEN_BRACKET int32 CLOSE_BRACKET \r
+owner_type             : type_spec\r
+                       | member_ref\r
                        ;\r
 \r
-ddItem                  : K_CHAR STAR OPEN_PARENS compQstring CLOSE_PARENS \r
-                       | AMPERSAND OPEN_PARENS id CLOSE_PARENS \r
-                       | bytearrayhead bytes CLOSE_PARENS \r
-                       | K_FLOAT32 OPEN_PARENS float64 CLOSE_PARENS ddItemCount \r
-                       | K_FLOAT64 OPEN_PARENS float64 CLOSE_PARENS ddItemCount \r
-                       | K_INT64 OPEN_PARENS int64 CLOSE_PARENS ddItemCount  \r
-                       | K_INT32 OPEN_PARENS int32 CLOSE_PARENS ddItemCount  \r
-                       | K_INT16 OPEN_PARENS int32 CLOSE_PARENS ddItemCount \r
-                       | K_INT8 OPEN_PARENS int32 CLOSE_PARENS ddItemCount \r
-                       | K_FLOAT32 ddItemCount \r
-                       | K_FLOAT64 ddItemCount \r
-                       | K_INT64 ddItemCount  \r
-                       | K_INT32 ddItemCount  \r
-                       | K_INT16 ddItemCount \r
-                       | K_INT8 ddItemCount \r
+member_ref             : K_METHOD member_ref\r
+                       | K_FIELD type type_spec DOUBLE_COLON id\r
+                       | K_FIELD type id\r
                        ;\r
 \r
-fieldInit               : K_FLOAT32 OPEN_PARENS float64 CLOSE_PARENS \r
-                       | K_FLOAT64 OPEN_PARENS float64 CLOSE_PARENS \r
-                       | K_FLOAT32 OPEN_PARENS int64 CLOSE_PARENS \r
-                       | K_FLOAT64 OPEN_PARENS int64 CLOSE_PARENS \r
-                       | K_INT64 OPEN_PARENS int64 CLOSE_PARENS  \r
-                       | K_INT32 OPEN_PARENS int64 CLOSE_PARENS \r
-                       | K_INT16 OPEN_PARENS int64 CLOSE_PARENS \r
-                       | K_CHAR OPEN_PARENS int64 CLOSE_PARENS \r
-                       | K_INT8 OPEN_PARENS int64 CLOSE_PARENS \r
-                       | K_BOOL OPEN_PARENS truefalse CLOSE_PARENS \r
-                       | compQstring \r
-                       | bytearrayhead bytes CLOSE_PARENS \r
-                       | K_NULLREF \r
+event_all              : event_head OPEN_BRACE event_decls CLOSE_BRACE\r
                        ;\r
 \r
-bytearrayhead           : K_BYTEARRAY OPEN_PARENS \r
+event_head             : D_EVENT event_attr type_spec id\r
+                       | D_EVENT event_attr id\r
                        ;\r
 \r
-\r
-hexbyte                        : INT32\r
-                       | id\r
+event_attr             : /* EMPTY */\r
+                       | event_attr K_RTSPECIALNAME\r
+                       | event_attr K_SPECIALNAME\r
                        ;\r
 \r
-bytes                  : /* EMPTY */ \r
-                       | hexbytes \r
+event_decls            : /* EMPTY */\r
+                       | event_decls event_decl\r
                        ;\r
 \r
-hexbytes                : hexbyte \r
-                       | hexbytes hexbyte \r
+event_decl             : D_ADDON method_ref\r
+                       | D_REMOVEON method_ref\r
+                       | D_FIRE method_ref\r
+                       | D_OTHER method_ref\r
+                       | customattr_decl\r
+                       | extsource_spec\r
+                       | language_decl\r
                        ;\r
 \r
-instr_r_head            : INSTR_R OPEN_PARENS \r
+prop_all               : prop_head OPEN_BRACE prop_decls CLOSE_BRACE\r
                        ;\r
 \r
-methodSpec              : K_METHOD \r
+prop_head              : D_PROPERTY prop_attr type id OPEN_PARENS sig_args CLOSE_PARENS init_opt\r
                        ;\r
 \r
-instr                   : INSTR_NONE           \r
-                         { \r
-                               codegen.CodeBuffer.Inst ((Op) $1); \r
-                         }\r
-                       | INSTR_VAR int32       {/* currentInstr = new InstrVar ((OpCode) $1, $2);*/}\r
-                       | INSTR_VAR id          {/* currentInstr = new InstrVar ((OpCode) $1, $2); */}\r
-                       | INSTR_I int32         \r
-                         {\r
-                               codegen.CodeBuffer.IntInst ((IntOp) $1, (int) $2); \r
-                         }\r
-                       | INSTR_I8 int64        {/* currentInstr = new InstrI8 ((OpCode) $1, (Int64) $2);*/}\r
-                       | INSTR_R float64       {/* currentInstr = new InstrR ((OpCode) $1, (Double) $2);*/}\r
-                       | INSTR_R int64         {/* currentInstr = new InstrR ((OpCode) $1, (Int64) $2);*/}\r
-                       | instr_r_head bytes CLOSE_PARENS \r
-                       | INSTR_BRTARGET int32  \r
-                       | INSTR_BRTARGET id \r
-                       | INSTR_METHOD method_ref \r
-                         {\r
-                               codegen.CodeBuffer.MethInst ((MethodOp) $1, (Method) $2);               \r
-                         }\r
-                       | INSTR_METHOD callConv method_ref \r
-                         {\r
-                               Method method = (Method) $3;\r
-                               method.AddCallConv ((CallConv) $2);\r
-                               codegen.CodeBuffer.MethInst ((MethodOp) $1, method);\r
-                         }\r
-\r
-                                       \r
-                       | INSTR_METHOD callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                                               {\r
-               \r
-                                               }\r
-                       | INSTR_NEWOBJ callConv type assembly_name name1 DOUBLE_COLON call_name OPEN_PARENS signature_args CLOSE_PARENS\r
-                                               { \r
-                                                       \r
-                                               }\r
-                       | INSTR_FIELD type typeSpec DOUBLE_COLON id \r
-                       | INSTR_FIELD field_ref \r
-                         {\r
-                               codegen.CodeBuffer.FieldInst ((FieldOp) $1, (Field) $2);\r
-                         }\r
-                       | INSTR_TYPE type_ref\r
-                         {\r
-                               TypeRef type_ref = (TypeRef) $2;\r
-                               codegen.CodeBuffer.TypeInst ((TypeOp) $1, type_ref.Type); \r
-                         }\r
-                       | INSTR_STRING compQstring \r
-                               {\r
-                                       codegen.CodeBuffer.ldstr ((string) $2);\r
-                               }\r
-                       | INSTR_STRING bytearrayhead bytes CLOSE_PARENS \r
-                       | INSTR_SIG callConv type OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | INSTR_RVA id \r
-                       | INSTR_RVA int32 \r
-                       | INSTR_TOK methodSpec callConv type typeSpec DOUBLE_COLON methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | INSTR_TOK methodSpec callConv type methodName OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | INSTR_TOK K_FIELD type typeSpec DOUBLE_COLON id \r
-                       | INSTR_TOK K_FIELD type id \r
-                       | INSTR_TOK typeSpec \r
-                       | INSTR_SWITCH OPEN_PARENS labels CLOSE_PARENS \r
-                       | INSTR_PHI int16s \r
-                       ;\r
-\r
-param_list             : /* EMPTY */\r
-                       | type_ref                      \r
-                         { \r
-                               ArrayList param_list = new ArrayList ();\r
-                               \r
-                               param_list.Add ($1);\r
-                               $$ = param_list; \r
-                         }\r
-                       | param_list COMMA type_ref\r
-                         {\r
-                               ArrayList param_list = (ArrayList) $1;\r
-                               \r
-                               param_list.Add ($3);\r
-                         }\r
-                       ;\r
-\r
-param_name             : /* EMPTY */\r
-                       | name1\r
-                       ;\r
-\r
-arg_list \r
-       : /* EMPTY */\r
-       | paramAttr type_ref param_name\r
-         {\r
-               ArrayList arg_list = new ArrayList ();\r
-               Param param = new Param ((ParamAttr) $1, $3 as string, ((TypeRef) $2).Type);\r
-               DictionaryEntry entry = new DictionaryEntry (param, $2);\r
-\r
-               arg_list.Add (entry);           \r
-               $$ = arg_list;\r
-         }\r
-       | arg_list COMMA paramAttr type_ref param_name\r
-         {\r
-               ArrayList arg_list = (ArrayList) $1;\r
-               Param param = new Param ((ParamAttr) $3, $5 as string, ((TypeRef) $4).Type);\r
-               DictionaryEntry entry = new DictionaryEntry (param, $4);\r
-\r
-               arg_list.Add (entry);\r
-               $$ = arg_list;\r
-         }\r
-       ;\r
-\r
-param_name             : /* EMPTY */\r
-                       | name1\r
-                       ;\r
-\r
-named_arg\r
-       : type_ref ID\r
-         {\r
-               $$ = new DictionaryEntry ((string) $1, (string) $2);\r
-         }\r
-       ;\r
-\r
-named_arg_list         \r
-       : /* EMPTY */\r
-       | named_arg\r
-         {\r
-               ArrayList arg_list = new ArrayList ();\r
-               arg_list.Add ($1);\r
-\r
-               $$ = arg_list;                                  \r
-         }\r
-       | named_arg_list COMMA named_arg \r
-         {\r
-               ArrayList arg_list = (ArrayList) $1;\r
-               arg_list.Add ($3);\r
-                               \r
-               $$ = arg_list;\r
-         }\r
-       ;           \r
-\r
-       \r
-signature_args         : /* EMPTY */\r
-                       | type\r
-                       | type COMMA signature_args\r
-                       ;\r
-\r
-binding_flags          : /* EMPTY */\r
-                       | K_INSTANCE\r
+prop_attr              : /* EMPTY */\r
+                       | prop_attr K_RTSPECIALNAME\r
+                       | prop_attr K_SPECIALNAME\r
                        ;\r
 \r
-sigArgs0                : /* EMPTY */ \r
-                       | sigArgs1 \r
+prop_decls             : /* EMPTY */\r
+                       | prop_decls prop_decl\r
                        ;\r
 \r
-sigArgs1                : sigArg \r
-                       | sigArgs1 COMMA sigArg { $$ = String.Format ("{0},{1}", $1, $2); }\r
+prop_decl              : D_SET method_ref\r
+                       | D_GET method_ref\r
+                       | D_OTHER method_ref\r
+                       | customattr_decl\r
+                       | extsource_spec\r
+                       | language_decl\r
                        ;\r
 \r
-sigArg                  : ELLIPSIS             \r
-                       | paramAttr type_ref \r
-                       | paramAttr type id { $$ = String.Format ("{0} {1}", $2, $3); }\r
-                       | paramAttr type K_MARSHAL OPEN_PARENS nativeType CLOSE_PARENS \r
-                       | paramAttr type K_MARSHAL OPEN_PARENS nativeType CLOSE_PARENS id \r
+customattr_decl                : D_CUSTOM custom_type\r
+                       | D_CUSTOM custom_type ASSIGN comp_qstring\r
+                       | D_CUSTOM custom_type ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
+                       | D_CUSTOM OPEN_PARENS owner_type CLOSE_PARENS custom_type\r
+                       | D_CUSTOM OPEN_PARENS owner_type CLOSE_PARENS custom_type ASSIGN comp_qstring\r
+                       | D_CUSTOM OPEN_PARENS owner_type CLOSE_PARENS custom_type ASSIGN\r
+                         OPEN_PARENS bytes CLOSE_PARENS\r
                        ;\r
                        \r
-\r
-dottedName             : id DOT id     {$$ = ($1 as string) + "." + ($3 as string);}\r
+custom_type            : call_conv type type_spec DOUBLE_COLON D_CTOR OPEN_PARENS sig_args CLOSE_PARENS\r
+                       | call_conv type D_CTOR OPEN_PARENS sig_args CLOSE_PARENS\r
                        ;\r
 \r
-\r
-name1                   : id\r
-                       | dottedName\r
-                       | name1 DOT name1       {$$ = String.Format ("{0}.{1}", $1, $3); }\r
+sec_decl               : D_PERMISSION sec_action type_spec OPEN_PARENS nameval_pairs CLOSE_PARENS\r
+                       | D_PERMISSION sec_action type_spec\r
+                       | D_PERMISSIONSET sec_action ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
                        ;\r
 \r
-call_name              : \r
-                       | id\r
-                       | D_CTOR\r
-                       | D_CCTOR\r
-                       ;\r
-                       \r
-assembly_ref           : id\r
-                       | assembly_ref DASH id          {$$ = String.Format ("{0}-{1}", $1, $3);}\r
-                       | assembly_ref DOT id           {$$ = String.Format ("{0}.{1}", $1, $3); }      \r
-                       ;\r
-\r
-assembly_name          : OPEN_BRACKET assembly_ref CLOSE_BRACKET {$$ = ($2 as string);}\r
-                       ;\r
-\r
-className               : OPEN_BRACKET name1 CLOSE_BRACKET slashedName \r
-                       | OPEN_BRACKET D_MODULE name1 CLOSE_BRACKET slashedName \r
-                       | slashedName \r
-                       ;\r
-\r
-slashedName             : name1\r
-                       | slashedName SLASH name1       {$$ = ($1 as string) + "/" + ($3 as string);}\r
-                       ;\r
-\r
-typeSpec                : className \r
-                       | OPEN_BRACKET name1 CLOSE_BRACKET \r
-                       | OPEN_BRACKET D_MODULE name1 CLOSE_BRACKET \r
-                       | type \r
-                       ;\r
-\r
-callConv                : /* EMPTY */          { $$ = new CallConv (); }\r
-                       | callConv K_INSTANCE   { $$ = (CallConv) $1 | CallConv.Instance; }\r
-                       | callConv K_EXPLICIT   { $$ = (CallConv) $1 | CallConv.InstanceExplicit; }\r
-                       | callConv callKind     { $$ = (CallConv) $1 | (CallConv) $2; }\r
-                       ;\r
-\r
-callKind                : K_DEFAULT            { $$ = (CallConv) $1 | CallConv.Default; }\r
-                       | K_VARARG              { $$ = (CallConv) $1 | CallConv.Vararg; }\r
-                       | K_UNMANAGED K_CDECL   { $$ = (CallConv) $1 | CallConv.Cdecl; }\r
-                       | K_UNMANAGED K_STDCALL { $$ = (CallConv) $1 | CallConv.Stdcall; }\r
-                       | K_UNMANAGED K_THISCALL { $$ = (CallConv) $1 | CallConv.Thiscall; }\r
-                       | K_UNMANAGED K_FASTCALL { $$ = (CallConv) $1 | CallConv.Fastcall; }\r
-                       ;\r
-\r
-nativeType              : /* EMPTY */  \r
-                       | K_CUSTOM OPEN_PARENS compQstring COMMA compQstring COMMA compQstring COMMA compQstring CLOSE_PARENS \r
-                       | K_CUSTOM OPEN_PARENS compQstring COMMA compQstring CLOSE_PARENS \r
-                       | K_FIXED K_SYSSTRING OPEN_BRACKET int32 CLOSE_BRACKET \r
-                       | K_FIXED K_ARRAY OPEN_BRACKET int32 CLOSE_BRACKET \r
-                       | K_VARIANT \r
-                       | K_CURRENCY \r
-                       | K_SYSCHAR \r
-                       | K_VOID \r
-                       | K_BOOL \r
-                       | K_INT8 \r
-                       | K_INT16 \r
-                       | K_INT32 \r
-                       | K_INT64 \r
-                       | K_FLOAT32 \r
-                       | K_FLOAT64 \r
-                       | K_ERROR \r
-                       | K_UNSIGNED K_INT8 \r
-                       | K_UNSIGNED K_INT16 \r
-                       | K_UNSIGNED K_INT32 \r
-                       | K_UNSIGNED K_INT64 \r
-                       | nativeType STAR \r
-                       | nativeType OPEN_BRACKET CLOSE_BRACKET \r
-                       | nativeType OPEN_BRACKET int32 CLOSE_BRACKET \r
-                       | nativeType OPEN_BRACKET int32 PLUS int32 CLOSE_BRACKET \r
-                       | nativeType OPEN_BRACKET PLUS int32 CLOSE_BRACKET \r
-                       | K_DECIMAL \r
-                       | K_DATE \r
-                       | K_BSTR \r
-                       | K_LPSTR \r
-                       | K_LPWSTR \r
-                       | K_LPTSTR \r
-                       | K_OBJECTREF \r
-                       | K_IUNKNOWN \r
-                       | K_IDISPATCH \r
-                       | K_STRUCT \r
-                       | K_INTERFACE \r
-                       | K_SAFEARRAY variantType \r
-                       | K_INT \r
-                       | K_UNSIGNED K_INT \r
-                       | K_NESTED K_STRUCT \r
-                       | K_BYVALSTR \r
-                       | K_ANSI K_BSTR \r
-                       | K_TBSTR \r
-                       | K_VARIANT K_BOOL \r
-                       | methodSpec \r
-                       | K_AS K_ANY \r
-                       | K_LPSTRUCT \r
-                       ;\r
-\r
-variantType             : /* EMPTY */ \r
-                       | K_NULL \r
-                       | K_VARIANT \r
-                       | K_CURRENCY \r
-                       | K_VOID \r
-                       | K_BOOL \r
-                       | K_INT8 \r
-                       | K_INT16 \r
-                       | K_INT32 \r
-                       | K_INT64 \r
-                       | K_FLOAT32 \r
-                       | K_FLOAT64 \r
-                       | K_UNSIGNED K_INT8 \r
-                       | K_UNSIGNED K_INT16 \r
-                       | K_UNSIGNED K_INT32 \r
-                       | K_UNSIGNED K_INT64 \r
-                       | STAR \r
-                       | variantType OPEN_BRACKET CLOSE_BRACKET \r
-                       | variantType K_VECTOR \r
-                       | variantType AMPERSAND \r
-                       | K_DECIMAL \r
-                       | K_DATE \r
-                       | K_BSTR \r
-                       | K_LPSTR \r
-                       | K_LPWSTR \r
-                       | K_IUNKNOWN \r
-                       | K_IDISPATCH \r
-                       | K_SAFEARRAY \r
-                       | K_INT \r
-                       | K_UNSIGNED K_INT \r
-                       | K_ERROR \r
-                       | K_HRESULT \r
-                       | K_CARRAY \r
-                       | K_USERDEFINED \r
-                       | K_RECORD \r
-                       | K_FILETIME \r
-                       | K_BLOB \r
-                       | K_STREAM \r
-                       | K_STORAGE \r
-                       | K_STREAMED_OBJECT \r
-                       | K_STORED_OBJECT \r
-                       | K_BLOB_OBJECT \r
-                       | K_CF \r
-                       | K_CLSID \r
-                       ;\r
-\r
-type                    : K_CLASS className \r
-                       | K_OBJECT  \r
-                       | K_STRING  \r
-                       | K_VALUE K_CLASS className  \r
-                       | K_VALUETYPE className  \r
-                       | type OPEN_BRACKET CLOSE_BRACKET  \r
-                       | type OPEN_BRACKET bounds1 CLOSE_BRACKET  \r
-                       /* uncomment when and if this type is supported by the Runtime\r
-                       | type K_VALUE OPEN_BRACKET int32 CLOSE_BRACKET \r
-                        */\r
-                       | type AMPERSAND \r
-                       | type STAR \r
-                       | type K_PINNED \r
-                       | type K_MODREQ OPEN_PARENS className CLOSE_PARENS \r
-                       | type K_MODOPT OPEN_PARENS className CLOSE_PARENS \r
-                       | BANG int32 \r
-                       | methodSpec callConv type STAR OPEN_PARENS sigArgs0 CLOSE_PARENS \r
-                       | K_TYPEDREF \r
-                       | K_CHAR \r
-                       | K_VOID \r
-                       | K_BOOL \r
-                       | K_INT8 \r
-                       | K_INT16 \r
-                       | K_INT32 \r
-                       | K_INT64 \r
-                       | K_FLOAT32 \r
-                       | K_FLOAT64 \r
-                       | K_UNSIGNED K_INT8     {$$ = "uint8";}\r
-                       | K_UNSIGNED K_INT16    {$$ = "uint16";}\r
-                       | K_UNSIGNED K_INT32    {$$ = "uint32";}\r
-                       | K_UNSIGNED K_INT64    {$$ = "uint64";}\r
-                       | K_NATIVE K_INT \r
-                       | K_NATIVE K_UNSIGNED K_INT \r
-                       | K_NATIVE K_FLOAT \r
+nameval_pairs          : nameval_pair \r
+                       | nameval_pairs COMMA nameval_pair\r
                        ;\r
 \r
-bounds1                 : bound \r
-                       | bounds1 COMMA bound \r
+nameval_pair           : comp_qstring ASSIGN cavalue\r
                        ;\r
 \r
-bound                   : /* EMPTY */ \r
-                       | ELLIPSIS \r
-                       | int32  \r
-                       | int32 ELLIPSIS int32    \r
-                       | int32 ELLIPSIS  \r
+cavalue                : truefalse\r
+                       | int32\r
+                       | int32 OPEN_PARENS int32 CLOSE_PARENS\r
+                       | comp_qstring \r
+                       | class_ref OPEN_PARENS K_INT8 COLON int32 CLOSE_PARENS\r
+                       | class_ref OPEN_PARENS K_INT16 COLON int32 CLOSE_PARENS\r
+                       | class_ref OPEN_PARENS K_INT32 COLON int32 CLOSE_PARENS\r
+                       | class_ref OPEN_PARENS int32 CLOSE_PARENS\r
                        ;\r
 \r
-labels                  : /* empty */ \r
-                       | id COMMA labels \r
-                       | int32 COMMA labels \r
-                       | id \r
-                       | int32 \r
+sec_action             : K_REQUEST\r
+                       | K_DEMAND\r
+                       | K_ASSERT\r
+                       | K_DENY\r
+                       | K_PERMITONLY\r
+                       | K_LINKCHECK\r
+                       | K_INHERITCHECK\r
+                       | K_REQMIN\r
+                       | K_REQOPT\r
+                       | K_REQREFUSE\r
+                       | K_PREJITGRANT\r
+                       | K_PREJITDENY\r
+                       | K_NONCASDEMAND\r
+                       | K_NONCASLINKDEMAND\r
+                       | K_NONCASINHERITANCE\r
                        ;\r
 \r
-\r
-id                      : ID \r
-                       | SQSTRING \r
+module_head            : D_MODULE\r
+                       | D_MODULE comp_name\r
+                       | D_MODULE K_EXTERN comp_name\r
                        ;\r
 \r
-int16s                  : /* EMPTY */ \r
-                       | int16s int32 \r
-                       ;\r
-                                \r
-int32                   : INT32 /* NOTE: it's INT64 in docs */\r
+file_decl              : D_FILE file_attr comp_name file_entry D_HASH ASSIGN\r
+                         OPEN_PARENS bytes CLOSE_PARENS file_entry\r
+                       | D_FILE file_attr comp_name file_entry\r
                        ;\r
 \r
-int64                   : INT64 \r
+file_attr              : /* EMPTY */\r
+                       | file_attr K_NOMETADATA\r
                        ;\r
 \r
-float64                 : FLOAT64 \r
-                       | K_FLOAT32 OPEN_PARENS int32 CLOSE_PARENS \r
-                       | K_FLOAT64 OPEN_PARENS int64 CLOSE_PARENS \r
+file_entry             : /* EMPTY */\r
+                       | D_ENTRYPOINT\r
                        ;\r
 \r
-secDecl                 : D_PERMISSION secAction typeSpec OPEN_PARENS nameValPairs CLOSE_PARENS \r
-                       | D_PERMISSION secAction typeSpec \r
-                       | psetHead bytes CLOSE_PARENS \r
+assembly_all           : assembly_head OPEN_BRACE assembly_decls CLOSE_BRACE\r
                        ;\r
 \r
-psetHead                : D_PERMISSIONSET secAction ASSIGN OPEN_PARENS \r
+assembly_head          : D_ASSEMBLY asm_attr comp_name\r
                        ;\r
 \r
-nameValPairs            : nameValPair \r
-                       | nameValPair COMMA nameValPairs \r
+asm_attr               : /* EMPTY */\r
+                       | asm_attr K_NOAPPDOMAIN\r
+                       | asm_attr K_NOPROCESS\r
+                       | asm_attr K_NOMACHINE\r
                        ;\r
 \r
-nameValPair             : compQstring ASSIGN caValue \r
+assembly_decls         : /* EMPTY */\r
+                       | assembly_decls assembly_decl\r
                        ;\r
 \r
-truefalse              : K_TRUE \r
-                       | K_FALSE \r
+assembly_decl          : D_HASH K_ALGORITHM int32\r
+                       | sec_decl\r
+                       | asm_or_ref_decl\r
                        ;\r
 \r
-caValue                 : truefalse \r
-                       | int32 \r
-                       | K_INT32 OPEN_PARENS int32 CLOSE_PARENS \r
-                       | compQstring \r
-                       | className OPEN_PARENS K_INT8 COLON int32 CLOSE_PARENS \r
-                       | className OPEN_PARENS K_INT16 COLON int32 CLOSE_PARENS \r
-                       | className OPEN_PARENS K_INT32 COLON int32 CLOSE_PARENS \r
-                       | className OPEN_PARENS int32 CLOSE_PARENS \r
+asm_or_ref_decl                : D_PUBLICKEY ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
+                       | D_VER int32 COLON int32 COLON int32 COLON int32 \r
+                       | D_LOCALE comp_qstring\r
+                       | D_LOCALE ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
+                       | customattr_decl\r
                        ;\r
 \r
-secAction               : K_REQUEST \r
-                       | K_DEMAND \r
-                       | K_ASSERT \r
-                       | K_DENY \r
-                       | K_PERMITONLY \r
-                       | K_LINKCHECK \r
-                       | K_INHERITCHECK \r
-                       | K_REQMIN \r
-                       | K_REQOPT \r
-                       | K_REQREFUSE \r
-                       | K_PREJITGRANT \r
-                       | K_PREJITDENY \r
-                       | K_NONCASDEMAND \r
-                       | K_NONCASLINKDEMAND \r
-                       | K_NONCASINHERITANCE \r
+assemblyref_all                : assemblyref_head OPEN_BRACE assemblyref_decls CLOSE_BRACE\r
                        ;\r
 \r
-extSourceSpec           : D_LINE int32 SQSTRING \r
-                       | D_LINE int32 \r
-                       | D_XLINE int32 QSTRING \r
+assemblyref_head       : D_ASSEMBLY K_EXTERN comp_name\r
+                       | D_ASSEMBLY K_EXTERN comp_name K_AS comp_name\r
                        ;\r
 \r
-fileDecl                : D_FILE fileAttr name1 fileEntry hashHead bytes CLOSE_PARENS fileEntry \r
-                       | D_FILE fileAttr name1 fileEntry \r
+assemblyref_decls      : /* EMPTY */\r
+                       | assemblyref_decls assemblyref_decl\r
                        ;\r
 \r
-fileAttr                : /* EMPTY */ \r
-                       | fileAttr K_NOMETADATA \r
+assemblyref_decl       : D_HASH ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
+                       | asm_or_ref_decl\r
+                       | D_PUBLICKEYTOKEN ASSIGN OPEN_PARENS bytes CLOSE_PARENS\r
                        ;\r
 \r
-fileEntry               : /* EMPTY */ \r
-                       | D_ENTRYPOINT \r
+exptype_all            : exptype_head OPEN_BRACE exptype_decls CLOSE_BRACE\r
                        ;\r
 \r
-hashHead                : D_HASH ASSIGN OPEN_PARENS \r
+exptype_head           : D_CLASS K_EXTERN expt_attr comp_name\r
                        ;\r
 \r
-assemblyHead            : D_ASSEMBLY asmAttr name1\r
-                       {\r
-                               /*\r
-                               // TODO: set assembly attrs\r
-                               codegen.SetName ($3 as string);\r
-                               */\r
-                       }\r
+expt_attr              : /* EMPTY */\r
+                       | expt_attr K_PRIVATE\r
+                       | expt_attr K_PUBLIC \r
+                       | expt_attr K_NESTED K_PUBLIC\r
+                       | expt_attr K_NESTED K_PRIVATE\r
+                       | expt_attr K_NESTED K_FAMILY\r
+                       | expt_attr K_NESTED K_ASSEMBLY\r
+                       | expt_attr K_NESTED K_FAMANDASSEM\r
+                       | expt_attr K_NESTED K_FAMORASSEM\r
                        ;\r
 \r
-asmAttr                 : /* EMPTY */ \r
-                       | asmAttr K_NOAPPDOMAIN \r
-                       | asmAttr K_NOPROCESS \r
-                       | asmAttr K_NOMACHINE \r
+exptype_decls          : /* EMPTY */\r
+                       | exptype_decls exptype_decl\r
                        ;\r
 \r
-assemblyDecls           : /* EMPTY */\r
-                       | assemblyDecls assemblyDecl\r
+exptype_decl           : D_FILE comp_name\r
+                       | D_CLASS K_EXTERN comp_name\r
+                       | D_CLASS int32\r
+                       | customattr_decl\r
                        ;\r
 \r
-assemblyDecl            : D_HASH K_ALGORITHM bytes\r
-                       | D_HASH K_ALGORITHM int32\r
-                       | secDecl\r
-                       | asmOrRefDecl\r
+manifestres_all                : manifestres_head OPEN_BRACE manifestres_decls CLOSE_BRACE\r
                        ;\r
 \r
-asmOrRefDecl            : publicKeyHead bytes CLOSE_PARENS \r
-                       | D_VER int32 COLON int32 COLON int32 COLON int32 \r
-                       | D_LOCALE compQstring \r
-                       | localeHead bytes CLOSE_PARENS \r
-                       | D_PROCESSOR int32 \r
-                       | D_OS int32 D_VER int32 COLON int32 \r
-                       | customAttrDecl\r
+manifestres_head       : D_MRESOURCE manres_attr comp_name     \r
                        ;\r
 \r
-publicKeyHead           : D_PUBLICKEY ASSIGN OPEN_PARENS \r
+manres_attr            : /* EMPTY */\r
+                       | manres_attr K_PUBLIC\r
+                       | manres_attr K_PRIVATE\r
                        ;\r
 \r
-publicKeyTokenHead      : D_PUBLICKEYTOKEN ASSIGN OPEN_PARENS \r
+manifestres_decls      : /* EMPTY */\r
+                       | manifestres_decls manifestres_decl\r
                        ;\r
 \r
-localeHead              : D_LOCALE ASSIGN OPEN_PARENS \r
+manifestres_decl       : D_FILE comp_name K_AT int32\r
+                       | D_ASSEMBLY K_EXTERN comp_name\r
+                       | customattr_decl\r
                        ;\r
 \r
-assemblyRefHead         : D_ASSEMBLY K_EXTERN assembly_ref\r
-                         {\r
-                               System.Reflection.AssemblyName asmb_name = \r
-                                       new System.Reflection.AssemblyName ();\r
-                               asmb_name.Name = (string) $3;\r
-                               codegen.ExternTable.AddAssembly ((string) $3, asmb_name);\r
-                         }\r
+dotted_name            : id\r
+                       | dotted_name DOT id    { $$ = String.Format ("{0}.{1}", $1, $3); }\r
                        ;\r
 \r
-assemblyRefDecls        : /* EMPTY */\r
-                       | assemblyRefDecls assemblyRefDecl\r
+comp_qstring           : QSTRING\r
+                       | comp_qstring PLUS QSTRING     { $$ = String.Format ("{0}{1}", $1, $3); }\r
                        ;\r
 \r
-assemblyRefDecl         : hashHead bytes CLOSE_PARENS \r
-                       | asmOrRefDecl\r
-                       | publicKeyTokenHead bytes CLOSE_PARENS \r
+int32                  : INT32\r
+                       | INT64\r
                        ;\r
 \r
-comtypeHead             : D_CLASS K_EXTERN comtAttr name1  \r
+int64                  : INT32\r
+                       | INT64\r
                        ;\r
 \r
-exportHead              : D_EXPORT comtAttr name1 \r
+float64                        : FLOAT64\r
+                       | K_FLOAT32 OPEN_PARENS int32 CLOSE_PARENS\r
+                       | K_FLOAT64 OPEN_PARENS int64 CLOSE_PARENS\r
                        ;\r
 \r
-comtAttr                : /* EMPTY */ \r
-                       | comtAttr K_PRIVATE \r
-                       | comtAttr K_PUBLIC \r
-                       | comtAttr K_NESTED K_PUBLIC \r
-                       | comtAttr K_NESTED K_PRIVATE \r
-                       | comtAttr K_NESTED K_FAMILY \r
-                       | comtAttr K_NESTED K_ASSEMBLY \r
-                       | comtAttr K_NESTED K_FAMANDASSEM \r
-                       | comtAttr K_NESTED K_FAMORASSEM \r
+hexbyte                        : HEXBYTE\r
+                        | INT32                                 // ******** ADDED\r
+                        | ID                                    // ******** ADDED\r
                        ;\r
 \r
-comtypeDecls            : /* EMPTY */\r
-                       | comtypeDecls comtypeDecl\r
+bytes                  : /* EMPTY */\r
+                       | hexbytes\r
                        ;\r
 \r
-comtypeDecl             : D_FILE name1 \r
-                       | D_CLASS K_EXTERN name1 \r
-                       | D_CLASS  int32 \r
-                       | customAttrDecl\r
+hexbytes               : hexbyte\r
+                       | hexbytes hexbyte\r
                        ;\r
 \r
-manifestResHead         : D_MRESOURCE manresAttr name1 \r
+truefalse              : K_TRUE\r
+                       | K_FALSE\r
                        ;\r
 \r
-manresAttr              : /* EMPTY */ \r
-                       | manresAttr K_PUBLIC \r
-                       | manresAttr K_PRIVATE \r
+id                     : ID\r
+                       | SQSTRING\r
                        ;\r
 \r
-manifestResDecls        : /* EMPTY */\r
-                       | manifestResDecls manifestResDecl\r
+comp_name              : id\r
+                       | dotted_name\r
                        ;\r
 \r
-manifestResDecl         : D_FILE name1 K_AT int32 \r
-                       | D_ASSEMBLY K_EXTERN name1 \r
-                       | customAttrDecl\r
+dotted_name            : id\r
+                       | dotted_name DOT id\r
                        ;\r
 \r
 \r
-\r
 %%\r
 \r
-} // namespace Mono.ILASM\r
+}\r
+\r