From: Jürg Billeter <j@bitron.ch>
Date: Fri, 16 Jan 2009 15:38:21 +0000 (+0000)
Subject: Use `internal' accessibility for namespace members by default
X-Git-Tag: VALA_0_5_6~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ddf50fca65f1ca9eebc4d24e3362b5e3bbf6f3a;p=thirdparty%2Fvala.git

Use `internal' accessibility for namespace members by default

2009-01-16  Jürg Billeter  <j@bitron.ch>

	* vala/valafield.vala:
	* vala/valaparser.vala:

	Use `internal' accessibility for namespace members by default

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

diff --git a/ChangeLog b/ChangeLog
index 09cbd850f..19f5f1330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-16  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valafield.vala:
+	* vala/valaparser.vala:
+
+	Use `internal' accessibility for namespace members by default
+
 2009-01-16  Jürg Billeter  <j@bitron.ch>
 
 	* tests/:
diff --git a/vala/valafield.vala b/vala/valafield.vala
index d8f7f80c8..fed7e26e6 100644
--- a/vala/valafield.vala
+++ b/vala/valafield.vala
@@ -294,12 +294,6 @@ public class Vala.Field : Member, Lockable {
 				analyzer.current_source_file.add_type_dependency (field_type, SourceFileDependencyType.HEADER_SHALLOW);
 			}
 		} else {
-			if (parent_symbol is Namespace) {
-				error = true;
-				Report.error (source_reference, "Namespaces may not have private members");
-				return false;
-			}
-
 			analyzer.current_source_file.add_type_dependency (field_type, SourceFileDependencyType.SOURCE);
 		}
 
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index d2e85282a..f3c07ac3e 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -1911,6 +1911,12 @@ public class Vala.Parser : CodeVisitor {
 
 	void parse_namespace_member (Namespace ns) throws ParseError {
 		var sym = parse_declaration ();
+
+		// namespaces do not support private memebers
+		if (sym.access == SymbolAccessibility.PRIVATE) {
+			sym.access = SymbolAccessibility.INTERNAL;
+		}
+
 		if (sym is Namespace) {
 			ns.add_namespace ((Namespace) sym);
 		} else if (sym is Class) {