Rename Java package to edu.stanford.CVC4 (#3752)

diff --git a/NEWS b/NEWS
index d9e1f9076de859d0863ed3d7fd0d72088a428593..b25f4517ad15b9eb2991c37d556a2ddc44b2e2a7 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,12 @@
 This file contains a summary of important user-visible changes.
 
+Changes since 1.7
+=================
+
+Changes:
+* Java API change: The name of CVC4's package is now `edu.stanford.CVC4`
+  instead of `edu.nyu.acsys.CVC4`.
+
 Changes since 1.6
 =================
 

diff --git a/examples/SimpleVC.java b/examples/SimpleVC.java
index c84b040a3af82fbb34f2dc0137c26c265e5da4cd..e77a5e99fa57d553b8bc299dcfcae1eb17a53a40 100644 (file)
--- a/examples/SimpleVC.java
+++ b/examples/SimpleVC.java
@@ -23,7 +23,7 @@
  **
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 
 public class SimpleVC {
   public static void main(String[] args) {

diff --git a/examples/api/java/BitVectors.java b/examples/api/java/BitVectors.java
index fec8713576bb677dda62d7ff8ff9725d5281454a..17111b63acfffda79c63b6066630186a8ed4d90b 100644 (file)
--- a/examples/api/java/BitVectors.java
+++ b/examples/api/java/BitVectors.java
@@ -14,7 +14,7 @@
  **
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 
 public class BitVectors {
   public static void main(String[] args) {

diff --git a/examples/api/java/BitVectorsAndArrays.java b/examples/api/java/BitVectorsAndArrays.java
index 11474d1e16739962913767a3173b83f9ffa44613..05232b8ab32adc2ac92a70f176393ba64d53a18d 100644 (file)
--- a/examples/api/java/BitVectorsAndArrays.java
+++ b/examples/api/java/BitVectorsAndArrays.java
@@ -14,7 +14,7 @@
  **
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 import java.util.*;
 
 public class BitVectorsAndArrays {
@@ -71,7 +71,7 @@ public class BitVectorsAndArrays {
 
     vectorExpr assertions = new vectorExpr();
     for (int i = 1; i < k; ++i) {
-      index = em.mkConst(new BitVector(index_size, new edu.nyu.acsys.CVC4.Integer(i)));
+      index = em.mkConst(new BitVector(index_size, new edu.stanford.CVC4.Integer(i)));
       Expr new_current = em.mkExpr(Kind.BITVECTOR_MULT, two, old_current);
       // current[i] = 2 * current[i-1]
       current_array = em.mkExpr(Kind.STORE, current_array, index, new_current);

diff --git a/examples/api/java/CVC4Streams.java b/examples/api/java/CVC4Streams.java
index 8e395b512717a793533490f1c05c98c5aeefd6b4..e09c1b6f7cb9d45be5353305d517693b9e873946 100644 (file)
--- a/examples/api/java/CVC4Streams.java
+++ b/examples/api/java/CVC4Streams.java
@@ -15,7 +15,7 @@
  **/
 
 import java.io.*;
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 
 public class CVC4Streams {
   public static void main(String[] args) throws IOException {

diff --git a/examples/api/java/Combination.java b/examples/api/java/Combination.java
index 6d34e16c425c808ca9539912eaa629267b3dc373..0c9ca84d6f7037857b4be63bc3a8bf507c28623a 100644 (file)
--- a/examples/api/java/Combination.java
+++ b/examples/api/java/Combination.java
@@ -16,7 +16,7 @@
  ** The model is displayed using getValue().
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 
 public class Combination {
   private static void prefixPrintGetValue(SmtEngine smt, Expr e, int level) {

diff --git a/examples/api/java/Datatypes.java b/examples/api/java/Datatypes.java
index c5efe3d06ccb2d83bcd97355f43869b867b8b75d..21f4a651e2bfa66d8dbc7f761c8d4665b6256f4d 100644 (file)
--- a/examples/api/java/Datatypes.java
+++ b/examples/api/java/Datatypes.java
@@ -14,7 +14,7 @@
  ** An example of using inductive datatypes in CVC4 (Java version).
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 import java.util.Iterator;
 
 public class Datatypes {

diff --git a/examples/api/java/FloatingPointArith.java b/examples/api/java/FloatingPointArith.java
index fe2e3747e823016f85d9de508866751673e1891d..9d2ceb1aebd444b21b9d43db45e09faedb64f6fb 100644 (file)
--- a/examples/api/java/FloatingPointArith.java
+++ b/examples/api/java/FloatingPointArith.java
@@ -18,7 +18,7 @@
  ** IEEE 754-2008 bit-vector to a floating-point number.
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 import java.util.Iterator;
 
 public class FloatingPointArith {

diff --git a/examples/api/java/HelloWorld.java b/examples/api/java/HelloWorld.java
index 56acffa767d69ac2d8e7838746c3de87d7c74bbf..393ce40f0c92a725186108799fba5179c258b3eb 100644 (file)
--- a/examples/api/java/HelloWorld.java
+++ b/examples/api/java/HelloWorld.java
@@ -20,7 +20,7 @@
  ** A very simple CVC4 tutorial example.
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 
 public class HelloWorld {
   public static void main(String[] args) {

diff --git a/examples/api/java/LinearArith.java b/examples/api/java/LinearArith.java
index 368178155e9fc2390a120ebb8287235eb7fd0306..2ddf9258432e4dd0ca5f443a11d448fcc8ee11c1 100644 (file)
--- a/examples/api/java/LinearArith.java
+++ b/examples/api/java/LinearArith.java
@@ -15,7 +15,7 @@
  ** the push pop of CVC4. This also gives an example option.
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 
 public class LinearArith {
   public static void main(String[] args) {

diff --git a/examples/api/java/PipedInput.java b/examples/api/java/PipedInput.java
index 13883d033af1065b3bb9858efde9f53038b8dbe1..0ab807e5d3fc8bc53298d6764fece1e6de3e8d08 100644 (file)
--- a/examples/api/java/PipedInput.java
+++ b/examples/api/java/PipedInput.java
@@ -16,7 +16,7 @@
  ** used from Java.
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 import java.io.*;
 
 public class PipedInput {

diff --git a/examples/api/java/Statistics.java b/examples/api/java/Statistics.java
index 0dda91aee32016f897b2739deab7763f75951414..8bf0effef2b374d2d21f2ae21113502c9cfb85c6 100644 (file)
--- a/examples/api/java/Statistics.java
+++ b/examples/api/java/Statistics.java
@@ -14,7 +14,7 @@
  ** An example of accessing CVC4's statistics using the Java API.
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 import java.util.Iterator;
 
 public class Statistics {
@@ -37,7 +37,7 @@ public class Statistics {
     // `Statistics` class implements the `Iterable<Statistic>` interface. A
     // `Statistic` is a pair that consists of a name and an `SExpr` that stores
     // the value of the statistic.
-    edu.nyu.acsys.CVC4.Statistics stats = smt.getStatistics();
+    edu.stanford.CVC4.Statistics stats = smt.getStatistics();
     for (Statistic stat : stats) {
       System.out.println(stat.getFirst() + " = " + stat.getSecond());
     }

diff --git a/examples/api/java/Strings.java b/examples/api/java/Strings.java
index fe017980b4453e1735cd49eeeb8c8e89a23a385c..4a87c0a1483b970a7083b4c6769046b2d118b768 100644 (file)
--- a/examples/api/java/Strings.java
+++ b/examples/api/java/Strings.java
@@ -14,7 +14,7 @@
  ** A simple demonstration of reasoning about strings with CVC4 via Jave API.
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 
 public class Strings {
   public static void main(String[] args) {

diff --git a/examples/api/java/UnsatCores.java b/examples/api/java/UnsatCores.java
index 65c01cf5a0fc0ea09ca6f6cc73f98f3ce6c91e33..6478aea5cbaa9c907c309d5a81308e3610927f02 100644 (file)
--- a/examples/api/java/UnsatCores.java
+++ b/examples/api/java/UnsatCores.java
@@ -14,7 +14,7 @@
  ** An example of interacting with unsat cores using CVC4's Java API.
  **/
 
-import edu.nyu.acsys.CVC4.*;
+import edu.stanford.CVC4.*;
 import java.util.Iterator;
 
 public class UnsatCores {

diff --git a/src/bindings/java/CMakeLists.txt b/src/bindings/java/CMakeLists.txt
index 3ab2ed4461f51c9b195b5acd2c6bfed93d0da1ba..508a745320e99e16d0f21acb7779ebb48b202295 100644 (file)
--- a/src/bindings/java/CMakeLists.txt
+++ b/src/bindings/java/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(${JNI_INCLUDE_DIRS})
 
 set(SWIG_MODULE_cvc4jni_EXTRA_DEPS cvc4 cvc4parser)
 set_property(SOURCE ${CVC4_SWIG_INTERFACE} PROPERTY CPLUSPLUS ON)
-set(CMAKE_SWIG_FLAGS -package edu.nyu.acsys.CVC4)
+set(CMAKE_SWIG_FLAGS -package edu.stanford.CVC4)
 
 if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
   swig_add_module(cvc4jni Java ${CVC4_SWIG_INTERFACE})

diff --git a/src/cvc4.i b/src/cvc4.i
index 69041b2779e0fbfd7cbc5298770243edb886cc31..9e69212aee4c10a3fc84dff1b92115f849f0f018 100644 (file)
--- a/src/cvc4.i
+++ b/src/cvc4.i
@@ -113,7 +113,7 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
 // Create a mapping from C++ Exceptions to Java Exceptions.
 // This is in a couple of throws typemaps, simply because it's sensitive to SWIG's concept of which namespace we're in.
 %typemap(throws) Exception %{
-  std::string name = "edu/nyu/acsys/CVC4/$1_type";
+  std::string name = "edu/stanford/CVC4/$1_type";
   /*
   size_t i = name.find("::");
   if(i != std::string::npos) {
@@ -132,7 +132,7 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
   assert(status == 0);
 %}
 %typemap(throws) CVC4::Exception %{
-  std::string name = "edu/nyu/acsys/$1_type";
+  std::string name = "edu/stanford/$1_type";
   size_t i = name.find("::");
   if(i != std::string::npos) {
     size_t j = name.rfind("::");
@@ -186,17 +186,17 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
 %typemap(jtype) std::ostream& "long"
 %typemap(jstype) std::ostream& "java.io.OutputStream"
 %typemap(javain,
-         pre="    edu.nyu.acsys.CVC4.JavaOutputStreamAdapter temp$javainput = new edu.nyu.acsys.CVC4.JavaOutputStreamAdapter();", pgcppname="temp$javainput",
+         pre="    edu.stanford.CVC4.JavaOutputStreamAdapter temp$javainput = new edu.stanford.CVC4.JavaOutputStreamAdapter();", pgcppname="temp$javainput",
          post="    new java.io.PrintStream($javainput).print(temp$javainput.toString());")
-         std::ostream& "edu.nyu.acsys.CVC4.JavaOutputStreamAdapter.getCPtr(temp$javainput)"
+         std::ostream& "edu.stanford.CVC4.JavaOutputStreamAdapter.getCPtr(temp$javainput)"
 
 %typemap(jni) std::istream& "jlong"
 %typemap(jtype) std::istream& "long"
 %typemap(jstype) std::istream& "java.io.InputStream"
 %typemap(javain,
-         pre="    edu.nyu.acsys.CVC4.JavaInputStreamAdapter temp$javainput = edu.nyu.acsys.CVC4.JavaInputStreamAdapter.get($javainput);", pgcppname="temp$javainput",
+         pre="    edu.stanford.CVC4.JavaInputStreamAdapter temp$javainput = edu.stanford.CVC4.JavaInputStreamAdapter.get($javainput);", pgcppname="temp$javainput",
          post="")
-         std::istream& "edu.nyu.acsys.CVC4.JavaInputStreamAdapter.getCPtr(temp$javainput)"
+         std::istream& "edu.stanford.CVC4.JavaInputStreamAdapter.getCPtr(temp$javainput)"
 %typemap(in) jobject inputStream %{
   $1 = jenv->NewGlobalRef($input);
 %}

diff --git a/src/expr/expr.i b/src/expr/expr.i
index fba1e8858710a9153ace644ab18c1621b4906225..14ccf213ce3e048362e6dba55a402baf7edb3ef5 100644 (file)
--- a/src/expr/expr.i
+++ b/src/expr/expr.i
@@ -99,18 +99,18 @@ namespace CVC4 {
 }
 
 // Expr is "iterable" on the Java side
-%typemap(javainterfaces) CVC4::Expr "java.lang.Iterable<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::Expr "java.lang.Iterable<edu.stanford.CVC4.Expr>";
 
 // the JavaIteratorAdapter should not be public, and implements Iterator
 %typemap(javaclassmodifiers) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "class";
-%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "java.util.Iterator<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "java.util.Iterator<edu.stanford.CVC4.Expr>";
 // add some functions to the Java side (do it here because there's no way to do these in C++)
 %typemap(javacode) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "
   public void remove() {
     throw new java.lang.UnsupportedOperationException();
   }
 
-  public edu.nyu.acsys.CVC4.Expr next() {
+  public edu.stanford.CVC4.Expr next() {
     if(hasNext()) {
       return getNext();
     } else {

diff --git a/src/expr/record.i b/src/expr/record.i
index 6133114cda74fb12c3c5b309b9cd93ede755d99a..dce785ea36768b1a3dbe54efef0d33b3dffea33a 100644 (file)
--- a/src/expr/record.i
+++ b/src/expr/record.i
@@ -35,7 +35,7 @@
 %typemap(out) std::pair<std::string, CVC4::Type> {
       $result = jenv->NewObjectArray(2, jenv->FindClass("java/lang/Object"), $null);
       jenv->SetObjectArrayElement($result, 0, jenv->NewStringUTF($1.first.c_str()));
-      jclass clazz = jenv->FindClass("edu/nyu/acsys/CVC4/Type");
+      jclass clazz = jenv->FindClass("edu/stanford/CVC4/Type");
       jmethodID methodid = jenv->GetMethodID(clazz, "<init>", "(JZ)V");
       jenv->SetObjectArrayElement($result, 1, jenv->NewObject(clazz, methodid, reinterpret_cast<uintptr_t>(new CVC4::Type($1.second)), true));
     };

diff --git a/src/proof/unsat_core.i b/src/proof/unsat_core.i
index d3fd615cecb5c88d04d5d02fc9564cf982227ca8..c37c8551d1328fd810a08c19e607f36df328eaac 100644 (file)
--- a/src/proof/unsat_core.i
+++ b/src/proof/unsat_core.i
@@ -35,18 +35,18 @@
 }
 
 // UnsatCore is "iterable" on the Java side
-%typemap(javainterfaces) CVC4::UnsatCore "java.lang.Iterable<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::UnsatCore "java.lang.Iterable<edu.stanford.CVC4.Expr>";
 
 // the JavaIteratorAdapter should not be public, and implements Iterator
 %typemap(javaclassmodifiers) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "class";
-%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "java.util.Iterator<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "java.util.Iterator<edu.stanford.CVC4.Expr>";
 // add some functions to the Java side (do it here because there's no way to do these in C++)
 %typemap(javacode) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "
   public void remove() {
     throw new java.lang.UnsupportedOperationException();
   }
 
-  public edu.nyu.acsys.CVC4.Expr next() {
+  public edu.stanford.CVC4.Expr next() {
     if(hasNext()) {
       return getNext();
     } else {

diff --git a/src/smt/command.i b/src/smt/command.i
index ff8094165c840f212440ca4b6fd052e488783427..bd28fa8e5aff5eed9d59a9db710ed1045ec0a467 100644 (file)
--- a/src/smt/command.i
+++ b/src/smt/command.i
@@ -36,18 +36,18 @@
 }
 
 // CommandSequence is "iterable" on the Java side
-%typemap(javainterfaces) CVC4::CommandSequence "java.lang.Iterable<edu.nyu.acsys.CVC4.Command>";
+%typemap(javainterfaces) CVC4::CommandSequence "java.lang.Iterable<edu.stanford.CVC4.Command>";
 
 // the JavaIteratorAdapter should not be public, and implements Iterator
 %typemap(javaclassmodifiers) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "class";
-%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "java.util.Iterator<edu.nyu.acsys.CVC4.Command>";
+%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "java.util.Iterator<edu.stanford.CVC4.Command>";
 // add some functions to the Java side (do it here because there's no way to do these in C++)
 %typemap(javacode) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "
   public void remove() {
     throw new java.lang.UnsupportedOperationException();
   }
 
-  public edu.nyu.acsys.CVC4.Command next() {
+  public edu.stanford.CVC4.Command next() {
     if(hasNext()) {
       return getNext();
     } else {

diff --git a/src/smt/smt_engine.i b/src/smt/smt_engine.i
index 4018cc3dca7a31c804a750d0698bc88816e07b4c..635e593bbd5ed8d0eb3faa97ecbc52edfb84b892 100644 (file)
--- a/src/smt/smt_engine.i
+++ b/src/smt/smt_engine.i
@@ -14,13 +14,13 @@
 %native (dlRef) void SmtEngine::dlRef(jobject);
 %{
 extern "C" {
-SWIGEXPORT jobject JNICALL Java_edu_nyu_acsys_CVC4_SmtEngine_mkRef(JNIEnv* jenv, jclass jcls, jobject o) {
+SWIGEXPORT jobject JNICALL Java_edu_stanford_CVC4_SmtEngine_mkRef(JNIEnv* jenv, jclass jcls, jobject o) {
   if(o == NULL) {
     return NULL;
   }
   return jenv->NewGlobalRef(o);
 }
-SWIGEXPORT void JNICALL Java_edu_nyu_acsys_CVC4_SmtEngine_dlRef(JNIEnv* jenv, jclass jcls, jobject o) {
+SWIGEXPORT void JNICALL Java_edu_stanford_CVC4_SmtEngine_dlRef(JNIEnv* jenv, jclass jcls, jobject o) {
   if(o != NULL) {
     jenv->DeleteGlobalRef(o);
   }