2 files changed, 123 insertions, 0 deletions
diff --git a/src/preprocessing/passes/apply_substs.cpp b/src/preprocessing/passes/apply_substs.cpp
new file mode 100644
index 000000000..6fb4b7793
--- /dev/null
+++ b/src/preprocessing/passes/apply_substs.cpp
@@ -0,0 +1,74 @@
+/*********************                                                        */
+/*! \file apply_substs.cpp
+ ** \verbatim
+ ** Top contributors (to current version):
+ **   Aina Niemetz
+ ** This file is part of the CVC4 project.
+ ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS
+ ** in the top-level source directory) and their institutional affiliations.
+ ** All rights reserved.  See the file COPYING in the top-level source
+ ** directory for licensing information.\endverbatim
+ **
+ ** \brief Apply substitutions preprocessing pass.
+ **
+ ** Apply top level substitutions to assertions, rewrite, and store back into
+ ** assertions.
+ **/
+
+#include "preprocessing/passes/apply_substs.h"
+
+#include "context/cdo.h"
+#include "theory/rewriter.h"
+#include "theory/substitutions.h"
+
+namespace CVC4 {
+namespace preprocessing {
+namespace passes {
+
+ApplySubsts::ApplySubsts(PreprocessingPassContext* preprocContext)
+    : PreprocessingPass(preprocContext, "apply-substs")
+{
+}
+
+PreprocessingPassResult ApplySubsts::applyInternal(
+    AssertionPipeline* assertionsToPreprocess)
+{
+  if (!options::unsatCores())
+  {
+    Chat() << "applying substitutions..." << std::endl;
+    Trace("apply-substs") << "SmtEnginePrivate::processAssertions(): "
+                      << "applying substitutions" << std::endl;
+    // TODO(#1255): Substitutions in incremental mode should be managed with a
+    // proper data structure.
+
+    // When solving incrementally, all substitutions are piled into the
+    // assertion at d_substitutionsIndex: we don't want to apply substitutions
+    // to this assertion or information will be lost.
+    context::CDO<unsigned>& substs_index =
+        assertionsToPreprocess->getSubstitutionsIndex();
+    unsigned size = assertionsToPreprocess->size();
+    unsigned substitutionAssertion = substs_index > 0 ? substs_index : size;
+    for (unsigned i = 0; i < size; ++i)
+    {
+      if (i == substitutionAssertion)
+      {
+        continue;
+      }
+      Trace("apply-substs") << "applying to " << (*assertionsToPreprocess)[i]
+                        << std::endl;
+      d_preprocContext->spendResource(options::preprocessStep());
+      assertionsToPreprocess->replace(
+          i,
+          theory::Rewriter::rewrite(
+              assertionsToPreprocess->getTopLevelSubstitutions().apply(
+                  (*assertionsToPreprocess)[i])));
+      Trace("apply-substs") << "  got " << (*assertionsToPreprocess)[i]
+                        << std::endl;
+    }
+  }
+  return PreprocessingPassResult::NO_CONFLICT;
+}
+
+}  // namespace passes
+}  // namespace preprocessing
+}  // namespace CVC4
diff --git a/src/preprocessing/passes/apply_substs.h b/src/preprocessing/passes/apply_substs.h
new file mode 100644
index 000000000..f2f77fd0e
--- /dev/null
+++ b/src/preprocessing/passes/apply_substs.h
@@ -0,0 +1,49 @@
+/*********************                                                        */
+/*! \file apply_substs.h
+ ** \verbatim
+ ** Top contributors (to current version):
+ **   Aina Niemetz
+ ** This file is part of the CVC4 project.
+ ** Copyright (c) 2009-2018 by the authors listed in the file AUTHORS
+ ** in the top-level source directory) and their institutional affiliations.
+ ** All rights reserved.  See the file COPYING in the top-level source
+ ** directory for licensing information.\endverbatim
+ **
+ ** \brief Apply substitutions preprocessing pass.
+ **
+ ** Apply top level substitutions to assertions, rewrite, and store back into
+ ** assertions.
+ **/
+
+#include "cvc4_private.h"
+
+#ifndef __CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
+#define __CVC4__PREPROCESSING__PASSES__APPLY_SUBSTS_H
+
+#include "preprocessing/preprocessing_pass.h"
+#include "preprocessing/preprocessing_pass_context.h"
+
+namespace CVC4 {
+namespace preprocessing {
+namespace passes {
+
+class ApplySubsts : public PreprocessingPass
+{
+ public:
+  ApplySubsts(PreprocessingPassContext* preprocContext);
+
+ protected:
+  /**
+   * Apply assertionsToPreprocess->getTopLevelSubstitutions() to the
+   * assertions, in assertionsToPreprocess, rewrite, and store back into
+   * given assertion pipeline.
+   */
+  PreprocessingPassResult applyInternal(
+      AssertionPipeline* assertionsToPreprocess) override;
+};
+
+}  // namespace passes
+}  // namespace preprocessing
+}  // namespace CVC4
+
+#endif