From: Jürg Billeter <j@bitron.ch>
Date: Sun, 8 Feb 2009 22:04:55 +0000 (+0000)
Subject: Drop experimental support for partial classes
X-Git-Tag: 0.5.7~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0382af24a04f4e2b2e2bdbb2ce99eaeec6fbf45b;p=thirdparty%2Fvala.git

Drop experimental support for partial classes

2009-02-08  Jürg Billeter  <j@bitron.ch>

	* vala/valanamespace.vala:

	Drop experimental support for partial classes

svn path=/trunk/; revision=2423
---

diff --git a/ChangeLog b/ChangeLog
index bc548ff27..52601084a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-08  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valanamespace.vala:
+
+	Drop experimental support for partial classes
+
 2009-02-04  Jürg Billeter  <j@bitron.ch>
 
 	* vapi/posix.vapi:
diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala
index ac8623bb9..a113381a5 100644
--- a/vala/valanamespace.vala
+++ b/vala/valanamespace.vala
@@ -124,30 +124,8 @@ public class Vala.Namespace : Symbol {
 			cl.access = SymbolAccessibility.INTERNAL;
 		}
 
-		if (scope.lookup (cl.name) is Class) {
-			// merge
-			var old_class = (Class) scope.lookup (cl.name);
-			foreach (DataType base_type in cl.get_base_types ()) {
-				old_class.add_base_type (base_type);
-			}
-			foreach (Field f in cl.get_fields ()) {
-				old_class.add_field (f);
-			}
-			foreach (Method m in cl.get_methods ()) {
-				if (m == cl.default_construction_method && old_class.default_construction_method != null) {
-					// ignore secondary default creation method
-					continue;
-				}
-				old_class.add_method (m);
-			}
-			if (cl.constructor != null) {
-				old_class.constructor = cl.constructor;
-			}
-			cl.source_reference.file.remove_node (cl);
-		} else {
-			classes.add (cl);
-			scope.add (cl.name, cl);
-		}
+		classes.add (cl);
+		scope.add (cl.name, cl);
 	}
 
 	/**