Allow non-external methods in VAPI files

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

	* vala/valasemanticanalyzer.vala:

	Allow non-external methods in VAPI files

svn path=/trunk/; revision=1678

diff --git a/ChangeLog b/ChangeLog
index 87472f9..790e0c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-07  Jürg Billeter  <j@bitron.ch>
+
+       * vala/valasemanticanalyzer.vala:
+
+       Allow non-external methods in VAPI files
+
 2008-07-05  Jürg Billeter  <j@bitron.ch>
 
        * vala/valaattributeprocessor.vala:

diff --git a/vala/valasemanticanalyzer.vala b/vala/valasemanticanalyzer.vala
index 2911b09..16cf2ec 100644 (file)
--- a/vala/valasemanticanalyzer.vala
+++ b/vala/valasemanticanalyzer.vala
@@ -457,9 +457,9 @@ public class Vala.SemanticAnalyzer : CodeVisitor {
 
                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");
                }