vala r1467 - in trunk: . vala

[juergbi svn gnome org]

Author: juergbi
Date: Wed May 28 19:23:57 2008
New Revision: 1467
URL: http://svn.gnome.org/viewvc/vala?rev=1467&view=rev

Log:
2008-05-28  Juerg Billeter  <j bitron ch>

	* vala/valaconstant.vala:
	* vala/valafield.vala:

	Fix crash when using concatenated strings as constant or field
	initializer, patch by Jared Moore, fixes bug 533723


Modified:
   trunk/ChangeLog
   trunk/vala/valaconstant.vala
   trunk/vala/valafield.vala

Modified: trunk/vala/valaconstant.vala
==============================================================================
--- trunk/vala/valaconstant.vala	(original)
+++ trunk/vala/valaconstant.vala	Wed May 28 19:23:57 2008
@@ -40,14 +40,24 @@
 	/**
 	 * The value of this constant.
 	 */
-	public Expression initializer { get; set; }
-	
+	public Expression? initializer { 
+		get { return _initializer; }
+		set {
+			_initializer = value;
+			if (_initializer != null) {
+				_initializer.parent_node = this;
+			}
+		}
+	}
+
 	private string cname;
 	
 	private bool lock_used = false;
 
 	private DataType _data_type;
 
+	private Expression _initializer;
+
 	/**
 	 * Creates a new constant.
 	 *

Modified: trunk/vala/valafield.vala
==============================================================================
--- trunk/vala/valafield.vala	(original)
+++ trunk/vala/valafield.vala	Wed May 28 19:23:57 2008
@@ -41,8 +41,16 @@
 	/**
 	 * Specifies the expression to be used to initialize this field.
 	 */
-	public Expression initializer { get; set; }
-	
+	public Expression? initializer { 
+		get { return _initializer; }
+		set {
+			_initializer = value;
+			if (_initializer != null) {
+				_initializer.parent_node = this;
+			}
+		}
+	}
+
 	/**
 	 * Specifies whether this field may only be accessed with an instance of
 	 * the contained type.
@@ -65,6 +73,8 @@
 	
 	private bool lock_used = false;
 
+	private Expression _initializer;
+
 	private DataType _data_type;
 
 	/**