Context packages merged src-disl removed

.classpath

@@ -23,6 +23,7 @@
 	<classpathentry kind="src" path="disl/src/src-weaver"/>
 	<classpathentry kind="src" path="disl/src/src-weaver-pe"/>
 	<classpathentry kind="src" path="disl/src/src-annotation"/>
+	<classpathentry kind="src" path="disl/src/src-context"/>
 	<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"/>

build.properties

@@ -11,6 +11,7 @@ src.disl=src-disl
 src.disl.annotation=src-annotation
 src.disl.classparser=src-classparser
 src.disl.coderep=src-coderep
+src.disl.context=src-context
 src.disl.exception=src-exception
 src.disl.guard=src-guard
 src.disl.localvar=src-localvar

build.xml

@@ -475,26 +475,27 @@
 	<target name="compile-disl" depends="compile-util,compile-disl-bypass">
 		<mkdir dir="${build.disl}"/>
 		<javac destdir="${build.disl}" debug="true">
-			<src path="${src.disl}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.classparser}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.exception}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.resolver}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.coderep}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.snippet}"/>
-			<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.weaver}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.weaver-pe}"/>
-			<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}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.annotation}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.util}"/>
-			<src path="${src.disl.prefix}/src/${src.disl.main}"/>
-
-			<src path="disl-server/src"/>
+            <src path="${src.disl.prefix}/src/${src.disl.annotation}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.classparser}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.coderep}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.context}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.exception}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.guard}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.localvar}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.main}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.marker}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.processor}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.resolver}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.scope}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.snippet}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.staticcontext-uid}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.staticcontext}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.util}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.weaver-pe}"/>
+            <src path="${src.disl.prefix}/src/${src.disl.weaver}"/>
+
+
+            <src path="disl-server/src"/>
 			<classpath>
 				<path refid="disl.bypass.classpath"/>
 				<path refid="util.classpath"/>
@@ -538,7 +539,7 @@
 	<target name="-check-disl-agent-codeflags">
 		<property name="build.disl.agent.codeflags.path" value="${src.disl.agent}/codeflags.h"/>
 		<uptodate property="build.disl.agent.codeflags.uptodate" targetfile="${build.disl.agent.codeflags.path}">
-			<srcfiles dir="${src.disl}" includes="**/DiSL.java"/>
+			<srcfiles dir="${src.disl.prefix}/src" includes="**/DiSL.java"/>
 		</uptodate>
 	</target>
 

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

