vala r2405 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Tue Jan 27 20:09:35 2009
New Revision: 2405
URL: http://svn.gnome.org/viewvc/vala?rev=2405&view=rev

Log:
2009-01-27  JÃrg Billeter  <j bitron ch>

	* vala/valacodewriter.vala:
	* vala/valamethod.vala:

	Add overriding members to .vapi files, fixes bug 569219


Modified:
   trunk/ChangeLog
   trunk/vala/valacodewriter.vala
   trunk/vala/valamethod.vala

Modified: trunk/vala/valacodewriter.vala
==============================================================================
--- trunk/vala/valacodewriter.vala	(original)
+++ trunk/vala/valacodewriter.vala	Tue Jan 27 20:09:35 2009
@@ -813,7 +813,7 @@
 		}
 
 		// don't write interface implementation unless it's an abstract or virtual method
-		if (!check_accessibility (m) || m.overrides || (m.base_interface_method != null && !m.is_abstract && !m.is_virtual)) {
+		if (!check_accessibility (m) || (m.base_interface_method != null && !m.is_abstract && !m.is_virtual)) {
 			if (!dump_tree) {
 				return;
 			}
@@ -910,6 +910,8 @@
 			write_string ("abstract ");
 		} else if (m.is_virtual) {
 			write_string ("virtual ");
+		} else if (m.overrides) {
+			write_string ("override ");
 		}
 		
 		if (!(m is CreationMethod)) {
@@ -933,7 +935,7 @@
 	}
 
 	public override void visit_property (Property prop) {
-		if (!check_accessibility (prop) || prop.overrides || (prop.base_interface_property != null && !prop.is_abstract && !prop.is_virtual)) {
+		if (!check_accessibility (prop) || (prop.base_interface_property != null && !prop.is_abstract && !prop.is_virtual)) {
 			return;
 		}
 
@@ -951,6 +953,8 @@
 			write_string ("abstract ");
 		} else if (prop.is_virtual) {
 			write_string ("virtual ");
+		} else if (prop.overrides) {
+			write_string ("override ");
 		}
 
 		write_type (prop.property_type);

Modified: trunk/vala/valamethod.vala
==============================================================================
--- trunk/vala/valamethod.vala	(original)
+++ trunk/vala/valamethod.vala	Tue Jan 27 20:09:35 2009
@@ -526,16 +526,11 @@
 		}
 
 		if (parent_symbol is Class) {
-			/* VAPI classes don't specify overridden methods */
-			if (!parent_symbol.external_package) {
-				if (!(this is CreationMethod)) {
-					find_base_interface_method ((Class) parent_symbol);
-					if (is_virtual || is_abstract || overrides) {
-						find_base_class_method ((Class) parent_symbol);
-					}
+			if (!(this is CreationMethod)) {
+				find_base_interface_method ((Class) parent_symbol);
+				if (is_virtual || is_abstract || overrides) {
+					find_base_class_method ((Class) parent_symbol);
 				}
-			} else if (is_virtual || is_abstract) {
-				_base_method = this;
 			}
 		} else if (parent_symbol is Interface) {
 			if (is_virtual || is_abstract) {