2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.Web / System.Web.UI / SimpleWebHandlerParser.cs

diff --git a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
index 6c212e1a24ba1411603ef1ba54e3d5e90e9d15b6..d075d404a5cc89064fb60ccde2e54a397c427dca 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
+++ b/mcs/class/System.Web/System.Web.UI/SimpleWebHandlerParser.cs
@@ -7,6 +7,27 @@
 // (C) 2002,2003 Ximian, Inc (http://www.ximian.com)
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.CodeDom.Compiler;
 using System.Collections;
@@ -38,9 +59,15 @@ namespace System.Web.UI
                string baseDir;
                string baseVDir;
                CompilationConfiguration compilationConfig;
+               int appAssemblyIndex = -1;
+               Type cachedType;
 
                protected SimpleWebHandlerParser (HttpContext context, string virtualPath, string physicalPath)
                {
+                       cachedType = CachingCompiler.GetTypeFromCache (physicalPath);
+                       if (cachedType != null)
+                               return; // We don't need anything else.
+
                        this.context = context;
                        this.vPath = virtualPath;
                        this.physPath = physicalPath;
@@ -49,7 +76,7 @@ namespace System.Web.UI
                        assemblies = new ArrayList ();
                        string location = Context.ApplicationInstance.AssemblyLocation;
                        if (location != typeof (TemplateParser).Assembly.Location)
-                               assemblies.Add (location);
+                               appAssemblyIndex = assemblies.Add (location);
 
                        assemblies.AddRange (CompilationConfig.Assemblies);
                        if (CompilationConfig.AssembliesInBin)
@@ -60,6 +87,11 @@ namespace System.Web.UI
                        GetDirectivesAndContent ();
                }
 
+               protected Type GetCompiledTypeFromCache ()
+               {
+                       return cachedType;
+               }
+
                void GetDirectivesAndContent ()
                {
                        StreamReader reader = new StreamReader (File.OpenRead (physPath));
@@ -67,7 +99,7 @@ namespace System.Web.UI
                        bool directiveFound = false;
                        StringBuilder content = new StringBuilder ();
 
-                       while ((line = reader.ReadLine ()) != null) {
+                       while ((line = reader.ReadLine ()) != null && cachedType == null) {
                                string trimmed = line.Trim ();
                                if (!directiveFound && trimmed == String.Empty)
                                        continue;
@@ -75,18 +107,26 @@ namespace System.Web.UI
                                if (trimmed.StartsWith ("<")) {
                                        ParseDirective (trimmed);
                                        directiveFound = true;
+                                       if (gotDefault) {
+                                               cachedType = CachingCompiler.GetTypeFromCache (physPath);
+                                               if (cachedType != null)
+                                                       break;
+                                       }
+
                                        continue;
                                }
 
                                content.Append (line + "\n");
                                content.Append (reader.ReadToEnd ());
                        }
+                       reader.Close ();
 
                        if (!gotDefault)
-                               throw new ParseException (null, "No @WebService directive found");
-                               
-                       this.program = content.ToString ();
-                       reader.Close ();
+                               throw new ParseException (null, "No @" + DefaultDirectiveName +
+                                                       " directive found");
+
+                       if (cachedType == null)
+                               this.program = content.ToString ();
                }
 
                void TagParsed (ILocation location, System.Web.Compilation.TagType tagtype, string tagid, TagAttributes attributes)
@@ -280,7 +320,7 @@ namespace System.Web.UI
 
                        AddDependency (realPath);
 
-                       CompilerResults result = CachingCompiler.Compile (realPath, realPath, assemblies);
+                       CompilerResults result = CachingCompiler.Compile (language, realPath, realPath, assemblies);
                        if (result.NativeCompilerReturnValue != 0) {
                                StreamReader reader = new StreamReader (realPath);
                                throw new CompilationException (realPath, result.Errors, reader.ReadToEnd ());
@@ -359,7 +399,16 @@ namespace System.Web.UI
                }
 
                internal ArrayList Assemblies {
-                       get { return assemblies; }
+                       get {
+                               if (appAssemblyIndex != -1) {
+                                       object o = assemblies [appAssemblyIndex];
+                                       assemblies.RemoveAt (appAssemblyIndex);
+                                       assemblies.Add (o);
+                                       appAssemblyIndex = -1;
+                               }
+
+                               return assemblies;
+                       }
                }
 
                internal ArrayList Dependencies {