diff options
| author | Chris Toshok <toshok@novell.com> | 2006-04-20 21:14:45 +0400 |
|---|---|---|
| committer | Chris Toshok <toshok@novell.com> | 2006-04-20 21:14:45 +0400 |
| commit | cef1d6fc4141915e243c37d1522b9a9429dde11d (patch) | |
| tree | 6968e6fe844ef3bb78aa7f291341f4fc95941ade /mcs | |
| parent | eee8a87b49f50ce6fa304a8e21e2d7a1dc5b6dea (diff) | |
2006-04-20 Chris Toshok <toshok@ximian.com>
* BaseCompiler.cs: for 2.0, emit the correct namespace and class
names in the case where you use "NS.ClassName" in the Inherits
attribute. Fixes bug #78135.
svn path=/trunk/mcs/; revision=59706
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs | 13 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.Compilation/ChangeLog | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs index 44f80a5f5ab..7c49dc30d24 100644 --- a/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs +++ b/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs @@ -72,8 +72,17 @@ namespace System.Web.Compilation unit = new CodeCompileUnit (); #if NET_2_0 if (parser.IsPartial) { - mainNS = new CodeNamespace (); - mainClass = new CodeTypeDeclaration (parser.PartialClassName); + string ns = null; + string classtype = parser.PartialClassName; + + if (classtype.Contains (".")) { + int dot = classtype.LastIndexOf ("."); + ns = classtype.Substring (0, dot); + classtype = classtype.Substring (dot + 1); + } + + mainNS = new CodeNamespace (ns); + mainClass = new CodeTypeDeclaration (classtype); mainClass.IsPartial = true; mainClassExpr = new CodeTypeReferenceExpression (parser.PartialClassName); } else { diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog index be0076eb7bb..35ce5f591cb 100644 --- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog +++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog @@ -1,3 +1,9 @@ +2006-04-20 Chris Toshok <toshok@ximian.com> + + * BaseCompiler.cs: for 2.0, emit the correct namespace and class + names in the case where you use "NS.ClassName" in the Inherits + attribute. Fixes bug #78135. + 2006-04-20 Gonzalo Paniagua Javier <gonzalo@ximian.com> * CachingCompiler.cs: no need to play the Wait/PulseAll game, as we |