add 'frontend' to frontend modules

wkktoria · Sep 5, 2024 · f0bb94a · f0bb94a
1 parent 1d640d9
commit f0bb94a
Show file tree

Hide file tree

Showing 636 changed files with 937 additions and 6,141 deletions.
diff --git a/docs/faq.md b/docs/faq.md
@@ -15,7 +15,7 @@ Please make sure to use Java8 to execute.
 ### Exception: Provider "jrt" not found
 ```shell
 java.lang.ExceptionInInitializerError
-	at sootup.java.bytecode.inputlocation.JrtFileSystemAnalysisInputLocationTest.getClassSource(JrtFileSystemAnalysisInputLocationTest.java:28)
+	at inputlocation.sootup.java.bytecode.frontend.JrtFileSystemAnalysisInputLocationTest.getClassSource(JrtFileSystemAnalysisInputLocationTest.java:28)
 	...
 Caused by: java.nio.file.ProviderNotFoundException: Provider "jrt" not found
 ```

diff --git a/docs/installation.md b/docs/installation.md
@@ -36,7 +36,7 @@ Add the following dependencies to your ```pom.xml``` / ```build.gradle```.
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.jimple.parser</artifactId>
+            <artifactId>sootup.jimple.frontend</artifactId>
             <version>{{ git_latest_release }}</version>
         </dependency>
         <dependency>
@@ -79,7 +79,7 @@ Add the following dependencies to your ```pom.xml``` / ```build.gradle```.
     compile "org.soot-oss:sootup.java.core:{{ git_latest_release }}"
     compile "org.soot-oss:sootup.java.sourcecode:{{ git_latest_release }}"
     compile "org.soot-oss:sootup.java.bytecode:{{ git_latest_release }}"
-    compile "org.soot-oss:sootup.jimple.parser:{{ git_latest_release }}"
+    compile "org.soot-oss:sootup.jimple.frontend:{{ git_latest_release }}"
     compile "org.soot-oss:sootup.callgraph:{{ git_latest_release }}"
     compile "org.soot-oss:sootup.analysis:{{ git_latest_release }}"
     compile "org.soot-oss:sootup.qilin:{{ git_latest_release }}"

diff --git a/pom.xml b/pom.xml
@@ -61,19 +61,19 @@
     </scm>
     <modules>
         <module>sootup.core</module>
-        <module>sootup.jimple.parser</module>
+        <module>sootup.jimple.frontend</module>
         <module>sootup.java.core</module>
         <module>sootup.interceptors</module>
-        <module>sootup.java.bytecode</module>
-        <module>sootup.java.sourcecode</module>
+        <module>sootup.java.bytecode.frontend</module>
+        <module>sootup.java.sourcecode.frontend</module>
         <module>sootup.tests</module>
         <module>sootup.callgraph</module>
         <module>sootup.qilin</module>
         <module>sootup.analysis.interprocedural</module>
         <module>sootup.analysis.intraprocedural</module>
         <module>sootup.examples</module>
         <module>sootup.report</module>
-        <module>sootup.apk.parser</module>
+        <module>sootup.apk.frontend</module>
         <module>sootup.codepropertygraph</module>
     </modules>
 
@@ -438,17 +438,17 @@
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.bytecode</artifactId>
+            <artifactId>sootup.java.bytecode.frontend</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.sourcecode</artifactId>
+            <artifactId>sootup.java.sourcecode.frontend</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.jimple.parser</artifactId>
+            <artifactId>sootup.jimple.frontend</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -471,7 +471,11 @@
             <artifactId>sootup.codepropertygraph</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.soot-oss</groupId>
+            <artifactId>sootup.apk.frontend</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
     </dependencyManagement>
 

diff --git a/sootup.analysis.interprocedural/pom.xml b/sootup.analysis.interprocedural/pom.xml
@@ -19,12 +19,12 @@
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.bytecode</artifactId>
+            <artifactId>sootup.java.bytecode.frontend</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.sourcecode</artifactId>
+            <artifactId>sootup.java.sourcecode.frontend</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...terprocedural/src/test/java/sootup/analysis/interprocedural/icfg/ICFGDotExporterTest.java b/...terprocedural/src/test/java/sootup/analysis/interprocedural/icfg/ICFGDotExporterTest.java
@@ -16,8 +16,8 @@
 import sootup.core.model.SootClass;
 import sootup.core.model.SootMethod;
 import sootup.core.signatures.MethodSignature;
-import sootup.java.bytecode.inputlocation.DefaultRTJarAnalysisInputLocation;
-import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
+import sootup.java.bytecode.frontend.inputlocation.DefaultRTJarAnalysisInputLocation;
+import sootup.java.bytecode.frontend.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;

