Added JSProxyMemberPolicy.ReplaceAll. Reordered enum so that it match…

…es default values (when querying attribute through Mono.Cecil).
sq · Aug 15, 2012 · ef8b1b6 · ef8b1b6
1 parent 2d9ff21
commit ef8b1b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/JSIL/TypeInformation.cs b/JSIL/TypeInformation.cs
@@ -626,6 +626,15 @@ public TypeInfo (ITypeInfoSource source, ModuleInfo module, TypeDefinition type,
                     escInfo.ForcedNewName = name;
                     ExtraStaticConstructors.Add(escInfo);
                 }
+
+                if (proxy.MemberPolicy == JSProxyMemberPolicy.ReplaceAll) {
+                    var previousMembers = Members.ToArray();
+                    Members.Clear();
+                    foreach (var member in previousMembers) {
+                        if (member.Value.IsFromProxy)
+                            Members.TryAdd(member.Key, member.Value);
+                    }
+                }
             }
         }
 
@@ -761,7 +770,9 @@ protected bool BeforeAddProxyMember<T> (ProxyInfo proxy, T member, out IMemberIn
                     ((owningMember != null) && (owningMember.CustomAttributes.Any(ShouldNeverReplace)))
                 ) {
                     return true;
-                } else if (proxy.MemberPolicy == JSProxyMemberPolicy.ReplaceDeclared) {
+                } else if (
+                           proxy.MemberPolicy == JSProxyMemberPolicy.ReplaceDeclared ||
+                           proxy.MemberPolicy == JSProxyMemberPolicy.ReplaceAll) {
                     if (result.IsFromProxy)
                         Debug.WriteLine(String.Format("Warning: Proxy member '{0}' replacing proxy member '{1}'.", member, result));
 

diff --git a/Meta/Proxies.cs b/Meta/Proxies.cs
@@ -6,7 +6,8 @@
 namespace JSIL.Proxy {
     public enum JSProxyMemberPolicy {
         ReplaceDeclared,
-        ReplaceNone
+        ReplaceNone,
+        ReplaceAll
     }
 
     public enum JSProxyAttributePolicy {
@@ -15,8 +16,8 @@ public enum JSProxyAttributePolicy {
     }
 
     public enum JSProxyInterfacePolicy {
-        ReplaceNone,
         ReplaceDeclared,
+        ReplaceNone,
         ReplaceAll
     }