vala: Recursively check for Version.deprecated attribute from bottom to top

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index 08b5b384e90f6354907dbc5f215ab15239b56a69..4360b4e60b7e5af389237c5754333a67fcca021d 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -921,7 +921,9 @@ public class Vala.MemberAccess : Expression {
                if (parent != member) {
                        member.used = true;
                }
-               member.version.check (context, source_reference);
+               if (!(parent_node is MemberAccess)) {
+                       member.version.check (context, source_reference);
+               }
 
                // FIXME Code duplication with MemberInitializer.check()
                if (access == SymbolAccessibility.PROTECTED && member.parent_symbol is TypeSymbol) {

diff --git a/vala/valaversionattribute.vala b/vala/valaversionattribute.vala
index aca09768e3ba4066eff20ac438273a906950e2c9..c7a63373be672eaa97927a8454c0b3bc9e480737 100644 (file)
--- a/vala/valaversionattribute.vala
+++ b/vala/valaversionattribute.vala
@@ -50,12 +50,21 @@ public class Vala.VersionAttribute {
         */
        public bool deprecated {
                get {
-                       if (_deprecated == null) {
+                       if (_deprecated != null) {
+                               return _deprecated;
+                       }
+                       if (symbol.has_attribute ("Version")
+                           // [Deprecated] is deprecated
+                           || symbol.has_attribute ("Deprecated")) {
                                _deprecated = symbol.get_attribute_bool ("Version", "deprecated", false)
                                        || symbol.has_attribute_argument ("Version", "deprecated_since")
                                        || symbol.has_attribute_argument ("Version", "replacement")
                                        // [Deprecated] is deprecated
                                        || symbol.has_attribute ("Deprecated");
+                       } else if (symbol.parent_symbol != null) {
+                               _deprecated = symbol.parent_symbol.version.deprecated;
+                       } else {
+                               _deprecated = false;
                        }
                        return _deprecated;
                }