diff --git a/...is.interprocedural/src/test/java/sootup/analysis/interprocedural/ifds/CGEdgeUtilTest.java b/...is.interprocedural/src/test/java/sootup/analysis/interprocedural/ifds/CGEdgeUtilTest.java
@@ -39,11 +39,11 @@
 import sootup.core.types.PrimitiveType;
 import sootup.core.types.Type;
 import sootup.core.util.printer.StmtPrinter;
-import sootup.java.bytecode.inputlocation.DefaultRTJarAnalysisInputLocation;
+import sootup.java.bytecode.frontend.inputlocation.DefaultRTJarAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;
-import sootup.java.sourcecode.inputlocation.JavaSourcePathAnalysisInputLocation;
+import sootup.java.frontend.inputlocation.JavaSourcePathAnalysisInputLocation;
 
 @Tag("Java8")
 public class CGEdgeUtilTest {

diff --git a/...nterprocedural/src/test/java/sootup/analysis/interprocedural/ifds/IFDSTaintTestSetUp.java b/...nterprocedural/src/test/java/sootup/analysis/interprocedural/ifds/IFDSTaintTestSetUp.java
@@ -36,8 +36,8 @@
 import sootup.core.model.SootMethod;
 import sootup.core.model.SourceType;
 import sootup.core.signatures.MethodSignature;
-import sootup.java.bytecode.inputlocation.DefaultRTJarAnalysisInputLocation;
-import sootup.java.bytecode.inputlocation.JavaClassPathAnalysisInputLocation;
+import sootup.java.bytecode.frontend.inputlocation.DefaultRTJarAnalysisInputLocation;
+import sootup.java.bytecode.frontend.inputlocation.JavaClassPathAnalysisInputLocation;
 import sootup.java.core.JavaIdentifierFactory;
 import sootup.java.core.types.JavaClassType;
 import sootup.java.core.views.JavaView;

diff --git a/sootup.analysis.intraprocedural/pom.xml b/sootup.analysis.intraprocedural/pom.xml
@@ -19,12 +19,12 @@
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.bytecode</artifactId>
+            <artifactId>sootup.java.bytecode.frontend</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.soot-oss</groupId>
-            <artifactId>sootup.java.sourcecode</artifactId>
+            <artifactId>sootup.java.sourcecode.frontend</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...up.apk.parser/Sootup DexToJimple Flow.pdf → ....apk.frontend/Sootup DexToJimple Flow.pdf b/...up.apk.parser/Sootup DexToJimple Flow.pdf → ....apk.frontend/Sootup DexToJimple Flow.pdf
diff --git a/sootup.apk.parser/pom.xml → sootup.apk.frontend/pom.xml b/sootup.apk.parser/pom.xml → sootup.apk.frontend/pom.xml
@@ -10,7 +10,7 @@
     </parent>
 
     <name>SootUp APK Frontend</name>
-    <artifactId>sootup.apk.parser</artifactId>
+    <artifactId>sootup.apk.frontend</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/...apk.parser/resources/FlowSensitivity1.apk → ...k.frontend/resources/FlowSensitivity1.apk b/...apk.parser/resources/FlowSensitivity1.apk → ...k.frontend/resources/FlowSensitivity1.apk
diff --git a/.../apk/parser/ApkAnalysisInputLocation.java → ...pk/frontend/ApkAnalysisInputLocation.java b/.../apk/parser/ApkAnalysisInputLocation.java → ...pk/frontend/ApkAnalysisInputLocation.java
@@ -1,4 +1,4 @@
-package sootup.apk.parser;
+package sootup.apk.frontend;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -7,10 +7,10 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.jf.dexlib2.iface.DexFile;
-import sootup.apk.parser.Util.*;
-import sootup.apk.parser.dexpler.DexClassProvider;
-import sootup.apk.parser.dexpler.DexFileProvider;
-import sootup.apk.parser.main.AndroidVersionInfo;
+import sootup.apk.frontend.Util.*;
+import sootup.apk.frontend.dexpler.DexClassProvider;
+import sootup.apk.frontend.dexpler.DexFileProvider;
+import sootup.apk.frontend.main.AndroidVersionInfo;
 import sootup.core.frontend.SootClassSource;
 import sootup.core.inputlocation.AnalysisInputLocation;
 import sootup.core.model.ClassModifier;

diff --git a/...ootup/apk/parser/DexBodyInterceptors.java → ...tup/apk/frontend/DexBodyInterceptors.java b/...ootup/apk/parser/DexBodyInterceptors.java → ...tup/apk/frontend/DexBodyInterceptors.java
@@ -1,11 +1,11 @@
-package sootup.apk.parser;
+package sootup.apk.frontend;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import javax.annotation.Nonnull;
-import sootup.apk.parser.interceptors.DexNullTransformer;
-import sootup.apk.parser.interceptors.DexNumberTranformer;
+import sootup.apk.frontend.interceptors.DexNullTransformer;
+import sootup.apk.frontend.interceptors.DexNumberTranformer;
 import sootup.core.transform.BodyInterceptor;
 
 public enum DexBodyInterceptors {

diff --git a/.../java/sootup/apk/parser/Util/DexUtil.java → ...ava/sootup/apk/frontend/Util/DexUtil.java b/.../java/sootup/apk/parser/Util/DexUtil.java → ...ava/sootup/apk/frontend/Util/DexUtil.java
@@ -1,11 +1,11 @@
-package sootup.apk.parser.Util;
+package sootup.apk.frontend.Util;
 
 import java.util.*;
 import javax.annotation.Nonnull;
 import org.jf.dexlib2.iface.Annotation;
 import org.jf.dexlib2.iface.AnnotationElement;
 import org.jf.dexlib2.iface.value.EncodedValue;
-import sootup.apk.parser.main.AndroidVersionInfo;
+import sootup.apk.frontend.main.AndroidVersionInfo;
 import sootup.core.signatures.PackageName;
 import sootup.core.types.*;
 import sootup.core.views.View;

diff --git a/.../apk/parser/dexpler/DexClassProvider.java → ...pk/frontend/dexpler/DexClassProvider.java b/.../apk/parser/dexpler/DexClassProvider.java → ...pk/frontend/dexpler/DexClassProvider.java
@@ -1,4 +1,4 @@
-package sootup.apk.parser.dexpler;
+package sootup.apk.frontend.dexpler;
 
 import java.nio.file.Path;
 import java.util.Optional;

diff --git a/...up/apk/parser/dexpler/DexClassSource.java → .../apk/frontend/dexpler/DexClassSource.java b/...up/apk/parser/dexpler/DexClassSource.java → .../apk/frontend/dexpler/DexClassSource.java
@@ -1,4 +1,4 @@
-package sootup.apk.parser.dexpler;
+package sootup.apk.frontend.dexpler;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -11,7 +11,7 @@
 import org.jf.dexlib2.iface.*;
 import org.jf.dexlib2.iface.Field;
 import org.jf.dexlib2.iface.Method;
-import sootup.apk.parser.Util.DexUtil;
+import sootup.apk.frontend.Util.DexUtil;
 import sootup.core.IdentifierFactory;
 import sootup.core.frontend.ResolveException;
 import sootup.core.inputlocation.AnalysisInputLocation;

diff --git a/...p/apk/parser/dexpler/DexFileProvider.java → ...apk/frontend/dexpler/DexFileProvider.java b/...p/apk/parser/dexpler/DexFileProvider.java → ...apk/frontend/dexpler/DexFileProvider.java
@@ -1,4 +1,4 @@
-package sootup.apk.parser.dexpler;
+package sootup.apk.frontend.dexpler;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...tup/apk/parser/dexpler/DexLibWrapper.java → ...p/apk/frontend/dexpler/DexLibWrapper.java b/...tup/apk/parser/dexpler/DexLibWrapper.java → ...p/apk/frontend/dexpler/DexLibWrapper.java
@@ -1,12 +1,12 @@
-package sootup.apk.parser.dexpler;
+package sootup.apk.frontend.dexpler;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
 import org.jf.dexlib2.iface.ClassDef;
 import org.jf.dexlib2.iface.DexFile;
 import org.jf.dexlib2.iface.MultiDexContainer;
-import sootup.apk.parser.Util.*;
+import sootup.apk.frontend.Util.*;
 import sootup.core.types.ClassType;
 
 /**

diff --git a/.../sootup/apk/parser/dexpler/DexMethod.java → ...ootup/apk/frontend/dexpler/DexMethod.java b/.../sootup/apk/parser/dexpler/DexMethod.java → ...ootup/apk/frontend/dexpler/DexMethod.java
@@ -1,4 +1,4 @@
-package sootup.apk.parser.dexpler;
+package sootup.apk.frontend.dexpler;
 
 import java.lang.reflect.Modifier;
 import java.util.Collections;
@@ -7,8 +7,8 @@
 import org.jf.dexlib2.iface.DexFile;
 import org.jf.dexlib2.iface.Method;
 import org.jf.dexlib2.iface.MultiDexContainer;
-import sootup.apk.parser.Util.DexUtil;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.Util.DexUtil;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.graph.MutableBlockStmtGraph;
 import sootup.core.signatures.MethodSignature;
 import sootup.core.transform.BodyInterceptor;

diff --git a/...p/apk/parser/dexpler/DexMethodSource.java → ...apk/frontend/dexpler/DexMethodSource.java b/...p/apk/parser/dexpler/DexMethodSource.java → ...apk/frontend/dexpler/DexMethodSource.java
@@ -1,4 +1,4 @@
-package sootup.apk.parser.dexpler;
+package sootup.apk.frontend.dexpler;
 
 import java.io.IOException;
 import java.util.Collections;

diff --git a/...ootup/apk/parser/dexpler/DexResolver.java → ...tup/apk/frontend/dexpler/DexResolver.java b/...ootup/apk/parser/dexpler/DexResolver.java → ...tup/apk/frontend/dexpler/DexResolver.java
@@ -1,4 +1,4 @@
-package sootup.apk.parser.dexpler;
+package sootup.apk.frontend.dexpler;
 
 import java.io.File;
 import java.util.HashMap;

diff --git a/...k/parser/instruction/AgetInstruction.java → ...frontend/instruction/AgetInstruction.java b/...k/parser/instruction/AgetInstruction.java → ...frontend/instruction/AgetInstruction.java
@@ -1,8 +1,8 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction23x;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.StmtPositionInfo;

diff --git a/...k/parser/instruction/AputInstruction.java → ...frontend/instruction/AputInstruction.java b/...k/parser/instruction/AputInstruction.java → ...frontend/instruction/AputInstruction.java
@@ -1,8 +1,8 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction23x;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.common.ref.JArrayRef;
 import sootup.core.jimple.common.stmt.JAssignStmt;

diff --git a/...r/instruction/ArrayLengthInstruction.java → ...d/instruction/ArrayLengthInstruction.java b/...r/instruction/ArrayLengthInstruction.java → ...d/instruction/ArrayLengthInstruction.java
@@ -1,8 +1,8 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction12x;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.StmtPositionInfo;

diff --git a/...er/instruction/Binop2addrInstruction.java → ...nd/instruction/Binop2addrInstruction.java b/...er/instruction/Binop2addrInstruction.java → ...nd/instruction/Binop2addrInstruction.java
@@ -1,9 +1,9 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction12x;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.StmtPositionInfo;

diff --git a/.../parser/instruction/BinopInstruction.java → ...rontend/instruction/BinopInstruction.java b/.../parser/instruction/BinopInstruction.java → ...rontend/instruction/BinopInstruction.java
@@ -1,9 +1,9 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction23x;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.StmtPositionInfo;

diff --git a/...rser/instruction/BinopLitInstruction.java → ...tend/instruction/BinopLitInstruction.java b/...rser/instruction/BinopLitInstruction.java → ...tend/instruction/BinopLitInstruction.java
@@ -1,12 +1,12 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.NarrowLiteralInstruction;
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction22b;
 import org.jf.dexlib2.iface.instruction.formats.Instruction22s;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.StmtPositionInfo;

diff --git a/...k/parser/instruction/CastInstruction.java → ...frontend/instruction/CastInstruction.java b/...k/parser/instruction/CastInstruction.java → ...frontend/instruction/CastInstruction.java
@@ -1,9 +1,9 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.TwoRegisterInstruction;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.StmtPositionInfo;
 import sootup.core.jimple.common.expr.JCastExpr;

diff --git a/...ser/instruction/CheckCastInstruction.java → ...end/instruction/CheckCastInstruction.java b/...ser/instruction/CheckCastInstruction.java → ...end/instruction/CheckCastInstruction.java
@@ -1,10 +1,10 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction21c;
 import org.jf.dexlib2.iface.reference.TypeReference;
-import sootup.apk.parser.Util.DexUtil;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.Util.DexUtil;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.StmtPositionInfo;

diff --git a/...pk/parser/instruction/CmpInstruction.java → .../frontend/instruction/CmpInstruction.java b/...pk/parser/instruction/CmpInstruction.java → .../frontend/instruction/CmpInstruction.java
@@ -1,9 +1,9 @@
-package sootup.apk.parser.instruction;
+package sootup.apk.frontend.instruction;
 
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.instruction.formats.Instruction23x;
-import sootup.apk.parser.main.DexBody;
+import sootup.apk.frontend.main.DexBody;
 import sootup.core.jimple.Jimple;
 import sootup.core.jimple.basic.Local;
 import sootup.core.jimple.basic.StmtPositionInfo;