From: Jamie McCracken <jamie.mccrack@gmail.com>
Date: Sun, 8 Sep 2013 23:18:14 +0000 (-0400)
Subject: Genie: Fixed use of print statements when variables are null
X-Git-Tag: 0.21.2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd35b034e2d016c5b4e24d39ecc711d44a18da81;p=thirdparty%2Fvala.git

Genie: Fixed use of print statements when variables are null
---

diff --git a/vala/valagenieparser.vala b/vala/valagenieparser.vala
index 01b89d690..f4799056a 100644
--- a/vala/valagenieparser.vala
+++ b/vala/valagenieparser.vala
@@ -835,8 +835,6 @@ public class Vala.Genie.Parser : CodeVisitor {
 					i++;
 					
 					if (p_expr != null) { 
-						
-						
 						if (p_expr is StringLiteral) {
 							var s_exp = (StringLiteral) p_expr;
 							var len = s_exp.value.length;
@@ -846,14 +844,16 @@ public class Vala.Genie.Parser : CodeVisitor {
 								var st =  s_exp.value.substring (0, len-1);
 								st += s;
 								s_exp.value = st;
+							} else {
+								string s = "\"\\n\"";
+								p_expr = new StringLiteral (s, get_src (begin));
 							}
 						} else {
-							string s = "\"\\n\"";
-							var rhs = new StringLiteral (s, get_src (begin));
-							p_expr = new BinaryExpression (BinaryOperator.PLUS, p_expr, rhs, get_src (begin));
+							string s = "\"%s\\n\"";
+							var s_exp = new StringLiteral (s, get_src (begin));
+							list.add (s_exp);
 						}
 					}
-				
 				} 
 				list.add (p_expr);