Contextes and annotations extracted back to subpackages.

disl/src/src-annotation/ch/usi/dag/disl/After.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/After.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
+
+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.processorcontext.ArgumentProcessorContext;
+import ch.usi.dag.disl.staticcontext.StaticContext;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/AfterReturning.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/AfterReturning.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
+
+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.processorcontext.ArgumentProcessorContext;
+import ch.usi.dag.disl.staticcontext.StaticContext;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/AfterThrowing.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/AfterThrowing.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
+
+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.processorcontext.ArgumentProcessorContext;
+import ch.usi.dag.disl.staticcontext.StaticContext;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/ArgumentProcessor.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/ArgumentProcessor.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
+
+import ch.usi.dag.disl.processorcontext.ArgumentContext;
+import ch.usi.dag.disl.classcontext.ClassContext;
+import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.staticcontext.StaticContext;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/Before.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/Before.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
+
+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.processorcontext.ArgumentProcessorContext;
+import ch.usi.dag.disl.staticcontext.StaticContext;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/GuardMethod.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/GuardMethod.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
+
+import ch.usi.dag.disl.processorcontext.ArgumentContext;
+import ch.usi.dag.disl.guardcontext.GuardContext;
+import ch.usi.dag.disl.Shadow;
+import ch.usi.dag.disl.staticcontext.StaticContext;
 
 import java.lang.annotation.*;
 

disl/src/src-annotation/ch/usi/dag/disl/Guarded.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/Guarded.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/ProcessAlso.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/ProcessAlso.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/SyntheticLocal.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/SyntheticLocal.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-annotation/ch/usi/dag/disl/ThreadLocal.java → disl/src/src-annotation/ch/usi/dag/disl/annotation/ThreadLocal.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

disl/src/src-classparser/ch/usi/dag/disl/AbstractParser.java

 package ch.usi.dag.disl;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
-import ch.usi.dag.disl.SyntheticLocal.Initialize;
+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.util.logging.Logger;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;

disl/src/src-classparser/ch/usi/dag/disl/ArgProcessorParser.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.annotation.Guarded;
+import ch.usi.dag.disl.annotation.ProcessAlso;
 import ch.usi.dag.util.Strings;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;

disl/src/src-classparser/ch/usi/dag/disl/ContextKind.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.classcontext.ClassContext;
+import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.processorcontext.ArgumentContext;
+import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
+import ch.usi.dag.disl.staticcontext.StaticContext;
 import org.objectweb.asm.Type;
 
 import java.util.HashMap;

disl/src/src-classparser/ch/usi/dag/disl/DislClasses.java

@@ -6,6 +6,7 @@
  */
 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.annotation.ArgumentProcessor;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.ClassNode;

disl/src/src-classparser/ch/usi/dag/disl/IsolatedSnippetParser.java

@@ -6,6 +6,7 @@
 
 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.staticcontext.StaticContext;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;

disl/src/src-classparser/ch/usi/dag/disl/SnippetParser.java

 package ch.usi.dag.disl;
 
+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.marker.Marker;
+import ch.usi.dag.disl.marker.Parameter;
 import ch.usi.dag.util.logging.Logger;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AnnotationNode;

disl/src/src-coderep/ch/usi/dag/disl/StaticContextMethod.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.staticcontext.StaticContext;
+
 import java.lang.reflect.Method;
 
 

