refactor(library/blast/unit): rename unit propagation module

src/CMakeLists.txt

@@ -349,8 +349,8 @@ add_subdirectory(library/blast)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:blast>)
 add_subdirectory(library/blast/backward)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:backward>)
-add_subdirectory(library/blast/forward)
+add_subdirectory(library/blast/unit)
-set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:forward>)
+set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:unit>)
 add_subdirectory(library/blast/simplifier)
 set(LEAN_OBJS ${LEAN_OBJS} $<TARGET_OBJECTS:simplifier>)
 add_subdirectory(library/error_handling)

src/library/blast/forward/CMakeLists.txt

@@ -1 +0,0 @@
-add_library(forward OBJECT init_module.cpp forward_action.cpp)

src/library/blast/init_module.cpp

@@ -14,7 +14,7 @@ Author: Leonardo de Moura
 #include "library/blast/assert_cc_action.h"
 #include "library/blast/simplifier/init_module.h"
 #include "library/blast/backward/init_module.h"
-#include "library/blast/forward/init_module.h"
+#include "library/blast/unit/init_module.h"
 
 namespace lean {
 void initialize_blast_module() {
@@ -24,7 +24,7 @@ void initialize_blast_module() {
     initialize_blast();
     blast::initialize_simplifier_module();
     blast::initialize_backward_module();
-    blast::initialize_forward_module();
+    blast::initialize_unit_module();
     initialize_blast_tactic();
     blast::initialize_recursor_action();
     blast::initialize_assert_cc_action();
@@ -35,7 +35,7 @@ void finalize_blast_module() {
     blast::finalize_assert_cc_action();
     blast::finalize_recursor_action();
     finalize_blast_tactic();
-    blast::finalize_forward_module();
+    blast::finalize_unit_module();
     blast::finalize_backward_module();
     blast::finalize_simplifier_module();
     finalize_blast();

src/library/blast/simple_strategy.cpp

@@ -13,7 +13,7 @@ Author: Leonardo de Moura
 #include "library/blast/subst_action.h"
 #include "library/blast/backward/backward_action.h"
 #include "library/blast/backward/backward_strategy.h"
-#include "library/blast/forward/forward_action.h"
+#include "library/blast/unit/unit_action.h"
 #include "library/blast/no_confusion_action.h"
 #include "library/blast/simplifier/simplifier_actions.h"
 #include "library/blast/recursor_action.h"
@@ -37,7 +37,7 @@ class simple_strategy : public strategy {
     }
 
     action_result hypothesis_post_activation(hypothesis_idx hidx) override {
-        Try(forward_action(hidx));
+        Try(unit_action(hidx));
         Try(recursor_preprocess_action(hidx));
         return action_result::new_branch();
     }

src/library/blast/unit/CMakeLists.txt

@@ -0,0 +1 @@
+add_library(unit OBJECT init_module.cpp unit_action.cpp)

src/library/blast/unit/init_module.cpp

@@ -3,16 +3,16 @@ Copyright (c) 2015 Daniel Selsam. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Author: Daniel Selsam
 */
-#include "library/blast/forward/forward_action.h"
+#include "library/blast/unit/unit_action.h"
 
 namespace lean {
 namespace blast {
 
-void initialize_forward_module() {
+void initialize_unit_module() {
-    initialize_forward_action();
+    initialize_unit_action();
 }
 
-void finalize_forward_module() {
+void finalize_unit_module() {
-    finalize_forward_action();
+    finalize_unit_action();
 }
 }}

src/library/blast/unit/init_module.h

@@ -7,7 +7,7 @@ Author: Daniel Selsam
 
 namespace lean {
 namespace blast {
-void initialize_forward_module();
+void initialize_unit_module();
-void finalize_forward_module();
+void finalize_unit_module();
 }
 }

src/library/blast/unit/unit_action.cpp

@@ -8,7 +8,7 @@ Author: Daniel Selsam
 #include "kernel/inductive/inductive.h"
 #include "library/blast/blast.h"
 #include "library/blast/action_result.h"
-#include "library/blast/forward/forward_action.h"
+#include "library/blast/unit/unit_action.h"
 #include "library/blast/proof_expr.h"
 #include "library/blast/choice_point.h"
 #include "library/blast/hypothesis.h"
@@ -20,15 +20,15 @@ namespace lean {
 namespace blast {
 
 static unsigned g_ext_id = 0;
-struct forward_branch_extension : public branch_extension {
+struct unit_branch_extension : public branch_extension {
     rb_multi_map<expr, hypothesis_idx, expr_quick_cmp> m_lemma_map;
     rb_map<expr, hypothesis_idx, expr_quick_cmp> m_fact_map;
 
-    forward_branch_extension() {}
+    unit_branch_extension() {}
-    forward_branch_extension(forward_branch_extension const & b):
+    unit_branch_extension(unit_branch_extension const & b):
         m_lemma_map(b.m_lemma_map), m_fact_map(b.m_fact_map) {}
-    virtual ~forward_branch_extension() {}
+    virtual ~unit_branch_extension() {}
-    virtual branch_extension * clone() override { return new forward_branch_extension(*this); }
+    virtual branch_extension * clone() override { return new unit_branch_extension(*this); }
 
     virtual void hypothesis_activated(hypothesis const & h, hypothesis_idx hidx) override {
         expr type = whnf(h.get_type());
@@ -60,18 +60,18 @@ public:
     void erase_fact(expr const & e) { return m_fact_map.erase(e); }
 };
 
-void initialize_forward_action() {
+void initialize_unit_action() {
-    g_ext_id = register_branch_extension(new forward_branch_extension());
+    g_ext_id = register_branch_extension(new unit_branch_extension());
 }
 
-void finalize_forward_action() { }
+void finalize_unit_action() { }
 
-static forward_branch_extension & get_extension() {
+static unit_branch_extension & get_extension() {
-    return static_cast<forward_branch_extension&>(curr_state().get_extension(g_ext_id));
+    return static_cast<unit_branch_extension&>(curr_state().get_extension(g_ext_id));
 }
 
-action_result forward_pi(expr const & _type, expr const & proof) {
+action_result unit_pi(expr const & _type, expr const & proof) {
-    forward_branch_extension & ext = get_extension();
+    unit_branch_extension & ext = get_extension();
     bool missing_argument = false;
     bool has_antecedent = false;
     expr type = _type;
@@ -140,8 +140,8 @@ action_result forward_pi(expr const & _type, expr const & proof) {
     lean_unreachable();
 }
 
-action_result forward_fact(expr const & type) {
+action_result unit_fact(expr const & type) {
-    forward_branch_extension & ext = get_extension();
+    unit_branch_extension & ext = get_extension();
     list<hypothesis_idx> const * lemmas = ext.find_lemmas(type);
     if (!lemmas) return action_result::failed();
     bool success = false;
@@ -150,7 +150,7 @@ action_result forward_fact(expr const & type) {
             if (h.is_dead()) {
                 return false;
             } else {
-                action_result r = forward_pi(whnf(h.get_type()), h.get_self());
+                action_result r = unit_pi(whnf(h.get_type()), h.get_self());
                 success = success || (r.get_kind() == action_result::NewBranch);
                 return true;
             }
@@ -159,11 +159,11 @@ action_result forward_fact(expr const & type) {
     else return action_result::failed();
 }
 
-action_result forward_action(unsigned _hidx) {
+action_result unit_action(unsigned _hidx) {
     hypothesis const & h = curr_state().get_hypothesis_decl(_hidx);
     expr type = whnf(h.get_type());
-    if (is_pi(type)) return forward_pi(type, h.get_self());
+    if (is_pi(type)) return unit_pi(type, h.get_self());
-    else if (is_prop(type)) return forward_fact(type);
+    else if (is_prop(type)) return unit_fact(type);
     else return action_result::failed();
 }
 }}

src/library/blast/unit/unit_action.h

@@ -8,8 +8,8 @@ Author: Daniel Selsam
 
 namespace lean {
 namespace blast {
-action_result forward_action(unsigned hidx);
+action_result unit_action(unsigned hidx);
 
-void initialize_forward_action();
+void initialize_unit_action();
-void finalize_forward_action();
+void finalize_unit_action();
 }}