diff options
| author | Juerg Billeter <j@bitron.ch> | 2008-03-22 22:19:49 +0000 |
|---|---|---|
| committer | Jürg Billeter <juergbi@src.gnome.org> | 2008-03-22 22:19:49 +0000 |
| commit | 5ced550b24df3f99294755c6e1ca93f8cbdd43fa (patch) | |
| tree | e8a94f2cb45975f886f549d40c1df86426b7c7c7 /vala/valanamespace.vala | |
| parent | dd5ab7ea0e3cb6a726af787ad6b91b9e5727742b (diff) | |
| download | vala-5ced550b24df3f99294755c6e1ca93f8cbdd43fa.tar.gz | |
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
Diffstat (limited to 'vala/valanamespace.vala')
| -rw-r--r-- | vala/valanamespace.vala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vala/valanamespace.vala b/vala/valanamespace.vala index c08423fa7..9fd827fc8 100644 --- 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")) { |