diff --git a/src/org/rascalmpl/debug/IRascalMonitor.java b/src/org/rascalmpl/debug/IRascalMonitor.java index d64c219a3c8..e40b17abb5e 100644 --- a/src/org/rascalmpl/debug/IRascalMonitor.java +++ b/src/org/rascalmpl/debug/IRascalMonitor.java @@ -20,7 +20,6 @@ import org.jline.terminal.Terminal; import org.rascalmpl.interpreter.BatchProgressMonitor; -import org.rascalmpl.interpreter.NullRascalMonitor; import org.rascalmpl.repl.TerminalProgressBarMonitor; import io.usethesource.vallang.ISourceLocation; diff --git a/src/org/rascalmpl/interpreter/NullRascalMonitor.java b/src/org/rascalmpl/debug/NullRascalMonitor.java similarity index 93% rename from src/org/rascalmpl/interpreter/NullRascalMonitor.java rename to src/org/rascalmpl/debug/NullRascalMonitor.java index 40353bbb855..20b5f7c180f 100644 --- a/src/org/rascalmpl/interpreter/NullRascalMonitor.java +++ b/src/org/rascalmpl/debug/NullRascalMonitor.java @@ -8,9 +8,7 @@ * * Jurgen J. Vinju - Jurgen.Vinju@cwi.nl - CWI * Anya Helene Bagge - anya@ii.uib.no (Univ. Bergen) * * Arnold Lankamp - Arnold.Lankamp@cwi.nl *******************************************************************************/ -package org.rascalmpl.interpreter; - -import org.rascalmpl.debug.IRascalMonitor; +package org.rascalmpl.debug; import io.usethesource.vallang.ISourceLocation; diff --git a/src/org/rascalmpl/ideservices/GsonUtils.java b/src/org/rascalmpl/ideservices/GsonUtils.java index 5946c97c3d2..389ae13b1db 100644 --- a/src/org/rascalmpl/ideservices/GsonUtils.java +++ b/src/org/rascalmpl/ideservices/GsonUtils.java @@ -32,7 +32,7 @@ import java.util.function.Consumer; import org.checkerframework.checker.nullness.qual.Nullable; -import org.rascalmpl.interpreter.NullRascalMonitor; +import org.rascalmpl.debug.NullRascalMonitor; import org.rascalmpl.library.lang.json.internal.JsonValueReader; import org.rascalmpl.library.lang.json.internal.JsonValueWriter; import org.rascalmpl.util.base64.StreamingBase64; diff --git a/src/org/rascalmpl/interpreter/Evaluator.java b/src/org/rascalmpl/interpreter/Evaluator.java index 3d05ba4456f..abd9989d327 100755 --- a/src/org/rascalmpl/interpreter/Evaluator.java +++ b/src/org/rascalmpl/interpreter/Evaluator.java @@ -56,6 +56,7 @@ import org.rascalmpl.debug.IRascalRuntimeInspection; import org.rascalmpl.debug.IRascalSuspendTrigger; import org.rascalmpl.debug.IRascalSuspendTriggerListener; +import org.rascalmpl.debug.NullRascalMonitor; import org.rascalmpl.exceptions.ImplementationError; import org.rascalmpl.exceptions.StackTrace; import org.rascalmpl.ideservices.IDEServices; diff --git a/src/org/rascalmpl/repl/rascal/RascalInterpreterREPL.java b/src/org/rascalmpl/repl/rascal/RascalInterpreterREPL.java index 13462e77983..176e32399ea 100644 --- a/src/org/rascalmpl/repl/rascal/RascalInterpreterREPL.java +++ b/src/org/rascalmpl/repl/rascal/RascalInterpreterREPL.java @@ -49,6 +49,7 @@ import org.jline.terminal.Terminal; import org.rascalmpl.dap.DebugSocketServer; import org.rascalmpl.debug.IRascalMonitor; +import org.rascalmpl.debug.NullRascalMonitor; import org.rascalmpl.exceptions.RascalStackOverflowError; import org.rascalmpl.exceptions.StackTrace; import org.rascalmpl.exceptions.Throw; @@ -57,7 +58,6 @@ import org.rascalmpl.ideservices.RemoteIDEServices; import org.rascalmpl.interpreter.Configuration; import org.rascalmpl.interpreter.Evaluator; -import org.rascalmpl.interpreter.NullRascalMonitor; import org.rascalmpl.interpreter.control_exceptions.InterruptException; import org.rascalmpl.interpreter.control_exceptions.QuitException; import org.rascalmpl.interpreter.staticErrors.StaticError; diff --git a/src/org/rascalmpl/runtime/RascalMonitor.java b/src/org/rascalmpl/runtime/RascalMonitor.java deleted file mode 100644 index bbd11278654..00000000000 --- a/src/org/rascalmpl/runtime/RascalMonitor.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2018-2025, NWO-I CWI, Swat.engineering and Paul Klint - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ -package org.rascalmpl.runtime; - -import org.rascalmpl.debug.IRascalMonitor; - -import io.usethesource.vallang.ISourceLocation; - -public class RascalMonitor implements IRascalMonitor { - - @Override - public void jobStart(String name, int workShare, int totalWork) { - // TODO Auto-generated method stub - - } - - @Override - public void jobStep(String name, String message, int workShare) { - // TODO Auto-generated method stub - - } - - @Override - public int jobEnd(String name, boolean succeeded) { - // TODO Auto-generated method stub - return 0; - } - - @Override - public boolean jobIsCanceled(String name) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void jobTodo(String name, int work) { - // TODO Auto-generated method stub - - } - - @Override - public void warning(String message, ISourceLocation src) { - // TODO Auto-generated method stub - - } - - @Override - public void endAllJobs() { - // TODO Auto-generated method stub - - } - -} diff --git a/src/org/rascalmpl/runtime/RascalRuntimeValueFactory.java b/src/org/rascalmpl/runtime/RascalRuntimeValueFactory.java index 5d0bcb92165..73fab13dfed 100644 --- a/src/org/rascalmpl/runtime/RascalRuntimeValueFactory.java +++ b/src/org/rascalmpl/runtime/RascalRuntimeValueFactory.java @@ -36,10 +36,10 @@ import java.util.concurrent.TimeUnit; import java.util.function.BiFunction; +import org.rascalmpl.debug.NullRascalMonitor; import org.rascalmpl.exceptions.ImplementationError; import org.rascalmpl.exceptions.RuntimeExceptionFactory; import org.rascalmpl.exceptions.Throw; -import org.rascalmpl.interpreter.NullRascalMonitor; import org.rascalmpl.interpreter.asserts.Ambiguous; import org.rascalmpl.parser.ParserGenerator; import org.rascalmpl.parser.gtd.IGTD; diff --git a/src/org/rascalmpl/values/RascalFunctionValueFactory.java b/src/org/rascalmpl/values/RascalFunctionValueFactory.java index 8f587235075..1ad439fb3fb 100644 --- a/src/org/rascalmpl/values/RascalFunctionValueFactory.java +++ b/src/org/rascalmpl/values/RascalFunctionValueFactory.java @@ -26,12 +26,12 @@ import java.util.function.Supplier; import org.rascalmpl.ast.AbstractAST; +import org.rascalmpl.debug.NullRascalMonitor; import org.rascalmpl.exceptions.ImplementationError; import org.rascalmpl.exceptions.RuntimeExceptionFactory; import org.rascalmpl.exceptions.Throw; import org.rascalmpl.interpreter.IEvaluator; import org.rascalmpl.interpreter.IEvaluatorContext; -import org.rascalmpl.interpreter.NullRascalMonitor; import org.rascalmpl.interpreter.asserts.Ambiguous; import org.rascalmpl.interpreter.control_exceptions.MatchFailed; import org.rascalmpl.interpreter.env.Environment; diff --git a/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java b/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java index 6f5737b9b56..1841f2f8c52 100644 --- a/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java +++ b/test/org/rascalmpl/test/functionality/ParallelEvaluatorsTests.java @@ -15,9 +15,9 @@ import org.junit.Test; import org.rascalmpl.debug.IRascalMonitor; +import org.rascalmpl.debug.NullRascalMonitor; import org.rascalmpl.interpreter.Evaluator; import org.rascalmpl.interpreter.ITestResultListener; -import org.rascalmpl.interpreter.NullRascalMonitor; import org.rascalmpl.shell.ShellEvaluatorFactory; import io.usethesource.vallang.ISourceLocation;