add support for pointer member access

2007-12-20  Juerg Billeter  <j@bitron.ch>

	* vala/parser.y, vala/scanner.l, vala/valacodecontext.vala,
	  vala/valadatatype.vala, vala/valamemberaccess.vala,
	  vala/valapointertype.vala, vala/valasemanticanalyzer.vala,
	  gobject/valadbusbindingprovider.vala: add support for pointer member
	  access

svn path=/trunk/; revision=782

diff --git a/ChangeLog b/ChangeLog
index d37c3e6b55d087bdba166ba4e5ee89aa2b2c9a34..cf9e965e9578d0f659d9b0e23fb6538649347949 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-20  Jürg Billeter  <j@bitron.ch>
+
+       * vala/parser.y, vala/scanner.l, vala/valacodecontext.vala,
+         vala/valadatatype.vala, vala/valamemberaccess.vala,
+         vala/valapointertype.vala, vala/valasemanticanalyzer.vala,
+         gobject/valadbusbindingprovider.vala: add support for pointer member
+         access
+
 2007-12-18  Jürg Billeter  <j@bitron.ch>
 
        * vapi/sqlite3.vapi: some enhancements to the SQLite bindings

diff --git a/gobject/valadbusbindingprovider.vala b/gobject/valadbusbindingprovider.vala
index 7e8b4029952255fba1cc7692ca1b24f798b25214..2ff2c0a5ca856e7700aa7a60f5b65983ca4f9b36 100644 (file)
--- a/gobject/valadbusbindingprovider.vala
+++ b/gobject/valadbusbindingprovider.vala
@@ -60,7 +60,7 @@ public class Vala.DBusBindingProvider : Object, BindingProvider {
                        Iterator<DataType> type_args_it = type_args.iterator ();
                        type_args_it.next ();
                        var ret_type = type_args_it.get ().copy ();
-                       if (!is_dbus_interface (ret_type.data_type)) {
+                       if (!is_dbus_interface (ret_type)) {
                                return null;
                        }
                        var m = _context.create_method ("get_object", ret_type, ma.source_reference);
@@ -72,7 +72,7 @@ public class Vala.DBusBindingProvider : Object, BindingProvider {
                        m.add_parameter (_context.create_formal_parameter ("path", string_type_ref));
                        symbols.add (m);
                        return m;
-               } else if (ma.inner != null && ma.inner.static_type != null && is_dbus_interface (ma.inner.static_type.data_type)) {
+               } else if (ma.inner != null && ma.inner.static_type != null && is_dbus_interface (ma.inner.static_type)) {
                        if (ma.parent_node is InvocationExpression) {
                                var expr = (InvocationExpression) ma.parent_node;
                                var ret_type = new DataType ();
@@ -104,11 +104,11 @@ public class Vala.DBusBindingProvider : Object, BindingProvider {
                return null;
        }
 
-       private bool is_dbus_interface (Typesymbol! t) {
-               if (!(t is Interface)) {
+       private bool is_dbus_interface (DataType! t) {
+               if (!(t.data_type is Interface)) {
                        return false;
                }
-               return (t.get_attribute ("DBusInterface") != null);
+               return (t.data_type.get_attribute ("DBusInterface") != null);
        }
 }
 

diff --git a/vala/parser.y b/vala/parser.y
index 191c37e7deb9e4f6b988ec8b5b9f97e55a021be7..a33cb2677cf24e06178bbb77655f7b244d05937b 100644 (file)
--- a/vala/parser.y
+++ b/vala/parser.y
@@ -145,6 +145,8 @@ static gboolean check_is_struct (ValaSymbol *symbol, ValaSourceReference *src);
 %token OP_AND "&&"
 %token TILDE "~"
 
+%token OP_PTR "->"
+
 %token ASSIGN "="
 %token PLUS "+"
 %token MINUS "-"
@@ -238,6 +240,7 @@ static gboolean check_is_struct (ValaSymbol *symbol, ValaSourceReference *src);
 %type <expression> simple_name
 %type <expression> parenthesized_expression
 %type <expression> member_access
+%type <expression> pointer_member_access
 %type <expression> invocation_expression
 %type <expression> element_access
 %type <list> expression_list
@@ -715,6 +718,7 @@ primary_no_array_creation_expression
        | simple_name
        | parenthesized_expression
        | member_access
+       | pointer_member_access
        | invocation_expression
        | element_access
        | this_access
@@ -780,6 +784,26 @@ member_access
          }
        ;
 
+pointer_member_access
+       : primary_expression OP_PTR identifier opt_type_argument_list
+         {
+               ValaSourceReference *src = src(@3);
+               $$ = VALA_EXPRESSION (vala_code_context_create_member_access_pointer (context, $1, $3, src));
+               g_object_unref ($1);
+               g_free ($3);
+               g_object_unref (src);
+
+               if ($4 != NULL) {
+                       GList *l;
+                       for (l = $4; l != NULL; l = l->next) {
+                               vala_member_access_add_type_argument (VALA_MEMBER_ACCESS ($$), l->data);
+                               g_object_unref (l->data);
+                       }
+                       g_list_free ($4);
+               }
+         }
+       ;
+
 invocation_expression
        : primary_expression open_parens opt_argument_list CLOSE_PARENS
          {

diff --git a/vala/scanner.l b/vala/scanner.l
index 80bafc1e47eb3b262ea36d3e0fe5bdb8120dcd04..cb9ac8eb089749272e3931ef6ddfa4664a5d703a 100644 (file)
--- a/vala/scanner.l
+++ b/vala/scanner.l
@@ -120,6 +120,8 @@ literal                             ({integer_literal}|{real_literal}|{character_literal}|{string_literal
 "^"            { uploc; return CARRET; }
 "~"            { uploc; return TILDE; }
 
+"->"           { uploc; return OP_PTR; }
+
 "="            { uploc; return ASSIGN; }
 "+"            { uploc; return PLUS; }
 "-"            { uploc; return MINUS; }

diff --git a/vala/valacodecontext.vala b/vala/valacodecontext.vala
index 75b228137563dd1e591635a2a4b1843332d92c3f..0feb6aff99dcc6095133ab9b162a2ebf8ee58ad3 100644 (file)
--- a/vala/valacodecontext.vala
+++ b/vala/valacodecontext.vala
@@ -681,6 +681,12 @@ public class Vala.CodeContext : Object {
                return node;
        }
 
+       public MemberAccess! create_member_access_pointer (Expression inner, string! member_name, SourceReference source_reference = null) {
+               var node = new MemberAccess.pointer (inner, member_name, source_reference);
+               node.code_binding = codegen.create_member_access_binding (node);
+               return node;
+       }
+
        public InvocationExpression! create_invocation_expression (Expression! call, SourceReference source_reference = null) {
                var node = new InvocationExpression (call, source_reference);
                node.code_binding = codegen.create_invocation_expression_binding (node);

diff --git a/vala/valadatatype.vala b/vala/valadatatype.vala
index 1260a77289a4ca902b64246de7932850def684c0..58e97710eb6449c03416c0cf0949dec9b74ba3d7 100644 (file)
--- a/vala/valadatatype.vala
+++ b/vala/valadatatype.vala
@@ -456,4 +456,8 @@ public class Vala.DataType : CodeNode {
                }
                return symbols;
        }
+
+       public virtual Symbol get_pointer_member (string member_name) {
+               return null;
+       }
 }

diff --git a/vala/valamemberaccess.vala b/vala/valamemberaccess.vala
index 5a2d468556574d10c5dc5dc50987913415f5d7d0..59fcb300db213b87e274261162181dd6665fbe08 100644 (file)
--- a/vala/valamemberaccess.vala
+++ b/vala/valamemberaccess.vala
@@ -47,6 +47,11 @@ public class Vala.MemberAccess : Expression {
         */
        public string! member_name { get; set; }
 
+       /**
+        * Pointer member access.
+        */
+       public bool pointer_member_access { get; set; }
+
        /**
         * Represents access to an instance member without an actual instance,
         * e.g. `MyClass.an_instance_method`.
@@ -74,7 +79,11 @@ public class Vala.MemberAccess : Expression {
 
        public MemberAccess.simple (construct string! member_name, construct SourceReference source_reference = null) {
        }
-       
+
+       public MemberAccess.pointer (construct Expression inner, construct string! member_name, construct SourceReference source_reference = null) {
+               pointer_member_access = true;
+       }
+
        /**
         * Appends the specified type as generic type argument.
         *

diff --git a/vala/valapointertype.vala b/vala/valapointertype.vala
index 9851a2a8d2eb90c0287ad02f406c981188befd5b..c54bd71d672ff9b24b1161e6ea0db1d8111278ba 100644 (file)
--- a/vala/valapointertype.vala
+++ b/vala/valapointertype.vala
@@ -62,4 +62,14 @@ public class Vala.PointerType : DataType {
 
                return false;
        }
+
+       public override Symbol get_pointer_member (string member_name) {
+               Symbol base_symbol = base_type.data_type;
+
+               if (base_symbol == null) {
+                       return null;
+               }
+
+               return SemanticAnalyzer.symbol_lookup_inherited (base_symbol, member_name);
+       }
 }

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 1362ff9998735f3c13c09e10a1426ac839dc9c28..43ce031d543d1f65569d3b91e028d70f15b64df6 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -1333,8 +1333,12 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                        }
 
                        if (expr.symbol_reference == null && expr.inner.static_type != null) {
-                               base_symbol = expr.inner.static_type.data_type;
-                               expr.symbol_reference = symbol_lookup_inherited (base_symbol, expr.member_name);
+                               if (expr.pointer_member_access) {
+                                       expr.symbol_reference = expr.inner.static_type.get_pointer_member (expr.member_name);
+                               } else {
+                                       base_symbol = expr.inner.static_type.data_type;
+                                       expr.symbol_reference = symbol_lookup_inherited (base_symbol, expr.member_name);
+                               }
                                if (expr.symbol_reference != null) {
                                        // inner expression is variable, field, or parameter
                                        // access to instance members of the corresponding type possible
@@ -1602,7 +1606,7 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
                                return null;
                        }
                        foreach (DataType base_type in base_types) {
-                               if (SemanticAnalyzer.symbol_lookup_inherited (base_type.data_type, generic_member.name) != null) {
+                               if (symbol_lookup_inherited (base_type.data_type, generic_member.name) != null) {
                                        // construct a new type reference for the base type with correctly linked type arguments
                                        ReferenceType instance_base_type;
                                        if (base_type.data_type is Class) {