Author: marek
Date: 2006-07-15 16:06:12 -0400 (Sat, 15 Jul 2006)
New Revision: 62646
Modified:
trunk/mcs/gmcs/ChangeLog
trunk/mcs/gmcs/anonymous.cs
trunk/mcs/gmcs/rootcontext.cs
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/anonymous.cs
trunk/mcs/mcs/rootcontext.cs
Log:
2006-07-15 Marek Safar <[EMAIL PROTECTED]>
* annonymous.cs (AnonymousMethod.CreateScopeType): Fixed nested type
modifiers.
* rootcontext.cs (Reset): Add helper_classes.
Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog 2006-07-15 20:01:22 UTC (rev 62645)
+++ trunk/mcs/gmcs/ChangeLog 2006-07-15 20:06:12 UTC (rev 62646)
@@ -1,5 +1,11 @@
2006-07-15 Marek Safar <[EMAIL PROTECTED]>
+ * annonymous.cs (AnonymousMethod.CreateScopeType): Fixed nested type
+ modifiers.
+ * rootcontext.cs (Reset): Add helper_classes.
+
+2006-07-15 Marek Safar <[EMAIL PROTECTED]>
+
A fix for #78860
* statement.cs (Switch.SimpleSwitchEmit): Handle case null at any
position
correctly.
Modified: trunk/mcs/gmcs/anonymous.cs
===================================================================
--- trunk/mcs/gmcs/anonymous.cs 2006-07-15 20:01:22 UTC (rev 62645)
+++ trunk/mcs/gmcs/anonymous.cs 2006-07-15 20:06:12 UTC (rev 62646)
@@ -490,9 +490,9 @@
TypeBuilder container = ec.TypeContainer.TypeBuilder;
string name = String.Format ("<>AnonHelp<{0}>",
scope.id);
- scope.ScopeTypeBuilder = container.DefineNestedType (
- name, TypeAttributes.AutoLayout |
TypeAttributes.Class |
- TypeAttributes.NestedAssembly,
TypeManager.object_type, null);
+ scope.ScopeTypeBuilder = container.DefineNestedType
(name,
+ TypeAttributes.Sealed |
TypeAttributes.BeforeFieldInit | TypeAttributes.NestedPrivate,
+ TypeManager.object_type);
Type [] constructor_types = Type.EmptyTypes;
ConstructorBuilder ctor =
scope.ScopeTypeBuilder.DefineConstructor (
@@ -720,11 +720,6 @@
Pad ();
Console.WriteLine ("END");
}
-
- public string MakeHelperName ()
- {
- return String.Format ("<>AnonHelp<{0}>", id);
- }
private string MakeFieldName (string local_name)
{
Modified: trunk/mcs/gmcs/rootcontext.cs
===================================================================
--- trunk/mcs/gmcs/rootcontext.cs 2006-07-15 20:01:22 UTC (rev 62645)
+++ trunk/mcs/gmcs/rootcontext.cs 2006-07-15 20:06:12 UTC (rev 62646)
@@ -115,10 +115,11 @@
StrongNameDelaySign = false;
MainClass = null;
Target = Target.Exe;
- TargetExt = ".exe";
+ TargetExt = ".exe";
Version = LanguageVersion.Default;
Documentation = null;
impl_details_class = null;
+ helper_classes = null;
}
public static bool NeedsEntryPoint {
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2006-07-15 20:01:22 UTC (rev 62645)
+++ trunk/mcs/mcs/ChangeLog 2006-07-15 20:06:12 UTC (rev 62646)
@@ -1,5 +1,11 @@
2006-07-15 Marek Safar <[EMAIL PROTECTED]>
+ * annonymous.cs (AnonymousMethod.CreateScopeType): Fixed nested type
+ modifiers.
+ * rootcontext.cs (Reset): Add helper_classes.
+
+2006-07-15 Marek Safar <[EMAIL PROTECTED]>
+
A fix for #78860
* statement.cs (Switch.SimpleSwitchEmit): Handle case null at any
position
correctly.
Modified: trunk/mcs/mcs/anonymous.cs
===================================================================
--- trunk/mcs/mcs/anonymous.cs 2006-07-15 20:01:22 UTC (rev 62645)
+++ trunk/mcs/mcs/anonymous.cs 2006-07-15 20:06:12 UTC (rev 62646)
@@ -440,9 +440,9 @@
TypeBuilder container = ec.TypeContainer.TypeBuilder;
string name = String.Format ("<>AnonHelp<{0}>",
scope.id);
- scope.ScopeTypeBuilder = container.DefineNestedType (
- name, TypeAttributes.AutoLayout |
TypeAttributes.Class |
- TypeAttributes.NestedAssembly,
TypeManager.object_type, null);
+ scope.ScopeTypeBuilder = container.DefineNestedType
(name,
+ TypeAttributes.Sealed |
TypeAttributes.BeforeFieldInit | TypeAttributes.NestedPrivate,
+ TypeManager.object_type);
Type [] constructor_types = Type.EmptyTypes;
scope.ScopeConstructor =
scope.ScopeTypeBuilder.DefineConstructor (
@@ -646,11 +646,6 @@
Pad ();
Console.WriteLine ("END");
}
-
- public string MakeHelperName ()
- {
- return String.Format ("<>AnonHelp<{0}>", id);
- }
private string MakeFieldName (string local_name)
{
Modified: trunk/mcs/mcs/rootcontext.cs
===================================================================
--- trunk/mcs/mcs/rootcontext.cs 2006-07-15 20:01:22 UTC (rev 62645)
+++ trunk/mcs/mcs/rootcontext.cs 2006-07-15 20:06:12 UTC (rev 62646)
@@ -113,10 +113,11 @@
StrongNameDelaySign = false;
MainClass = null;
Target = Target.Exe;
- TargetExt = ".exe";
+ TargetExt = ".exe";
Version = LanguageVersion.Default;
Documentation = null;
impl_details_class = null;
+ helper_classes = null;
}
public static bool NeedsEntryPoint {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
