ide/debugger: Watches: removed need for a Code Editor to evaluate expressions

diff --git a/compiler/bootstrap/libec/bootstrap/pass15.c b/compiler/bootstrap/libec/bootstrap/pass15.c
index 916dfda..f96a0d7 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass15.c
+++ b/compiler/bootstrap/libec/bootstrap/pass15.c
@@ -13455,7 +13455,7 @@ case 0:
 {
 struct Identifier * id = exp->identifier;
 
-if(!id)
+if(!id || !topContext)
 return ;
 if(id->_class && id->_class->name)
 {

diff --git a/compiler/libec/src/pass15.ec b/compiler/libec/src/pass15.ec
index 12848d5..b1c3a55 100644 (file)
--- a/compiler/libec/src/pass15.ec
+++ b/compiler/libec/src/pass15.ec
@@ -7263,7 +7263,7 @@ void ProcessExpressionType(Expression exp)
       case identifierExp:
       {
          Identifier id = exp.identifier;
-         if(!id) return;
+         if(!id || !topContext) return;
 
          // DOING THIS LATER NOW...
          if(id._class && id._class.name)

diff --git a/ide/src/debugger/Debugger.ec b/ide/src/debugger/Debugger.ec
index 6eb02ff..e129fa3 100644 (file)
--- a/ide/src/debugger/Debugger.ec
+++ b/ide/src/debugger/Debugger.ec
@@ -2744,13 +2744,11 @@ class Debugger
                expString[0] = 0;
                PrintExpression(exp, expString);
 
-               if(GetPrivateModule())
-               {
-                  SetThisClass(null);
-                  if(codeEditor && activeFrame)
-                     DebugFindCtxTree(codeEditor.ast, activeFrame.line, 0);
-                  ProcessExpressionType(exp);
-               }
+               SetThisClass(null);
+               if(codeEditor && activeFrame)
+                  DebugFindCtxTree(codeEditor.ast, activeFrame.line, 0);
+               ProcessExpressionType(exp);
+
                wh.type = exp.expType;
                if(wh.type)
                   wh.type.refCount++;