From: Juerg Billeter <j@bitron.ch>
Date: Sat, 10 May 2008 16:22:50 +0000 (+0000)
Subject: Fix `namespace Foo.Bar {...}' parsing, fixes bug 531379
X-Git-Tag: VALA_0_3_2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aec1f216a79cb311c0603671ffc48bf72f050e44;p=thirdparty%2Fvala.git

Fix `namespace Foo.Bar {...}' parsing, fixes bug 531379

2008-05-10  Juerg Billeter  <j@bitron.ch>

	* vala/valaparser.vala:

	Fix `namespace Foo.Bar {...}' parsing, fixes bug 531379

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

diff --git a/ChangeLog b/ChangeLog
index 5c08f11fa..edeec6f94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-10  Jürg Billeter  <j@bitron.ch>
+
+	* vala/valaparser.vala:
+
+	Fix `namespace Foo.Bar {...}' parsing, fixes bug 531379
+
 2008-05-10  Jürg Billeter  <j@bitron.ch>
 
 	* vala/valaattributeprocessor.vala:
diff --git a/vala/valaparser.vala b/vala/valaparser.vala
index 1c58da89d..36462e90c 100644
--- a/vala/valaparser.vala
+++ b/vala/valaparser.vala
@@ -1801,7 +1801,15 @@ public class Vala.Parser : CodeVisitor {
 		var ns = new Namespace (sym.name, get_src_com (begin));
 		set_attributes (ns, attrs);
 		parse_declarations (ns);
-		return ns;
+
+		Namespace result = ns;
+		while (sym.inner != null) {
+			sym = sym.inner;
+			ns = new Namespace (sym.name, result.source_reference);
+			ns.add_namespace ((Namespace) result);
+			result = ns;
+		}
+		return result;
 	}
 
 	void parse_namespace_member (Namespace ns) throws ParseError {