michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(library/rewriter): implement depth RW

Browse source
This commit is contained in:
Soonho Kong 2013-12-01 00:58:06 -05:00
parent ae0508128f
commit 506cca0ac1
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/library/rewriter/rewriter.cpp
View file

@ -11,13 +11,12 @@
#include "kernel/context.h"
#include "kernel/environment.h"
#include "kernel/expr.h"
#include "kernel/replace.h"
#include "kernel/printer.h"
#include "kernel/replace.h"
#include "library/basic_thms.h"
#include "library/type_inferer.h"
#include "library/rewriter/fo_match.h"
#include "library/rewriter/rewriter.h"
#include "library/rewriter/apply_rewriter_fn.h"
#include "library/type_inferer.h"
#include "util/buffer.h"
#include "util/trace.h"
@ -967,8 +966,7 @@ ostream & repeat_rewriter_cell::display(ostream & out) const {
depth_rewriter_cell::depth_rewriter_cell(rewriter const & rw):rewriter_cell(rewriter_kind::Depth), m_rw(rw) { }
depth_rewriter_cell::~depth_rewriter_cell() { }
pair<expr, expr> depth_rewriter_cell::operator()(environment const & env, context & ctx, expr const & v) const throw(rewriter_exception) {
apply_rewriter_fn f(m_rw);
return f.apply(env, ctx, v);
return apply_rewriter_fn<decltype(m_rw)>(m_rw)(env, ctx, v);
}
ostream & depth_rewriter_cell::display(ostream & out) const {
out << "Depth_RW(" << m_rw << ")";

26
src/library/rewriter/rewriter.h
View file

@ -380,6 +380,11 @@ class apply_rewriter_fn {
results.push_back(apply(env, ctx, arg(v, i)));
}
result = rewrite_app(env, ctx, v, results);
std::pair<expr, expr> tmp = m_rw(env, ctx, result.first);
if (result.first != tmp.first) {
tmp.second = Trans(ty_v, v, result.first, tmp.first, result.second, tmp.second);
result = tmp;
}
}
break;
case expr_kind::Eq: {
@ -406,6 +411,11 @@ class apply_rewriter_fn {
result = std::make_pair(v, Refl(lc(v, ctx), v));
}
}
std::pair<expr, expr> tmp = m_rw(env, ctx, result.first);
if (result.first != tmp.first) {
tmp.second = Trans(ty_v, v, result.first, tmp.first, result.second, tmp.second);
result = tmp;
}
}
break;
case expr_kind::Lambda: {
@ -432,6 +442,11 @@ class apply_rewriter_fn {
result = std::make_pair(v, Refl(lc(v, ctx), v));
}
}
std::pair<expr, expr> tmp = m_rw(env, ctx, result.first);
if (result.first != tmp.first) {
tmp.second = Trans(ty_v, v, result.first, tmp.first, result.second, tmp.second);
result = tmp;
}
}
break;
@ -459,6 +474,11 @@ class apply_rewriter_fn {
result = std::make_pair(v, Refl(lc(v, ctx), v));
}
}
std::pair<expr, expr> tmp = m_rw(env, ctx, result.first);
if (result.first != tmp.first) {
tmp.second = Trans(ty_v, v, result.first, tmp.first, result.second, tmp.second);
result = tmp;
}
}
break;
case expr_kind::Let: {
@ -506,6 +526,12 @@ class apply_rewriter_fn {
changed = true;
}
result = std::make_pair(new_v, pf);
std::pair<expr, expr> tmp = m_rw(env, ctx, result.first);
if (result.first != tmp.first) {
tmp.second = Trans(ty_v, v, result.first, tmp.first, result.second, tmp.second);
result = tmp;
}
}
break;
}