Author: martin
Date: 2005-04-12 08:05:43 -0400 (Tue, 12 Apr 2005)
New Revision: 42823
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/cs-tokenizer.cs
Log:
**** Merged r40511 from MCS ****
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2005-04-12 12:04:56 UTC (rev 42822)
+++ trunk/mcs/gmcs/ChangeLog 2005-04-12 12:05:43 UTC (rev 42823)
@@ -1,3 +1,7 @@
+2005-02-11 Miguel de Icaza <[EMAIL PROTECTED]>
+
+ * cs-tokenizer.cs (pp_and): recurse on pp_and, fixes #61903.
+
2005-02-11 Marek Safar <[EMAIL PROTECTED]>
C# 2.0 Fixed buffer implementation
Modified: trunk/mcs/gmcs/cs-tokenizer.cs
===================================================================
--- trunk/mcs/gmcs/cs-tokenizer.cs 2005-04-12 12:04:56 UTC (rev 42822)
+++ trunk/mcs/gmcs/cs-tokenizer.cs 2005-04-12 12:05:43 UTC (rev 42823)
@@ -1634,7 +1634,7 @@
if (s [0] == '&'){
if (len > 2 && s [1] == '&'){
s = s.Substring (2);
- return (va & pp_eq (ref s));
+ return (va & pp_and (ref s));
} else {
Error_InvalidDirective ();
return false;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
