[Monodevelop-patches-list] r1284 - in trunk/MonoDevelop/src: AddIns/BackendBindings/CSharpBinding AddIns/BackendBindings/CSharpBinding/Parser Main/Base Main/Base/Services/ParserService

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2004-03-28 17:13:54 -0500 (Sun, 28 Mar 2004)
New Revision: 1284

Modified:
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
   trunk/MonoDevelop/src/Main/Base/ChangeLog
   trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
Log:
fix a couple things related to bug #56128


Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-03-28 21:42:52 UTC (rev 1283)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2004-03-28 22:13:54 UTC (rev 1284)
@@ -1,3 +1,7 @@
+2004-03-28  John Luke  <jluke at cfl.rr.com>
+
+	* Parser/Resolver.cs: comment some CWL's that were causing exceptions
+
 2003-03-27  Todd Berman  <tberman at sevenl.net>
 
 	* *: update parser and other things from upstream.

Modified: trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
===================================================================
--- trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs	2004-03-28 21:42:52 UTC (rev 1283)
+++ trunk/MonoDevelop/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs	2004-03-28 22:13:54 UTC (rev 1284)
@@ -146,17 +146,17 @@
 			cu = (ICompilationUnit)cSharpVisitor.Visit(fileCompilationUnit, null);
 			if (cu != null) {
 				callingClass = GetInnermostClass();
-				Console.WriteLine("CallingClass is " + callingClass == null ? "null" : callingClass.Name);
+				//Console.WriteLine("CallingClass is " + callingClass == null ? "null" : callingClass.Name);
 			}
-			Console.WriteLine("expression = " + expr.ToString());
+			//Console.WriteLine("expression = " + expr.ToString());
 			IReturnType type = expr.AcceptVisitor(typeVisitor, null) as IReturnType;
-			Console.WriteLine("type visited");
+			//Console.WriteLine("type visited");
 			if (type == null || type.PointerNestingLevel != 0) {
 //				Console.WriteLine("Type == null || type.PointerNestingLevel != 0");
 				if (type != null) {
-					Console.WriteLine("PointerNestingLevel is " + type.PointerNestingLevel);
+					//Console.WriteLine("PointerNestingLevel is " + type.PointerNestingLevel);
 				} else {
-					Console.WriteLine("Type == null");
+					//Console.WriteLine("Type == null");
 				}
 				//// when type is null might be file needs to be reparsed - some vars were lost
 				fileCompilationUnit=parserService.ParseFile(fileName, fileContent).MostRecentCompilationUnit.Tag 

Modified: trunk/MonoDevelop/src/Main/Base/ChangeLog
===================================================================
--- trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-28 21:42:52 UTC (rev 1283)
+++ trunk/MonoDevelop/src/Main/Base/ChangeLog	2004-03-28 22:13:54 UTC (rev 1284)
@@ -1,3 +1,8 @@
+2004-03-28  John Luke  <jluke at cfl.rr.com>
+
+	* Services/ParserService/DefaultParserService.cs:
+	if filename == null don't switch on it
+
 2004-03-27  Todd Berman  <tberman at sevenl.net>
 
 	* Commands/FileCommands: remove save as notification, as its useless

Modified: trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs
===================================================================
--- trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-03-28 21:42:52 UTC (rev 1283)
+++ trunk/MonoDevelop/src/Main/Base/Services/ParserService/DefaultParserService.cs	2004-03-28 22:13:54 UTC (rev 1284)
@@ -697,12 +697,14 @@
 		public virtual IParser GetParser(string fileName)
 		{
 			// HACK: I'm too lazy to do it 'right'
-			if (Path.GetExtension(fileName).ToUpper() == ".CS") {
-				return parser[0];
+			if (fileName != null) {
+				if (Path.GetExtension(fileName).ToUpper() == ".CS") {
+					return parser[0];
+				}
+				if (Path.GetExtension(fileName).ToUpper() == ".VB") {
+					return parser[1];
+				}
 			}
-			if (Path.GetExtension(fileName).ToUpper() == ".VB") {
-				return parser[1];
-			}
 			return null;
 		}