Commit 47493e80 authored by Vít Kabele's avatar Vít Kabele

Coderep package merged.

parent 96e42df5
Pipeline #3325 passed with stages
in 3 minutes and 39 seconds
......@@ -9,6 +9,7 @@
<classpathentry kind="src" path="disl/src/src-exception"/>
<classpathentry kind="src" path="disl/src/src-main"/>
<classpathentry kind="src" path="disl/src/src-resolver"/>
<classpathentry kind="src" path="disl/src/src-coderep"/>
<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"/>
......
......@@ -10,6 +10,7 @@ src.disl=src-disl
src.disl.main=src-main
src.disl.classparser=src-classparser
src.disl.resolver=src-resolver
src.disl.coderep=src-coderep
src.disl.exception=src-exception
src.disl.bypass=src-disl-bypass
src.disl.agent=src-disl-agent
......
......@@ -479,6 +479,7 @@
<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.main}"/>
<classpath>
<path refid="disl.bypass.classpath"/>
......
......@@ -15,7 +15,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.guard.GuardHelper;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.processor.ArgProcessor;
......
......@@ -6,8 +6,6 @@
package ch.usi.dag.disl;
import ch.usi.dag.util.Strings;
import org.objectweb.asm.Attribute;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
......
package ch.usi.dag.disl.coderep;
package ch.usi.dag.disl;
import java.util.Collections;
import java.util.List;
......
package ch.usi.dag.disl.coderep;
package ch.usi.dag.disl;
import java.util.Collections;
import java.util.EnumSet;
......@@ -8,8 +8,6 @@ import java.util.Set;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.MethodNode;
import ch.usi.dag.disl.ContextKind;
/**
* Captures the set of context kinds and static context types referenced by
......@@ -44,13 +42,13 @@ final class ContextUsage {
/**
* @return An unmodifiable set of used static context types.
*/
public Set <Type> staticContextTypes () {
Set <Type> staticContextTypes () {
return __contextTypes;
}
//
public static ContextUsage forMethod (final MethodNode method) {
static ContextUsage forMethod (final MethodNode method) {
//
// Collect the kinds of contexts appearing in the arguments as well as
// the types of static contexts.
......
package ch.usi.dag.disl.coderep;
package ch.usi.dag.disl;
import java.util.List;
import java.util.stream.Collectors;
......
package ch.usi.dag.disl.coderep;
package ch.usi.dag.disl;
import java.lang.reflect.Method;
import ch.usi.dag.disl.StaticContextGenException;
import ch.usi.dag.disl.staticcontext.StaticContext;
......@@ -32,7 +31,7 @@ public class StaticContextMethod {
private final Class <?> __referencedClass;
public StaticContextMethod (
StaticContextMethod (
final String id, final Method method, final Class <?> referencedClass
) {
__id = id;
......
package ch.usi.dag.disl.coderep;
package ch.usi.dag.disl;
import java.lang.reflect.Method;
import java.util.Collections;
......@@ -19,8 +19,6 @@ import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.InitializationException;
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;
......
......@@ -4,7 +4,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import ch.usi.dag.disl.coderep.StaticContextMethod;
import ch.usi.dag.disl.StaticContextMethod;
import ch.usi.dag.disl.localvar.LocalVars;
......
......@@ -4,8 +4,8 @@ import java.lang.reflect.Method;
import java.util.Set;
import ch.usi.dag.disl.annotation.ArgumentProcessor;
import ch.usi.dag.disl.coderep.Code;
import ch.usi.dag.disl.coderep.UnprocessedCode;
import ch.usi.dag.disl.Code;
import ch.usi.dag.disl.UnprocessedCode;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.snippet.Snippet;
......
......@@ -2,7 +2,7 @@ package ch.usi.dag.disl.processor.generator;
import org.objectweb.asm.Type;
import ch.usi.dag.disl.coderep.Code;
import ch.usi.dag.disl.Code;
import ch.usi.dag.disl.processor.ArgProcessorKind;
......
......@@ -10,8 +10,8 @@ import java.util.stream.Collectors;
import org.objectweb.asm.tree.InsnList;
import org.objectweb.asm.tree.TryCatchBlockNode;
import ch.usi.dag.disl.coderep.Code;
import ch.usi.dag.disl.coderep.StaticContextMethod;
import ch.usi.dag.disl.Code;
import ch.usi.dag.disl.StaticContextMethod;
import ch.usi.dag.disl.localvar.LocalVars;
import ch.usi.dag.disl.localvar.SyntheticLocalVar;
import ch.usi.dag.disl.localvar.ThreadLocalVar;
......
......@@ -16,8 +16,8 @@ import org.objectweb.asm.tree.MethodInsnNode;
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.Code;
import ch.usi.dag.disl.UnprocessedCode;
import ch.usi.dag.disl.ProcessorException;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.localvar.LocalVars;
......
......@@ -4,7 +4,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import ch.usi.dag.disl.coderep.StaticContextMethod;
import ch.usi.dag.disl.StaticContextMethod;
import ch.usi.dag.disl.ReflectionException;
import ch.usi.dag.disl.StaticContextGenException;
import ch.usi.dag.disl.SCResolver;
......
......@@ -20,7 +20,7 @@ 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.coderep.Code;
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;
......
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