Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - perf: improve to_additive performance #1060

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Mathlib.lean
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ import Mathlib.Init.Data.List.Basic
import Mathlib.Init.Data.List.Lemmas
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Lemmas
import Mathlib.Init.Data.Nat.Notation
import Mathlib.Init.Data.Ordering.Basic
import Mathlib.Init.Data.Prod
import Mathlib.Init.Data.Quot
Expand Down
1 change: 1 addition & 0 deletions Mathlib/Algebra/GroupPower/Order.lean
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import Mathlib.Algebra.Order.WithZero
import Mathlib.Algebra.GroupPower.Ring
import Mathlib.Data.Set.Intervals.Basic
import Mathlib.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Basic

/-!
# Lemmas about the interaction of power operations with order
Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Data/Fin/Fin2.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Mario Carneiro
-/
import Std.Tactic.NoMatch
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation

/-!
# Inductive type variant of `Fin`
Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Data/Stream/Defs.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Leonardo de Moura
-/
import Mathlib.Mathport.Rename
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation
/-!
# Definition of `Stream'` and functions on streams

Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/Fin/Basic.lean
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Copyright (c) 2016 Microsoft Corporation. All rights reserved.
Released under Apache 2.0 license as described in the file LICENSE.
Authors: Leonardo de Moura
-/
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation
import Mathlib.Util.MapsTo

/-!
Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/Int/Basic.lean
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Authors: Jeremy Avigad
The integers, with addition, multiplication, and subtraction.
-/
import Mathlib.Mathport.Rename
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation
import Mathlib.Init.ZeroOne
import Std.Data.Int.Lemmas

Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/List/Basic.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Leonardo de Moura
-/
import Mathlib.Mathport.Rename
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation
import Std.Data.Nat.Lemmas
import Std.Data.List.Basic
/-!
Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/List/Lemmas.lean
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Authors: Leonardo de Moura
import Mathlib.Mathport.Rename
import Std.Data.List.Basic
import Std.Data.List.Lemmas
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation
import Mathlib.Init.Data.Nat.Lemmas
import Mathlib.Init.Data.List.Basic
/-!
Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/Nat/Basic.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Floris van Doorn, Leonardo de Moura
-/
import Mathlib.Init.ZeroOne
notation "ℕ" => Nat
import Mathlib.Init.Data.Nat.Notation

namespace Nat

Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Init/Data/Nat/Lemmas.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Leonardo de Moura, Jeremy Avigad
-/
import Std.Data.Nat.Lemmas
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation
import Mathlib.Init.Algebra.Functions

universe u
Expand Down
11 changes: 11 additions & 0 deletions Mathlib/Init/Data/Nat/Notation.lean
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/-
Copyright (c) 2014 Microsoft Corporation. All rights reserved.
Released under Apache 2.0 license as described in the file LICENSE.
Authors: Floris van Doorn, Leonardo de Moura
-/

/-!
# Notation `ℕ` for the natural numbers.
-/

notation "ℕ" => Nat
38 changes: 0 additions & 38 deletions Mathlib/Lean/Expr/ReplaceRec.lean
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,4 @@ def replaceRec (f? : (Expr → Expr) → Expr → Option Expr) : Expr → Expr :
| some x => x
| none => traverseChildren (M := Id) r e

/-- replaceRec under a monad. -/
partial def replaceRecM [Monad M] (f? : (Expr → M Expr) → Expr → M (Option Expr)) (e : Expr) :
M Expr := do
match ← f? (replaceRecM f?) e with
| some x => return x
| none => traverseChildren (replaceRecM f?) e

/-- Similar to `replaceRecM` except that bound variables are instantiated with free variables
(like `Lean.Meta.transform`).
This means that MetaM tactics can be used inside the replacement function.

If you don't need recursive calling,
you should prefer using `Lean.Meta.transform` because it also caches visits.
-/
partial def replaceRecMeta [Monad M] [MonadLiftT MetaM M] [MonadControlT MetaM M]
(f? : (Expr → M Expr) → Expr → M (Option Expr)) (e : Expr) : M Expr := do
match ← f? (replaceRecMeta f?) e with
| some x => return x
| none => Lean.Meta.traverseChildren (replaceRecMeta f?) e

/-- A version of `Expr.replace` where we can use recursive calls even if we replace a subexpression.
When reaching a subexpression `e` we call `traversal e` to see if we want to do anything with this
expression. If `traversal e = none` we proceed to the children of `e`. If
`traversal e = some (#[e₁, ..., eₙ], g)`, we first recursively apply this function to
`#[e₁, ..., eₙ]` to get new expressions `#[f₁, ..., fₙ]`.
Then we replace `e` by `g [f₁, ..., fₙ]`.

Important: In order for this function to terminate, the `[e₁, ..., eₙ]` must all be smaller than
`e` according to some measure (and this measure must also be strictly decreasing on the w.r.t.
the structural subterm relation).
-/
def replaceRecTraversal (traversal : Expr → Option (Array Expr × (Array Expr → Expr))) :
Expr → Expr :=
replaceRec fun r e ↦
match traversal e with
| none => none
| some (get, set) => some <| set <| .map r <| get

end Lean.Expr
2 changes: 1 addition & 1 deletion Mathlib/Tactic/PermuteGoals.lean
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Authors: Arthur Paulino, Mario Carneiro

import Lean
import Std.Data.List.Basic
import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation

namespace Mathlib.Tactic

Expand Down
2 changes: 1 addition & 1 deletion Mathlib/Tactic/Simps/Basic.lean
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
Authors: Floris van Doorn
-/

import Mathlib.Init.Data.Nat.Basic
import Mathlib.Init.Data.Nat.Notation
import Mathlib.Lean.Message
import Mathlib.Tactic.ToAdditive
import Mathlib.Tactic.Simps.NotationClass
Expand Down
Loading