fixing evaluation unit tests

src/AddIns/Debugger/Debugger.AddIn/NRefactory/ExpressionEvaluationVisitor.cs

@@ -87,7 +87,7 @@ namespace Debugger.AddIn
 			Value val = Value.GetMemberValue(evalThread, target, importedMember);
 			if (val == null)
 				throw new GetValueException("Member not found!");
-			return target;
+			return val;
 		}
 		
 		Value Visit(OperatorResolveResult result)
@@ -194,7 +194,7 @@ namespace Debugger.AddIn
 			Debug.Assert(result.Operands.Count == 2);
 			Debug.Assert(operatorType != BinaryOperatorType.ConditionalAnd && operatorType != BinaryOperatorType.ConditionalOr && operatorType != BinaryOperatorType.NullCoalescing);
 			var lhs = Convert(result.Operands[0]).GetPermanentReference(evalThread);
-			var rhs = Convert(result.Operands[1]);
+			var rhs = Convert(result.Operands[1]).GetPermanentReference(evalThread);
 			var lhsRR = lhs.ToResolveResult(context);
 			var rhsRR = rhs.ToResolveResult(context);
 			CSharpResolver resolver = new CSharpResolver(debuggerTypeSystem).WithCheckForOverflow(checkForOverflow);

src/AddIns/Debugger/Debugger.Tests/Tests/ExpressionEvaluatorVisitor_Tests.cs

@@ -226,6 +226,7 @@ namespace Debugger.Tests
 			float pi = 3.14f;
 			string hi = "hi";
 			string emptyString = "";
+			DBBool boo = DBBool.Null;
 			
 			char[] array = "Hello".ToCharArray();
 			char[] array2 = "world".ToCharArray();
@@ -280,13 +281,12 @@ namespace Debugger.Tests
 			AssertEval("hi", "\"hi\"");
 			AssertEval("i is int", "true");
 			AssertEval("i is string", "false");
-//			AssertEval("hi + i", "\"hi4\"");
-//			AssertEval("hi + 1", "\"hi1\"");
+			AssertEval("hi + i", "\"hi4\"");
+			AssertEval("hi + 1", "\"hi1\"");
 			AssertEval("i > 2 ? i : i * 2", "4");
 			AssertEval("i < 2 ? i : i * 2", "8");
 			AssertEval("DBBool.True.IsTrue", "true");
-//			AssertEval("i < 2 ? i : i * 2", "8");
-			
+			AssertEval("i < 2 ? i : i * 2", "8");
 			
 			EndTest(false);
 		}