Commit f1985a33 authored by Vít Kabele's avatar Vít Kabele

Marker package merged

parent 9da53e7b
Pipeline #3377 passed with stages
in 2 minutes and 57 seconds
......@@ -19,6 +19,7 @@
<classpathentry kind="src" path="disl-server/src"/>
<classpathentry kind="src" path="disl/src/src-staticcontext"/>
<classpathentry kind="src" path="disl/src/src-staticcontext-uid"/>
<classpathentry kind="src" path="disl/src/src-marker"/>
<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"/>
......
......@@ -18,6 +18,7 @@ src.disl.guard=src-guard
src.disl.localvar=src-localvar
src.disl.exception=src-exception
src.disl.scope=src-scope
src.disl.marker=src-marker
src.disl.staticcontext=src-staticcontext
src.disl.staticcontext-uid=src-staticcontext-uid
src.disl.bypass=src-disl-bypass
......
......@@ -484,6 +484,7 @@
<src path="${src.disl.prefix}/src/${src.disl.processor}"/>
<src path="${src.disl.prefix}/src/${src.disl.guard}"/>
<src path="${src.disl.prefix}/src/${src.disl.scope}"/>
<src path="${src.disl.prefix}/src/${src.disl.marker}"/>
<src path="${src.disl.prefix}/src/${src.disl.localvar}"/>
<src path="${src.disl.prefix}/src/${src.disl.staticcontext}"/>
<src path="${src.disl.prefix}/src/${src.disl.staticcontext-uid}"/>
......
......@@ -8,8 +8,6 @@ import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.marker.Marker;
import ch.usi.dag.disl.marker.Parameter;
import ch.usi.dag.util.logging.Logger;
......
package ch.usi.dag.disl;
import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
import ch.usi.dag.disl.processorcontext.ArgumentContext;
// used for guard invocation - reduced visibility
......
......@@ -7,7 +7,6 @@ import java.util.HashSet;
import java.util.Set;
import ch.usi.dag.disl.guardcontext.GuardContext;
import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
import ch.usi.dag.disl.processorcontext.ArgumentContext;
......
package ch.usi.dag.disl;
import ch.usi.dag.disl.processor.generator.PIResolver;
import ch.usi.dag.disl.processor.generator.ProcGenerator;
import ch.usi.dag.disl.processor.generator.ProcInstance;
import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
import ch.usi.dag.disl.weaver.Weaver;
import ch.usi.dag.util.asm.ClassNodeHelper;
import ch.usi.dag.util.logging.Logger;
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.HashSet;
import java.util.LinkedList;
......@@ -11,10 +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.MarkerException;
import ch.usi.dag.disl.Shadow;
import ch.usi.dag.disl.Shadow.WeavingRegion;
import ch.usi.dag.disl.Snippet;
/**
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......@@ -12,9 +12,7 @@ import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.annotation.Before;
import ch.usi.dag.disl.Shadow.WeavingRegion;
import ch.usi.dag.disl.AsmHelper;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.JavaNames;
/**
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......@@ -7,7 +7,6 @@ import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.BasicBlockCalc;
/**
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......@@ -7,7 +7,6 @@ import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.Shadow.WeavingRegion;
import ch.usi.dag.disl.AsmHelper;
import ch.usi.dag.disl.AsmHelper.Insns;
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.HashSet;
import java.util.LinkedList;
......@@ -8,9 +8,7 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.AsmOpcodes;
/**
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......@@ -8,7 +8,7 @@ import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.CtrlFlowGraph;
/**
* Marks an exception handler.
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.HashSet;
import java.util.LinkedList;
......@@ -8,7 +8,6 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.AsmHelper.Insns;
/**
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.List;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.Shadow;
import ch.usi.dag.disl.Snippet;
/**
* <p>
......@@ -19,37 +16,37 @@ import ch.usi.dag.disl.Snippet;
* scoped methods.
* <ul>
* <li>
* {@link ch.usi.dag.disl.marker.AfterInitBodyMarker
* {@link AfterInitBodyMarker
* AfterInitBodyMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.BasicBlockMarker
* {@link BasicBlockMarker
* BasicBlockMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.BodyMarker
* {@link BodyMarker
* BodyMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.BytecodeMarker
* {@link BytecodeMarker
* BytcodeMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.EmptyMarker
* {@link EmptyMarker
* EmptyMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.ExceptionHandlerMarker
* {@link ExceptionHandlerMarker
* ExceptionHandlerMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.InsnNodeMarker
* {@link InsnNodeMarker
* InsnNodeMarker - experimental}</li>
* <li>
* {@link ch.usi.dag.disl.marker.NewObjMarker
* {@link NewObjMarker
* NewObjMarker - experimental}</li>
* <li>
* {@link ch.usi.dag.disl.marker.PreciseBasicBlockMarker
* {@link PreciseBasicBlockMarker
* PreciseBasicBlockMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.StrictBytecodeMarker
* {@link StrictBytecodeMarker
* StrictBytecodeMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.TryClauseMarker
* {@link TryClauseMarker
* TryClauseMarker}</li>
* </ul>
*
......@@ -58,13 +55,13 @@ import ch.usi.dag.disl.Snippet;
* be implemented directly or following abstract markers might be used.
* <ul>
* <li>
* {@link ch.usi.dag.disl.marker.AbstractMarker
* {@link AbstractMarker
* AbstractMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.AbstractDWRMarker
* {@link AbstractDWRMarker
* AbstractDWRMarker}</li>
* <li>
* {@link ch.usi.dag.disl.marker.AbstractInsnMarker
* {@link AbstractInsnMarker
* AbstractInsnMarker}</li>
* </ul>
*/
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......@@ -9,7 +9,7 @@ import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.AsmHelper.Insns;
import ch.usi.dag.disl.JavaNames;
/**
* Marks object creation.
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
/**
* Used for marker parameter parsing.
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.HashSet;
import java.util.LinkedList;
......@@ -8,8 +8,6 @@ import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.MarkerException;
import ch.usi.dag.disl.AsmOpcodes;
/**
* <p>
......
package ch.usi.dag.disl.marker;
package ch.usi.dag.disl;
import java.util.LinkedList;
import java.util.List;
......
package ch.usi.dag.disl.processor.generator;
package ch.usi.dag.disl;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import ch.usi.dag.disl.Shadow;
public class PIResolver {
......
package ch.usi.dag.disl.processor.generator;
package ch.usi.dag.disl;
import java.util.HashMap;
import java.util.LinkedList;
......@@ -9,16 +9,8 @@ import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.MethodInsnNode;
import ch.usi.dag.disl.DiSLFatalException;
import ch.usi.dag.disl.ProcessorException;
import ch.usi.dag.disl.GuardHelper;
import ch.usi.dag.disl.ArgProcessor;
import ch.usi.dag.disl.ArgProcessorKind;
import ch.usi.dag.disl.ArgProcessorMethod;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
import ch.usi.dag.disl.ProcInvocation;
import ch.usi.dag.disl.Shadow;
import ch.usi.dag.disl.Snippet;
public class ProcGenerator {
......
package ch.usi.dag.disl.processor.generator;
package ch.usi.dag.disl;
import java.util.List;
......
package ch.usi.dag.disl.processor.generator;
package ch.usi.dag.disl;
import org.objectweb.asm.Type;
......
......@@ -12,7 +12,6 @@ import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.DiSL.CodeOption;
import ch.usi.dag.disl.marker.Marker;
/**
......
......@@ -16,8 +16,6 @@ import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.DiSL.CodeOption;
import ch.usi.dag.disl.marker.BytecodeMarker;
import ch.usi.dag.disl.marker.Marker;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
import ch.usi.dag.disl.AsmHelper.Insns;
......
......@@ -2,8 +2,6 @@ package ch.usi.dag.disl;
import org.objectweb.asm.tree.FieldInsnNode;
import ch.usi.dag.disl.marker.BytecodeMarker;
/**
* Represents a field access static context. Provides field's name and type
......
......@@ -3,8 +3,6 @@ package ch.usi.dag.disl;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.MethodInsnNode;
import ch.usi.dag.disl.marker.BytecodeMarker;
/**
* Represents a static context for method invocations. Provides information
......
......@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import ch.usi.dag.disl.classcontext.ClassContext;
import ch.usi.dag.disl.dynamiccontext.DynamicContext;
import ch.usi.dag.disl.marker.Marker;
import ch.usi.dag.disl.Marker;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
import ch.usi.dag.disl.StaticContext;
......@@ -62,7 +62,7 @@ public @interface After {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see ch.usi.dag.disl.marker.Marker Implementation details
* @see Marker Implementation details
*/
Class <? extends Marker> marker();
......
......@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import ch.usi.dag.disl.classcontext.ClassContext;
import ch.usi.dag.disl.dynamiccontext.DynamicContext;
import ch.usi.dag.disl.marker.Marker;
import ch.usi.dag.disl.Marker;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
import ch.usi.dag.disl.StaticContext;
......@@ -62,7 +62,7 @@ public @interface AfterReturning {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see ch.usi.dag.disl.marker.Marker Implementation details
* @see Marker Implementation details
*/
Class <? extends Marker> marker();
......
......@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import ch.usi.dag.disl.classcontext.ClassContext;
import ch.usi.dag.disl.dynamiccontext.DynamicContext;
import ch.usi.dag.disl.marker.Marker;
import ch.usi.dag.disl.Marker;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
import ch.usi.dag.disl.StaticContext;
......@@ -61,7 +61,7 @@ public @interface AfterThrowing {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see ch.usi.dag.disl.marker.Marker Implementation details
* @see Marker Implementation details
*/
Class <? extends Marker> marker();
......
......@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
import ch.usi.dag.disl.classcontext.ClassContext;
import ch.usi.dag.disl.dynamiccontext.DynamicContext;
import ch.usi.dag.disl.marker.Marker;
import ch.usi.dag.disl.Marker;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
import ch.usi.dag.disl.StaticContext;
......@@ -61,7 +61,7 @@ public @interface Before {
* Selects the marker class. A marker determines the region of code within a
* method where to apply the snippet.
*
* @see ch.usi.dag.disl.marker.Marker Implementation details
* @see Marker Implementation details
*/
Class <? extends Marker> marker();
......
......@@ -23,7 +23,7 @@ import ch.usi.dag.disl.annotation.SyntheticLocal.Initialize;
import ch.usi.dag.disl.InvalidContextUsageException;
import ch.usi.dag.disl.SyntheticLocalVar;
import ch.usi.dag.disl.ThreadLocalVar;
import ch.usi.dag.disl.processor.generator.PIResolver;
import ch.usi.dag.disl.PIResolver;
import ch.usi.dag.disl.Shadow;
import ch.usi.dag.disl.Shadow.WeavingRegion;
import ch.usi.dag.disl.Snippet;
......
......@@ -24,9 +24,9 @@ import ch.usi.dag.disl.Code;
import ch.usi.dag.disl.dynamiccontext.DynamicContext;
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;
import ch.usi.dag.disl.PIResolver;
import ch.usi.dag.disl.ProcInstance;
import ch.usi.dag.disl.ProcMethodInstance;
import ch.usi.dag.disl.processorcontext.ArgumentContext;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
......
......@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.after.instr;
import ch.usi.dag.disl.annotation.After;
import ch.usi.dag.disl.annotation.AfterThrowing;
import ch.usi.dag.disl.marker.BodyMarker;
import ch.usi.dag.disl.BodyMarker;
public class DiSLClass {
......
......@@ -5,7 +5,7 @@ import java.util.Stack;
import ch.usi.dag.disl.annotation.After;
import ch.usi.dag.disl.annotation.Before;
import ch.usi.dag.disl.annotation.ThreadLocal;
import ch.usi.dag.disl.marker.BodyMarker;
import ch.usi.dag.disl.BodyMarker;
import ch.usi.dag.disl.RandomMethodUid;
import ch.usi.dag.disl.test.suite.after2.instr.runtime.Analysis;
......
......@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.after3.instr;
import ch.usi.dag.disl.annotation.AfterReturning;
import ch.usi.dag.disl.annotation.AfterThrowing;
import ch.usi.dag.disl.marker.BodyMarker;
import ch.usi.dag.disl.BodyMarker;
import ch.usi.dag.disl.MethodStaticContext;
public class DiSLClass {
......
package ch.usi.dag.disl.test.suite.afterinit1.app;
import ch.usi.dag.disl.marker.AfterInitBodyMarker;
import ch.usi.dag.disl.AfterInitBodyMarker;
/**
......
......@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit1.instr;
import ch.usi.dag.disl.annotation.After;
import ch.usi.dag.disl.annotation.Before;
import ch.usi.dag.disl.marker.AfterInitBodyMarker;
import ch.usi.dag.disl.AfterInitBodyMarker;
public class DiSLClass {
......
......@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit2.app;
import ch.usi.dag.disl.annotation.After;
import ch.usi.dag.disl.annotation.Before;
import ch.usi.dag.disl.marker.AfterInitBodyMarker;
import ch.usi.dag.disl.AfterInitBodyMarker;
/**
......
......@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit2.instr;
import ch.usi.dag.disl.annotation.After;
import ch.usi.dag.disl.annotation.Before;
import ch.usi.dag.disl.marker.AfterInitBodyMarker;
import ch.usi.dag.disl.AfterInitBodyMarker;
import ch.usi.dag.disl.ClassStaticContext;
import ch.usi.dag.disl.MethodStaticContext;
......
package ch.usi.dag.disl.test.suite.args.instr;
import ch.usi.dag.disl.annotation.AfterReturning;