vala: Don't ignore qualified parent when inferring type of enum member

Regression of 33c91a04f758c89f0402994a6df894e6c2032def

https://bugzilla.gnome.org/show_bug.cgi?id=666035

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7f10b16065163c6b576c2b3e509e8c217066ce92..89c878d47ab926848124233ffb3b5ce856f88f53 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -193,6 +193,8 @@ TESTS = \
        enums/flags.vala \
        enums/no_gtype_to_string.vala \
        enums/bug666035.vala \
+       enums/bug666035-1.test \
+       enums/bug666035-2.test \
        enums/bug673879.vala \
        enums/bug763831.vala \
        enums/bug780050.vala \

diff --git a/tests/enums/bug666035-1.test b/tests/enums/bug666035-1.test
new file mode 100644 (file)
index 0000000..487254e
--- /dev/null
+++ b/tests/enums/bug666035-1.test
@@ -0,0 +1,5 @@
+Invalid Code
+
+void main () {
+       GLib.BindingFlags foo = GLib.Binding.SYNC_CREATE;
+}

diff --git a/tests/enums/bug666035-2.test b/tests/enums/bug666035-2.test
new file mode 100644 (file)
index 0000000..fb4c783
--- /dev/null
+++ b/tests/enums/bug666035-2.test
@@ -0,0 +1,9 @@
+Invalid Code
+
+void main () {
+       GLib.BindingFlags foo = 0;
+
+       switch (foo) {
+               case GLib.Binding.SYNC_CREATE: break;
+       }
+}

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index e148fa27691f0e02e7e3e54d37203f7b6dbce551..8fd60db56c140d658d019da87f36711beeda7610 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -450,7 +450,7 @@ public class Vala.MemberAccess : Expression {
                }
 
                // enum-type inference
-               if (symbol_reference == null && target_type != null && target_type.data_type is Enum) {
+               if (inner == null && symbol_reference == null && target_type != null && target_type.data_type is Enum) {
                        var enum_type = (Enum) target_type.data_type;
                        foreach (var val in enum_type.get_values ()) {
                                if (member_name == val.name) {