2002-11-24 Miguel de Icaza <miguel@ximian.com>

	* cs-tokenizer.cs: Do not short-circuit, because if we do, we
	report errors (ie, #if false && true would produce an invalid
	directive error);

svn path=/trunk/mcs/; revision=9179

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index d8288036d78276bfff6524419c294d1c68b5bb9c..c1f5f9bd3f01a9664aa6e2bc8baf4c66b5c19579 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2002-11-24  Miguel de Icaza  <miguel@ximian.com>
+
+       * cs-tokenizer.cs: Do not short-circuit, because if we do, we
+       report errors (ie, #if false && true would produce an invalid
+       directive error);
+
 2002-11-24  Martin Baulig  <martin@ximian.com>
 
        * expression.cs (Cast.TryReduce): If we're in checked syntax,

diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
index 3c74c1edf11b17fccf7e75aca066c96cd76f57e6..974820e551a8e990c4496b28fc14c3562e182c8d 100755 (executable)
--- a/mcs/mcs/cs-tokenizer.cs
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -1148,7 +1148,7 @@ namespace Mono.CSharp
 \r
                                        return va != pp_unary (ref s);\r
 \r
-                               }\r
+                               } \r
                        }\r
 \r
                        return va;\r
@@ -1165,7 +1165,7 @@ namespace Mono.CSharp
                                if (s [0] == '&'){\r
                                        if (len > 2 && s [1] == '&'){\r
                                                s = s.Substring (2);\r
-                                               return va && pp_eq (ref s);\r
+                                               return (va & pp_eq (ref s));\r
                                        } else {\r
                                                Error_InvalidDirective ();\r
                                                return false;\r
@@ -1190,7 +1190,7 @@ namespace Mono.CSharp
                                if (c == '|'){\r
                                        if (len > 2 && s [1] == '|'){\r
                                                s = s.Substring (2);\r
-                                               return va || pp_and (ref s);\r
+                                               return va | pp_and (ref s);\r
                                        } else {\r
                                                Error_InvalidDirective ();\r
                                                return false;\r