diff --git a/IDE/src/ScriptManager.bf b/IDE/src/ScriptManager.bf index 56510c6f..b24ca91d 100644 --- a/IDE/src/ScriptManager.bf +++ b/IDE/src/ScriptManager.bf @@ -455,7 +455,11 @@ namespace IDE return; } } - else // Integer + else if ((argView == "false") || (argView == "true")) + { + args.Add(scope:: box (argView == "true")); + } + else // Integer { switch (int.Parse(argView)) { @@ -721,6 +725,8 @@ namespace IDE { public EditWidgetContent.LineAndColumn mMarkedPos; public ScriptManager mScriptManager; + bool mIsFirstBreak = true; + bool mWaitForExecutionPaused = true; public this(ScriptManager scriptManager) { @@ -861,6 +867,12 @@ namespace IDE return true; } + [IDECommand] + public void SetWaitForExecutionPaused(bool value) + { + mWaitForExecutionPaused = value; + } + [IDECommand] public void OutputLine(Object obj) { @@ -895,8 +907,6 @@ namespace IDE curCmd.mHandled = false; } - bool mIsFirstBreak = true; - public bool IsPaused() { /*if (gApp.mWatchPanel.mVisible) @@ -971,8 +981,11 @@ namespace IDE if (gApp.mDebugger.HasPendingDebugLoads()) return false; - if ((!gApp.mExecutionPaused) && (gApp.mDebugger.mIsRunning)) - return false; + if (mWaitForExecutionPaused) + { + if ((!gApp.mExecutionPaused) && (gApp.mDebugger.mIsRunning)) + return false; + } var runState = gApp.mDebugger.GetRunState(); if (runState == .Terminating) @@ -993,8 +1006,15 @@ namespace IDE if (runState == .Running_ToTempBreakpoint) return false; - Debug.Assert((runState == .NotStarted) || (runState == .Paused) || (runState == .Running_ToTempBreakpoint) || - (runState == .Exception) || (runState == .Breakpoint) || (runState == .Terminated)); + if ((!mWaitForExecutionPaused) && (runState == .Running)) + { + + } + else + { + Debug.Assert((runState == .NotStarted) || (runState == .Paused) || (runState == .Running_ToTempBreakpoint) || + (runState == .Exception) || (runState == .Breakpoint) || (runState == .Terminated)); + } /*if (runState == .Paused) { NOP!(); @@ -1313,9 +1333,15 @@ namespace IDE } [IDECommand] - public void Execute(String path) + public void Execute(String cmd) { - ExecuteRaw(path); + ExecuteRaw(cmd); + } + + [IDECommand] + public void ExecuteCommandFile(String path) + { + mScriptManager.QueueCommandFile(path); } [IDECommand] @@ -2237,6 +2263,13 @@ namespace IDE ScriptManager.sActiveManager.mHadExpectingError = true; } + [IDECommand] + public void ClearExpectError() + { + DeleteAndNullify!(ScriptManager.sActiveManager.mExpectingError); + ScriptManager.sActiveManager.mHadExpectingError = false; + } + [IDECommand] public void ExpectError() {