summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadrieril2019-04-22 00:08:46 +0200
committerNadrieril2019-04-22 00:08:46 +0200
commit0f334c9d112e3ee961eb35c09c85140fdf2aa8f6 (patch)
tree58fc27e37fecd968601cabb9e60223f3f6cf0a60
parent316c6ea1c5512bcc9e0a07aa63fd086eb313abc5 (diff)
Remove now obsolete subst_shift
-rw-r--r--dhall_core/src/core.rs43
1 files changed, 1 insertions, 42 deletions
diff --git a/dhall_core/src/core.rs b/dhall_core/src/core.rs
index 03974eb..72b42f8 100644
--- a/dhall_core/src/core.rs
+++ b/dhall_core/src/core.rs
@@ -520,7 +520,7 @@ pub fn shift0<N, E>(
shift(delta, &V(label.clone(), 0), in_expr)
}
-fn shift0_multiple<N, E>(
+pub fn shift0_multiple<N, E>(
deltas: &HashMap<Label, isize>,
in_expr: &SubExpr<N, E>,
) -> SubExpr<N, E> {
@@ -546,44 +546,3 @@ fn shift0_multiple_inner<N, E>(
),
}
}
-
-/// Substitute all occurrences of a variable with an expression, and
-/// removes the variable from the environment by shifting the indices
-/// of other variables appropriately.
-///
-/// ```text
-/// subst_shift(x, v, e) = ↑(-1, x, e[x := ↑(1, x, v)])
-/// ```
-///
-pub fn subst_shift<N, E>(
- var: &V<Label>,
- value: &SubExpr<N, E>,
- in_expr: &SubExpr<N, E>,
-) -> SubExpr<N, E> {
- subst_shift_inner(&HashMap::new(), var, value, in_expr)
-}
-
-fn subst_shift_inner<N, E>(
- ctx: &HashMap<Label, isize>,
- var: &V<Label>,
- value: &SubExpr<N, E>,
- in_expr: &SubExpr<N, E>,
-) -> SubExpr<N, E> {
- use crate::ExprF::*;
- let V(x, n) = var;
- let dn = ctx.get(x).unwrap_or(&0);
- let actual_var = V(x.clone(), add_ui(*n, *dn));
- match in_expr.as_ref() {
- Var(v) if v == &actual_var => shift0_multiple(ctx, value),
- Var(v) => rc(Var(v.shift(-1, &actual_var))),
- _ => in_expr.map_subexprs_with_special_handling_of_binders(
- |e| subst_shift_inner(ctx, var, value, e),
- |l: &Label, e| {
- let mut ctx = ctx.clone();
- let count = ctx.entry(l.clone()).or_insert(0);
- *count += 1;
- subst_shift_inner(&ctx, var, value, e)
- },
- ),
- }
-}