Skip to content

Commit 395049e

Browse files
committed
moved NullRascalMonitor out of interpreter-specific context to generic IRascalMonitor package
1 parent f943da9 commit 395049e

8 files changed

Lines changed: 6 additions & 55 deletions

File tree

src/org/rascalmpl/debug/IRascalMonitor.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import org.jline.terminal.Terminal;
2222
import org.rascalmpl.interpreter.BatchProgressMonitor;
23-
import org.rascalmpl.interpreter.NullRascalMonitor;
2423
import org.rascalmpl.repl.TerminalProgressBarMonitor;
2524

2625
import io.usethesource.vallang.ISourceLocation;

src/org/rascalmpl/ideservices/GsonUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.function.Consumer;
3333

3434
import org.checkerframework.checker.nullness.qual.Nullable;
35-
import org.rascalmpl.interpreter.NullRascalMonitor;
35+
import org.rascalmpl.debug.NullRascalMonitor;
3636
import org.rascalmpl.library.lang.json.internal.JsonValueReader;
3737
import org.rascalmpl.library.lang.json.internal.JsonValueWriter;
3838
import org.rascalmpl.util.base64.StreamingBase64;

src/org/rascalmpl/interpreter/Evaluator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
import org.rascalmpl.debug.IRascalRuntimeInspection;
5757
import org.rascalmpl.debug.IRascalSuspendTrigger;
5858
import org.rascalmpl.debug.IRascalSuspendTriggerListener;
59+
import org.rascalmpl.debug.NullRascalMonitor;
5960
import org.rascalmpl.exceptions.ImplementationError;
6061
import org.rascalmpl.exceptions.StackTrace;
6162
import org.rascalmpl.ideservices.IDEServices;

src/org/rascalmpl/interpreter/NullRascalMonitor.java

Lines changed: 0 additions & 49 deletions
This file was deleted.

src/org/rascalmpl/repl/rascal/RascalInterpreterREPL.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.jline.terminal.Terminal;
5050
import org.rascalmpl.dap.DebugSocketServer;
5151
import org.rascalmpl.debug.IRascalMonitor;
52+
import org.rascalmpl.debug.NullRascalMonitor;
5253
import org.rascalmpl.exceptions.RascalStackOverflowError;
5354
import org.rascalmpl.exceptions.StackTrace;
5455
import org.rascalmpl.exceptions.Throw;
@@ -57,7 +58,6 @@
5758
import org.rascalmpl.ideservices.RemoteIDEServices;
5859
import org.rascalmpl.interpreter.Configuration;
5960
import org.rascalmpl.interpreter.Evaluator;
60-
import org.rascalmpl.interpreter.NullRascalMonitor;
6161
import org.rascalmpl.interpreter.control_exceptions.InterruptException;
6262
import org.rascalmpl.interpreter.control_exceptions.QuitException;
6363
import org.rascalmpl.interpreter.staticErrors.StaticError;

src/org/rascalmpl/runtime/RascalRuntimeValueFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
import java.util.concurrent.TimeUnit;
3737
import java.util.function.BiFunction;
3838

39+
import org.rascalmpl.debug.NullRascalMonitor;
3940
import org.rascalmpl.exceptions.ImplementationError;
4041
import org.rascalmpl.exceptions.RuntimeExceptionFactory;
4142
import org.rascalmpl.exceptions.Throw;
42-
import org.rascalmpl.interpreter.NullRascalMonitor;
4343
import org.rascalmpl.interpreter.asserts.Ambiguous;
4444
import org.rascalmpl.parser.ParserGenerator;
4545
import org.rascalmpl.parser.gtd.IGTD;

src/org/rascalmpl/values/RascalFunctionValueFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import java.util.function.Supplier;
2727

2828
import org.rascalmpl.ast.AbstractAST;
29+
import org.rascalmpl.debug.NullRascalMonitor;
2930
import org.rascalmpl.exceptions.ImplementationError;
3031
import org.rascalmpl.exceptions.RuntimeExceptionFactory;
3132
import org.rascalmpl.exceptions.Throw;
3233
import org.rascalmpl.interpreter.IEvaluator;
3334
import org.rascalmpl.interpreter.IEvaluatorContext;
34-
import org.rascalmpl.interpreter.NullRascalMonitor;
3535
import org.rascalmpl.interpreter.asserts.Ambiguous;
3636
import org.rascalmpl.interpreter.control_exceptions.MatchFailed;
3737
import org.rascalmpl.interpreter.env.Environment;

test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
import org.junit.Test;
1717
import org.rascalmpl.debug.IRascalMonitor;
18+
import org.rascalmpl.debug.NullRascalMonitor;
1819
import org.rascalmpl.interpreter.Evaluator;
1920
import org.rascalmpl.interpreter.ITestResultListener;
20-
import org.rascalmpl.interpreter.NullRascalMonitor;
2121
import org.rascalmpl.shell.ShellEvaluatorFactory;
2222

2323
import io.usethesource.vallang.ISourceLocation;

0 commit comments

Comments
 (0)