Combine internal modules by inheritance to improve performance

2008-11-03  Jürg Billeter  <j@bitron.ch>

	* gobject/valaccodearraymodule.vala:
	* gobject/valaccodeassignmentmodule.vala:
	* gobject/valaccodedynamicpropertymodule.vala:
	* gobject/valaccodedynamicsignalmodule.vala:
	* gobject/valaccodegenerator.vala:
	* gobject/valaccodeinvocationexpressionmodule.vala:
	* gobject/valaccodememberaccessmodule.vala:
	* gobject/valaccodemethodmodule.vala:
	* gobject/valaccodestructmodule.vala:
	* gobject/valadbusclientmodule.vala:
	* gobject/valadbusservermodule.vala:
	* gobject/valagasyncmodule.vala:
	* gobject/valagobjectmodule.vala:
	* gobject/valagsignalmodule.vala:
	* gobject/valagtypemodule.vala:

	Combine internal modules by inheritance to improve performance

svn path=/trunk/; revision=1962

diff --git a/ChangeLog b/ChangeLog
index 56a799b3f6abfbba9d0dac809fb0cb88c47c07a4..e458f70250c8528481a5456dabd0ba5e504aacb0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-11-03  Jürg Billeter  <j@bitron.ch>
+
+       * gobject/valaccodearraymodule.vala:
+       * gobject/valaccodeassignmentmodule.vala:
+       * gobject/valaccodedynamicpropertymodule.vala:
+       * gobject/valaccodedynamicsignalmodule.vala:
+       * gobject/valaccodegenerator.vala:
+       * gobject/valaccodeinvocationexpressionmodule.vala:
+       * gobject/valaccodememberaccessmodule.vala:
+       * gobject/valaccodemethodmodule.vala:
+       * gobject/valaccodestructmodule.vala:
+       * gobject/valadbusclientmodule.vala:
+       * gobject/valadbusservermodule.vala:
+       * gobject/valagasyncmodule.vala:
+       * gobject/valagobjectmodule.vala:
+       * gobject/valagsignalmodule.vala:
+       * gobject/valagtypemodule.vala:
+
+       Combine internal modules by inheritance to improve performance
+
 2008-11-03  Jürg Billeter  <j@bitron.ch>
 
        * gobject/Makefile.am:

diff --git a/gobject/valaccodearraymodule.vala b/gobject/valaccodearraymodule.vala
index 04e43973b8d5e3cae7fc5c8dafb68b141dbff18a..585d405960f94444ab67dcde87614f24772a11e3 100644 (file)
--- a/gobject/valaccodearraymodule.vala
+++ b/gobject/valaccodearraymodule.vala
@@ -27,7 +27,7 @@ using Gee;
 /**
  * The link between an assignment and generated code.
  */
