Revert "Merge branch 'origin' of https://github.com/CVC4/CVC4.git"

This reverts commit 3395c5c13cd61d98aec0d9806e3b9bc3d707968a, reversing
changes made to 5f415d4585134612bc24e9a823289fee35541a01.

2 files changed, 0 insertions, 24 deletions

diff --git a/src/printer/cvc/cvc_printer.cpp b/src/printer/cvc/cvc_printer.cpp
index 84c8eecf5..d09290db5 100644
--- a/src/printer/cvc/cvc_printer.cpp
+++ b/src/printer/cvc/cvc_printer.cpp
@@ -768,22 +768,6 @@ void CvcPrinter::toStream(std::ostream& out, TNode n, int depth, bool types, boo
       op << "IS_IN";
       opType = INFIX;
       break;
-    case kind::PRODUCT:
-      op << "PRODUCT";
-      opType = INFIX;
-      break;
-    case kind::JOIN:
-      op << "JOIN";
-      opType = INFIX;
-      break;
-    case kind::TRANSPOSE:
-      op << "TRANSPOSE";
-      opType = PREFIX;
-      break;
-    case kind::TCLOSURE:
-      op << "TCLOSURE";
-      opType = PREFIX;
-      break;
     case kind::SINGLETON:
       out << "{";
       toStream(out, n[0], depth, types, false);
diff --git a/src/printer/smt2/smt2_printer.cpp b/src/printer/smt2/smt2_printer.cpp
index c9dc814f2..7b7d569b7 100644
--- a/src/printer/smt2/smt2_printer.cpp
+++ b/src/printer/smt2/smt2_printer.cpp
@@ -512,10 +512,6 @@ void Smt2Printer::toStream(std::ostream& out, TNode n,
   case kind::SUBSET:
   case kind::MEMBER:
   case kind::SET_TYPE:
-  case kind::TCLOSURE:
-  case kind::TRANSPOSE:
-  case kind::JOIN:
-  case kind::PRODUCT:
   case kind::SINGLETON: out << smtKindString(k) << " "; break;
 
     // fp theory
@@ -801,10 +797,6 @@ static string smtKindString(Kind k) throw() {
   case kind::SET_TYPE: return "Set";
   case kind::SINGLETON: return "singleton";
   case kind::INSERT: return "insert";
-  case kind::TCLOSURE: return "tclosure";
-  case kind::TRANSPOSE: return "transpose";
-  case kind::PRODUCT: return "product";
-  case kind::JOIN: return "join";
 
     // fp theory
   case kind::FLOATINGPOINT_FP: return "fp";