support nested namespaces, fixes bug 516584

2008-03-22  Juerg Billeter  <j@bitron.ch>

	* vala/parser.y, vala/valanamespace.vala: support nested namespaces,
	  fixes bug 516584

svn path=/trunk/; revision=1151

diff --git a/ChangeLog b/ChangeLog
index e7ae46950e5bed20d1d46511de4f8ef5b0b87509..537e7793c3f8bd88fc53b644408e542ad1dcc1df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-22  Jürg Billeter  <j@bitron.ch>
+
+       * vala/parser.y, vala/valanamespace.vala: support nested namespaces,
+         fixes bug 516584
+
 2008-03-22  Jürg Billeter  <j@bitron.ch>
 
        * ccode/valaccodedeclaration.vala, gobject/valaccodegenerator.vala:

diff --git a/vala/parser.y b/vala/parser.y
index dc1ab853d9a7668a78e5102ab5e1723b354f6121..9afa0acce75676539c7212aab8761b9be23a597d 100644 (file)
--- a/vala/parser.y
+++ b/vala/parser.y
@@ -2630,8 +2630,7 @@ outer_declarations
        ;
 
 outer_declaration
-       : namespace_declaration
-       | namespace_member_declaration
+       : namespace_member_declaration
        ;
 
 opt_namespace_member_declarations
@@ -2645,7 +2644,8 @@ namespace_member_declarations
        ;
 
 namespace_member_declaration
-       : class_declaration
+       : namespace_declaration
+       | class_declaration
        | struct_declaration
        | interface_declaration
        | enum_declaration

diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala
index c08423fa7d0d783f23ae1353b5dc6c7898155905..9fd827fc87463d6ef938947f06ec5df5026da5f5 100644 (file)
--- a/vala/valanamespace.vala
+++ b/vala/valanamespace.vala
@@ -260,7 +260,7 @@ public class Vala.Namespace : Symbol {
                if (cprefixes.size > 0) {
                        return cprefixes[0];
                } else if (null != name) {
-                       return name;
+                       return parent_symbol.get_cprefix () + name;
                } else {
                        return "";
                }
@@ -295,7 +295,7 @@ public class Vala.Namespace : Symbol {
                        if (name == null) {
                                lower_case_cprefix = "";
                        } else {
-                               lower_case_cprefix = "%s_".printf (camel_case_to_lower_case (name));
+                               lower_case_cprefix = "%s%s_".printf (parent_symbol.get_lower_case_cprefix (), camel_case_to_lower_case (name));
                        }
                }
                return lower_case_cprefix;
@@ -347,7 +347,7 @@ public class Vala.Namespace : Symbol {
        
        private void process_ccode_attribute (Attribute! a) {
                if (a.has_argument ("cprefix")) {
-                       foreach(string name in a.get_string ("cprefix").split (","))
+                       foreach (string name in a.get_string ("cprefix").split (","))
                                add_cprefix (name);
                }
                if (a.has_argument ("lower_case_cprefix")) {