2002-07-04 Miguel de Icaza <miguel@ximian.com>

	* cs-tokenizer.cs (define): We also have to track locally the
	defines.  AllDefines is just used for the Conditional Attribute,
	but we also need the local defines for the current source code.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index e63893fa25d576df49cfc26a373208b7e1dcf534..b6f367e70cc7bbccf10b7c45f025917665798455 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-04  Miguel de Icaza  <miguel@ximian.com>
+
+       * cs-tokenizer.cs (define): We also have to track locally the
+       defines.  AllDefines is just used for the Conditional Attribute,
+       but we also need the local defines for the current source code. 
+
 2002-07-03  Miguel de Icaza  <miguel@ximian.com>
 
        * statement.cs (While, For, Do): These loops can exit through a
@@ -192,7 +198,6 @@ Mon Jul 1 12:26:12 CEST 2002 Paolo Molaro <lupus@ximian.com>
 
        * namespace.cs: Use Report.Error instead of GenericParser.error
 
-       
 2002-06-22  Miguel de Icaza  <miguel@ximian.com>
 
        * class.cs (TypeContainer.AddMethod, TypeContainer.AddIndexer,

diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
index 51e9d9b5e6a796adca3714fe73202748bdd8f6a4..c24d5e1ca2ac71d1ca2d0fdd42a5e48aab23b1ba 100755 (executable)
--- a/mcs/mcs/cs-tokenizer.cs
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -285,9 +285,12 @@ namespace Mono.CSharp
 \r
                void define (string def)\r
                {\r
-                       if (RootContext.AllDefines.Contains (def))\r
+                       if (!RootContext.AllDefines.Contains (def)){\r
+                               RootContext.AllDefines [def] = true;\r
+                       }\r
+                       if (defines.Contains (def))\r
                                return;\r
-                       RootContext.AllDefines [def] = true;\r
+                       defines [def] = true;\r
                }\r
                \r
                public Tokenizer (System.IO.Stream input, string fname, ArrayList defs)\r