Merge pull request #2824 from lambdageek/dev/monoerror-icalls-noraise

[mono.git] / mcs / class / System / Microsoft.CSharp / CSharpCodeProvider.cs

diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeProvider.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeProvider.cs
index 5f59d5779abac93770182c042c41bb08f6eea9d4..99678016b6b2f8cda98a6df70b13ad226c0c8475 100644 (file)
--- a/mcs/class/System/Microsoft.CSharp/CSharpCodeProvider.cs
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeProvider.cs
@@ -5,17 +5,43 @@
 //   Daniel Stodden (stodden@in.tum.de)
 //
 // (C) 2002 Ximian, Inc.
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
 //
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.CodeDom;
+using System.CodeDom.Compiler;
+using System.ComponentModel;
+using System.IO;
+using System.Security.Permissions;
+using System.Collections.Generic;
 
-namespace Microsoft.CSharp
-{
-       using System;
-       using System.CodeDom.Compiler;
-       using System.ComponentModel;
+namespace Microsoft.CSharp {
 
-       public class CSharpCodeProvider
-               : CodeDomProvider
-       {
+       [PermissionSet (SecurityAction.LinkDemand, Unrestricted = true)]
+       [PermissionSet (SecurityAction.InheritanceDemand, Unrestricted = true)]
+       public class CSharpCodeProvider : CodeDomProvider {
+               IDictionary <string, string> providerOptions;
+               
                //
                // Constructors
                //
@@ -23,6 +49,11 @@ namespace Microsoft.CSharp
                {
                }
 
+               public CSharpCodeProvider (IDictionary <string, string> providerOptions)
+               {
+                       this.providerOptions = providerOptions;
+               }
+
                //
                // Properties
                //
@@ -35,19 +66,30 @@ namespace Microsoft.CSharp
                //
                // Methods
                //
-               [MonoTODO]
+               [Obsolete ("Use CodeDomProvider class")]
                public override ICodeCompiler CreateCompiler()
                {
-                       throw new NotImplementedException();
+                       if (providerOptions != null && providerOptions.Count > 0)
+                               return new Mono.CSharp.CSharpCodeCompiler (providerOptions);
+                       return new Mono.CSharp.CSharpCodeCompiler();
                }
 
+               [Obsolete ("Use CodeDomProvider class")]
                public override ICodeGenerator CreateGenerator()
                {
+                       if (providerOptions != null && providerOptions.Count > 0)
+                               return new Mono.CSharp.CSharpCodeGenerator (providerOptions);
                        return new Mono.CSharp.CSharpCodeGenerator();
                }
                
                [MonoTODO]
-               public override TypeConverter GetConverter( Type Type )
+               public override TypeConverter GetConverter (Type type)
+               {
+                       throw new NotImplementedException();
+               }
+
+               [MonoTODO]
+               public override void GenerateCodeFromMember (CodeTypeMember member, TextWriter writer, CodeGeneratorOptions options)
                {
                        throw new NotImplementedException();
                }