Revert r106068 and reopen bug #400807. The revision broke more than it fixed and...

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

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspParser.cs b/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
index 28a71b11014bd402d42e88b2ab1fdb7c0e8be5e0..004d9732ee3ba569e17e665958846f3e634a51ea 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
@@ -423,8 +423,7 @@ namespace System.Web.Compilation
                                        i = 0;
                                }
 
-                               if (token < Token.FIRST_TOKEN || token > Token.LAST_TOKEN)
-                                       vb_text.Append ((char) token);
+                               vb_text.Append ((char) token);
                                token = tokenizer.get_token ();
                        } 
 
@@ -470,7 +469,7 @@ namespace System.Web.Compilation
 
                                return;
                        }
-
+                       
                        if (Eat (Token.DOUBLEDASH)) {
                                tokenizer.ExpectAttrValue = old;
                                tokenizer.Verbatim = true;
@@ -488,13 +487,8 @@ namespace System.Web.Compilation
                        varname = Eat ('=');
                        databinding = !varname && Eat ('#');
 
-                       if (Eat (Token.IDENTIFIER))
-                               inside_tags = tokenizer.Value;
-                       else
-                               inside_tags = String.Empty;
-                       
                        tokenizer.Verbatim = true;
-                       inside_tags += GetVerbatim (tokenizer.get_token (), "%>");
+                       inside_tags = GetVerbatim (tokenizer.get_token (), "%>");
                        tokenizer.Verbatim = false;
                        id = inside_tags;
                        attributes = null;

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspTokenizer.cs b/mcs/class/System.Web/System.Web.Compilation/AspTokenizer.cs
index 276907ce209346a74b11923f9b12eb094976ca02..b915e7fd18143762d89f4731d6ff6d32e6a1df98 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspTokenizer.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspTokenizer.cs
@@ -37,7 +37,6 @@ namespace System.Web.Compilation
 {
        class Token
        {
-               public const int FIRST_TOKEN    = 0x0200000;
                public const int EOF            = 0x0200000;
                public const int IDENTIFIER     = 0x0200001;
                public const int DIRECTIVE      = 0x0200002;
@@ -45,7 +44,6 @@ namespace System.Web.Compilation
                public const int TEXT           = 0x0200004;
                public const int DOUBLEDASH     = 0x0200005;
                public const int CLOSING        = 0x0200006;
-               public const int LAST_TOKEN     = 0x0200006;
        }
 
        class AspTokenizer
@@ -94,7 +92,7 @@ namespace System.Web.Compilation
                {
                        if (hasPutBack){
                                hasPutBack = false;
-                               position += Value.Length;                               
+                               position += Value.Length;
                                return current_token;
                        }
 
@@ -269,7 +267,7 @@ namespace System.Web.Compilation
 
                                        if (current_token == '@' && Directive.IsDirective (sb.ToString ()))
                                                return Token.DIRECTIVE;
-
+                                       
                                        return Token.IDENTIFIER;
                                }
 

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 77a5acac33e06d9df0ab22f44b97830c1601677d..643c59284358e9808f913b1369eefd5ad59370a0 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -3,16 +3,6 @@
        * TemplateControlCompiler.cs: AddChildCall properly processes the
        PartialCachingAttribute now.
 
-2008-06-17  Marek Habersack  <mhabersack@novell.com>
-
-       * AspTokenizer.cs: Added FIRST_TOKEN and LAST_TOKEN symbols to the
-       internal Token class.
-
-       * AspParser.cs: GetServerTag must use parsed identifiers when
-       gathering verbatim code strings.
-       GetVerbatim must not add to the text tokens which aren't
-       characters. Fixes bug #400807
-
 2008-06-11  Marek Habersack  <mhabersack@novell.com>
 
        * BuildManager.cs: if an error occurs while assigning the