diff --git a/.github/workflows/maven-2.yml b/.github/workflows/maven-2.yml index 8871608..be1f42e 100644 --- a/.github/workflows/maven-2.yml +++ b/.github/workflows/maven-2.yml @@ -28,11 +28,11 @@ jobs: distribution: 'temurin' cache: maven - name: Build with Maven - working-directory: latte-umbrella + working-directory: latte run: mvn -B package --file pom.xml # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive - name: Update dependency graph run: | - cd latte-umbrella + cd latte mvn com.github.ferstl:depgraph-maven-plugin:4.0.1:graph diff --git a/README.md b/README.md index 8bae0ce..ce5520c 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,12 @@ Local variables are not annotated and start with a default annotation that allow ## Project Structure ``` -latte-umbrella/ +latte/ ├── src/ │ └── main/ │ └── java/ │ ├── latte/ -│ │ └── latte_umbrella/ -│ │ └── App.java # Main application entry point +│ │ └── App.java # Main application entry point │ └── examples/ # Test examples for the analysis │ └── test/ │ └── java/ @@ -58,8 +57,8 @@ latte-umbrella/ Clone the repository and build with Maven: ```bash -git clone https://github.com/your-username/latte.git -cd latte +git clone https://github.com/CatarinaGamboa/latte.git +cd latte/latte mvn clean install ``` diff --git a/latte-umbrella/.classpath b/latte-umbrella/.classpath deleted file mode 100644 index 653dfd7..0000000 --- a/latte-umbrella/.classpath +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/latte-umbrella/.project b/latte-umbrella/.project deleted file mode 100644 index 5afd2b4..0000000 --- a/latte-umbrella/.project +++ /dev/null @@ -1,34 +0,0 @@ - - - latte-umbrella - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - - - 1710786331789 - - 30 - - org.eclipse.core.resources.regexFilterMatcher - node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ - - - - diff --git a/latte-umbrella/.settings/org.eclipse.core.resources.prefs b/latte-umbrella/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 839d647..0000000 --- a/latte-umbrella/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding/=UTF-8 diff --git a/latte-umbrella/.settings/org.eclipse.jdt.core.prefs b/latte-umbrella/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ea7a397..0000000 --- a/latte-umbrella/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,16 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore -org.eclipse.jdt.core.compiler.processAnnotations=disabled -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/latte-umbrella/.settings/org.eclipse.m2e.core.prefs b/latte-umbrella/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/latte-umbrella/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/latte-umbrella/.github/workflows/maven-tests.yml b/latte/.github/workflows/maven-tests.yml similarity index 100% rename from latte-umbrella/.github/workflows/maven-tests.yml rename to latte/.github/workflows/maven-tests.yml diff --git a/latte-umbrella/.gitignore b/latte/.gitignore similarity index 100% rename from latte-umbrella/.gitignore rename to latte/.gitignore diff --git a/latte-umbrella/LICENSE.md b/latte/LICENSE.md similarity index 100% rename from latte-umbrella/LICENSE.md rename to latte/LICENSE.md diff --git a/latte-umbrella/pom.xml b/latte/pom.xml similarity index 98% rename from latte-umbrella/pom.xml rename to latte/pom.xml index 5d63e41..68db751 100644 --- a/latte-umbrella/pom.xml +++ b/latte/pom.xml @@ -5,10 +5,10 @@ 4.0.0 latte - latte-umbrella + latte 0.0.1-SNAPSHOT - latte-umbrella + latte http://www.example.com diff --git a/latte-umbrella/spooned/MyNode.java b/latte/spooned/MyNode.java similarity index 100% rename from latte-umbrella/spooned/MyNode.java rename to latte/spooned/MyNode.java diff --git a/latte-umbrella/spooned/MyNodeCallUniqueFree.java b/latte/spooned/MyNodeCallUniqueFree.java similarity index 100% rename from latte-umbrella/spooned/MyNodeCallUniqueFree.java rename to latte/spooned/MyNodeCallUniqueFree.java diff --git a/latte-umbrella/spooned/MyNodeNoDistinct.java b/latte/spooned/MyNodeNoDistinct.java similarity index 100% rename from latte-umbrella/spooned/MyNodeNoDistinct.java rename to latte/spooned/MyNodeNoDistinct.java diff --git a/latte-umbrella/spooned/MyNodePushPop.java b/latte/spooned/MyNodePushPop.java similarity index 100% rename from latte-umbrella/spooned/MyNodePushPop.java rename to latte/spooned/MyNodePushPop.java diff --git a/latte-umbrella/spooned/MyNodePushPopIncorrect.java b/latte/spooned/MyNodePushPopIncorrect.java similarity index 100% rename from latte-umbrella/spooned/MyNodePushPopIncorrect.java rename to latte/spooned/MyNodePushPopIncorrect.java diff --git a/latte-umbrella/spooned/Node.java b/latte/spooned/Node.java similarity index 100% rename from latte-umbrella/spooned/Node.java rename to latte/spooned/Node.java diff --git a/latte-umbrella/spooned/SmallestIncorrectExample.java b/latte/spooned/SmallestIncorrectExample.java similarity index 100% rename from latte-umbrella/spooned/SmallestIncorrectExample.java rename to latte/spooned/SmallestIncorrectExample.java diff --git a/latte-umbrella/spooned/examples/MyNodeComplete.java b/latte/spooned/examples/MyNodeComplete.java similarity index 100% rename from latte-umbrella/spooned/examples/MyNodeComplete.java rename to latte/spooned/examples/MyNodeComplete.java diff --git a/latte-umbrella/spooned/examples/MyNodePush.java b/latte/spooned/examples/MyNodePush.java similarity index 100% rename from latte-umbrella/spooned/examples/MyNodePush.java rename to latte/spooned/examples/MyNodePush.java diff --git a/latte-umbrella/spooned/examples/MyStack.java b/latte/spooned/examples/MyStack.java similarity index 100% rename from latte-umbrella/spooned/examples/MyStack.java rename to latte/spooned/examples/MyStack.java diff --git a/latte-umbrella/spooned/examples/Node.java b/latte/spooned/examples/Node.java similarity index 100% rename from latte-umbrella/spooned/examples/Node.java rename to latte/spooned/examples/Node.java diff --git a/latte-umbrella/spooned/latte/MyNode.java b/latte/spooned/latte/MyNode.java similarity index 100% rename from latte-umbrella/spooned/latte/MyNode.java rename to latte/spooned/latte/MyNode.java diff --git a/latte-umbrella/src/main/java/latte/latte_umbrella/App.java b/latte/src/main/java/api/App.java similarity index 97% rename from latte-umbrella/src/main/java/latte/latte_umbrella/App.java rename to latte/src/main/java/api/App.java index a7320e2..6b7f6ec 100644 --- a/latte-umbrella/src/main/java/latte/latte_umbrella/App.java +++ b/latte/src/main/java/api/App.java @@ -1,5 +1,4 @@ -package latte.latte_umbrella; - +package api; import java.io.File; import java.security.InvalidParameterException; import java.util.Arrays; @@ -30,7 +29,7 @@ public static void main( String[] args ){ if (args.length == 0) { System.out.println("Please enter the path to the file you want to process"); - String allPath = "latte-umbrella/src/main/java/examples/MyStackTest.java"; + String allPath = "latte/src/main/java/examples/MyStackTest.java"; launcher(allPath); } else if (args.length == 1 && args[0].equals("-multi")) { diff --git a/latte-umbrella/src/main/java/latte/latte_umbrella/JsonError.java b/latte/src/main/java/api/JsonError.java similarity index 97% rename from latte-umbrella/src/main/java/latte/latte_umbrella/JsonError.java rename to latte/src/main/java/api/JsonError.java index 7537bc4..7485972 100644 --- a/latte-umbrella/src/main/java/latte/latte_umbrella/JsonError.java +++ b/latte/src/main/java/api/JsonError.java @@ -1,4 +1,4 @@ -package latte.latte_umbrella; +package api; public class JsonError { private int startLine; diff --git a/latte-umbrella/src/main/java/context/ClassLevelMaps.java b/latte/src/main/java/context/ClassLevelMaps.java similarity index 100% rename from latte-umbrella/src/main/java/context/ClassLevelMaps.java rename to latte/src/main/java/context/ClassLevelMaps.java diff --git a/latte-umbrella/src/main/java/context/PermissionEnvironment.java b/latte/src/main/java/context/PermissionEnvironment.java similarity index 100% rename from latte-umbrella/src/main/java/context/PermissionEnvironment.java rename to latte/src/main/java/context/PermissionEnvironment.java diff --git a/latte-umbrella/src/main/java/context/SymbolicEnvironment.java b/latte/src/main/java/context/SymbolicEnvironment.java similarity index 100% rename from latte-umbrella/src/main/java/context/SymbolicEnvironment.java rename to latte/src/main/java/context/SymbolicEnvironment.java diff --git a/latte-umbrella/src/main/java/context/SymbolicValue.java b/latte/src/main/java/context/SymbolicValue.java similarity index 100% rename from latte-umbrella/src/main/java/context/SymbolicValue.java rename to latte/src/main/java/context/SymbolicValue.java diff --git a/latte-umbrella/src/main/java/context/Uniqueness.java b/latte/src/main/java/context/Uniqueness.java similarity index 100% rename from latte-umbrella/src/main/java/context/Uniqueness.java rename to latte/src/main/java/context/Uniqueness.java diff --git a/latte-umbrella/src/main/java/context/UniquenessAnnotation.java b/latte/src/main/java/context/UniquenessAnnotation.java similarity index 100% rename from latte-umbrella/src/main/java/context/UniquenessAnnotation.java rename to latte/src/main/java/context/UniquenessAnnotation.java diff --git a/latte-umbrella/src/main/java/context/VariableHeapLoc.java b/latte/src/main/java/context/VariableHeapLoc.java similarity index 100% rename from latte-umbrella/src/main/java/context/VariableHeapLoc.java rename to latte/src/main/java/context/VariableHeapLoc.java diff --git a/latte-umbrella/src/main/java/examples/MyStackTest.java b/latte/src/main/java/examples/MyStackTest.java similarity index 100% rename from latte-umbrella/src/main/java/examples/MyStackTest.java rename to latte/src/main/java/examples/MyStackTest.java diff --git a/latte-umbrella/src/main/java/specification/Borrowed.java b/latte/src/main/java/specification/Borrowed.java similarity index 100% rename from latte-umbrella/src/main/java/specification/Borrowed.java rename to latte/src/main/java/specification/Borrowed.java diff --git a/latte-umbrella/src/main/java/specification/Free.java b/latte/src/main/java/specification/Free.java similarity index 100% rename from latte-umbrella/src/main/java/specification/Free.java rename to latte/src/main/java/specification/Free.java diff --git a/latte-umbrella/src/main/java/specification/Shared.java b/latte/src/main/java/specification/Shared.java similarity index 100% rename from latte-umbrella/src/main/java/specification/Shared.java rename to latte/src/main/java/specification/Shared.java diff --git a/latte-umbrella/src/main/java/specification/Unique.java b/latte/src/main/java/specification/Unique.java similarity index 100% rename from latte-umbrella/src/main/java/specification/Unique.java rename to latte/src/main/java/specification/Unique.java diff --git a/latte-umbrella/src/main/java/typechecking/LatteAbstractChecker.java b/latte/src/main/java/typechecking/LatteAbstractChecker.java similarity index 100% rename from latte-umbrella/src/main/java/typechecking/LatteAbstractChecker.java rename to latte/src/main/java/typechecking/LatteAbstractChecker.java diff --git a/latte-umbrella/src/main/java/typechecking/LatteClassFirstPass.java b/latte/src/main/java/typechecking/LatteClassFirstPass.java similarity index 100% rename from latte-umbrella/src/main/java/typechecking/LatteClassFirstPass.java rename to latte/src/main/java/typechecking/LatteClassFirstPass.java diff --git a/latte-umbrella/src/main/java/typechecking/LatteException.java b/latte/src/main/java/typechecking/LatteException.java similarity index 100% rename from latte-umbrella/src/main/java/typechecking/LatteException.java rename to latte/src/main/java/typechecking/LatteException.java diff --git a/latte-umbrella/src/main/java/typechecking/LatteProcessor.java b/latte/src/main/java/typechecking/LatteProcessor.java similarity index 100% rename from latte-umbrella/src/main/java/typechecking/LatteProcessor.java rename to latte/src/main/java/typechecking/LatteProcessor.java diff --git a/latte-umbrella/src/main/java/typechecking/LatteTypeChecker.java b/latte/src/main/java/typechecking/LatteTypeChecker.java similarity index 100% rename from latte-umbrella/src/main/java/typechecking/LatteTypeChecker.java rename to latte/src/main/java/typechecking/LatteTypeChecker.java diff --git a/latte-umbrella/src/main/resources/logback.xml b/latte/src/main/resources/logback.xml similarity index 100% rename from latte-umbrella/src/main/resources/logback.xml rename to latte/src/main/resources/logback.xml diff --git a/latte-umbrella/src/test/examples/BoxMain.java b/latte/src/test/examples/BoxMain.java similarity index 100% rename from latte-umbrella/src/test/examples/BoxMain.java rename to latte/src/test/examples/BoxMain.java diff --git a/latte-umbrella/src/test/examples/FieldAccessNoThis.java b/latte/src/test/examples/FieldAccessNoThis.java similarity index 100% rename from latte-umbrella/src/test/examples/FieldAccessNoThis.java rename to latte/src/test/examples/FieldAccessNoThis.java diff --git a/latte-umbrella/src/test/examples/FieldAccessRightNoThis.java b/latte/src/test/examples/FieldAccessRightNoThis.java similarity index 100% rename from latte-umbrella/src/test/examples/FieldAccessRightNoThis.java rename to latte/src/test/examples/FieldAccessRightNoThis.java diff --git a/latte-umbrella/src/test/examples/HttpEntityNoAnnotations.java b/latte/src/test/examples/HttpEntityNoAnnotations.java similarity index 100% rename from latte-umbrella/src/test/examples/HttpEntityNoAnnotations.java rename to latte/src/test/examples/HttpEntityNoAnnotations.java diff --git a/latte-umbrella/src/test/examples/MyNode.java b/latte/src/test/examples/MyNode.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNode.java rename to latte/src/test/examples/MyNode.java diff --git a/latte-umbrella/src/test/examples/MyNodeCallUniqueFree.java b/latte/src/test/examples/MyNodeCallUniqueFree.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNodeCallUniqueFree.java rename to latte/src/test/examples/MyNodeCallUniqueFree.java diff --git a/latte-umbrella/src/test/examples/MyNodeComplete.java b/latte/src/test/examples/MyNodeComplete.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNodeComplete.java rename to latte/src/test/examples/MyNodeComplete.java diff --git a/latte-umbrella/src/test/examples/MyNodeCorrect.java b/latte/src/test/examples/MyNodeCorrect.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNodeCorrect.java rename to latte/src/test/examples/MyNodeCorrect.java diff --git a/latte-umbrella/src/test/examples/MyNodeNoDistinct.java b/latte/src/test/examples/MyNodeNoDistinct.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNodeNoDistinct.java rename to latte/src/test/examples/MyNodeNoDistinct.java diff --git a/latte-umbrella/src/test/examples/MyNodePush.java b/latte/src/test/examples/MyNodePush.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNodePush.java rename to latte/src/test/examples/MyNodePush.java diff --git a/latte-umbrella/src/test/examples/MyNodePushPop.java b/latte/src/test/examples/MyNodePushPop.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNodePushPop.java rename to latte/src/test/examples/MyNodePushPop.java diff --git a/latte-umbrella/src/test/examples/MyNodePushPopIncorrect.java b/latte/src/test/examples/MyNodePushPopIncorrect.java similarity index 100% rename from latte-umbrella/src/test/examples/MyNodePushPopIncorrect.java rename to latte/src/test/examples/MyNodePushPopIncorrect.java diff --git a/latte-umbrella/src/test/examples/MyStackFieldAssign.java b/latte/src/test/examples/MyStackFieldAssign.java similarity index 100% rename from latte-umbrella/src/test/examples/MyStackFieldAssign.java rename to latte/src/test/examples/MyStackFieldAssign.java diff --git a/latte-umbrella/src/test/examples/MyStackFieldAssignMethod.java b/latte/src/test/examples/MyStackFieldAssignMethod.java similarity index 100% rename from latte-umbrella/src/test/examples/MyStackFieldAssignMethod.java rename to latte/src/test/examples/MyStackFieldAssignMethod.java diff --git a/latte-umbrella/src/test/examples/SmallestIncorrectExample.java b/latte/src/test/examples/SmallestIncorrectExample.java similarity index 100% rename from latte-umbrella/src/test/examples/SmallestIncorrectExample.java rename to latte/src/test/examples/SmallestIncorrectExample.java diff --git a/latte-umbrella/src/test/examples/searching_state_space/ResultSetForwardOnly.java b/latte/src/test/examples/searching_state_space/ResultSetForwardOnly.java similarity index 100% rename from latte-umbrella/src/test/examples/searching_state_space/ResultSetForwardOnly.java rename to latte/src/test/examples/searching_state_space/ResultSetForwardOnly.java diff --git a/latte-umbrella/src/test/examples/searching_state_space/ResultSetNoNext.java b/latte/src/test/examples/searching_state_space/ResultSetNoNext.java similarity index 100% rename from latte-umbrella/src/test/examples/searching_state_space/ResultSetNoNext.java rename to latte/src/test/examples/searching_state_space/ResultSetNoNext.java diff --git a/latte-umbrella/src/test/examples/searching_state_space/TimerTaskCannotReschedule.java b/latte/src/test/examples/searching_state_space/TimerTaskCannotReschedule.java similarity index 100% rename from latte-umbrella/src/test/examples/searching_state_space/TimerTaskCannotReschedule.java rename to latte/src/test/examples/searching_state_space/TimerTaskCannotReschedule.java diff --git a/latte-umbrella/src/test/examples/searching_state_space/URLConnectionReuseConnection.java b/latte/src/test/examples/searching_state_space/URLConnectionReuseConnection.java similarity index 100% rename from latte-umbrella/src/test/examples/searching_state_space/URLConnectionReuseConnection.java rename to latte/src/test/examples/searching_state_space/URLConnectionReuseConnection.java diff --git a/latte-umbrella/src/test/examples/searching_state_space/URLConnectionSetProperty1.java b/latte/src/test/examples/searching_state_space/URLConnectionSetProperty1.java similarity index 100% rename from latte-umbrella/src/test/examples/searching_state_space/URLConnectionSetProperty1.java rename to latte/src/test/examples/searching_state_space/URLConnectionSetProperty1.java diff --git a/latte-umbrella/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleComplete.java b/latte/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleComplete.java similarity index 100% rename from latte-umbrella/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleComplete.java rename to latte/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleComplete.java diff --git a/latte-umbrella/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleShort.java b/latte/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleShort.java similarity index 100% rename from latte-umbrella/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleShort.java rename to latte/src/test/examples/searching_state_space/URLConnectionSetPropertyMultipleShort.java diff --git a/latte-umbrella/src/test/examples/stack_overflow/Iterator.java b/latte/src/test/examples/stack_overflow/Iterator.java similarity index 100% rename from latte-umbrella/src/test/examples/stack_overflow/Iterator.java rename to latte/src/test/examples/stack_overflow/Iterator.java diff --git a/latte-umbrella/src/test/examples/stack_overflow/MediaRecord.java b/latte/src/test/examples/stack_overflow/MediaRecord.java similarity index 100% rename from latte-umbrella/src/test/examples/stack_overflow/MediaRecord.java rename to latte/src/test/examples/stack_overflow/MediaRecord.java diff --git a/latte-umbrella/src/test/java/latte/latte_umbrella/AppTest.java b/latte/src/test/java/AppTest.java similarity index 99% rename from latte-umbrella/src/test/java/latte/latte_umbrella/AppTest.java rename to latte/src/test/java/AppTest.java index 65329eb..4cb2631 100644 --- a/latte-umbrella/src/test/java/latte/latte_umbrella/AppTest.java +++ b/latte/src/test/java/AppTest.java @@ -1,4 +1,4 @@ -package latte.latte_umbrella; + import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -11,7 +11,7 @@ import context.SymbolicEnvironment; import context.SymbolicValue; import typechecking.LatteException; - +import api.App; /** * Unit test for simple App. */