vala r1678 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Mon Jul  7 09:52:40 2008
New Revision: 1678
URL: http://svn.gnome.org/viewvc/vala?rev=1678&view=rev

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

	* vala/valasemanticanalyzer.vala:

	Allow non-external methods in VAPI files


Modified:
   trunk/ChangeLog
   trunk/vala/valasemanticanalyzer.vala

Modified: trunk/vala/valasemanticanalyzer.vala
==============================================================================
--- trunk/vala/valasemanticanalyzer.vala	(original)
+++ trunk/vala/valasemanticanalyzer.vala	Mon Jul  7 09:52:40 2008
@@ -457,9 +457,9 @@
 
 		if (m.is_abstract && m.body != null) {
 			Report.error (m.source_reference, "Abstract methods cannot have bodies");
-		} else if ((m.external || current_source_file.external_package) && m.body != null) {
+		} else if (m.external && m.body != null) {
 			Report.error (m.source_reference, "Extern methods cannot have bodies");
-		} else if (!m.is_abstract && !m.external && !current_source_file.external_package && m.body == null) {
+		} else if (!m.is_abstract && !m.external && m.body == null) {
 			Report.error (m.source_reference, "Non-abstract, non-extern methods must have bodies");
 		}