Author: mhutch
Date: 2007-11-19 18:53:18 -0500 (Mon, 19 Nov 2007)
New Revision: 89953

Modified:
   trunk/monodevelop/Extras/CSharpBinding/CSharpEnhancedCodeProvider.cs
   trunk/monodevelop/Extras/CSharpBinding/ChangeLog
   trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs
Log:
* CSharpEnhancedCodeProvider.cs: Use non-obsolete APIs.
* Parser/CodeGenerator.cs: Track API change.

Modified: trunk/monodevelop/Extras/CSharpBinding/CSharpEnhancedCodeProvider.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/CSharpEnhancedCodeProvider.cs        
2007-11-19 23:50:08 UTC (rev 89952)
+++ trunk/monodevelop/Extras/CSharpBinding/CSharpEnhancedCodeProvider.cs        
2007-11-19 23:53:18 UTC (rev 89953)
@@ -44,6 +44,7 @@
        {
                private ICodeParser codeParser;
                
+               [Obsolete]
                public override ICodeParser CreateParser ()
                {
                        if (codeParser == null)
@@ -53,69 +54,73 @@
                
                public override CodeCompileUnit Parse (TextReader codeStream)
                {
-                       return CreateParser ().Parse (codeStream);
+                       return ParseInternal (codeStream);
                }
                
-               private class CodeParser : ICodeParser
+               static CodeCompileUnit ParseInternal (TextReader codeStream)
                {
-                       public CodeCompileUnit Parse (TextReader codeStream)
-                       {
-                               CodeDomVisitor cdv = new CodeDomVisitor ();
-                               IParser parser = ParserFactory.CreateParser (
-                                       SupportedLanguage.CSharp,
-                                       codeStream);
-                               parser.ParseMethodBodies = true;
-                               parser.Parse ();
-                               
-                               if (parser.Errors.Count > 0)
-                                       throw new ArgumentException 
(parser.Errors.ErrorOutput);
-                               
-                               parser.CompilationUnit.AcceptVisitor (cdv, 
null);
-                               
-                               parser.Dispose ();
-                               
-                               CodeCompileUnit ccu = cdv.codeCompileUnit;
-                               
-                               //C# parser seems to insist on putting imports 
in the "Global" namespace; fix it up
-                               for (int i = 0; i < ccu.Namespaces.Count; i++) {
-                                       CodeNamespace global = ccu.Namespaces 
[i];
-                                       if ((global.Name == "Global") && 
(global.Types.Count == 0)) {
-                                               global.Name = "";
-                                               ccu.Namespaces.RemoveAt (i);
-                                               ccu.Namespaces.Insert (0, 
global);
+                       CodeDomVisitor cdv = new CodeDomVisitor ();
+                       IParser parser = ParserFactory.CreateParser (
+                               SupportedLanguage.CSharp,
+                               codeStream);
+                       parser.ParseMethodBodies = true;
+                       parser.Parse ();
+                       
+                       if (parser.Errors.Count > 0)
+                               throw new ArgumentException 
(parser.Errors.ErrorOutput);
+                       
+                       parser.CompilationUnit.AcceptVisitor (cdv, null);
+                       
+                       parser.Dispose ();
+                       
+                       CodeCompileUnit ccu = cdv.codeCompileUnit;
+                       
+                       //C# parser seems to insist on putting imports in the 
"Global" namespace; fix it up
+                       for (int i = 0; i < ccu.Namespaces.Count; i++) {
+                               CodeNamespace global = ccu.Namespaces [i];
+                               if ((global.Name == "Global") && 
(global.Types.Count == 0)) {
+                                       global.Name = "";
+                                       ccu.Namespaces.RemoveAt (i);
+                                       ccu.Namespaces.Insert (0, global);
+                                       
+                                       //clear out repeat imports...
+                                       for (int j = 1; j < 
ccu.Namespaces.Count; j++) {
+                                               CodeNamespace cn = 
ccu.Namespaces [j];
                                                
-                                               //clear out repeat imports...
-                                               for (int j = 1; j < 
ccu.Namespaces.Count; j++) {
-                                                       CodeNamespace cn = 
ccu.Namespaces [j];
+                                               //why can't we remove imports? 
will have to collect ones to keep
+                                               //then clear and refill
+                                               CodeNamespaceImportCollection 
imps = new CodeNamespaceImportCollection ();
+                                               
+                                               for (int m = 0; m < 
cn.Imports.Count; m++) {
+                                                       bool found = false;
                                                        
-                                                       //why can't we remove 
imports? will have to collect ones to keep
-                                                       //then clear and refill
-                                                       
CodeNamespaceImportCollection imps = new CodeNamespaceImportCollection ();
-                                                       
-                                                       for (int m = 0; m < 
cn.Imports.Count; m++) {
-                                                               bool found = 
false;
-                                                               
-                                                               for (int n = 0; 
n < global.Imports.Count; n++)
-                                                                       if 
(global.Imports [n] == cn.Imports [m])
-                                                                               
found = true;
-                                                       
-                                                               if (!found)
-                                                                       
imps.Add (cn.Imports [m]);
-                                                       }
-                                                       
-                                                       cn.Imports.Clear ();
-                                                       
-                                                       foreach 
(CodeNamespaceImport imp in imps)
-                                                               cn.Imports.Add 
(imp);
+                                                       for (int n = 0; n < 
global.Imports.Count; n++)
+                                                               if 
(global.Imports [n] == cn.Imports [m])
+                                                                       found = 
true;
+                                               
+                                                       if (!found)
+                                                               imps.Add 
(cn.Imports [m]);
                                                }
                                                
-                                               break;
+                                               cn.Imports.Clear ();
+                                               
+                                               foreach (CodeNamespaceImport 
imp in imps)
+                                                       cn.Imports.Add (imp);
                                        }
+                                       
+                                       break;
                                }
-                               
-                               return ccu;
                        }
+                       return ccu;
                }
+               
+               private class CodeParser : ICodeParser
+               {
+                       public CodeCompileUnit Parse (TextReader codeStream)
+                       {
+                               return ParseInternal (codeStream);
+                       }
+               }
        }
        
        

Modified: trunk/monodevelop/Extras/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2007-11-19 23:50:08 UTC 
(rev 89952)
+++ trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2007-11-19 23:53:18 UTC 
(rev 89953)
@@ -1,3 +1,8 @@
+2007-11-19  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * CSharpEnhancedCodeProvider.cs: Use non-obsolete APIs.
+       * Parser/CodeGenerator.cs: Track API change.
+
 2007-11-19  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * Gui/CSharpTextEditorExtension.cs: Fix invalid cast. Fixes bug #342607.

Modified: trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs      
2007-11-19 23:50:08 UTC (rev 89952)
+++ trunk/monodevelop/Extras/CSharpBinding/Parser/CodeGenerator.cs      
2007-11-19 23:53:18 UTC (rev 89953)
@@ -57,16 +57,17 @@
 {
        class CSharpRefactorer: BaseRefactorer
        {
-               CSharpCodeProvider csharpProvider = new CSharpCodeProvider ();
+               CSharpEnhancedCodeProvider csharpProvider = new 
CSharpEnhancedCodeProvider ();
                
                public override RefactorOperations SupportedOperations {
                        get { return RefactorOperations.All; }
                }
                
-               protected override ICodeGenerator GetGenerator ()
+               protected override CodeDomProvider GetCodeDomProvider ()
                {
-                       return csharpProvider.CreateGenerator ();
+                       return csharpProvider;
                }
+               
                public override string ConvertToLanguageTypeName (string 
netTypeName)
                {
                        Console.WriteLine ("Convert : '{0}'", netTypeName);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to