ide/Debugger: (#505) Implemented conditional operator support in watches

diff --git a/ide/src/debugger/debugTools.ec b/ide/src/debugger/debugTools.ec
index 89fa885..f6e31d6 100644 (file)
--- a/ide/src/debugger/debugTools.ec
+++ b/ide/src/debugger/debugTools.ec
@@ -1392,34 +1392,78 @@ void DebugComputeExpression(Expression exp)
          }
          break;
       }
-      /*
-      case ExpCondition:
+      case conditionExp:
       {
-         Expression e;
-         exp.isConstant = true;
+         if(exp.cond.cond)
+         {
+            DebugComputeExpression(exp.cond.cond);
 
-         FreeType(exp.cond.cond.destType);
-         exp.cond.cond.destType = MkClassType("bool");
-         DebugComputeExpression(exp.cond.cond);
-         if(!exp.cond.cond.isConstant)
-            exp.isConstant = false;
-         for(e = exp.cond.exp->first; e; e = e.next)
+            if(ExpressionIsError(exp.cond.cond))
+               CarryExpressionError(exp, exp.cond.cond);
+            else if(exp.cond.cond.type == constantExp && exp.cond.cond.constant)
+            {
+               Expression e = null;
+               if(strtol(exp.cond.cond.constant, null, 0))
+               {
+                  for(e = exp.cond.exp ? exp.cond.exp->first : null; e; e = e.next)
+                  {
+                     DebugComputeExpression(e);
+                     if(!e.next) break;
+                  }
+                  if(e)
+                  {
+                     if(ExpressionIsError(e))
+                     {
+                        CarryExpressionError(exp, e);
+                        e = null;
+                     }
+                     else
+                        exp.cond.exp->Remove(e);
+                  }
+               }
+               else
+               {
+                  e = exp.cond.elseExp;
+                  if(e)
+                  {
+                     DebugComputeExpression(e);
+                     if(ExpressionIsError(e))
+                     {
+                        CarryExpressionError(exp, e);
+                        e = null;
+                     }
+                     else
+                        exp.cond.elseExp = null;
+                  }
+               }
+               if(e)
+               {
+                  FreeType(exp.expType);
+                  FreeType(exp.destType);
+                  e.prev = exp.prev;
+                  e.next = exp.next;
+                  FreeExpContents(exp);
+                  *exp = *e;
+                  delete e;
+               }
+               else if(!ExpressionIsError(exp))
+               {
+                  FreeExpContents(exp);
+                  exp.type = unknownErrorExp;
+               }
+            }
+            else
+            {
+               FreeExpContents(exp);
+               exp.type = unknownErrorExp;
+            }
+         }
+         else
          {
-            FreeType(e.destType);
-            e.destType = exp.destType;
-            DebugComputeExpression(e);
-            if(!e.isConstant)
-               exp.isConstant = false;
+            FreeExpContents(exp);
+            exp.type = unknownErrorExp;
          }
-         if(!exp.cond.elseExp.isConstant)
-            exp.isConstant = false;
-
-         FreeType(exp.cond.elseExp.destType);
-         exp.cond.elseExp.destType = exp.destType;
-         DebugComputeExpression(exp.cond.elseExp);
          break;
       }
-      */
    }
-
 }