vala r1891 - in trunk: . gobject vala

[juergbi svn gnome org]

Author: juergbi
Date: Fri Oct 24 13:17:10 2008
New Revision: 1891
URL: http://svn.gnome.org/viewvc/vala?rev=1891&view=rev

Log:
2008-10-24  JÃrg Billeter  <j bitron ch>

	* vala/valacodegenerator.vala:
	* vala/valamemberaccess.vala:
	* gobject/Makefile.am:
	* gobject/valaccodegenerator.vala:
	* gobject/valaccodememberaccessmodule.vala:
	* gobject/valaccodemodule.vala:

	Add CCodeMemberAccessModule


Added:
   trunk/gobject/valaccodememberaccessmodule.vala   (contents, props changed)
      - copied, changed from r1889, /trunk/gobject/valaccodememberaccessbinding.vala
Removed:
   trunk/gobject/valaccodememberaccessbinding.vala
Modified:
   trunk/ChangeLog
   trunk/gobject/Makefile.am
   trunk/gobject/valaccodegenerator.vala
   trunk/gobject/valaccodemodule.vala
   trunk/vala/valacodegenerator.vala
   trunk/vala/valamemberaccess.vala

Modified: trunk/gobject/Makefile.am
==============================================================================
--- trunk/gobject/Makefile.am	(original)
+++ trunk/gobject/Makefile.am	Fri Oct 24 13:17:10 2008
@@ -25,7 +25,7 @@
 	valaccodegeneratorsourcefile.vala \
 	valaccodegeneratorstruct.vala \
 	valaccodeinvocationexpressionbinding.vala \
-	valaccodememberaccessbinding.vala \
+	valaccodememberaccessmodule.vala \
 	valaccodemethodmodule.vala \
 	valaccodemodule.vala \
 	valaclassregisterfunction.vala \

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Fri Oct 24 13:17:10 2008
@@ -143,6 +143,7 @@
 	public CCodeGenerator () {
 		head = new CCodeBaseModule (this, head);
 		head = new CCodeMethodModule (this, head);
+		head = new CCodeMemberAccessModule (this, head);
 		head = new CCodeArrayModule (this, head);
 		head = new GObjectModule (this, head);
 		head = new GObjectClassModule (this, head);
@@ -2821,7 +2822,7 @@
 	}
 
 	public override void visit_member_access (MemberAccess expr) {
-		code_binding (expr).emit ();
+		head.visit_member_access (expr);
 	}
 
 	public override void visit_invocation_expression (InvocationExpression expr) {
@@ -4373,10 +4374,6 @@
 		return new CCodeDynamicSignalBinding (this, node);
 	}
 
-	public override CodeBinding? create_member_access_binding (MemberAccess node) {
-		return new CCodeMemberAccessBinding (this, node);
-	}
-
 	public override CodeBinding? create_invocation_expression_binding (InvocationExpression node) {
 		return new CCodeInvocationExpressionBinding (this, node);
 	}

Copied: trunk/gobject/valaccodememberaccessmodule.vala (from r1889, /trunk/gobject/valaccodememberaccessbinding.vala)
==============================================================================
--- /trunk/gobject/valaccodememberaccessbinding.vala	(original)
+++ trunk/gobject/valaccodememberaccessmodule.vala	Fri Oct 24 13:17:10 2008
@@ -1,4 +1,4 @@
-/* valaccodememberaccessbinding.vala
+/* valaccodememberaccessmodule.vala
  *
  * Copyright (C) 2006-2008  JÃrg Billeter, Raffaele Sandrini
  *
@@ -23,12 +23,9 @@
 
 using GLib;
 
-public class Vala.CCodeMemberAccessBinding : CCodeBinding {
-	public MemberAccess member_access { get; set; }
-
-	public CCodeMemberAccessBinding (CCodeGenerator codegen, MemberAccess member_access) {
-		this.member_access = member_access;
-		this.codegen = codegen;
+public class Vala.CCodeMemberAccessModule : CCodeModule {
+	public CCodeMemberAccessModule (CCodeGenerator codegen, CCodeModule? next) {
+		base (codegen, next);
 	}
 
 	private void process_cmember (MemberAccess expr, CCodeExpression? pub_inst, DataType? base_type) {
@@ -286,9 +283,7 @@
 		}
 	}
 
-	public override void emit () {
-		var expr = member_access;
-
+	public override void visit_member_access (MemberAccess expr) {
 		CCodeExpression pub_inst = null;
 		DataType base_type = null;
 	

Modified: trunk/gobject/valaccodemodule.vala
==============================================================================
--- trunk/gobject/valaccodemodule.vala	(original)
+++ trunk/gobject/valaccodemodule.vala	Fri Oct 24 13:17:10 2008
@@ -68,6 +68,10 @@
 		next.visit_creation_method (m);
 	}
 
+	public virtual void visit_member_access (MemberAccess expr) {
+		next.visit_member_access (expr);
+	}
+
 	public virtual void visit_array_creation_expression (ArrayCreationExpression expr) {
 		next.visit_array_creation_expression (expr);
 	}

Modified: trunk/vala/valacodegenerator.vala
==============================================================================
--- trunk/vala/valacodegenerator.vala	(original)
+++ trunk/vala/valacodegenerator.vala	Fri Oct 24 13:17:10 2008
@@ -42,10 +42,6 @@
 		return null;
 	}
 
-	public virtual CodeBinding? create_member_access_binding (MemberAccess node) {
-		return null;
-	}
-
 	public virtual CodeBinding? create_invocation_expression_binding (InvocationExpression node) {
 		return null;
 	}

Modified: trunk/vala/valamemberaccess.vala
==============================================================================
--- trunk/vala/valamemberaccess.vala	(original)
+++ trunk/vala/valamemberaccess.vala	Fri Oct 24 13:17:10 2008
@@ -158,10 +158,6 @@
 		}
 	}
 
-	public override CodeBinding? create_code_binding (CodeGenerator codegen) {
-		return codegen.create_member_access_binding (this);
-	}
-
 	public override bool is_constant () {
 		if (symbol_reference is Constant) {
 			return true;