vala r2153 - in trunk: . gobject

[juergbi svn gnome org]

Author: juergbi
Date: Mon Dec 15 08:36:59 2008
New Revision: 2153
URL: http://svn.gnome.org/viewvc/vala?rev=2153&view=rev

Log:
2008-12-15  JÃrg Billeter  <j bitron ch>

	* gobject/valaccodebasemodule.vala:

	Fix comparing nullable struct values with null, fixes bug 548672


Modified:
   trunk/ChangeLog
   trunk/gobject/valaccodebasemodule.vala

Modified: trunk/gobject/valaccodebasemodule.vala
==============================================================================
--- trunk/gobject/valaccodebasemodule.vala	(original)
+++ trunk/gobject/valaccodebasemodule.vala	Mon Dec 15 08:36:59 2008
@@ -2987,9 +2987,11 @@
 						cright = new InstanceCast (cright, left_cl);
 					}
 				}
-			} else if (left_type_as_struct != null && expr.right.value_type is NullType) {
+			} else if (left_type_as_struct != null && !expr.left.value_type.nullable
+			           && expr.right.value_type is NullType) {
 				cleft = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cleft);
-			} else if (right_type_as_struct != null && expr.left.value_type is NullType) {
+			} else if (right_type_as_struct != null && !expr.right.value_type.nullable
+			           && expr.left.value_type is NullType) {
 				cright = new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, cright);
 			}
 		}