-public class Vala.CCodeArrayModule : CCodeModule {
+public class Vala.CCodeArrayModule : CCodeInvocationExpressionModule {
        public CCodeArrayModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valaccodeassignmentmodule.vala b/gobject/valaccodeassignmentmodule.vala
index b9ebb25767905c73df30a6651b619a855df90a79..0c7ca3d99ab5505fe7fc1e9e9daa7b93d5a0ec28 100644 (file)
--- a/gobject/valaccodeassignmentmodule.vala
+++ b/gobject/valaccodeassignmentmodule.vala
@@ -27,7 +27,7 @@ using Gee;
 /**
  * The link between an assignment and generated code.
  */
-public class Vala.CCodeAssignmentModule : CCodeModule {
+public class Vala.CCodeAssignmentModule : CCodeMemberAccessModule {
        public CCodeAssignmentModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valaccodedynamicpropertymodule.vala b/gobject/valaccodedynamicpropertymodule.vala
index 9490c68c90fb65376b95a9348b5525a6c517f35f..07fc68a4c17bacc3cef05e87a89c00f73274becc 100644 (file)
--- a/gobject/valaccodedynamicpropertymodule.vala
+++ b/gobject/valaccodedynamicpropertymodule.vala
@@ -26,7 +26,7 @@ using Gee;
 /**
  * The link between a dynamic property and generated code.
  */
-public class Vala.CCodeDynamicPropertyModule : CCodeModule {
+public class Vala.CCodeDynamicPropertyModule : CCodeArrayModule {
        int dynamic_property_id;
 
        public CCodeDynamicPropertyModule (CCodeGenerator codegen, CCodeModule? next) {

diff --git a/gobject/valaccodedynamicsignalmodule.vala b/gobject/valaccodedynamicsignalmodule.vala
index 81bfc93a1e53da57fcbcd3f49e9acd4de0b801a8..0053e11f3e361e969edf172601957934787bdc1d 100644 (file)
--- a/gobject/valaccodedynamicsignalmodule.vala
+++ b/gobject/valaccodedynamicsignalmodule.vala
@@ -26,7 +26,7 @@ using Gee;
 /**
  * The link between a dynamic signal and generated code.
  */
-public class Vala.CCodeDynamicSignalModule : CCodeModule {
+public class Vala.CCodeDynamicSignalModule : CCodeDynamicPropertyModule {
        public CCodeDynamicSignalModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valaccodegenerator.vala b/gobject/valaccodegenerator.vala
index 949209f39287b91e864cc4506f09e2175aac4d0e..c2d0ee55cec76867888e89fc3f53eeb1cc8cde6e 100644 (file)
--- a/gobject/valaccodegenerator.vala
+++ b/gobject/valaccodegenerator.vala
@@ -143,6 +143,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
        public Set<string> wrappers;
 
        public CCodeGenerator () {
+               /* included by inheritance
                head = new CCodeBaseModule (this, head);
                head = new CCodeStructModule (this, head);
                head = new CCodeMethodModule (this, head);
@@ -157,6 +158,7 @@ public class Vala.CCodeGenerator : CodeGenerator {
                head = new GSignalModule (this, head);
                head = new GAsyncModule (this, head);
                head = new DBusClientModule (this, head);
+               */
                head = new DBusServerModule (this, head);
 
                predefined_marshal_set = new HashSet<string> (str_hash, str_equal);

diff --git a/gobject/valaccodeinvocationexpressionmodule.vala b/gobject/valaccodeinvocationexpressionmodule.vala
index d571e67e35a0e24bc55d936270263b56c8244e76..1a73050cf23f31f133953a4ba59bf3d0f6cea627 100644 (file)
--- a/gobject/valaccodeinvocationexpressionmodule.vala
+++ b/gobject/valaccodeinvocationexpressionmodule.vala
@@ -24,7 +24,7 @@
 using GLib;
 using Gee;
 
-public class Vala.CCodeInvocationExpressionModule : CCodeModule {
+public class Vala.CCodeInvocationExpressionModule : CCodeAssignmentModule {
        public CCodeInvocationExpressionModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valaccodememberaccessmodule.vala b/gobject/valaccodememberaccessmodule.vala
index 6abac26233857e2d63973c1fc9643ee32dcb3214..5eda25be6b43df798c5b6b37318adb9986f2e3d7 100644 (file)
--- a/gobject/valaccodememberaccessmodule.vala
+++ b/gobject/valaccodememberaccessmodule.vala
@@ -23,7 +23,7 @@
 
 using GLib;
 
-public class Vala.CCodeMemberAccessModule : CCodeModule {
+public class Vala.CCodeMemberAccessModule : CCodeMethodModule {
        public CCodeMemberAccessModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valaccodemethodmodule.vala b/gobject/valaccodemethodmodule.vala
index dc0366d2e1acb8c689c08f0528545a08c180f7e2..56e9cf9270f84598e446c5619c28087647faa3fb 100644 (file)
--- a/gobject/valaccodemethodmodule.vala
+++ b/gobject/valaccodemethodmodule.vala
@@ -27,7 +27,7 @@ using Gee;
 /**
  * The link between a method and generated code.
  */
-public class Vala.CCodeMethodModule : CCodeModule {
+public class Vala.CCodeMethodModule : CCodeStructModule {
        public CCodeMethodModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valaccodestructmodule.vala b/gobject/valaccodestructmodule.vala
index 7615a76caf147d4ac54fa098eb9fb75328b1591d..39e5d53235594741af25b86255d05cb388661579 100644 (file)
--- a/gobject/valaccodestructmodule.vala
+++ b/gobject/valaccodestructmodule.vala
@@ -23,7 +23,7 @@
 
 using GLib;
 
-public class Vala.CCodeStructModule : CCodeModule {
+public class Vala.CCodeStructModule : CCodeBaseModule {
        public CCodeStructModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valadbusclientmodule.vala b/gobject/valadbusclientmodule.vala
index 51ebfccc38ad2a7c8daff26d19cbbd56686b477b..ca9ac48ed2baa3991bb365ba919bcaa16409296c 100644 (file)
--- a/gobject/valadbusclientmodule.vala
+++ b/gobject/valadbusclientmodule.vala
@@ -28,7 +28,7 @@ using Gee;
 /**
  * The link between a dynamic method and generated code.
  */
-public class Vala.DBusClientModule : CCodeModule {
+public class Vala.DBusClientModule : GAsyncModule {
        public DBusClientModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valadbusservermodule.vala b/gobject/valadbusservermodule.vala
index 13b26b9b0f89163a94eb5ae0cde8e746c155f6cb..f449af1576eb9f9aef80390d9a5086e5fea29fe4 100644 (file)
--- a/gobject/valadbusservermodule.vala
+++ b/gobject/valadbusservermodule.vala
@@ -28,7 +28,7 @@ using Gee;
 /**
  * The link between a dynamic method and generated code.
  */
-public class Vala.DBusServerModule : CCodeModule {
+public class Vala.DBusServerModule : DBusClientModule {
        public DBusServerModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valagasyncmodule.vala b/gobject/valagasyncmodule.vala
index 96ac8657b914ea37d91509620533fd0041e3fb1a..40775bd50f44eaccdde3a3220eb9b499bae2c969 100644 (file)
--- a/gobject/valagasyncmodule.vala
+++ b/gobject/valagasyncmodule.vala
@@ -23,7 +23,7 @@
 using GLib;
 using Gee;
 
-public class Vala.GAsyncModule : CCodeModule {
+public class Vala.GAsyncModule : GSignalModule {
        public GAsyncModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valagobjectmodule.vala b/gobject/valagobjectmodule.vala
index 64bcbefc5ddc2af731a1d1e5906f9a86aa4876a7..a9bc1347e6c3ab47f0d6486757d0aeff41025c91 100644 (file)
--- a/gobject/valagobjectmodule.vala
+++ b/gobject/valagobjectmodule.vala
@@ -23,7 +23,7 @@
 
 using GLib;
 
-public class Vala.GObjectModule : CCodeModule {
+public class Vala.GObjectModule : GTypeModule {
        public GObjectModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valagsignalmodule.vala b/gobject/valagsignalmodule.vala
index fec7c6b70261d84c9388ad56e32f4b0ce8fa6427..7277e47c6043efe51b7ab777f7b3bd44c1cd43e7 100644 (file)
--- a/gobject/valagsignalmodule.vala
+++ b/gobject/valagsignalmodule.vala
@@ -23,7 +23,7 @@
 
 using GLib;
 
-public class Vala.GSignalModule : CCodeModule {
+public class Vala.GSignalModule : GObjectModule {
        public GSignalModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }

diff --git a/gobject/valagtypemodule.vala b/gobject/valagtypemodule.vala
index f5a57e0ba4d5a66b75597542c18750c27f918a26..2a2ba8f8904a6e75fec56df84e0d70f51a205c50 100644 (file)
--- a/gobject/valagtypemodule.vala
+++ b/gobject/valagtypemodule.vala
@@ -23,7 +23,7 @@
 
 using GLib;
 
-public class Vala.GTypeModule : CCodeModule {
+public class Vala.GTypeModule : CCodeDynamicSignalModule {
        public GTypeModule (CCodeGenerator codegen, CCodeModule? next) {
                base (codegen, next);
        }