[ilasm] Clenup warnings

diff --git a/mcs/ilasm/Driver.cs b/mcs/ilasm/Driver.cs
index 6f38e9d67be4078eeb2eb85ef17dd4c69cd8ccdb..c04622aeb1d2b12ad9019d5af63ac5892c3a0557 100644 (file)
--- a/mcs/ilasm/Driver.cs
+++ b/mcs/ilasm/Driver.cs
@@ -44,8 +44,8 @@ namespace Mono.ILASM {
                         private Target target = Target.Exe;
                         private string target_string = "exe";
                         private bool show_tokens = false;
-                        private bool show_method_def = false;
-                        private bool show_method_ref = false;
+//                        private bool show_method_def = false;
+//                        private bool show_method_ref = false;
                         private bool show_parser = false;
                         private bool scan_only = false;
                        private bool debugging_info = false;
@@ -189,7 +189,7 @@ namespace Mono.ILASM {
                                         ie.FilePath = file_path;
                                         ie.Location = scanner.Reader.Location;
                                         throw;
-                                } catch (Exception e){
+                                } catch (Exception){
                                         Console.Write ("{0} ({1}, {2}): ",file_path, scanner.Reader.Location.line, scanner.Reader.Location.column);
                                         throw;
                                 } finally {
@@ -276,12 +276,12 @@ namespace Mono.ILASM {
                                         case "show_tokens":
                                                 show_tokens = true;
                                                 break;
-                                        case "show_method_def":
-                                                show_method_def = true;
-                                                break;
-                                        case "show_method_ref":
-                                                show_method_ref = true;
-                                                break;
+//                                        case "show_method_def":
+//                                                show_method_def = true;
+//                                                break;
+//                                        case "show_method_ref":
+//                                                show_method_ref = true;
+//                                                break;
                                         case "show_parser":
                                                 show_parser = true;
                                                 break;

diff --git a/mcs/ilasm/Makefile b/mcs/ilasm/Makefile
index 6b24d0d0536c459fe9a0496212cf326288057754..090d1cc32312bfa4d3269348b5784c8042bb6921 100644 (file)
--- a/mcs/ilasm/Makefile
+++ b/mcs/ilasm/Makefile
@@ -4,7 +4,7 @@ include ../build/rules.make
 
 PROGRAM = ilasm.exe
 BUILT_SOURCES = ILParser.cs
-LOCAL_MCS_FLAGS = /lib:../class/lib/$(PROFILE) /r:../class/lib/$(PROFILE)/PEAPI.dll /r:Mono.CompilerServices.SymbolWriter.dll /r:Mono.Security.dll
+LIB_REFS = PEAPI Mono.CompilerServices.SymbolWriter Mono.Security
 
 CLEAN_FILES = parser/y.output
 

diff --git a/mcs/ilasm/codegen/CodeGen.cs b/mcs/ilasm/codegen/CodeGen.cs
index b0b1803c18060a442523c60a46fda4794cb477ae..6b9aadfc80ecd363d6e14baea059ba95c60e5d29 100644 (file)
--- a/mcs/ilasm/codegen/CodeGen.cs
+++ b/mcs/ilasm/codegen/CodeGen.cs
@@ -29,7 +29,7 @@ namespace Mono.ILASM {
 \r
                 private PEFile pefile;\r
                 private ExternAssembly current_assemblyref;\r
-                private ExternModule current_moduleref;\r
+//                private ExternModule current_moduleref;\r
                 private string current_namespace;\r
                 private TypeDef current_typedef;\r
                 private MethodDef current_methoddef;\r
@@ -61,7 +61,6 @@ namespace Mono.ILASM {
                 private long stack_reserve;\r
 \r
                 private string output_file;\r
-               private string debug_file;\r
                 private bool is_dll;\r
                 private bool entry_point;\r
 \r
@@ -119,9 +118,9 @@ namespace Mono.ILASM {
                         get { return current_assemblyref; }\r
                 }\r
 \r
-                public ExternModule CurrentModuleRef {\r
-                        get { return current_moduleref; }\r
-                }\r
+//                public ExternModule CurrentModuleRef {\r
+//                        get { return current_moduleref; }\r
+//                }\r
 \r
                 public ICustomAttrTarget CurrentCustomAttrTarget {\r
                         get { return current_customattrtarget; }\r

diff --git a/mcs/ilasm/codegen/FieldDef.cs b/mcs/ilasm/codegen/FieldDef.cs
index 19c23b9bfef4a5887408c813dd7d8ee8577c2830..456b9a5ee239bccfc8984545a759ca195eda8a26 100644 (file)
--- a/mcs/ilasm/codegen/FieldDef.cs
+++ b/mcs/ilasm/codegen/FieldDef.cs
@@ -23,7 +23,7 @@ namespace Mono.ILASM {
                 private PEAPI.NativeType native_type;
 
                 private bool offset_set;
-                private bool datavalue_set;
+//                private bool datavalue_set;
                 private bool value_set;
 
                 private bool is_resolved;
@@ -40,7 +40,7 @@ namespace Mono.ILASM {
                         this.type = type;
 
                         offset_set = false;
-                        datavalue_set = false;
+//                        datavalue_set = false;
                         value_set = false;
 
                         at_data_id = null;

diff --git a/mcs/ilasm/codegen/GenericTypeInst.cs b/mcs/ilasm/codegen/GenericTypeInst.cs
index 6634f418b6346482c33fd997c18fc649e79edf74..5510500749b0f1de2d3f867771a525179ceaf3e8 100644 (file)
--- a/mcs/ilasm/codegen/GenericTypeInst.cs
+++ b/mcs/ilasm/codegen/GenericTypeInst.cs
@@ -19,7 +19,7 @@ namespace Mono.ILASM {
 
                 private BaseClassRef class_ref;
                 private PEAPI.GenericTypeInst p_gen_inst;
-                private bool is_valuetypeinst;
+                const bool is_valuetypeinst = false;
                 private GenericArguments gen_args;
                 private bool is_added; /* Added to PEFile (to TypeSpec table) ? */
                 /* Note: Using static hashtable here as GenericTypeInsts is not cached */

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index a6b861903b6f8434a097c72410963f482cdf0a56..56f37d06ea333fc57878eecd43b184b6ed2705b8 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -32,7 +32,7 @@ namespace Mono.ILASM {
                 private string pinvoke_meth;\r
                 private PEAPI.PInvokeAttr pinvoke_attr;\r
                 private ILTokenizer tokenizer;\r
-               static int yacc_verbose_flag;\r
+               const int yacc_verbose_flag = 0;\r
                KeyValuePair<string, TypeAttr> current_extern;\r
 \r
                 class NameValuePair {\r
@@ -59,13 +59,14 @@ namespace Mono.ILASM {
 \r
                 public bool CheckSecurityActionValidity (System.Security.Permissions.SecurityAction action, bool for_assembly)\r
                 {\r
+#pragma warning disable 618\r
                         if ((action == System.Security.Permissions.SecurityAction.RequestMinimum || \r
                                 action == System.Security.Permissions.SecurityAction.RequestOptional || \r
                                 action == System.Security.Permissions.SecurityAction.RequestRefuse) && !for_assembly) {\r
                                 Report.Warning (String.Format ("System.Security.Permissions.SecurityAction '{0}' is not valid for this declaration", action));\r
                                 return false;\r
                         }\r
-\r
+#pragma warning restore 618\r
                         return true;\r
                 }\r
 \r

diff --git a/mcs/ilasm/scanner/InstrToken.cs b/mcs/ilasm/scanner/InstrToken.cs
index bc78f97fd18fdcc0b5dac527f8f4c7aed782533e..f4d996aeb1032292c8817f63dfc39d0651d4363b 100644 (file)
--- a/mcs/ilasm/scanner/InstrToken.cs
+++ b/mcs/ilasm/scanner/InstrToken.cs
@@ -56,10 +56,11 @@ namespace Mono.ILASM {
                                case OperandType.InlineNone:\r
                                        token = Token.INSTR_NONE;\r
                                        break;\r
-\r
+#pragma warning disable 618\r
                                case OperandType.InlinePhi:\r
                                        token = Token.INSTR_PHI;\r
                                        break;\r
+#pragma warning restore 618\r
 \r
                                case OperandType.InlineR:\r
                                case OperandType.ShortInlineR:\r