disl/src/src-context/ch/usi/dag/disl/ClassContext.java → disl/src/src-context/ch/usi/dag/disl/classcontext/ClassContext.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.classcontext;
 
 /**
  * Allows converting {@link String} literals to {@link Class} instances.

disl/src/src-context/ch/usi/dag/disl/DynamicContext.java → disl/src/src-context/ch/usi/dag/disl/dynamiccontext/DynamicContext.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.dynamiccontext;
+
+import ch.usi.dag.disl.annotation.After;
+import ch.usi.dag.disl.annotation.AfterThrowing;
+import ch.usi.dag.disl.staticcontext.FieldAccessStaticContext;
+
 
 /**
  * Provides access to dynamic information available to a snippet at runtime.

disl/src/src-context/ch/usi/dag/disl/GuardContext.java → disl/src/src-context/ch/usi/dag/disl/guardcontext/GuardContext.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.guardcontext;
 
 /**
  * Guard context is used to invoke guard inside of other guard.

disl/src/src-context/ch/usi/dag/disl/ReflectionStaticContext.java → disl/src/src-context/ch/usi/dag/disl/guardcontext/ReflectionStaticContext.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.guardcontext;
 
+import ch.usi.dag.disl.Reflection;
 import ch.usi.dag.disl.Reflection.Class;
 import ch.usi.dag.disl.Reflection.Method;
+import ch.usi.dag.disl.staticcontext.AbstractStaticContext;
 import org.objectweb.asm.tree.MethodNode;
 
 

disl/src/src-context/ch/usi/dag/disl/ArgumentContext.java → disl/src/src-context/ch/usi/dag/disl/processorcontext/ArgumentContext.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.processorcontext;
+
+import ch.usi.dag.disl.annotation.ArgumentProcessor;
+
 
 /**
  * Provides information about a particular method argument from within an

disl/src/src-context/ch/usi/dag/disl/ArgumentProcessorContext.java → disl/src/src-context/ch/usi/dag/disl/processorcontext/ArgumentProcessorContext.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.processorcontext;
 
 /**
  * Provides access to method arguments. This can be done either by querying the

disl/src/src-context/ch/usi/dag/disl/ArgumentProcessorMode.java → disl/src/src-context/ch/usi/dag/disl/processorcontext/ArgumentProcessorMode.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.processorcontext;
+
+import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
+
 
 /**
  * Determines the scope of {@link ArgumentProcessorContext} methods.

disl/src/src-guard/ch/usi/dag/disl/ArgumentContextImpl.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.processorcontext.ArgumentContext;
+
+
 // used for guard invocation - reduced visibility
 class ArgumentContextImpl implements ArgumentContext {
 

disl/src/src-guard/ch/usi/dag/disl/GuardContextImpl.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.guardcontext.GuardContext;
+import ch.usi.dag.disl.processorcontext.ArgumentContext;
+
+
 //used for guard invocation - reduced visibility
 class GuardContextImpl implements GuardContext {
 

disl/src/src-guard/ch/usi/dag/disl/GuardHelper.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.guardcontext.GuardContext;
+import ch.usi.dag.disl.processorcontext.ArgumentContext;
+import ch.usi.dag.disl.staticcontext.StaticContext;
+
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Formatter;

disl/src/src-localvar/ch/usi/dag/disl/SyntheticLocalVar.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.annotation.SyntheticLocal;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.InsnList;
 

disl/src/src-main/ch/usi/dag/disl/DiSL.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.staticcontext.SCGenerator;
 import ch.usi.dag.util.asm.ClassNodeHelper;
 import ch.usi.dag.util.logging.Logger;
 import org.objectweb.asm.Opcodes;

disl/src/src-marker/ch/usi/dag/disl/AbstractDWRMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/AbstractDWRMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import org.objectweb.asm.tree.MethodNode;
 

disl/src/src-marker/ch/usi/dag/disl/AbstractInsnMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/AbstractInsnMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import ch.usi.dag.disl.Shadow.WeavingRegion;
 import org.objectweb.asm.tree.AbstractInsnNode;

disl/src/src-marker/ch/usi/dag/disl/AbstractMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/AbstractMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
+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;
 import org.objectweb.asm.tree.*;
 
 import java.util.HashSet;

disl/src/src-marker/ch/usi/dag/disl/AfterInitBodyMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/AfterInitBodyMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
+import ch.usi.dag.disl.AsmHelper;
 import ch.usi.dag.disl.AsmHelper.Insns;
+import ch.usi.dag.disl.JavaNames;
 import ch.usi.dag.disl.Shadow.WeavingRegion;
+import ch.usi.dag.disl.annotation.Before;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.commons.AdviceAdapter;

disl/src/src-marker/ch/usi/dag/disl/BasicBlockMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/BasicBlockMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
+import ch.usi.dag.disl.BasicBlockCalc;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 

disl/src/src-marker/ch/usi/dag/disl/BodyMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/BodyMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
+import ch.usi.dag.disl.AsmHelper;
 import ch.usi.dag.disl.AsmHelper.Insns;
 import ch.usi.dag.disl.Shadow.WeavingRegion;
 import org.objectweb.asm.tree.AbstractInsnNode;

disl/src/src-marker/ch/usi/dag/disl/BytecodeMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/BytecodeMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
+import ch.usi.dag.disl.AsmOpcodes;
+import ch.usi.dag.disl.MarkerException;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 

disl/src/src-marker/ch/usi/dag/disl/EmptyMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/EmptyMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import org.objectweb.asm.tree.MethodNode;
 

disl/src/src-marker/ch/usi/dag/disl/ExceptionHandlerMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/ExceptionHandlerMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
+import ch.usi.dag.disl.CtrlFlowGraph;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TryCatchBlockNode;

disl/src/src-marker/ch/usi/dag/disl/InsnNodeMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/InsnNodeMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
+import ch.usi.dag.disl.MarkerException;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 

disl/src/src-marker/ch/usi/dag/disl/Marker.java → disl/src/src-marker/ch/usi/dag/disl/marker/Marker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
+import ch.usi.dag.disl.MarkerException;
+import ch.usi.dag.disl.Shadow;
+import ch.usi.dag.disl.Snippet;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 

disl/src/src-marker/ch/usi/dag/disl/NewObjMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/NewObjMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
+import ch.usi.dag.disl.JavaNames;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;

disl/src/src-marker/ch/usi/dag/disl/Parameter.java → disl/src/src-marker/ch/usi/dag/disl/marker/Parameter.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 /**
  * Used for marker parameter parsing.

disl/src/src-marker/ch/usi/dag/disl/PreciseBasicBlockMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/PreciseBasicBlockMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 /**
  * <p>

disl/src/src-marker/ch/usi/dag/disl/StrictBytecodeMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/StrictBytecodeMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
+import ch.usi.dag.disl.AsmOpcodes;
+import ch.usi.dag.disl.MarkerException;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 

disl/src/src-marker/ch/usi/dag/disl/TryClauseMarker.java → disl/src/src-marker/ch/usi/dag/disl/marker/TryClauseMarker.java

-package ch.usi.dag.disl;
+package ch.usi.dag.disl.marker;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
 import org.objectweb.asm.tree.AbstractInsnNode;

disl/src/src-processor/ch/usi/dag/disl/ArgProcessorMethod.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.annotation.ArgumentProcessor;
+
 import java.lang.reflect.Method;
 import java.util.Set;
 

disl/src/src-processor/ch/usi/dag/disl/ProcGenerator.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
@@ -72,7 +73,8 @@ public class ProcGenerator {
         ProcInstance procInst = insideMethodPIs.get(prcInv.getProcessor());
 
         if (procInst == null) {
-            procInst = createProcInstance(ArgumentProcessorMode.METHOD_ARGS,
+            procInst = createProcInstance(
+                ArgumentProcessorMode.METHOD_ARGS,
                     shadow.getMethodNode().desc, shadow, prcInv);
         }
 

disl/src/src-processor/ch/usi/dag/disl/ProcInstance.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
+
 import java.util.List;
 
 

disl/src/src-resolver/ch/usi/dag/disl/GuardResolver.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.annotation.GuardMethod;
+
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.HashMap;

disl/src/src-resolver/ch/usi/dag/disl/SCResolver.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.staticcontext.StaticContext;
+
 import java.util.HashMap;
 import java.util.Map;
 

disl/src/src-snippet/ch/usi/dag/disl/ProcInvocation.java

 package ch.usi.dag.disl;
 
+import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
+
+
 public class ProcInvocation {
 
     private ArgProcessor processor;

disl/src/src-snippet/ch/usi/dag/disl/Shadow.java

@@ -50,7 +50,7 @@ public final class Shadow {
         private AbstractInsnNode afterThrowEnd;
 
 
-        WeavingRegion (
+        public WeavingRegion (
             final AbstractInsnNode start, final List <AbstractInsnNode> ends,
             final AbstractInsnNode afterThrowStart, final AbstractInsnNode afterThrowEnd
         ) {
@@ -90,7 +90,7 @@ public final class Shadow {
             this.afterThrowStart = afterThrowStart;
         }
 
-        void setAfterThrowEnd(final AbstractInsnNode afterThrowEnd) {
+        public void setAfterThrowEnd(final AbstractInsnNode afterThrowEnd) {
             this.afterThrowEnd = afterThrowEnd;
         }
 

disl/src/src-snippet/ch/usi/dag/disl/Snippet.java

 package ch.usi.dag.disl;
 
 import ch.usi.dag.disl.DiSL.CodeOption;
+import ch.usi.dag.disl.marker.Marker;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;

disl/src/src-snippet/ch/usi/dag/disl/SnippetCode.java

@@ -69,7 +69,7 @@ public class SnippetCode {
      *         code, including those referenced in argument processors applied
      *         within this snippet.
      */
-    Set <StaticContextMethod> getReferencedSCMs () {
+    public Set <StaticContextMethod> getReferencedSCMs () {
         return __getCachedReferencedSCMs ();
     }
 

disl/src/src-snippet/ch/usi/dag/disl/SnippetUnprocessedCode.java

@@ -2,6 +2,10 @@ package ch.usi.dag.disl;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
 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 org.objectweb.asm.Opcodes;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.*;

disl/src/src-staticcontext-uid/ch/usi/dag/disl/AbstractUniqueId.java

 package ch.usi.dag.disl;