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 09cbd850f2b4818b268625892341c8d692423b21..19f5f13307a84faf650120e088136741865346d6 100644 (file)
--- 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 d8f7f80c8d9678b541d1d57886cbb1bd434fb22e..fed7e26e6419d5e84bbedc1eb385c4e1ca04c075 100644 (file)
--- 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 d2e85282ae0d86361286d6c057a5aa01e6c95106..f3c07ac3ee0075ad3bdda7cfbd87a278ff8f7a4d 100644 (file)
--- 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) {