Author: marek
Date: 2008-02-18 05:48:37 -0500 (Mon, 18 Feb 2008)
New Revision: 96042
Modified:
trunk/mcs/mcs/ChangeLog
trunk/mcs/mcs/attribute.cs
trunk/mcs/mcs/class.cs
trunk/mcs/mcs/ecore.cs
trunk/mcs/mcs/expression.cs
trunk/mcs/mcs/generic.cs
trunk/mcs/mcs/support.cs
trunk/mcs/mcs/typemanager.cs
Log:
2008-02-18 Marek Safar <[EMAIL PROTECTED]>
* generic.cs (TypeParameter): Cache attribute target name.
* support.cs: Removed unused variable.
* typemanager.cs: Removed debugging leftover.
* ecore.cs: Use local type instead of a property;
* class.cs (VerifyMembers): Consider also parent to test whether type
member
is local or public.
* expression.cs (FullMethodDesc): Removed.
* attribute.cs (IsValidArgumentType): Made static.
Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/ChangeLog 2008-02-18 10:48:37 UTC (rev 96042)
@@ -1,3 +1,20 @@
+2008-02-18 Marek Safar <[EMAIL PROTECTED]>
+
+ * generic.cs (TypeParameter): Cache attribute target name.
+
+ * support.cs: Removed unused variable.
+
+ * typemanager.cs: Removed debugging leftover.
+
+ * ecore.cs: Use local type instead of a property;
+
+ * class.cs (VerifyMembers): Consider also parent to test whether type
member
+ is local or public.
+
+ * expression.cs (FullMethodDesc): Removed.
+
+ * attribute.cs (IsValidArgumentType): Made static.
+
2008-02-17 Raja R Harinath <[EMAIL PROTECTED]>
Cleanup to be more readable.
Modified: trunk/mcs/mcs/attribute.cs
===================================================================
--- trunk/mcs/mcs/attribute.cs 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/attribute.cs 2008-02-18 10:48:37 UTC (rev 96042)
@@ -293,7 +293,7 @@
return LeftExpr == null ? Identifier :
LeftExpr.GetSignatureForError () + "." + Identifier;
}
- bool IsValidArgumentType (Type t)
+ static bool IsValidArgumentType (Type t)
{
if (t.IsArray)
t = t.GetElementType ();
Modified: trunk/mcs/mcs/class.cs
===================================================================
--- trunk/mcs/mcs/class.cs 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/class.cs 2008-02-18 10:48:37 UTC (rev 96042)
@@ -2293,9 +2293,14 @@
CheckMemberUsage (constants, "constant");
if (fields != null){
+ bool is_type_exposed = Kind ==
Kind.Struct || IsExposedFromAssembly ();
foreach (FieldBase f in fields) {
- if ((f.ModFlags &
Modifiers.Accessibility) != Modifiers.PRIVATE)
- continue;
+ if ((f.ModFlags &
Modifiers.Accessibility) != Modifiers.PRIVATE) {
+ if (is_type_exposed)
+ continue;
+
+ f.SetMemberIsUsed ();
+ }
if (!f.IsUsed){
if ((f.caching_flags &
Flags.IsAssigned) == 0)
Modified: trunk/mcs/mcs/ecore.cs
===================================================================
--- trunk/mcs/mcs/ecore.cs 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/ecore.cs 2008-02-18 10:48:37 UTC (rev 96042)
@@ -347,9 +347,9 @@
if (TypeManager.IsGenericParameter (Type) &&
TypeManager.IsGenericParameter (target) && type.Name == target.Name) {
#if GMCS_SOURCE
- string sig1 = Type.DeclaringMethod == null ?
- TypeManager.CSharpName
(Type.DeclaringType) :
- TypeManager.CSharpSignature
(Type.DeclaringMethod);
+ string sig1 = type.DeclaringMethod == null ?
+ TypeManager.CSharpName
(type.DeclaringType) :
+ TypeManager.CSharpSignature
(type.DeclaringMethod);
string sig2 = target.DeclaringMethod == null ?
TypeManager.CSharpName
(target.DeclaringType) :
TypeManager.CSharpSignature
(target.DeclaringMethod);
Modified: trunk/mcs/mcs/expression.cs
===================================================================
--- trunk/mcs/mcs/expression.cs 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/expression.cs 2008-02-18 10:48:37 UTC (rev 96042)
@@ -4289,23 +4289,6 @@
this.arguments_resolved = arguments_resolved;
}
- public static string FullMethodDesc (MethodBase mb)
- {
- if (mb == null)
- return "";
-
- StringBuilder sb;
- if (mb is MethodInfo) {
- sb = new StringBuilder (TypeManager.CSharpName
(((MethodInfo) mb).ReturnType));
- sb.Append (" ");
- }
- else
- sb = new StringBuilder ();
-
- sb.Append (TypeManager.CSharpSignature (mb));
- return sb.ToString ();
- }
-
public override Expression CreateExpressionTree (EmitContext ec)
{
ArrayList args = new ArrayList (Arguments.Count + 3);
Modified: trunk/mcs/mcs/generic.cs
===================================================================
--- trunk/mcs/mcs/generic.cs 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/generic.cs 2008-02-18 10:48:37 UTC (rev 96042)
@@ -604,6 +604,8 @@
/// </summary>
public class TypeParameter : MemberCore, IMemberContainer
{
+ static readonly string[] attribute_target = new string [] {
"type parameter" };
+
string name;
DeclSpace decl;
GenericConstraints gc;
@@ -872,13 +874,13 @@
public override AttributeTargets AttributeTargets {
get {
- return (AttributeTargets)
AttributeTargets.GenericParameter;
+ return AttributeTargets.GenericParameter;
}
}
public override string[] ValidAttributeTargets {
get {
- return new string [] { "type parameter" };
+ return attribute_target;
}
}
Modified: trunk/mcs/mcs/support.cs
===================================================================
--- trunk/mcs/mcs/support.cs 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/support.cs 2008-02-18 10:48:37 UTC (rev 96042)
@@ -472,7 +472,7 @@
while (value > buffer_start +
char_count){
pos = char_count+1;
- int p = Peek ();
+ Peek ();
}
pos = value - buffer_start;
}
Modified: trunk/mcs/mcs/typemanager.cs
===================================================================
--- trunk/mcs/mcs/typemanager.cs 2008-02-18 10:37:44 UTC (rev 96041)
+++ trunk/mcs/mcs/typemanager.cs 2008-02-18 10:48:37 UTC (rev 96042)
@@ -863,17 +863,11 @@
for (int i = 0; i < methods.Length; ++i) {
MethodBase method = (MethodBase) methods [i];
ParameterData pd = TypeManager.GetParameterData
(method);
- if (pd.Count != args.Length) {
- if (name == "SetCorlibTypeBuilders")
- Console.WriteLine
("XX");
+ if (pd.Count != args.Length)
continue;
- }
for (int ii = 0; ii < args.Length; ++ii) {
if (!IsEqual (pd.Types [ii], args
[ii])) {
- if (name ==
"SetCorlibTypeBuilders")
-
Console.WriteLine (pd.Types [ii].FullName);
-
method = null;
break;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
