summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuerg Billeter <j@bitron.ch>2008-03-23 19:34:45 +0000
committerJürg Billeter <juergbi@src.gnome.org>2008-03-23 19:34:45 +0000
commit93297a48cb7413ff6ca3ee189981e96475208290 (patch)
tree534fce7f12c351e97a9524c80a7e4c81a96919af
parent59df639426ad4c596e9bb8720b16e2ed68f4d5c8 (diff)
downloadvala-93297a48cb7413ff6ca3ee189981e96475208290.tar.gz
inherit default value from base type
2008-03-23 Juerg Billeter <j@bitron.ch> * vala/valastruct.vala: inherit default value from base type svn path=/trunk/; revision=1157
-rw-r--r--ChangeLog4
-rw-r--r--vala/valastruct.vala13
2 files changed, 16 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a4d52d52..941f79cf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-03-23 Jürg Billeter <j@bitron.ch>
+ * vala/valastruct.vala: inherit default value from base type
+
+2008-03-23 Jürg Billeter <j@bitron.ch>
+
* vala/valareport.vala, vala/valasourcefile.vala,
compiler/valacompiler.vala: add -v commandline option to improve
error reporting, patch by Daniel Silverstone, fixes bug 522511
diff --git a/vala/valastruct.vala b/vala/valastruct.vala
index ca5dd4e6f..c5643a747 100644
--- a/vala/valastruct.vala
+++ b/vala/valastruct.vala
@@ -378,7 +378,18 @@ public class Vala.Struct : Typesymbol {
}
public override string get_default_value () {
- return default_value;
+ if (default_value != null) {
+ return default_value;
+ }
+
+ // inherit default value from base type
+ foreach (DataType type in base_types) {
+ var st = type.data_type as Struct;
+ if (st != null) {
+ return st.get_default_value ();
+ }
+ }
+ return null;
}
private void set_default_value (string! value) {