summaryrefslogtreecommitdiff
path: root/vala/valanamespace.vala
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2009-02-08 22:04:55 +0000
committerJürg Billeter <juergbi@src.gnome.org>2009-02-08 22:04:55 +0000
commit0382af24a04f4e2b2e2bdbb2ce99eaeec6fbf45b (patch)
tree95c2866b1aabc10583b3c24c22c81a305d5b9040 /vala/valanamespace.vala
parent8b0dd8819f280f34beb4e8e91b62e5d468fbb8a8 (diff)
downloadvala-0382af24a04f4e2b2e2bdbb2ce99eaeec6fbf45b.tar.gz
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
Diffstat (limited to 'vala/valanamespace.vala')
-rw-r--r--vala/valanamespace.vala26
1 files changed, 2 insertions, 24 deletions
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);
}
/**