[Monodevelop-patches-list] r2390 - in trunk/MonoDevelop/Core/src: AddIns/BackendBindings/CSharpBinding ICSharpCode.SharpRefactory ICSharpCode.SharpRefactory/src/Lexer

[John Luke <jluke@cfl.rr.com>]

Author: jluke
Date: 2005-03-25 13:23:18 -0500 (Fri, 25 Mar 2005)
New Revision: 2390

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
   trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog
   trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am
   trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Lexer/Lexer.cs
Log:
fix a small parser bug


Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-03-24 22:49:03 UTC (rev 2389)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Makefile.am	2005-03-25 18:23:18 UTC (rev 2390)
@@ -92,7 +92,7 @@
 parse: $(PARSE)
 
 $(PARSE): parse.cs $(ASSEMBLY)
-	$(CSC) -out:$@ parse.cs $(DLLS) -r:../../../../../build/AddIns/BackendBindings/$(ASSEMBLY)
+	$(CSC) -out:$@ parse.cs $(DLLS) -r:$(ASSEMBLY)
 
 run-parse-test: $(PARSE)
 	MONO_PATH=../../../../../build/AddIns/BackendBindings/:../../../../../build/bin/ mono $(PARSE) .

Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog	2005-03-24 22:49:03 UTC (rev 2389)
+++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/ChangeLog	2005-03-25 18:23:18 UTC (rev 2390)
@@ -1,3 +1,8 @@
+2005-03-25  John Luke  <john.luke at gmail.com>
+
+	* src/Lexer/Lexer.cs: workaround SD code that
+	depends on .NET 1.1 apparent bug, see bug #72221
+
 2005-02-04  John Luke  <john.luke at gmail.com>
 
 	* src/Parser/AST/Modifier.cs: add Static to Class

Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am
===================================================================
--- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am	2005-03-24 22:49:03 UTC (rev 2389)
+++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/Makefile.am	2005-03-25 18:23:18 UTC (rev 2390)
@@ -127,7 +127,7 @@
 	$(CSC) -out:$@ -r:$(DLL) $(srcdir)/src/Main.cs
 
 run-test: test
-	mono $(TEST) a.cs
+	MONO_PATH=../../../build/bin mono $(TEST) a.cs
 
 assemblydir = $(libdir)/monodevelop/bin
 assembly_DATA = $(DLL)

Modified: trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Lexer/Lexer.cs
===================================================================
--- trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Lexer/Lexer.cs	2005-03-24 22:49:03 UTC (rev 2389)
+++ trunk/MonoDevelop/Core/src/ICSharpCode.SharpRefactory/src/Lexer/Lexer.cs	2005-03-25 18:23:18 UTC (rev 2390)
@@ -373,9 +373,12 @@
 				}
 			}
 			
-			double d = 0;
+			long d = 0;
 			// FIXME: http://bugzilla.ximian.com/show_bug.cgi?id=72221
-			if (!Double.TryParse(digit, ishex ? NumberStyles.HexNumber : NumberStyles.Integer, null, out d)) {
+			try {
+				d = long.Parse (digit, ishex ? NumberStyles.HexNumber : NumberStyles.Integer);
+			}
+			catch {
 				errors.Error(y, x, String.Format("Can't parse integral constant {0}", digit));
 				return new Token(Tokens.Literal, x, y, stringValue.ToString(), 0);
 			}