From 7e161985dac51d987de16504bb8a97671085de68 Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Thu, 19 May 2016 11:28:19 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../annimon/ownlang/parser/ast/ConditionalExpression.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/annimon/ownlang/parser/ast/ConditionalExpression.java b/src/com/annimon/ownlang/parser/ast/ConditionalExpression.java
index 87668e8..658596b 100644
--- a/src/com/annimon/ownlang/parser/ast/ConditionalExpression.java
+++ b/src/com/annimon/ownlang/parser/ast/ConditionalExpression.java
@@ -57,12 +57,12 @@ public final class ConditionalExpression implements Expression {
         final Value value2 = expr2.eval();
         
         double number1, number2;
-        if (value1.type() == Types.STRING) {
-            number1 = value1.asString().compareTo(value2.asString());
-            number2 = 0;
-        } else {
+        if (value1.type() == Types.NUMBER) {
             number1 = value1.asNumber();
             number2 = value2.asNumber();
+        } else {
+            number1 = value1.compareTo(value2);
+            number2 = 0;
         }
         
         boolean result;