|
4 | 4 | using Jint; |
5 | 5 | using IOriginalPrimitiveInstance = Jint.Native.IPrimitiveInstance; |
6 | 6 | using OriginalCancellationConstraint = Jint.Constraints.CancellationConstraint; |
7 | | -using OriginalDebuggerBreakDelegate = Jint.Engine.BreakDelegate; |
| 7 | +using OriginalDebuggerBreakDelegate = Jint.Runtime.Debugger.DebugHandler.BreakDelegate; |
8 | 8 | using OriginalDebuggerStatementHandlingMode = Jint.Runtime.Debugger.DebuggerStatementHandling; |
9 | | -using OriginalDebuggerStepDelegate = Jint.Engine.DebugStepDelegate; |
| 9 | +using OriginalDebuggerStepDelegate = Jint.Runtime.Debugger.DebugHandler.DebugStepDelegate; |
10 | 10 | using OriginalEngine = Jint.Engine; |
11 | 11 | using OriginalExecutionCanceledException = Jint.Runtime.ExecutionCanceledException; |
12 | 12 | using OriginalJavaScriptException = Jint.Runtime.JavaScriptException; |
@@ -52,7 +52,7 @@ public sealed class JintJsEngine : JsEngineBase |
52 | 52 | /// <summary> |
53 | 53 | /// Version of original JS engine |
54 | 54 | /// </summary> |
55 | | - private const string EngineVersion = "3.0.0 Beta 2031"; |
| 55 | + private const string EngineVersion = "3.0.0 Beta 2032"; |
56 | 56 |
|
57 | 57 | /// <summary> |
58 | 58 | /// Jint JS engine |
@@ -138,11 +138,11 @@ public JintJsEngine(JintSettings settings) |
138 | 138 | }); |
139 | 139 | if (_debuggerBreakCallback != null) |
140 | 140 | { |
141 | | - _jsEngine.Break += _debuggerBreakCallback; |
| 141 | + _jsEngine.DebugHandler.Break += _debuggerBreakCallback; |
142 | 142 | } |
143 | 143 | if (_debuggerStepCallback != null) |
144 | 144 | { |
145 | | - _jsEngine.Step += _debuggerStepCallback; |
| 145 | + _jsEngine.DebugHandler.Step += _debuggerStepCallback; |
146 | 146 | } |
147 | 147 | } |
148 | 148 | catch (Exception e) |
@@ -397,7 +397,7 @@ protected override object InnerEvaluate(string expression, string documentName) |
397 | 397 |
|
398 | 398 | try |
399 | 399 | { |
400 | | - resultValue = _jsEngine.Execute(expression, parserOptions).GetCompletionValue(); |
| 400 | + resultValue = _jsEngine.Evaluate(expression, parserOptions); |
401 | 401 | } |
402 | 402 | catch (OriginalParserException e) |
403 | 403 | { |
@@ -710,13 +710,13 @@ public override void Dispose() |
710 | 710 | { |
711 | 711 | if (_debuggerStepCallback != null) |
712 | 712 | { |
713 | | - _jsEngine.Step -= _debuggerStepCallback; |
| 713 | + _jsEngine.DebugHandler.Step -= _debuggerStepCallback; |
714 | 714 | _debuggerStepCallback = null; |
715 | 715 | } |
716 | 716 |
|
717 | 717 | if (_debuggerBreakCallback != null) |
718 | 718 | { |
719 | | - _jsEngine.Break -= _debuggerBreakCallback; |
| 719 | + _jsEngine.DebugHandler.Break -= _debuggerBreakCallback; |
720 | 720 | _debuggerBreakCallback = null; |
721 | 721 | } |
722 | 722 |
|
|
0 commit comments