vala r1892 - in trunk: . gobject vala

[juergbi svn gnome org]

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

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

	* vala/valacodegenerator.vala:
	* vala/valainvocationexpression.vala:
	* gobject/Makefile.am:
	* gobject/valaccodegenerator.vala:
	* gobject/valaccodeinvocationexpressionmodule.vala:
	* gobject/valaccodemodule.vala:

	Add CCodeInvocationExpressionModule


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

Modified: trunk/gobject/Makefile.am
==============================================================================
--- trunk/gobject/Makefile.am	(original)
+++ trunk/gobject/Makefile.am	Fri Oct 24 13:22:26 2008
@@ -24,7 +24,7 @@
 	valaccodegeneratorsignal.vala \
 	valaccodegeneratorsourcefile.vala \
 	valaccodegeneratorstruct.vala \
-	valaccodeinvocationexpressionbinding.vala \
+	valaccodeinvocationexpressionmodule.vala \
 	valaccodememberaccessmodule.vala \
 	valaccodemethodmodule.vala \
 	valaccodemodule.vala \

Modified: trunk/gobject/valaccodegenerator.vala
==============================================================================
--- trunk/gobject/valaccodegenerator.vala	(original)
+++ trunk/gobject/valaccodegenerator.vala	Fri Oct 24 13:22:26 2008
@@ -144,6 +144,7 @@
 		head = new CCodeBaseModule (this, head);
 		head = new CCodeMethodModule (this, head);
 		head = new CCodeMemberAccessModule (this, head);
+		head = new CCodeInvocationExpressionModule (this, head);
 		head = new CCodeArrayModule (this, head);
 		head = new GObjectModule (this, head);
 		head = new GObjectClassModule (this, head);
@@ -2826,7 +2827,7 @@
 	}
 
 	public override void visit_invocation_expression (InvocationExpression expr) {
-		code_binding (expr).emit ();
+		head.visit_invocation_expression (expr);
 	}
 
 	public string get_array_length_cname (string array_cname, int dim) {
@@ -4374,10 +4375,6 @@
 		return new CCodeDynamicSignalBinding (this, node);
 	}
 
-	public override CodeBinding? create_invocation_expression_binding (InvocationExpression node) {
-		return new CCodeInvocationExpressionBinding (this, node);
-	}
-
 	public override CodeBinding? create_element_access_binding (ElementAccess node) {
 		return new CCodeElementAccessBinding (this, node);
 	}

Copied: trunk/gobject/valaccodeinvocationexpressionmodule.vala (from r1889, /trunk/gobject/valaccodeinvocationexpressionbinding.vala)
==============================================================================
--- /trunk/gobject/valaccodeinvocationexpressionbinding.vala	(original)
+++ trunk/gobject/valaccodeinvocationexpressionmodule.vala	Fri Oct 24 13:22:26 2008
@@ -1,4 +1,4 @@
-/* valaccodeinvocationexpressionbinding.vala
+/* valaccodeinvocationexpressionmodule.vala
  *
  * Copyright (C) 2006-2008  JÃrg Billeter, Raffaele Sandrini
  *
@@ -24,17 +24,12 @@
 using GLib;
 using Gee;
 
-public class Vala.CCodeInvocationExpressionBinding : CCodeBinding {
-	public InvocationExpression invocation_expression { get; set; }
-
-	public CCodeInvocationExpressionBinding (CCodeGenerator codegen, InvocationExpression invocation_expression) {
-		this.invocation_expression = invocation_expression;
-		this.codegen = codegen;
+public class Vala.CCodeInvocationExpressionModule : CCodeModule {
+	public CCodeInvocationExpressionModule (CCodeGenerator codegen, CCodeModule? next) {
+		base (codegen, next);
 	}
 
-	public override void emit () {
-		var expr = invocation_expression;
-
+	public override void visit_invocation_expression (InvocationExpression expr) {
 		expr.accept_children (codegen);
 
 		// the bare function call

Modified: trunk/gobject/valaccodemodule.vala
==============================================================================
--- trunk/gobject/valaccodemodule.vala	(original)
+++ trunk/gobject/valaccodemodule.vala	Fri Oct 24 13:22:26 2008
@@ -72,6 +72,10 @@
 		next.visit_member_access (expr);
 	}
 
+	public virtual void visit_invocation_expression (InvocationExpression expr) {
+		next.visit_invocation_expression (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:22:26 2008
@@ -42,10 +42,6 @@
 		return null;
 	}
 
-	public virtual CodeBinding? create_invocation_expression_binding (InvocationExpression node) {
-		return null;
-	}
-
 	public virtual CodeBinding? create_element_access_binding (ElementAccess node) {
 		return null;
 	}

Modified: trunk/vala/valainvocationexpression.vala
==============================================================================
--- trunk/vala/valainvocationexpression.vala	(original)
+++ trunk/vala/valainvocationexpression.vala	Fri Oct 24 13:22:26 2008
@@ -120,8 +120,4 @@
 	public override bool is_pure () {
 		return false;
 	}
-
-	public override CodeBinding? create_code_binding (CodeGenerator codegen) {
-		return codegen.create_invocation_expression_binding (this);
-	}
 }