From 28f319acbe0ccb7a638a674c775e324a331fcf8d Mon Sep 17 00:00:00 2001 From: Azat Abdullin Date: Fri, 29 Apr 2022 11:25:03 +0300 Subject: [PATCH] move from jetbrains to vorpal --- Makefile | 2 +- pom.xml | 6 +++--- .../{jetbrains => vorpal}/research/boolector/ArrayNode.java | 2 +- .../{jetbrains => vorpal}/research/boolector/ArraySort.java | 2 +- .../research/boolector/BitvecNode.java | 2 +- .../research/boolector/BitvecSort.java | 2 +- .../{jetbrains => vorpal}/research/boolector/BoolNode.java | 4 ++-- .../{jetbrains => vorpal}/research/boolector/BoolSort.java | 2 +- .../research/boolector/BoolectorFunction.java | 2 +- .../research/boolector/BoolectorNode.java | 2 +- .../research/boolector/BoolectorObject.java | 2 +- .../research/boolector/BoolectorSort.java | 2 +- .../org/{jetbrains => vorpal}/research/boolector/Btor.java | 2 +- .../research/boolector/FunctionDecl.java | 2 +- .../research/boolector/FunctionSort.java | 2 +- .../{jetbrains => vorpal}/research/boolector/Native.java | 2 +- .../research/boolector/NativeUtils.java | 2 +- .../{jetbrains => vorpal}/research/boolector/TypeNode.java | 2 +- .../research/boolector/UninterpretedFunction.java | 2 +- .../research/boolector/BitvecSortTest.java | 2 +- .../research/boolector/BoolectorNodeTest.java | 2 +- .../research/boolector/FunctionDeclTest.java | 2 +- .../research/boolector/UninterpretedFunctionTest.java | 2 +- 23 files changed, 26 insertions(+), 26 deletions(-) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/ArrayNode.java (97%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/ArraySort.java (94%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BitvecNode.java (99%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BitvecSort.java (93%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BoolNode.java (93%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BoolSort.java (93%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BoolectorFunction.java (92%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BoolectorNode.java (98%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BoolectorObject.java (95%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/BoolectorSort.java (96%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/Btor.java (97%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/FunctionDecl.java (97%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/FunctionSort.java (95%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/Native.java (99%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/NativeUtils.java (99%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/TypeNode.java (62%) rename src/main/java/org/{jetbrains => vorpal}/research/boolector/UninterpretedFunction.java (92%) rename src/test/java/org/{jetbrains => vorpal}/research/boolector/BitvecSortTest.java (90%) rename src/test/java/org/{jetbrains => vorpal}/research/boolector/BoolectorNodeTest.java (99%) rename src/test/java/org/{jetbrains => vorpal}/research/boolector/FunctionDeclTest.java (97%) rename src/test/java/org/{jetbrains => vorpal}/research/boolector/UninterpretedFunctionTest.java (96%) diff --git a/Makefile b/Makefile index b4168cf..a60a142 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ $(OBJECTS): $(SOURCES) $(CC) $(CFLAGS) $< -o $@ headers: - javah -d $(SOURCES_DIR) -classpath $(BASE_DIR)/src/main/java -force org.jetbrains.research.boolector.Native + javah -d $(SOURCES_DIR) -classpath $(BASE_DIR)/src/main/java -force org.vorpal.research.boolector.Native clean: rm -rfi $(OBJECTS_DIR) $(EXECUTABLE) diff --git a/pom.xml b/pom.xml index 5b9b6a9..1b723d0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.jetbrains.research + org.vorpal.research boolector-java - 3.2.5 + 3.2.6 UTF-8 @@ -17,7 +17,7 @@ junit junit - 4.12 + 4.13.2 test diff --git a/src/main/java/org/jetbrains/research/boolector/ArrayNode.java b/src/main/java/org/vorpal/research/boolector/ArrayNode.java similarity index 97% rename from src/main/java/org/jetbrains/research/boolector/ArrayNode.java rename to src/main/java/org/vorpal/research/boolector/ArrayNode.java index af893e7..7bdd13b 100644 --- a/src/main/java/org/jetbrains/research/boolector/ArrayNode.java +++ b/src/main/java/org/vorpal/research/boolector/ArrayNode.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public class ArrayNode extends BoolectorNode { diff --git a/src/main/java/org/jetbrains/research/boolector/ArraySort.java b/src/main/java/org/vorpal/research/boolector/ArraySort.java similarity index 94% rename from src/main/java/org/jetbrains/research/boolector/ArraySort.java rename to src/main/java/org/vorpal/research/boolector/ArraySort.java index cdbe105..418c547 100644 --- a/src/main/java/org/jetbrains/research/boolector/ArraySort.java +++ b/src/main/java/org/vorpal/research/boolector/ArraySort.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public class ArraySort extends BoolectorSort { diff --git a/src/main/java/org/jetbrains/research/boolector/BitvecNode.java b/src/main/java/org/vorpal/research/boolector/BitvecNode.java similarity index 99% rename from src/main/java/org/jetbrains/research/boolector/BitvecNode.java rename to src/main/java/org/vorpal/research/boolector/BitvecNode.java index 320f4c4..43d18b0 100644 --- a/src/main/java/org/jetbrains/research/boolector/BitvecNode.java +++ b/src/main/java/org/vorpal/research/boolector/BitvecNode.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/org/jetbrains/research/boolector/BitvecSort.java b/src/main/java/org/vorpal/research/boolector/BitvecSort.java similarity index 93% rename from src/main/java/org/jetbrains/research/boolector/BitvecSort.java rename to src/main/java/org/vorpal/research/boolector/BitvecSort.java index d028c67..9ae8768 100644 --- a/src/main/java/org/jetbrains/research/boolector/BitvecSort.java +++ b/src/main/java/org/vorpal/research/boolector/BitvecSort.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public class BitvecSort extends BoolectorSort { diff --git a/src/main/java/org/jetbrains/research/boolector/BoolNode.java b/src/main/java/org/vorpal/research/boolector/BoolNode.java similarity index 93% rename from src/main/java/org/jetbrains/research/boolector/BoolNode.java rename to src/main/java/org/vorpal/research/boolector/BoolNode.java index 7b782f3..d39854f 100644 --- a/src/main/java/org/jetbrains/research/boolector/BoolNode.java +++ b/src/main/java/org/vorpal/research/boolector/BoolNode.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public class BoolNode extends BoolectorNode { BoolNode(Btor btor, long ref) { @@ -48,7 +48,7 @@ public BoolNode toBoolNode() { @Override public BitvecNode toBitvecNode() { - return (BitvecNode) BitvecNode.create(this.btor, this.ref, this.name); + return (BitvecNode) create(this.btor, this.ref, this.name); } @Override diff --git a/src/main/java/org/jetbrains/research/boolector/BoolSort.java b/src/main/java/org/vorpal/research/boolector/BoolSort.java similarity index 93% rename from src/main/java/org/jetbrains/research/boolector/BoolSort.java rename to src/main/java/org/vorpal/research/boolector/BoolSort.java index 15849b9..9f37d03 100644 --- a/src/main/java/org/jetbrains/research/boolector/BoolSort.java +++ b/src/main/java/org/vorpal/research/boolector/BoolSort.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public class BoolSort extends BoolectorSort { private static final int BOOL_WIDTH = 1; diff --git a/src/main/java/org/jetbrains/research/boolector/BoolectorFunction.java b/src/main/java/org/vorpal/research/boolector/BoolectorFunction.java similarity index 92% rename from src/main/java/org/jetbrains/research/boolector/BoolectorFunction.java rename to src/main/java/org/vorpal/research/boolector/BoolectorFunction.java index b76b692..61081f2 100644 --- a/src/main/java/org/jetbrains/research/boolector/BoolectorFunction.java +++ b/src/main/java/org/vorpal/research/boolector/BoolectorFunction.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import java.util.List; diff --git a/src/main/java/org/jetbrains/research/boolector/BoolectorNode.java b/src/main/java/org/vorpal/research/boolector/BoolectorNode.java similarity index 98% rename from src/main/java/org/jetbrains/research/boolector/BoolectorNode.java rename to src/main/java/org/vorpal/research/boolector/BoolectorNode.java index 5d833ca..f3dd4e7 100644 --- a/src/main/java/org/jetbrains/research/boolector/BoolectorNode.java +++ b/src/main/java/org/vorpal/research/boolector/BoolectorNode.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public abstract class BoolectorNode extends BoolectorObject { protected static int numberOfNames; diff --git a/src/main/java/org/jetbrains/research/boolector/BoolectorObject.java b/src/main/java/org/vorpal/research/boolector/BoolectorObject.java similarity index 95% rename from src/main/java/org/jetbrains/research/boolector/BoolectorObject.java rename to src/main/java/org/vorpal/research/boolector/BoolectorObject.java index 0bc54d1..8b3a54b 100644 --- a/src/main/java/org/jetbrains/research/boolector/BoolectorObject.java +++ b/src/main/java/org/vorpal/research/boolector/BoolectorObject.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import java.util.Objects; diff --git a/src/main/java/org/jetbrains/research/boolector/BoolectorSort.java b/src/main/java/org/vorpal/research/boolector/BoolectorSort.java similarity index 96% rename from src/main/java/org/jetbrains/research/boolector/BoolectorSort.java rename to src/main/java/org/vorpal/research/boolector/BoolectorSort.java index bc27fc3..ed81600 100644 --- a/src/main/java/org/jetbrains/research/boolector/BoolectorSort.java +++ b/src/main/java/org/vorpal/research/boolector/BoolectorSort.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public abstract class BoolectorSort extends BoolectorObject { private Integer width; diff --git a/src/main/java/org/jetbrains/research/boolector/Btor.java b/src/main/java/org/vorpal/research/boolector/Btor.java similarity index 97% rename from src/main/java/org/jetbrains/research/boolector/Btor.java rename to src/main/java/org/vorpal/research/boolector/Btor.java index 41c6dcb..021aeca 100644 --- a/src/main/java/org/jetbrains/research/boolector/Btor.java +++ b/src/main/java/org/vorpal/research/boolector/Btor.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import java.io.IOException; import java.util.Objects; diff --git a/src/main/java/org/jetbrains/research/boolector/FunctionDecl.java b/src/main/java/org/vorpal/research/boolector/FunctionDecl.java similarity index 97% rename from src/main/java/org/jetbrains/research/boolector/FunctionDecl.java rename to src/main/java/org/vorpal/research/boolector/FunctionDecl.java index f47a36f..24d8430 100644 --- a/src/main/java/org/jetbrains/research/boolector/FunctionDecl.java +++ b/src/main/java/org/vorpal/research/boolector/FunctionDecl.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import java.util.List; diff --git a/src/main/java/org/jetbrains/research/boolector/FunctionSort.java b/src/main/java/org/vorpal/research/boolector/FunctionSort.java similarity index 95% rename from src/main/java/org/jetbrains/research/boolector/FunctionSort.java rename to src/main/java/org/vorpal/research/boolector/FunctionSort.java index 6e53e64..7c2e802 100644 --- a/src/main/java/org/jetbrains/research/boolector/FunctionSort.java +++ b/src/main/java/org/vorpal/research/boolector/FunctionSort.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public class FunctionSort extends BoolectorSort { diff --git a/src/main/java/org/jetbrains/research/boolector/Native.java b/src/main/java/org/vorpal/research/boolector/Native.java similarity index 99% rename from src/main/java/org/jetbrains/research/boolector/Native.java rename to src/main/java/org/vorpal/research/boolector/Native.java index 6d6e569..ccfd79c 100644 --- a/src/main/java/org/jetbrains/research/boolector/Native.java +++ b/src/main/java/org/vorpal/research/boolector/Native.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public final class Native { diff --git a/src/main/java/org/jetbrains/research/boolector/NativeUtils.java b/src/main/java/org/vorpal/research/boolector/NativeUtils.java similarity index 99% rename from src/main/java/org/jetbrains/research/boolector/NativeUtils.java rename to src/main/java/org/vorpal/research/boolector/NativeUtils.java index 41a6e1b..13e870b 100644 --- a/src/main/java/org/jetbrains/research/boolector/NativeUtils.java +++ b/src/main/java/org/vorpal/research/boolector/NativeUtils.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; /* * Class NativeUtils is published under the The MIT License: diff --git a/src/main/java/org/jetbrains/research/boolector/TypeNode.java b/src/main/java/org/vorpal/research/boolector/TypeNode.java similarity index 62% rename from src/main/java/org/jetbrains/research/boolector/TypeNode.java rename to src/main/java/org/vorpal/research/boolector/TypeNode.java index 6b39c1e..36d1e42 100644 --- a/src/main/java/org/jetbrains/research/boolector/TypeNode.java +++ b/src/main/java/org/vorpal/research/boolector/TypeNode.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public enum TypeNode { ARRAYNODE, diff --git a/src/main/java/org/jetbrains/research/boolector/UninterpretedFunction.java b/src/main/java/org/vorpal/research/boolector/UninterpretedFunction.java similarity index 92% rename from src/main/java/org/jetbrains/research/boolector/UninterpretedFunction.java rename to src/main/java/org/vorpal/research/boolector/UninterpretedFunction.java index 6046ccb..ae7df26 100644 --- a/src/main/java/org/jetbrains/research/boolector/UninterpretedFunction.java +++ b/src/main/java/org/vorpal/research/boolector/UninterpretedFunction.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; public class UninterpretedFunction extends BoolectorFunction { private final String name; diff --git a/src/test/java/org/jetbrains/research/boolector/BitvecSortTest.java b/src/test/java/org/vorpal/research/boolector/BitvecSortTest.java similarity index 90% rename from src/test/java/org/jetbrains/research/boolector/BitvecSortTest.java rename to src/test/java/org/vorpal/research/boolector/BitvecSortTest.java index 80dcc35..2477944 100644 --- a/src/test/java/org/jetbrains/research/boolector/BitvecSortTest.java +++ b/src/test/java/org/vorpal/research/boolector/BitvecSortTest.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import org.junit.Test; diff --git a/src/test/java/org/jetbrains/research/boolector/BoolectorNodeTest.java b/src/test/java/org/vorpal/research/boolector/BoolectorNodeTest.java similarity index 99% rename from src/test/java/org/jetbrains/research/boolector/BoolectorNodeTest.java rename to src/test/java/org/vorpal/research/boolector/BoolectorNodeTest.java index a9e4449..98f1ca4 100644 --- a/src/test/java/org/jetbrains/research/boolector/BoolectorNodeTest.java +++ b/src/test/java/org/vorpal/research/boolector/BoolectorNodeTest.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import org.junit.Test; diff --git a/src/test/java/org/jetbrains/research/boolector/FunctionDeclTest.java b/src/test/java/org/vorpal/research/boolector/FunctionDeclTest.java similarity index 97% rename from src/test/java/org/jetbrains/research/boolector/FunctionDeclTest.java rename to src/test/java/org/vorpal/research/boolector/FunctionDeclTest.java index 84a7171..16e9337 100644 --- a/src/test/java/org/jetbrains/research/boolector/FunctionDeclTest.java +++ b/src/test/java/org/vorpal/research/boolector/FunctionDeclTest.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import org.junit.Test; diff --git a/src/test/java/org/jetbrains/research/boolector/UninterpretedFunctionTest.java b/src/test/java/org/vorpal/research/boolector/UninterpretedFunctionTest.java similarity index 96% rename from src/test/java/org/jetbrains/research/boolector/UninterpretedFunctionTest.java rename to src/test/java/org/vorpal/research/boolector/UninterpretedFunctionTest.java index c0bc468..16de2c2 100644 --- a/src/test/java/org/jetbrains/research/boolector/UninterpretedFunctionTest.java +++ b/src/test/java/org/vorpal/research/boolector/UninterpretedFunctionTest.java @@ -1,4 +1,4 @@ -package org.jetbrains.research.boolector; +package org.vorpal.research.boolector; import org.junit.Test;