Commit 389088a5 authored by Vít Kabele's avatar Vít Kabele

ch.usi.dag.disl.exception package merged into main disl package.

parent 10403c4a
Pipeline #3286 passed with stages
in 3 minutes and 44 seconds
......@@ -6,6 +6,7 @@
<classpathentry kind="src" output="output/build/test" path="src-test"/>
<classpathentry kind="src" output="output/build/shvm-dispatch" path="src-shvm-dispatch"/>
<classpathentry kind="src" path="disl/src-classparser"/>
<classpathentry kind="src" path="disl/src-exception"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="output/lib/disl-bypass.jar"/>
<classpathentry kind="lib" path="lib/disl/log4j.jar" sourcepath="lib/devel/log4j-source.jar"/>
......
......@@ -8,6 +8,7 @@ src.bin=bin
src.disl.prefix=disl
src.disl=src-disl
src.disl.classparser=src-classparser
src.disl.exception=src-exception
src.disl.bypass=src-disl-bypass
src.disl.agent=src-disl-agent
src.shvm=src-shvm
......
......@@ -477,6 +477,7 @@
<javac destdir="${build.disl}" debug="true">
<src path="${src.disl}"/>
<src path="${src.disl.prefix}/${src.disl.classparser}"/>
<src path="${src.disl.prefix}/${src.disl.exception}"/>
<classpath>
<path refid="disl.bypass.classpath"/>
<path refid="util.classpath"/>
......
......@@ -25,8 +25,6 @@ import org.objectweb.asm.tree.analysis.SourceValue;
import ch.usi.dag.disl.annotation.SyntheticLocal;
import ch.usi.dag.disl.annotation.SyntheticLocal.Initialize;
import ch.usi.dag.disl.annotation.ThreadLocal;
import ch.usi.dag.disl.exception.ParserException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.localvar.SyntheticLocalVar;
import ch.usi.dag.disl.localvar.ThreadLocalVar;
......
......@@ -16,8 +16,6 @@ import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.annotation.Guarded;
import ch.usi.dag.disl.annotation.ProcessAlso;
import ch.usi.dag.disl.coderep.UnprocessedCode;
import ch.usi.dag.disl.exception.GuardException;
import ch.usi.dag.disl.exception.ParserException;
import ch.usi.dag.disl.guard.GuardHelper;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.processor.ArgProcessor;
......
......@@ -7,9 +7,6 @@
package ch.usi.dag.disl;
import ch.usi.dag.disl.annotation.ArgumentProcessor;
import ch.usi.dag.disl.exception.ParserException;
import ch.usi.dag.disl.exception.ProcessorException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.processor.ArgProcessor;
import ch.usi.dag.disl.snippet.Snippet;
......
package ch.usi.dag.disl;
import ch.usi.dag.disl.DiSL.CodeOption;
import ch.usi.dag.disl.annotation.ArgumentProcessor;
import ch.usi.dag.disl.exception.ParserException;
import ch.usi.dag.disl.exception.ProcessorException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.exception.StaticContextGenException;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.processor.ArgProcessor;
import ch.usi.dag.disl.snippet.Snippet;
import ch.usi.dag.util.asm.ClassNodeHelper;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.ClassNode;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
......
......@@ -8,9 +8,6 @@
*/
package ch.usi.dag.disl;
import ch.usi.dag.disl.exception.ParserException;
import ch.usi.dag.disl.exception.ProcessorException;
import ch.usi.dag.disl.exception.ReflectionException;
import org.objectweb.asm.tree.ClassNode;
import java.util.List;
......
......@@ -13,12 +13,6 @@ import ch.usi.dag.disl.annotation.After;
import ch.usi.dag.disl.annotation.AfterReturning;
import ch.usi.dag.disl.annotation.AfterThrowing;
import ch.usi.dag.disl.annotation.Before;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.exception.GuardException;
import ch.usi.dag.disl.exception.MarkerException;
import ch.usi.dag.disl.exception.ParserException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.exception.SnippetParserException;
import ch.usi.dag.disl.guard.GuardHelper;
import ch.usi.dag.disl.marker.Marker;
import ch.usi.dag.disl.marker.Parameter;
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
@SuppressWarnings ("serial")
public abstract class DiSLException extends Exception {
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
/**
* Represents a DiSL internal error, which means that there is something bad in
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class DiSLInMethodException extends DiSLException {
......
......@@ -14,7 +14,7 @@ public abstract class GeneralException extends RuntimeException {
super (message);
}
protected GeneralException (final Throwable cause) {
GeneralException (final Throwable cause) {
super (cause);
}
......@@ -24,7 +24,7 @@ public abstract class GeneralException extends RuntimeException {
super (String.format (format, args));
}
protected GeneralException (
GeneralException (
final Throwable cause, final String format, final Object ... args
) {
super (String.format (format, args), cause);
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class GuardException extends DiSLException {
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class GuardRuntimeException extends RuntimeException {
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
/**
* Thrown when an illegal context usage is detected. This usually happens when a
......
......@@ -8,8 +8,6 @@
*/
package ch.usi.dag.disl;
import ch.usi.dag.disl.exception.DiSLException;
/**
* To be thrown in case of error in instrumentation manifest.
*/
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class MarkerException extends DiSLException {
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class ParserException extends DiSLException {
private static final long serialVersionUID = -2826083567381934062L;
public ParserException () {
ParserException () {
super ();
}
public ParserException (final String message, final Throwable cause) {
ParserException (final String message, final Throwable cause) {
super (message, cause);
}
public ParserException (final String message) {
ParserException (final String message) {
super (message);
}
public ParserException (final Throwable cause) {
ParserException (final Throwable cause) {
super (cause);
}
......@@ -30,7 +30,7 @@ public class ParserException extends DiSLException {
super (cause, format, args);
}
public ParserException (final String format, final Object... args) {
ParserException (final String format, final Object... args) {
super (format, args);
}
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class ProcessorException extends DiSLException {
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
/**
* Wraps exceptions that occurred during reflective operations.
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class SnippetParserException extends ParserException {
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class StaticContextException extends RuntimeException {
......
package ch.usi.dag.disl.exception;
package ch.usi.dag.disl;
public class StaticContextGenException extends DiSLException {
......
package ch.usi.dag.disl;
import ch.usi.dag.disl.exception.DiSLException;
@SuppressWarnings ("serial")
class TransformerException extends DiSLException {
public TransformerException (
TransformerException (
final Throwable cause, final String format, final Object ... args
) {
super (cause, format, args);
......
......@@ -17,7 +17,6 @@ import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.dynamicbypass.BypassCheck;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.util.AsmHelper;
......
package ch.usi.dag.disl;
import ch.usi.dag.disl.exception.DiSLException;
import ch.usi.dag.disl.exception.DiSLInMethodException;
import ch.usi.dag.disl.localvar.SyntheticLocalVar;
import ch.usi.dag.disl.localvar.ThreadLocalVar;
import ch.usi.dag.disl.processor.generator.PIResolver;
......
......@@ -2,7 +2,7 @@ package ch.usi.dag.disl.coderep;
import java.lang.reflect.Method;
import ch.usi.dag.disl.exception.StaticContextGenException;
import ch.usi.dag.disl.StaticContextGenException;
import ch.usi.dag.disl.staticcontext.StaticContext;
......
......@@ -20,7 +20,7 @@ import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.InitializationException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.localvar.AbstractLocalVar;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.localvar.SyntheticLocalVar;
......
package ch.usi.dag.disl.guard;
import ch.usi.dag.disl.exception.GuardException;
import ch.usi.dag.disl.exception.GuardRuntimeException;
import ch.usi.dag.disl.GuardException;
import ch.usi.dag.disl.GuardRuntimeException;
import ch.usi.dag.disl.guardcontext.GuardContext;
import ch.usi.dag.disl.processorcontext.ArgumentContext;
import ch.usi.dag.disl.snippet.Shadow;
......
......@@ -6,10 +6,10 @@ import java.util.Formatter;
import java.util.HashSet;
import java.util.Set;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.exception.GuardException;
import ch.usi.dag.disl.exception.GuardRuntimeException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.DiSLFatalException;
import ch.usi.dag.disl.GuardException;
import ch.usi.dag.disl.GuardRuntimeException;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.guardcontext.GuardContext;
import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
import ch.usi.dag.disl.processorcontext.ArgumentContext;
......
......@@ -11,7 +11,7 @@ import org.objectweb.asm.tree.LabelNode;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.exception.MarkerException;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.snippet.Shadow;
import ch.usi.dag.disl.snippet.Shadow.WeavingRegion;
import ch.usi.dag.disl.snippet.Snippet;
......
......@@ -8,7 +8,7 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.exception.MarkerException;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.util.AsmHelper.Insns;
import ch.usi.dag.disl.util.AsmOpcodes;
......
......@@ -8,7 +8,7 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.exception.MarkerException;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.util.AsmHelper.Insns;
/**
......
......@@ -5,7 +5,7 @@ import java.util.List;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.exception.MarkerException;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.snippet.Shadow;
import ch.usi.dag.disl.snippet.Snippet;
......
......@@ -8,7 +8,7 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.exception.MarkerException;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.util.AsmOpcodes;
/**
......
......@@ -7,7 +7,7 @@ import java.util.Set;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.DiSLFatalException;
public enum ArgProcessorKind {
......
......@@ -9,8 +9,8 @@ import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodInsnNode;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.exception.ProcessorException;
import ch.usi.dag.disl.DiSLFatalException;
import ch.usi.dag.disl.ProcessorException;
import ch.usi.dag.disl.guard.GuardHelper;
import ch.usi.dag.disl.processor.ArgProcessor;
import ch.usi.dag.disl.processor.ArgProcessorKind;
......
......@@ -7,7 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import ch.usi.dag.disl.exception.GuardException;
import ch.usi.dag.disl.GuardException;
/**
......
......@@ -3,7 +3,7 @@ package ch.usi.dag.disl.resolver;
import java.util.HashMap;
import java.util.Map;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.staticcontext.StaticContext;
import ch.usi.dag.disl.util.ReflectionHelper;
......
......@@ -12,9 +12,9 @@ import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.DiSL.CodeOption;
import ch.usi.dag.disl.exception.MarkerException;
import ch.usi.dag.disl.exception.ProcessorException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.ProcessorException;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.guard.GuardHelper;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.marker.Marker;
......
......@@ -18,8 +18,8 @@ import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.DiSL.CodeOption;
import ch.usi.dag.disl.coderep.Code;
import ch.usi.dag.disl.coderep.UnprocessedCode;
import ch.usi.dag.disl.exception.ProcessorException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.ProcessorException;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.marker.BytecodeMarker;
import ch.usi.dag.disl.marker.Marker;
......
......@@ -5,8 +5,8 @@ import java.util.List;
import java.util.Map;
import ch.usi.dag.disl.coderep.StaticContextMethod;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.exception.StaticContextGenException;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.StaticContextGenException;
import ch.usi.dag.disl.resolver.SCResolver;
import ch.usi.dag.disl.snippet.Shadow;
import ch.usi.dag.disl.snippet.Snippet;
......
......@@ -5,7 +5,7 @@ import java.io.PrintWriter;
import java.util.HashMap;
import java.util.Map;
import ch.usi.dag.disl.exception.StaticContextException;
import ch.usi.dag.disl.StaticContextException;
// holds IDs
class IdHolder {
......
......@@ -35,7 +35,7 @@ import org.objectweb.asm.tree.TryCatchBlockNode;
import org.objectweb.asm.tree.TypeInsnNode;
import org.objectweb.asm.tree.VarInsnNode;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.DiSLFatalException;
public abstract class AsmHelper {
......
......@@ -20,7 +20,7 @@ import org.objectweb.asm.tree.analysis.SourceInterpreter;
import org.objectweb.asm.tree.analysis.SourceValue;
import org.objectweb.asm.tree.analysis.Value;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.DiSLFatalException;
public class FrameHelper {
......
......@@ -6,8 +6,8 @@ import java.lang.reflect.Method;
import org.objectweb.asm.Type;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.exception.ReflectionException;
import ch.usi.dag.disl.DiSLFatalException;
import ch.usi.dag.disl.ReflectionException;
public final class ReflectionHelper {
......
......@@ -6,7 +6,7 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.DiSLFatalException;
public class BasicBlock implements Iterable <AbstractInsnNode> {
......
......@@ -7,7 +7,7 @@ import org.objectweb.asm.commons.TryCatchBlockSorter;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.DiSLFatalException;
import ch.usi.dag.disl.util.AsmHelper;
import ch.usi.dag.disl.util.AsmHelper.Insns;
......
......@@ -20,7 +20,7 @@ import ch.usi.dag.disl.annotation.AfterReturning;
import ch.usi.dag.disl.annotation.AfterThrowing;
import ch.usi.dag.disl.annotation.Before;
import ch.usi.dag.disl.annotation.SyntheticLocal.Initialize;
import ch.usi.dag.disl.exception.InvalidContextUsageException;
import ch.usi.dag.disl.InvalidContextUsageException;
import ch.usi.dag.disl.localvar.SyntheticLocalVar;
import ch.usi.dag.disl.localvar.ThreadLocalVar;
import ch.usi.dag.disl.processor.generator.PIResolver;
......
......@@ -22,8 +22,8 @@ import org.objectweb.asm.tree.analysis.SourceValue;
import ch.usi.dag.disl.classcontext.ClassContext;
import ch.usi.dag.disl.coderep.Code;
import ch.usi.dag.disl.dynamiccontext.DynamicContext;
import ch.usi.dag.disl.exception.DiSLFatalException;
import ch.usi.dag.disl.exception.InvalidContextUsageException;
import ch.usi.dag.disl.DiSLFatalException;
import ch.usi.dag.disl.InvalidContextUsageException;
import ch.usi.dag.disl.processor.generator.PIResolver;
import ch.usi.dag.disl.processor.generator.ProcInstance;
import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
......
......@@ -17,7 +17,7 @@ import com.google.protobuf.ByteString;
import ch.usi.dag.disl.DiSL;
import ch.usi.dag.disl.DiSL.CodeOption;
import ch.usi.dag.disl.exception.DiSLException;
import ch.usi.dag.disl.DiSLException;
import ch.usi.dag.disl.util.JavaNames;
import ch.usi.dag.dislserver.Protocol.InstrumentClassRequest;
import ch.usi.dag.dislserver.Protocol.InstrumentClassResponse;
......
......@@ -5,7 +5,7 @@ import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import ch.usi.dag.disl.DiSL;
import ch.usi.dag.disl.exception.DiSLException;
import ch.usi.dag.disl.DiSLException;
public class Transformer implements ClassFileTransformer {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment