dova: Use simple . instead of -> for pointer member access

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index 2ada89a96d8e633f9d62c2f6363f94db8f8736ab..82570b002f150bd3fe7c9994728e48adaf0d8513 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -292,7 +292,7 @@ public class Vala.MemberAccess : Expression {
                                return false;
                        }
 
-                       if (pointer_member_access) {
+                       if (inner.value_type is PointerType) {
                                var pointer_type = inner.value_type as PointerType;
                                if (pointer_type != null && pointer_type.base_type is ValueType) {
                                        // transform foo->bar to (*foo).bar

diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index b5b85cf718cabd31b591e14008ae481f721bda1a..391bbb45388b7ea874b563ca53143e587797ed8c 100644 (file)
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -628,7 +628,11 @@ public class Vala.Parser : CodeVisitor {
                                expr = parse_member_access (begin, expr);
                                break;
                        case TokenType.OP_PTR:
-                               expr = parse_pointer_member_access (begin, expr);
+                               if (context.profile == Profile.DOVA) {
+                                       found = false;
+                               } else {
+                                       expr = parse_pointer_member_access (begin, expr);
+                               }
                                break;
                        case TokenType.OPEN_PARENS:
                                expr = parse_method_call (begin, expr);

diff --git a/vala/valapointertype.vala b/vala/valapointertype.vala
index d3203f461788ebc3cce71fa6770686faf362206f..f1b318d9a535e89d7143c7530182a1b46c436d03 100644 (file)
--- a/vala/valapointertype.vala
+++ b/vala/valapointertype.vala
@@ -94,6 +94,20 @@ public class Vala.PointerType : DataType {
                return false;
        }
 
+       public override Symbol? get_member (string member_name) {
+               if (CodeContext.get ().profile != Profile.DOVA) {
+                       return null;
+               }
+
+               Symbol base_symbol = base_type.data_type;
+
+               if (base_symbol == null) {
+                       return null;
+               }
+
+               return SemanticAnalyzer.symbol_lookup_inherited (base_symbol, member_name);
+       }
+
        public override Symbol? get_pointer_member (string member_name) {
                Symbol base_symbol = base_type.data_type;