@@ -4,12 +4,6 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 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;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.StaticContext;
-
 
 /**
  * Marks a method as a DiSL snippet to be inserted after the marked code region.

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

@@ -4,12 +4,6 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 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;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.StaticContext;
-
 
 /**
  * Marks a method as a DiSL snippet to be inserted after the marked code region.

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

@@ -4,12 +4,6 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 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;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.StaticContext;
-
 
 /**
  * Marks a method as a DiSL snippet to be inserted after the marked code region.

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

@@ -4,10 +4,6 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Target;
 
-import ch.usi.dag.disl.classcontext.ClassContext;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.processorcontext.ArgumentContext;
-
 
 /**
  * Indicates that the class contains methods for processing method arguments

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

@@ -4,12 +4,6 @@ import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 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;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.StaticContext;
-
 
 /**
  * Marks a method as a DiSL snippet to be inserted before the marked code

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

@@ -5,11 +5,6 @@ import java.util.Map;
 
 import org.objectweb.asm.Type;
 
-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;
-
 
 public enum ContextKind {
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -6,9 +6,6 @@ import java.util.Formatter;
 import java.util.HashSet;
 import java.util.Set;
 
-import ch.usi.dag.disl.guardcontext.GuardContext;
-import ch.usi.dag.disl.processorcontext.ArgumentContext;
-
 
 public abstract class GuardHelper {
 

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

@@ -9,8 +9,6 @@ import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
-
 
 public class ProcGenerator {
 

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

@@ -2,7 +2,6 @@ package ch.usi.dag.disl;
 
 import java.util.List;
 
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
 
 public class ProcInstance {
     private final ArgumentProcessorMode __mode;

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/SnippetUnprocessedCode.java

@@ -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.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
 import ch.usi.dag.disl.AsmHelper.Insns;
 
 

disl/src/src-weaver/ch/usi/dag/disl/WeavingCode.java

@@ -19,11 +19,6 @@ import org.objectweb.asm.tree.analysis.BasicValue;
 import org.objectweb.asm.tree.analysis.Frame;
 import org.objectweb.asm.tree.analysis.SourceValue;
 
-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.processorcontext.ArgumentProcessorMode;
 import ch.usi.dag.disl.AsmHelper.Insns;
 
 

src-test/ch/usi/dag/disl/test/suite/args/instr/DiSLClass.java

@@ -2,8 +2,8 @@ package ch.usi.dag.disl.test.suite.args.instr;
 
 import ch.usi.dag.disl.AfterReturning;
 import ch.usi.dag.disl.BodyMarker;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
+import ch.usi.dag.disl.ArgumentProcessorContext;
+import ch.usi.dag.disl.ArgumentProcessorMode;
 import ch.usi.dag.disl.MethodStaticContext;
 
 public class DiSLClass {

src-test/ch/usi/dag/disl/test/suite/dispatch2/instr/DiSLClass.java

 package ch.usi.dag.disl.test.suite.dispatch2.instr;
 
 import ch.usi.dag.disl.Before;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.DynamicContext;
 import ch.usi.dag.disl.BytecodeMarker;
 
 public class DiSLClass {

src-test/ch/usi/dag/disl/test/suite/dispatchmp/instr/DiSLClass.java

 package ch.usi.dag.disl.test.suite.dispatchmp.instr;
 
 import ch.usi.dag.disl.Before;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.DynamicContext;
 import ch.usi.dag.disl.BytecodeMarker;
 
 

src-test/ch/usi/dag/disl/test/suite/dynamiccontext/instr/DiSLClass.java

 package ch.usi.dag.disl.test.suite.dynamiccontext.instr;
 
 import ch.usi.dag.disl.AfterReturning;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.DynamicContext;
 import ch.usi.dag.disl.BodyMarker;
 import ch.usi.dag.disl.BytecodeMarker;
 import ch.usi.dag.disl.FieldAccessStaticContext;

src-test/ch/usi/dag/disl/test/suite/dynamicinfo/instr/DiSLClass.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.dynamicinfo.instr;
 
 import ch.usi.dag.disl.AfterReturning;
 import ch.usi.dag.disl.Before;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.DynamicContext;
 import ch.usi.dag.disl.BodyMarker;
 import ch.usi.dag.disl.BytecodeMarker;
 import ch.usi.dag.disl.MethodStaticContext;

src-test/ch/usi/dag/disl/test/suite/gettarget/instr/DiSLClass.java

@@ -2,9 +2,9 @@ package ch.usi.dag.disl.test.suite.gettarget.instr;
 
 import ch.usi.dag.disl.Before;
 import ch.usi.dag.disl.BytecodeMarker;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.ArgumentProcessorContext;
+import ch.usi.dag.disl.ArgumentProcessorMode;
+import ch.usi.dag.disl.DynamicContext;
 
 
 public class DiSLClass {

src-test/ch/usi/dag/disl/test/suite/guard/instr/DiSLClass.java

@@ -4,8 +4,8 @@ import ch.usi.dag.disl.After;
 import ch.usi.dag.disl.Before;
 import ch.usi.dag.disl.BodyMarker;
 import ch.usi.dag.disl.BytecodeMarker;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
+import ch.usi.dag.disl.ArgumentProcessorContext;
+import ch.usi.dag.disl.ArgumentProcessorMode;
 import ch.usi.dag.disl.MethodStaticContext;
 
 

src-test/ch/usi/dag/disl/test/suite/guard/instr/GuardLength.java

 package ch.usi.dag.disl.test.suite.guard.instr;
 
 import ch.usi.dag.disl.GuardMethod;
-import ch.usi.dag.disl.guardcontext.GuardContext;
+import ch.usi.dag.disl.GuardContext;
 
 
 public abstract class GuardLength {

src-test/ch/usi/dag/disl/test/suite/guard/instr/ProcessorTest.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.guard.instr;
 
 import ch.usi.dag.disl.Guarded;
 import ch.usi.dag.disl.ArgumentProcessor;
-import ch.usi.dag.disl.processorcontext.ArgumentContext;
+import ch.usi.dag.disl.ArgumentContext;
 
 
 @ArgumentProcessor

src-test/ch/usi/dag/disl/test/suite/newobjmarker/instr/DiSLClass.java

@@ -3,7 +3,7 @@ package ch.usi.dag.disl.test.suite.newobjmarker.instr;
 import ch.usi.dag.disl.AfterReturning;
 import ch.usi.dag.disl.Before;
 import ch.usi.dag.disl.NewObjMarker;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.DynamicContext;
 
 
 public class DiSLClass {

src-test/ch/usi/dag/disl/test/suite/processor/instr/DiSLClass.java

@@ -2,11 +2,11 @@ package ch.usi.dag.disl.test.suite.processor.instr;
 
 import ch.usi.dag.disl.Before;
 import ch.usi.dag.disl.SyntheticLocal;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.DynamicContext;
 import ch.usi.dag.disl.BodyMarker;
 import ch.usi.dag.disl.BytecodeMarker;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
-import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
+import ch.usi.dag.disl.ArgumentProcessorContext;
+import ch.usi.dag.disl.ArgumentProcessorMode;
 import ch.usi.dag.disl.MethodStaticContext;
 
 

src-test/ch/usi/dag/disl/test/suite/processor/instr/ProcessorTest.java

@@ -4,8 +4,8 @@ import ch.usi.dag.disl.ArgumentProcessor;
 import ch.usi.dag.disl.ProcessAlso;
 import ch.usi.dag.disl.ProcessAlso.Type;
 import ch.usi.dag.disl.SyntheticLocal;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.processorcontext.ArgumentContext;
+import ch.usi.dag.disl.DynamicContext;
+import ch.usi.dag.disl.ArgumentContext;
 import ch.usi.dag.disl.MethodStaticContext;
 
 

src-test/ch/usi/dag/disl/test/suite/processor/instr/ProcessorTest2.java

@@ -2,8 +2,8 @@ package ch.usi.dag.disl.test.suite.processor.instr;
 
 import ch.usi.dag.disl.ArgumentProcessor;
 import ch.usi.dag.disl.SyntheticLocal;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.processorcontext.ArgumentContext;
+import ch.usi.dag.disl.DynamicContext;
+import ch.usi.dag.disl.ArgumentContext;
 
 
 @ArgumentProcessor

src-test/ch/usi/dag/disl/test/suite/stack/instr/DiSLClass.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.stack.instr;
 
 import ch.usi.dag.disl.AfterReturning;
 import ch.usi.dag.disl.BytecodeMarker;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
+import ch.usi.dag.disl.DynamicContext;
 
 
 public class DiSLClass {