chore: update stage0

2020-12-29 15:13:16 -08:00 · 2020-12-29 15:13:16 -08:00 · fcd155931b
commit fcd155931b
parent bf88656288
41 changed files with 18914 additions and 1958 deletions
--- a/stage0/src/CMakeLists.txt
+++ b/stage0/src/CMakeLists.txt
@ -373,7 +373,7 @@ endif()
 configure_file("${LEAN_SOURCE_DIR}/githash.h.in" "${LEAN_BINARY_DIR}/githash.h")

 # Version
-configure_file("${LEAN_SOURCE_DIR}/version.h.in" "${LEAN_BINARY_DIR}/version.h")
+configure_file("${LEAN_SOURCE_DIR}/version.h.in" "${LEAN_BINARY_DIR}/include/lean/version.h")
 if (${STAGE} EQUAL 0)
  set(LEAN_IS_STAGE0 "#define LEAN_IS_STAGE0 1")
 else()
--- a/stage0/src/Init/Meta.lean
+++ b/stage0/src/Init/Meta.lean
@ -9,6 +9,33 @@ prelude
 import Init.Data.Array.Basic

 namespace Lean
+
+@[extern c inline "lean_box(LEAN_VERSION_MAJOR)"]
+private constant version.getMajor (u : Unit) : Nat
+def version.major : Nat := version.getMajor ()
+
+@[extern c inline "lean_box(LEAN_VERSION_MINOR)"]
+private constant version.getMinor (u : Unit) : Nat
+def version.minor : Nat := version.getMinor ()
+
+@[extern c inline "lean_box(LEAN_VERSION_PATCH)"]
+private constant version.getPatch (u : Unit) : Nat
+def version.patch : Nat := version.getPatch ()
+
+-- @[extern c inline "lean_mk_string(LEAN_GITHASH)"]
+-- constant getGithash (u : Unit) : String
+-- def githash : String := getGithash ()
+
+@[extern c inline "LEAN_VERSION_IS_RELEASE"]
+constant version.getIsRelease (u : Unit) : Bool
+def version.isRelease : Bool := version.getIsRelease ()
+
+/-- Additional version description like "nightly-2018-03-11" -/
+@[extern c inline "lean_mk_string(LEAN_SPECIAL_VERSION_DESC)"]
+constant version.getSpecialDesc (u : Unit) : String
+def version.specialDesc : String := version.getSpecialDesc ()
+
+
 /- Valid identifier names -/
 def isGreek (c : Char) : Bool :=
  0x391 ≤ c.val && c.val ≤ 0x3dd
--- a/stage0/src/Lean/Elab/Match.lean
+++ b/stage0/src/Lean/Elab/Match.lean
@ -709,12 +709,16 @@ builtin_initialize
 def ignoreUnusedAlts (opts : Options) : Bool :=
  opts.get `match.ignoreUnusedAlts false

-def reportMatcherResultErrors (result : MatcherResult) : TermElabM Unit := do
-  -- TODO: improve error messages
+def reportMatcherResultErrors (altLHSS : List AltLHS) (result : MatcherResult) : TermElabM Unit := do
  unless result.counterExamples.isEmpty do
    throwError! "missing cases:\n{Meta.Match.counterExamplesToMessageData result.counterExamples}"
  unless ignoreUnusedAlts (← getOptions) || result.unusedAltIdxs.isEmpty do
-    throwError! "unused alternatives: {result.unusedAltIdxs.map fun idx => s!"#{idx+1}"}"
+    let mut i := 0
+    for alt in altLHSS do
+      if result.unusedAltIdxs.contains i then
+        withRef alt.ref do
+          logError "redundant alternative"
+      i := i + 1

 private def elabMatchAux (discrStxs : Array Syntax) (altViews : Array MatchAltView) (matchOptType : Syntax) (expectedType : Expr)
    : TermElabM Expr := do
@ -760,7 +764,7 @@ private def elabMatchAux (discrStxs : Array Syntax) (altViews : Array MatchAltVi
  let matcherName ← mkAuxName `match
  let matcherResult ← mkMatcher matcherName matchType numDiscrs altLHSS
  let motive ← forallBoundedTelescope matchType numDiscrs fun xs matchType => mkLambdaFVars xs matchType
-  reportMatcherResultErrors matcherResult
+  reportMatcherResultErrors altLHSS matcherResult
  let r := mkApp matcherResult.matcher motive
  let r := mkAppN r discrs
  let r := mkAppN r rhss
--- a/stage0/src/Lean/Meta/Match/Match.lean
+++ b/stage0/src/Lean/Meta/Match/Match.lean
@ -498,6 +498,21 @@ def isCurrVarInductive (p : Problem) : MetaM Bool := do
    let val? ← getInductiveVal? x
    pure val?.isSome

+private def checkNextPatternTypes (p : Problem) : MetaM Unit := do
+  match p.vars with
+  | []   => return ()
+  | x::_ => withGoalOf p do
+    for alt in p.alts do
+      withRef alt.ref do
+        match alt.patterns with
+        | []   => pure ()
+        | p::_ =>
+          let e ← p.toExpr
+          let xType ← inferType x
+          let eType ← inferType e
+          unless (← isDefEq xType eType) do
+            throwError! "pattern{indentExpr e}\n{← mkHasTypeButIsExpectedMsg eType xType}"
+
 private partial def process (p : Problem) : StateRefT State MetaM Unit := withIncRecDepth do
  traceState p
  let isInductive ← liftM $ isCurrVarInductive p
@ -528,7 +543,8 @@ private partial def process (p : Problem) : StateRefT State MetaM Unit := withIn
    let ps ← processArrayLit p
    ps.forM process
  else
-    liftM $ throwNonSupported p
+    checkNextPatternTypes p
+    throwNonSupported p

 private def getUElimPos? (matcherLevels : List Level) (uElim : Level) : MetaM (Option Nat) :=
  if uElim == levelZero then
--- a/stage0/src/Lean/Meta/Tactic/Simp.lean
+++ b/stage0/src/Lean/Meta/Tactic/Simp.lean
@ -3,4 +3,6 @@ Copyright (c) 2020 Microsoft Corporation. All rights reserved.
 Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
-import Lean.Meta.Tactic.Simp.Basic
+import Lean.Meta.Tactic.Simp.SimpLemmas
+import Lean.Meta.Tactic.Simp.Types
+import Lean.Meta.Tactic.Simp.Main
--- a/stage0/src/Lean/Meta/Tactic/Simp/Main.lean
+++ b/stage0/src/Lean/Meta/Tactic/Simp/Main.lean
@ -0,0 +1,11 @@
+/-
+Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Leonardo de Moura
+-/
+import Lean.Meta.Tactic.Simp.Types
+
+namespace Lean.Meta.Simp
+
+
+end Lean.Meta.Simp
--- a/stage0/src/Lean/Meta/Tactic/Simp/SimpLemmas.lean
+++ b/stage0/src/Lean/Meta/Tactic/Simp/SimpLemmas.lean
--- a/stage0/src/Lean/Meta/Tactic/Simp/Types.lean
+++ b/stage0/src/Lean/Meta/Tactic/Simp/Types.lean
@ -0,0 +1,58 @@
+/-
+Copyright (c) 2020 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Leonardo de Moura
+-/
+import Lean.Meta.Tactic.Simp.SimpLemmas
+
+namespace Lean.Meta
+namespace Simp
+
+def defaultMaxSteps := 100000
+
+structure Result where
+  expr   : Expr
+  proof? : Option Expr := none -- If none, proof is assumed to be `refl`
+
+abbrev Cache := ExprMap Result
+
+structure Config where
+  maxSteps   : Nat  := defaultMaxSteps
+  contextual : Bool := false
+  memoize    : Bool := true
+  singlePass : Bool := false
+  zeta       : Bool := true
+  beta       : Bool := true
+  eta        : Bool := true
+  proj       : Bool := true
+  ctorEq     : Bool := true
+
+structure Context where
+  config     : Config
+  parent?    : Option Expr := none
+  simpLemmas : SimpLemmas
+
+structure State (σ : Type) where
+  user     : σ -- user state
+  cache    : Cache := {}
+  numSteps : Nat := 0
+
+abbrev SimpM (σ : Type) := ReaderT Context $ StateRefT (State σ) $ MetaM
+
+inductive Step where
+  | visit : Result → Step
+  | done  : Result → Step
+
+structure Methods (σ : Type) where
+  pre        : Expr → SimpM σ Step          := fun e => return Step.visit { expr := e }
+  post       : Expr → SimpM σ Step          := fun e => return Step.done { expr := e }
+  discharge? : Expr → SimpM σ (Option Expr) := fun e => return none
+
+/- Internal monad -/
+abbrev M (σ : Type) := ReaderT (Methods σ) $ SimpM σ
+
+end Simp
+
+export Simp (SimpM)
+
+end Lean.Meta
--- a/stage0/src/Lean/Parser/Term.lean
+++ b/stage0/src/Lean/Parser/Term.lean
@ -175,6 +175,8 @@ def matchAltsWhereDecls := parser! matchAlts >> optional whereDecls

@[builtinTermParser] def noindex := parser! "noindex!" >> termParser maxPrec

+@[builtinTermParser] def binrel  := parser! "binrel!" >> ident >> termParser maxPrec >> termParser maxPrec
+
@[builtinTermParser] def typeOf             := parser! "typeOf! " >> termParser maxPrec
@[builtinTermParser] def ensureTypeOf       := parser! "ensureTypeOf! " >> termParser maxPrec >> strLit >> termParser
@[builtinTermParser] def ensureExpectedType := parser! "ensureExpectedType! " >> strLit >> termParser maxPrec
--- a/stage0/src/Leanpkg.lean
+++ b/stage0/src/Leanpkg.lean
@ -0,0 +1,135 @@
+/-
+Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Gabriel Ebner, Sebastian Ullrich
+-/
+import Leanpkg.Resolve
+import Leanpkg.Git
+
+namespace Leanpkg
+
+def readManifest : IO Manifest := do
+  let m ← Manifest.fromFile leanpkgTomlFn
+  if m.leanVersion ≠ leanVersionString then
+    IO.eprintln $ "\nWARNING: Lean version mismatch: installed version is " ++ leanVersionString
+       ++ ", but package requires " ++ m.leanVersion ++ "\n"
+  return m
+
+def writeManifest (manifest : Lean.Syntax) (fn : String) : IO Unit := do
+  IO.FS.writeFile fn manifest.reprint.get!
+
+def configure : IO String := do
+  let d ← readManifest
+  IO.eprintln $ "configuring " ++ d.name ++ " " ++ d.version
+  let assg ← solveDeps d
+  let paths ← constructPath assg
+  for path in paths do
+    unless path == "./." do
+      -- TODO: share build of common dependencies
+      execCmd {
+        cmd := "leanpkg"
+        cwd := path
+        args := #["build"]
+      }
+  System.FilePath.searchPathSeparator.toString.intercalate <| paths.map (· ++ "/build")
+
+def build (leanArgs : List String) : IO Unit := do
+  let manifest ← readManifest
+  let path ← configure
+  let leanArgs := (match manifest.timeout with | some t => ["-T", toString t] | none => []) ++ leanArgs
+  execCmd {
+    cmd := "leanmake"
+    cwd := manifest.effectivePath
+    args := #[s!"LEAN_OPTS={" ".intercalate leanArgs}", s!"LEAN_PATH={path}"]
+  }
+
+def initGitignoreContents :=
+  "/build
+"
+
+def initPkg (n : String) (fromNew : Bool) : IO Unit := do
+  IO.FS.writeFile leanpkgTomlFn s!"[package]
+name = \"{n}\"
+version = \"0.1\"
+"
+  IO.FS.writeFile s!"{n.capitalize}.lean" "def main : IO Unit :=
+  IO.println \"Hello, world!\"
+"
+  let h ← IO.FS.Handle.mk ".gitignore" IO.FS.Mode.append (bin := false)
+  h.putStr initGitignoreContents
+  let gitEx ← IO.isDir ".git"
+  unless gitEx do
+    (do
+      execCmd {cmd := "git", args := #["init", "-q"]}
+      unless upstreamGitBranch = "master" do
+        execCmd {cmd := "git", args := #["checkout", "-B", upstreamGitBranch]}
+    ) <|> IO.println "WARNING: failed to initialize git repository"
+
+def init (n : String) := initPkg n false
+
+def usage :=
+  "Lean package manager, version " ++ uiLeanVersionString ++ "
+
+Usage: leanpkg <command>
+
+configure              download dependencies
+build [-- <Lean-args>] download dependencies and build *.olean files
+init <name>            create a Lean package in the current directory
+
+See `leanpkg help <command>` for more information on a specific command."
+
+def main : (cmd : String) → (leanpkgArgs leanArgs : List String) → IO Unit
+  | "configure", [],     []        => discard <| configure
+  | "build",     _,      leanArgs  => build leanArgs
+  | "init",      [Name], []        => init Name
+  | "help",      ["configure"], [] => IO.println "Download dependencies
+
+Usage:
+  leanpkg configure
+
+This command sets up the `build/deps` directory.
+
+For each (transitive) git dependency, the specified commit is checked out
+into a sub-directory of `build/deps`. If there are dependencies on multiple
+versions of the same package, the version materialized is undefined. No copy
+is made of local dependencies."
+  | "help",       ["build"], []    => IO.println "download dependencies and build *.olean files
+
+Usage:
+  leanpkg build [-- <lean-args>]
+
+This command invokes `Leanpkg configure` followed by
+`Leanmake <lean-args>`, building the package's Lean files as well as
+(transitively) imported files of dependencies. If defined, the `package.timeout`
+configuration value is passed to Lean via its `-T` parameter."
+  | "help",       ["init"], []     => IO.println "Create a new Lean package in the current directory
+
+Usage:
+  leanpkg init <name>
+
+This command creates a new Lean package with the given name in the current
+directory."
+  | "help",       _,     []        => IO.println usage
+  | _,            _,     _         => throw <| IO.userError usage
+
+private def splitCmdlineArgsCore : List String → List String × List String
+  | []           => ([], [])
+  | (arg::args)  => if arg == "--"
+                    then ([], args)
+                    else
+                      let (outerArgs, innerArgs) := splitCmdlineArgsCore args
+                      (arg::outerArgs, innerArgs)
+
+def splitCmdlineArgs : List String → IO (String × List String × List String)
+| [] => throw <| IO.userError usage
+| [cmd] => return (cmd, [], [])
+| (cmd::rest) =>
+  let (outerArgs, innerArgs) := splitCmdlineArgsCore rest
+  return (cmd, outerArgs, innerArgs)
+
+end Leanpkg
+
+def main (args : List String) : IO Unit := do
+  Lean.initSearchPath none  -- HACK
+  let (cmd, outerArgs, innerArgs) ← Leanpkg.splitCmdlineArgs args
+  Leanpkg.main cmd outerArgs innerArgs
--- a/stage0/src/Leanpkg/.gitignore
+++ b/stage0/src/Leanpkg/.gitignore
@ -0,0 +1 @@
+/leanpkg/config_vars.lean
--- a/stage0/src/Leanpkg/Git.lean
+++ b/stage0/src/Leanpkg/Git.lean
@ -0,0 +1,41 @@
+/-
+Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Gabriel Ebner, Sebastian Ullrich
+-/
+import Leanpkg.LeanVersion
+
+namespace Leanpkg
+
+def upstreamGitBranch :=
+  if Lean.version.isRelease then
+    "Lean-" ++ leanVersionStringCore
+  else
+    "master"
+
+def gitdefaultRevision : Option String → String
+  | none => upstreamGitBranch
+  | some branch => branch
+
+def gitParseRevision (gitRepoDir : String) (rev : String) : IO String := do
+  let rev ← IO.Process.run {cmd := "git", args := #["rev-parse", "-q", "--verify", rev], cwd := gitRepoDir}
+  rev.trim -- remove newline at end
+
+def gitHeadRevision (gitRepoDir : String) : IO String :=
+  gitParseRevision gitRepoDir "HEAD"
+
+def gitParseOriginRevision (gitRepoDir : String) (rev : String) : IO String :=
+  (gitParseRevision gitRepoDir $ "origin/" ++ rev) <|> gitParseRevision gitRepoDir rev
+    <|> throw (IO.userError s!"cannot find revision {rev} in repository {gitRepoDir}")
+
+def gitLatestOriginRevision (gitRepoDir : String) (branch : Option String) : IO String := do
+  discard <| IO.Process.run {cmd := "git", args := #["fetch"], cwd := gitRepoDir}
+  gitParseOriginRevision gitRepoDir (gitdefaultRevision branch)
+
+def gitRevisionExists (gitRepoDir : String) (rev : String) : IO Bool := do
+  try
+    discard <| gitParseRevision gitRepoDir (rev ++ "^{commit}")
+    true
+  catch _ => false
+
+end Leanpkg
--- a/stage0/src/Leanpkg/LeanVersion.lean
+++ b/stage0/src/Leanpkg/LeanVersion.lean
@ -0,0 +1,27 @@
+/-
+Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Gabriel Ebner, Sebastian Ullrich
+-/
+namespace Leanpkg
+
+def leanVersionStringCore :=
+  s!"{Lean.version.major}.{Lean.version.minor}.{Lean.version.patch}"
+
+def leanVersionString :=
+  if Lean.version.isRelease then
+      s!"leanprover/lean:{leanVersionStringCore}"
+  else if Lean.version.specialDesc ≠ "" then
+      Lean.version.specialDesc
+  else
+      "master"
+
+def uiLeanVersionString :=
+if Lean.version.isRelease then
+    leanVersionStringCore
+else if Lean.version.specialDesc ≠ "" then
+    Lean.version.specialDesc
+else
+    s!"master ({leanVersionStringCore})"
+
+end Leanpkg
--- a/stage0/src/Leanpkg/Manifest.lean
+++ b/stage0/src/Leanpkg/Manifest.lean
@ -0,0 +1,85 @@
+/-
+Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Gabriel Ebner, Sebastian Ullrich
+-/
+import Leanpkg.Toml
+import Leanpkg.LeanVersion
+
+namespace Leanpkg
+
+inductive Source where
+  | path (dirName : String) : Source
+  | git (url rev : String) (branch : Option String) : Source
+
+namespace Source
+
+def fromToml (v : Toml.Value) : Option Source :=
+  (do let Toml.Value.str dirName ← v.lookup "path" | none
+      path dirName) <|>
+  (do let Toml.Value.str url ← v.lookup "git" | none
+      let Toml.Value.str rev ← v.lookup "rev" | none
+      match v.lookup "branch" with
+      | none                         => git url rev none
+      | some (Toml.Value.str branch) => git url rev (some branch)
+      | _ => none)
+
+def toToml : Source → Toml.Value
+  | path dirName => Toml.Value.table [("path", Toml.Value.str dirName)]
+  | git url rev none =>
+    Toml.Value.table [("git", Toml.Value.str url), ("rev", Toml.Value.str rev)]
+  | git url rev (some branch) =>
+    Toml.Value.table [("git", Toml.Value.str url), ("branch", Toml.Value.str branch), ("rev", Toml.Value.str rev)]
+
+end Source
+
+structure Dependency where
+  name : String
+  src : Source
+
+structure Manifest where
+  name : String
+  version : String
+  leanVersion : String := leanVersionString
+  timeout : Option Nat := none
+  path : Option String := none
+  dependencies : List Dependency := []
+
+namespace Manifest
+
+def effectivePath (m : Manifest) : String :=
+  m.path.getD "."
+
+def fromToml (t : Toml.Value) : Option Manifest := do
+  let pkg ← t.lookup "package"
+  let Toml.Value.str n ← pkg.lookup "name" | none
+  let Toml.Value.str ver ← pkg.lookup "version" | none
+  let leanVer ← match pkg.lookup "lean_version" with
+    | some (Toml.Value.str leanVer) => some leanVer
+    | none => some leanVersionString
+    | _ => none
+  let tm ← match pkg.lookup "timeout" with
+    | some (Toml.Value.nat timeout) => some (some timeout)
+    | none => some none
+    | _ => none
+  let path ← match pkg.lookup "path" with
+    | some (Toml.Value.str path) => some (some path)
+    | none => some none
+    | _ => none
+  let Toml.Value.table deps ← t.lookup "dependencies" <|> some (Toml.Value.table []) | none
+  let deps ← deps.mapM fun ⟨n, src⟩ => do Dependency.mk n (← Source.fromToml src)
+  return { name := n, version := ver, leanVersion := leanVer,
+           path := path, dependencies := deps, timeout := tm }
+
+def fromFile (fn : String) : IO Manifest := do
+  let cnts ← IO.FS.readFile fn
+  let toml ← Toml.parse cnts
+  let some manifest ← pure (fromToml toml)
+    | throw <| IO.userError s!"cannot read manifest from {fn}"
+  manifest
+
+end Manifest
+
+def leanpkgTomlFn := "leanpkg.toml"
+
+end Leanpkg
--- a/stage0/src/Leanpkg/Proc.lean
+++ b/stage0/src/Leanpkg/Proc.lean
@ -0,0 +1,20 @@
+/-
+Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Gabriel Ebner, Sebastian Ullrich
+-/
+namespace Leanpkg
+
+def execCmd (args : IO.Process.SpawnArgs) : IO Unit := do
+  let envstr := String.join <| args.env.toList.map fun (k, v) => s!"{k}={v.getD ""} "
+  let cmdstr := " ".intercalate (args.cmd :: args.args.toList)
+  IO.println <| "> " ++ envstr ++
+    match args.cwd with
+    | some cwd => cmdstr ++ "    # in directory " ++ cwd
+    | none     => cmdstr
+  let child ← IO.Process.spawn args
+  let exitCode ← child.wait
+  if exitCode != 0 then
+    throw <| IO.userError <| s!"external command exited with status {exitCode}"
+
+end Leanpkg
--- a/stage0/src/Leanpkg/Resolve.lean
+++ b/stage0/src/Leanpkg/Resolve.lean
@ -0,0 +1,91 @@
+/-
+Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Gabriel Ebner, Sebastian Ullrich
+-/
+import Leanpkg.Manifest
+import Leanpkg.Proc
+import Leanpkg.Git
+
+namespace Leanpkg
+
+def Assignment := List (String × String)
+
+namespace Assignment
+def empty : Assignment := []
+
+def contains (a : Assignment) (s : String) : Bool :=
+  (a.lookup s).isSome
+
+def insert (a : Assignment) (k v : String) : Assignment :=
+  if a.contains k then a else (k, v) :: a
+
+def fold {α} (i : α) (f : α → String → String → α) : Assignment → α :=
+  List.foldl (fun a ⟨k, v⟩ => f a k v) i
+
+end Assignment
+
+abbrev Solver := StateT Assignment IO
+
+def notYetAssigned (d : String) : Solver Bool := do
+  ¬ (← get).contains d
+
+def resolvedPath (d : String) : Solver String := do
+  let some path ← pure ((← get).lookup d) | unreachable!
+  path
+
+-- TODO(gabriel): windows?
+def resolveDir (absOrRel : String) (base : String) : String :=
+  if absOrRel.front = '/' then
+    absOrRel -- absolute
+  else
+    base ++ "/" ++ absOrRel
+
+def materialize (relpath : String) (dep : Dependency) : Solver Unit :=
+  match dep.src with
+  | Source.path dir => do
+    let depdir := resolveDir dir relpath
+    IO.println s!"{dep.name}: using local path {depdir}"
+    modify (·.insert dep.name depdir)
+  | Source.git url rev branch => do
+    let depdir := "build/deps/" ++ dep.name
+    let alreadyThere ← IO.isDir depdir
+    if alreadyThere then
+      IO.print s!"{dep.name}: trying to update {depdir} to revision {rev}"
+      IO.println (match branch with | none => "" | some branch => "@" ++ branch)
+      let hash ← gitParseOriginRevision depdir rev
+      let revEx ← gitRevisionExists depdir hash
+      unless revEx do
+        execCmd {cmd := "git", args := #["fetch"], cwd := depdir}
+    else
+      IO.println s!"{dep.name}: cloning {url} to {depdir}"
+      execCmd {cmd := "git", args := #["clone", url, depdir]}
+    let hash ← gitParseOriginRevision depdir rev
+    execCmd {cmd := "git", args := #["checkout", "--detach", hash], cwd := depdir}
+    modify (·.insert dep.name depdir)
+
+def solveDepsCore (relPath : String) (d : Manifest) : (maxDepth : Nat) → Solver Unit
+  | 0 => throw <| IO.userError "maximum dependency resolution depth reached"
+  | maxDepth + 1 => do
+    let deps ← d.dependencies.filterM (notYetAssigned ·.name)
+    deps.forM (materialize relPath)
+    for dep in deps do
+      let p ← resolvedPath dep.name
+      let d' ← Manifest.fromFile $ p ++ "/" ++ "leanpkg.toml"
+      unless d'.name = dep.name do
+        throw <| IO.userError <| d.name ++ " (in " ++ relPath ++ ") depends on " ++ d'.name ++
+          ", but resolved dependency has name " ++ dep.name ++ " (in " ++ p ++ ")"
+      solveDepsCore p d' maxDepth
+
+def solveDeps (d : Manifest) : IO Assignment := do
+  let (_, assg) ← (solveDepsCore "." d 1024).run <| Assignment.empty.insert d.name "."
+  assg
+
+def constructPathCore (depname : String) (dirname : String) : IO String := do
+  let path ← Manifest.effectivePath (← Manifest.fromFile $ dirname ++ "/" ++ leanpkgTomlFn)
+  return dirname ++ "/" ++ path
+
+def constructPath (assg : Assignment) : IO (List String) := do
+  assg.reverse.mapM fun ⟨depname, dirname⟩ => constructPathCore depname dirname
+
+end Leanpkg
--- a/stage0/src/Leanpkg/Toml.lean
+++ b/stage0/src/Leanpkg/Toml.lean
@ -0,0 +1,72 @@
+/-
+Copyright (c) 2017 Microsoft Corporation. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Gabriel Ebner, Sebastian Ullrich
+-/
+import Lean.Parser
+
+namespace Toml
+
+inductive Value : Type where
+  | str : String → Value
+  | nat : Nat → Value
+  | bool : Bool → Value
+  | table : List (String × Value) → Value
+  deriving Inhabited
+
+def Value.lookup : Value → String → Option Value
+  | Value.table cs, k => cs.lookup k
+  | _, _ => none
+
+-- TODO: custom whitespace and other inaccuracies
+declare_syntax_cat val
+syntax "True" : val
+syntax "False" : val
+syntax str : val
+syntax num : val
+syntax bareKey := ident  -- TODO
+syntax key := bareKey <|> str
+declare_syntax_cat keyCat @[keyCatParser] def key' := key  -- HACK: for the antiquotation
+syntax keyVal := key " = " val
+syntax table := "[" key "]" keyVal*
+syntax inlineTable := "{" keyVal,* "}"
+syntax inlineTable : val
+syntax file := table*
+declare_syntax_cat fileCat @[fileCatParser] def file' := file  -- HACK: for the antiquotation
+
+open Lean
+
+partial def ofSyntax : Syntax → Value
+  | `(val|True) => Value.bool true
+  | `(val|False) => Value.bool false
+  | `(val|$s:strLit) => Value.str <| s.isStrLit?.get!
+  | `(val|$n:numLit) => Value.nat <| n.isNatLit?.get!
+  | `(val|{$[$keys:key = $values],*}) => toTable keys (values.map ofSyntax)
+  | `(fileCat|$[[$keys] $kvss*]*) => toTable keys <| kvss.map fun kvs => ofSyntax <| Lean.Unhygienic.run `(val|{$kvs,*})
+  | stx => unreachable!
+  where
+    toKey : Syntax → String
+      | `(keyCat|$key:ident)  => key.getId.toString
+      | `(keyCat|$key:strLit) => key.isStrLit?.get!
+      | _                     => unreachable!
+    toTable (keys : Array Syntax) (vals : Array Value) : Value :=
+      Value.table <| Array.toList <| keys.zipWith vals fun k v => (toKey k, v)
+
+open Lean.Parser
+
+def parse (input : String) : IO Value := do
+  -- HACKHACKHACK
+  let env ← importModules [{ module := `Leanpkg.Toml }] {}
+  let fileParser ← compileParserDescr (parserExtension.getState env).categories file { env := env, opts := {} }
+  let c := mkParserContext (mkInputContext input "") { env := env, options := {} }
+  let s := mkParserState input
+  let s := whitespace c s
+  let s := fileParser.fn c s
+  if s.hasError then
+    throw <| IO.userError (s.toErrorMsg c)
+  else if input.atEnd s.pos then
+    ofSyntax s.stxStack.back
+  else
+    throw <| IO.userError ((s.mkError "end of input").toErrorMsg c)
+
+end Toml
--- a/stage0/src/config.h.in
+++ b/stage0/src/config.h.in
@ -5,6 +5,8 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Author: Leonardo de Moura
 */
 #pragma once
+#include <lean/version.h>
+
@LEAN_SMALL_ALLOCATOR@
@LEAN_LAZY_RC@
@LEAN_COMPRESSED_OBJECT_HEADER@
--- a/stage0/src/lean.mk.in
+++ b/stage0/src/lean.mk.in
@ -34,7 +34,7 @@ SHELL = /usr/bin/env bash -eo pipefail

 all: $(OBJS)

-bin: $(BIN_OUT)/$(PKG)
+bin: $(BIN_OUT)/$(BIN_NAME)

 lib: $(LIB_OUT)/$(STATIC_LIB_NAME)

--- a/stage0/src/library/util.cpp
+++ b/stage0/src/library/util.cpp
@ -20,7 +20,7 @@ Author: Leonardo de Moura
 #include "library/projection.h"
 #include "library/replace_visitor.h"
 #include "library/num.h"
-#include "version.h"
+#include <lean/version.h>
 #include "githash.h" // NOLINT

 namespace lean {
--- a/stage0/src/shell/CMakeLists.txt
+++ b/stage0/src/shell/CMakeLists.txt
@ -112,3 +112,7 @@ FOREACH(T ${LEANTESTS})
             COMMAND bash -c "PATH=${LEAN_BIN}:$PATH ./test_single.sh ${T_NAME}")
  endif()
 ENDFOREACH(T)
+
+add_test(NAME leanpkgtest
+         WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../tests/leanpkg/b"
+         COMMAND bash -c "PATH=${LEAN_BIN}:$PATH leanpkg build")
--- a/stage0/src/stdlib.make.in
+++ b/stage0/src/stdlib.make.in
@ -7,6 +7,7 @@ LEANMAKE_OPTS=\
 	OUT="${LIB}"\
 	LIB_OUT="${LIB}/lean"\
 	OLEAN_OUT="${LIB}/lean"\
+	BIN_OUT="${CMAKE_BINARY_DIR}/bin"\
 	LEAN_OPTS+="${LEAN_EXTRA_MAKE_OPTS} -Dinterpreter.prefer_native=false"\
 	LEANC_OPTS+="${LEANC_OPTS}"\
 	MORE_DEPS+="${PREV_STAGE}/bin/lean${CMAKE_EXECUTABLE_SUFFIX}"\
@ -17,3 +18,4 @@ stdlib:
 	+"${LEAN_BIN}/leanmake" lib PKG=Init $(LEANMAKE_OPTS)
 	+"${LEAN_BIN}/leanmake" lib PKG=Std $(LEANMAKE_OPTS)
 	+"${LEAN_BIN}/leanmake" lib PKG=Lean $(LEANMAKE_OPTS)
+	+"${LEAN_BIN}/leanmake" bin PKG=Leanpkg BIN_NAME=leanpkg $(LEANMAKE_OPTS) LINK_OPTS="${CMAKE_EXE_LINKER_FLAGS}"
--- a/stage0/src/version.h.in
+++ b/stage0/src/version.h.in
@ -1,6 +1,8 @@
+#pragma once
 #define LEAN_VERSION_MAJOR @LEAN_VERSION_MAJOR@
 #define LEAN_VERSION_MINOR @LEAN_VERSION_MINOR@
 #define LEAN_VERSION_PATCH @LEAN_VERSION_PATCH@
+#define LEAN_VERSION_IS_RELEASE @LEAN_VERSION_IS_RELEASE@

 // Additional version description like "nightly-2018-03-11"
 #define LEAN_SPECIAL_VERSION_DESC "@LEAN_SPECIAL_VERSION_DESC@"
--- a/stage0/stdlib/CMakeLists.txt
+++ b/stage0/stdlib/CMakeLists.txt
--- a/stage0/stdlib/Init/Meta.c
+++ b/stage0/stdlib/Init/Meta.c
@ -19,6 +19,7 @@ lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decode___boxed(lean_object
 lean_object* l_Lean_Syntax_identToAtom_match__1(lean_object*);
 lean_object* l_Substring_takeWhileAux___at___private_Init_Meta_0__Lean_Syntax_decodeNameLitAux___spec__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkCIdentFrom(lean_object*, lean_object*);
+lean_object* l___private_Init_Meta_0__Lean_version_getMajor___boxed(lean_object*);
 lean_object* lean_string_push(lean_object*, uint32_t);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeOctalLitAux___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Name_toString___closed__1;
@ -70,6 +71,7 @@ lean_object* l_Array_filterSepElemsM___rarg(lean_object*, lean_object*, lean_obj
 lean_object* l_Lean_instQuoteSubstring___closed__3;
 lean_object* l_Lean_Name_capitalize(lean_object*);
 lean_object* l_Lean_Syntax_isAtom___boxed(lean_object*);
+lean_object* l_Lean_version_specialDesc___closed__1;
 lean_object* l___private_Init_Meta_0__Lean_Syntax_updateFirst(lean_object*);
 lean_object* l_Lean_monadNameGeneratorLift(lean_object*, lean_object*);
 lean_object* l_Array_mapSepElemsM___rarg(lean_object*, lean_object*, lean_object*);
@ -124,6 +126,7 @@ lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_setTailInfoAux_match__2(lean_object*);
 lean_object* l_Lean_Syntax_setInfo_match__1(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_version_getSpecialDesc___boxed(lean_object*);
 lean_object* l_Lean_Syntax_mkApp_match__1(lean_object*);
 extern lean_object* l_Array_getEvenElems___rarg___closed__1;
 lean_object* l_Lean_Syntax_strLitToAtom_match__1(lean_object*);
@ -147,10 +150,12 @@ lean_object* l_Lean_mkIdentFrom___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_setHeadInfo(lean_object*, lean_object*);
 lean_object* l_Lean_instQuoteBool___closed__1;
 uint8_t l_USize_decLt(size_t, size_t);
+lean_object* l_Lean_version_patch;
 extern lean_object* l_Lean_nameLitKind;
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrLit_loop_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_isNatLitAux___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_instQuoteBool___boxed(lean_object*);
+lean_object* l_Lean_version_specialDesc;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_mkSep___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_myMacro____x40_Init_Notation___hyg_109____spec__1(lean_object*, lean_object*);
@ -163,6 +168,7 @@ lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_SepArray_ofElems(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar_match__3___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Name_capitalize_match__1(lean_object*);
+lean_object* l_Lean_version_major___closed__1;
 lean_object* l_Lean_Syntax_isLit_x3f_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_instQuoteSubstring___closed__1;
 lean_object* lean_string_utf8_next(lean_object*, lean_object*);
@ -178,7 +184,9 @@ lean_object* l_Lean_Syntax_mkApp(lean_object*, lean_object*);
 lean_object* l_Array_mapSepElems___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__6;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Meta_0__Lean_version_getMinor___boxed(lean_object*);
 lean_object* l_Lean_evalPrio___closed__1;
+uint8_t l_Lean_version_isRelease___closed__1;
 lean_object* l_Lean_instQuoteBool___closed__5;
 lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeExp___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isLit_x3f(lean_object*, lean_object*);
@ -190,6 +198,7 @@ lean_object* l_Lean_Syntax_isCharLit_x3f(lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isNatLit_x3f(lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar_match__4___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_version_major;
 lean_object* l_Lean_Name_appendAfter_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_setHeadInfoAux_match__1___rarg(lean_object*, lean_object*, lean_object*);
@ -301,6 +310,7 @@ lean_object* l_Lean_termEvalPrio_x21_____closed__7;
 lean_object* l_Lean_mkCIdent(lean_object*);
 lean_object* l_Lean_mkOptionalNode_match__1(lean_object*);
 lean_object* l_Lean_Syntax_replaceInfo(lean_object*, lean_object*);
+lean_object* l_Lean_version_getIsRelease___boxed(lean_object*);
 extern lean_object* l_Lean_numLitKind___closed__2;
 lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__2;
 lean_object* l_Lean_Syntax_isNameLit_x3f_match__1(lean_object*);
@ -315,6 +325,7 @@ lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeAfterExp(lean_object
 lean_object* l_Lean_Syntax_findAux_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_setTailInfoAux_match__1(lean_object*);
 lean_object* l_Lean_mkOptionalNode(lean_object*);
+lean_object* l___private_Init_Meta_0__Lean_version_getPatch___boxed(lean_object*);
 lean_object* l_Nat_pred(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeHexLitAux___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Array_filterSepElemsMAux(lean_object*);
@ -326,11 +337,14 @@ lean_object* l_Lean_evalOptPrec(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__4;
 lean_object* l_Array_findSomeRevM_x3f_find___at_Lean_Syntax_getTailPos___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_version_patch___closed__1;
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 lean_object* l_Lean_Name_toStringWithSep___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isNone_match__1(lean_object*);
 lean_object* l_Array_filterSepElemsM(lean_object*);
 extern lean_object* l_Lean_instInhabitedSyntax;
+lean_object* l_Lean_version_getSpecialDesc(lean_object*);
+lean_object* l_Lean_version_minor___closed__1;
 lean_object* l_Lean_Syntax_copyTailInfo___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_mkSepArray(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_SepArray_ofElemsUsingRef___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@ -350,6 +364,7 @@ size_t lean_usize_of_nat(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrLit(lean_object*);
 extern lean_object* l_term___x2b_x2b_____closed__2;
 lean_object* l_Lean_Syntax_getOptionalIdent_x3f_match__1(lean_object*);
+lean_object* l_Lean_version_minor;
 lean_object* l_Lean_Syntax_decodeStrLit___boxed(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__1;
 lean_object* l_Lean_Name_appendIndexAfter_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@ -357,11 +372,13 @@ lean_object* l___private_Init_Meta_0__Array_mapSepElemsMAux___at_Array_mapSepEle
 lean_object* l_Lean_NameGenerator_namePrefix___default___closed__2;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_isIdEndEscape(uint32_t);
+lean_object* l___private_Init_Meta_0__Lean_version_getMajor(lean_object*);
 lean_object* l_Lean_Syntax_unsetTrailing_match__1(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Syntax_expandInterpolatedStrChunks___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_updateLast___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_decodeNatLitVal_x3f___boxed(lean_object*);
 lean_object* l_Lean_Syntax_decodeCharLit(lean_object*);
+uint8_t l_Lean_version_isRelease;
 lean_object* l_Lean_Syntax_decodeNatLitVal_x3f___closed__1;
 lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__1;
 uint8_t l_Char_isAlpha(uint32_t);
@ -400,8 +417,10 @@ lean_object* l_Lean_termEvalPrec_x21_____closed__6;
 lean_object* l_Lean_Name_instReprName___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar_match__6(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteName_match__1(lean_object*);
+uint8_t l_Lean_version_getIsRelease(lean_object*);
 lean_object* l_Lean_Name_appendAfter(lean_object*, lean_object*);
 lean_object* l_Lean_termEvalPrio_x21_____closed__1;
+lean_object* l___private_Init_Meta_0__Lean_version_getMinor(lean_object*);
 lean_object* l_Lean_Syntax_getSepArgs(lean_object*);
 lean_object* l_Lean_termEvalPrio_x21_____closed__2;
 lean_object* l_Lean_Syntax_isIdent_match__1___rarg(lean_object*, lean_object*, lean_object*);
@ -529,6 +548,7 @@ lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_toNat(lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar_match__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Name_appendBefore(lean_object*, lean_object*);
+lean_object* l___private_Init_Meta_0__Lean_version_getPatch(lean_object*);
 lean_object* l_Lean_Syntax_strLitToAtom_match__2(lean_object*);
 lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l_Lean_Syntax_getOptional_x3f___boxed(lean_object*);
@ -554,12 +574,12 @@ extern lean_object* l_myMacro____x40_Init_Notation___hyg_2137____closed__4;
 lean_object* l_Array_filterSepElemsM___at_Array_filterSepElems___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteOption_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_monadNameGeneratorLift___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4078_(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4181_(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4305_(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4436_(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4539_(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4663_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4158_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4385_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4619_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4261_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4516_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4743_(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_expandInterpolatedStr___closed__1;
 lean_object* l_Lean_Syntax_decodeQuotedChar_match__5(lean_object*);
 lean_object* l_Lean_Syntax_expandInterpolatedStr___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -619,6 +639,132 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_Syntax_replaceInfo___spec__1___box
 lean_object* l_Lean_Syntax_strLitToAtom_match__2___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Syntax_isIdent(lean_object*);
 lean_object* l_Lean_evalOptPrio_match__1(lean_object*);
+lean_object* l___private_Init_Meta_0__Lean_version_getMajor___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_box(LEAN_VERSION_MAJOR);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_major___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_box(0);
+x_2 = lean_box(LEAN_VERSION_MAJOR);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_major() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_version_major___closed__1;
+return x_1;
+}
+}
+lean_object* l___private_Init_Meta_0__Lean_version_getMinor___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_box(LEAN_VERSION_MINOR);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_minor___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_box(0);
+x_2 = lean_box(LEAN_VERSION_MINOR);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_minor() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_version_minor___closed__1;
+return x_1;
+}
+}
+lean_object* l___private_Init_Meta_0__Lean_version_getPatch___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_box(LEAN_VERSION_PATCH);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_patch___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_box(0);
+x_2 = lean_box(LEAN_VERSION_PATCH);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_patch() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_version_patch___closed__1;
+return x_1;
+}
+}
+lean_object* l_Lean_version_getIsRelease___boxed(lean_object* x_1) {
+_start:
+{
+uint8_t x_2; lean_object* x_3; 
+x_2 = LEAN_VERSION_IS_RELEASE;
+x_3 = lean_box(x_2);
+return x_3;
+}
+}
+static uint8_t _init_l_Lean_version_isRelease___closed__1() {
+_start:
+{
+lean_object* x_1; uint8_t x_2; 
+x_1 = lean_box(0);
+x_2 = LEAN_VERSION_IS_RELEASE;
+return x_2;
+}
+}
+static uint8_t _init_l_Lean_version_isRelease() {
+_start:
+{
+uint8_t x_1; 
+x_1 = l_Lean_version_isRelease___closed__1;
+return x_1;
+}
+}
+lean_object* l_Lean_version_getSpecialDesc___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_mk_string(LEAN_SPECIAL_VERSION_DESC);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_specialDesc___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_box(0);
+x_2 = lean_mk_string(LEAN_SPECIAL_VERSION_DESC);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_version_specialDesc() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_version_specialDesc___closed__1;
+return x_1;
+}
+}
 uint8_t l_Lean_isGreek(uint32_t x_1) {
 _start:
 {
@ -8444,7 +8590,7 @@ _start:
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; 
 x_1 = l_Lean_Syntax_strLitToAtom___closed__1;
 x_2 = l_Lean_Syntax_strLitToAtom___closed__2;
-x_3 = lean_unsigned_to_nat(573u);
+x_3 = lean_unsigned_to_nat(600u);
 x_4 = lean_unsigned_to_nat(14u);
 x_5 = l_Lean_Syntax_strLitToAtom___closed__3;
 x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
@ -10281,7 +10427,7 @@ return x_75;
 }
 }
 }
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4078_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4158_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@ -10416,7 +10562,7 @@ return x_40;
 }
 }
 }
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4181_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4261_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@ -10635,7 +10781,7 @@ x_1 = l_Lean_termEvalPrec_x21_____closed__7;
 return x_1;
 }
 }
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4305_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4385_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@ -11087,7 +11233,7 @@ return x_75;
 }
 }
 }
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4436_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4516_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@ -11222,7 +11368,7 @@ return x_40;
 }
 }
 }
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4539_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4619_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@ -11441,7 +11587,7 @@ x_1 = l_Lean_termEvalPrio_x21_____closed__7;
 return x_1;
 }
 }
-lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4663_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4743_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@ -13631,6 +13777,24 @@ _G_initialized = true;
 res = initialize_Init_Data_Array_Basic(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
+l_Lean_version_major___closed__1 = _init_l_Lean_version_major___closed__1();
+lean_mark_persistent(l_Lean_version_major___closed__1);
+l_Lean_version_major = _init_l_Lean_version_major();
+lean_mark_persistent(l_Lean_version_major);
+l_Lean_version_minor___closed__1 = _init_l_Lean_version_minor___closed__1();
+lean_mark_persistent(l_Lean_version_minor___closed__1);
+l_Lean_version_minor = _init_l_Lean_version_minor();
+lean_mark_persistent(l_Lean_version_minor);
+l_Lean_version_patch___closed__1 = _init_l_Lean_version_patch___closed__1();
+lean_mark_persistent(l_Lean_version_patch___closed__1);
+l_Lean_version_patch = _init_l_Lean_version_patch();
+lean_mark_persistent(l_Lean_version_patch);
+l_Lean_version_isRelease___closed__1 = _init_l_Lean_version_isRelease___closed__1();
+l_Lean_version_isRelease = _init_l_Lean_version_isRelease();
+l_Lean_version_specialDesc___closed__1 = _init_l_Lean_version_specialDesc___closed__1();
+lean_mark_persistent(l_Lean_version_specialDesc___closed__1);
+l_Lean_version_specialDesc = _init_l_Lean_version_specialDesc();
+lean_mark_persistent(l_Lean_version_specialDesc);
 l_Lean_idBeginEscape = _init_l_Lean_idBeginEscape();
 l_Lean_idEndEscape = _init_l_Lean_idEndEscape();
 l_Lean_Name_toStringWithSep___closed__1 = _init_l_Lean_Name_toStringWithSep___closed__1();
--- a/stage0/stdlib/Lean/Elab/Declaration.c
+++ b/stage0/stdlib/Lean/Elab/Declaration.c
@ -351,7 +351,7 @@ extern lean_object* l_Lean_Parser_Command_constant___elambda__1___closed__1;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Command_mkDefViewOfConstant___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withAutoBoundImplicitLocal___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandInitCmd___closed__5;
-extern lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process___lambda__1___closed__2;
+extern lean_object* l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process___lambda__1___closed__1;
 extern lean_object* l_Lean_Elab_checkNotAlreadyDeclared___rarg___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_expandBuiltinInitialize(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabAxiom___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -5119,7 +5119,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1097____closed__3;
-x_2 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process___lambda__1___closed__2;
+x_2 = l___private_Lean_Meta_Match_Match_0__Lean_Meta_Match_process___lambda__1___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
--- a/stage0/stdlib/Lean/Elab/Match.c
+++ b/stage0/stdlib/Lean/Elab/Match.c
@ -25,7 +25,6 @@ lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Match_0__
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_set(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_getNumExplicitCtorParams___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__8;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_elabForall___spec__1___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch_match__2(lean_object*);
@ -100,7 +99,6 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_expandMacros___spec__1___boxed(lea
 lean_object* l_Lean_Meta_forallTelescopeReducing___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_hasOptAutoParams___spec__2___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Array_mapSepElemsMAux___at_Lean_Elab_Term_CollectPatternVars_collect___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNoMatch(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__6;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible___closed__1;
 lean_object* l_Lean_Elab_Term_finalizePatternDecls_match__1___rarg(lean_object*, lean_object*, lean_object*);
@ -114,6 +112,7 @@ extern lean_object* l_myMacro____x40_Init_Notation___hyg_12156____closed__9;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_processExplicitArg___spec__1(size_t, size_t, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Term_quoteAutoTactic___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch_match__4(lean_object*);
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__3;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwCtorExpected___rarg___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwCtorExpected___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___spec__1___lambda__1___closed__5;
@ -137,7 +136,6 @@ lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwAmbiguous(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMVarWithIdKind(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_reportMatcherResultErrors___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_12156____closed__2;
 lean_object* lean_local_ctx_erase(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -171,6 +169,7 @@ lean_object* l_Lean_annotation_x3f(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_Term_quoteAutoTactic___closed__4;
 lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_1397____closed__2;
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwAmbiguous___rarg___closed__2;
 lean_object* l_Lean_Elab_Term_elabMatch_match__5(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -181,7 +180,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mark
 lean_object* l_Lean_mkFreshId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___closed__1;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_CtorApp_instInhabitedContext___closed__1;
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processId_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapM___at_Lean_Elab_Term_ToDepElimPattern_main___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_pushNewArg___closed__4;
@ -217,7 +216,6 @@ lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Expr_getAppArgs___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_getNumExplicitCtorParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___closed__5;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorApp___lambda__1(lean_object*, lean_object*, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
@ -290,7 +288,6 @@ lean_object* l_Lean_Elab_Term_finalizePatternDecls___boxed(lean_object*, lean_ob
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedTypeAndDiscrs_match__1(lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__2(lean_object*);
 extern lean_object* l_Lean_initFn____x40_Lean_Parser_Extra___hyg_866____closed__7;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getDiscrs(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_expandMacrosInPatterns___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -377,6 +374,7 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls__
 lean_object* l_Lean_mkAnnotation(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_quotedNameToPattern_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_log___at___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___spec__3(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns_match__2(lean_object*);
@ -406,7 +404,6 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getDiscrs___boxed(lea
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_13073____closed__8;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__11;
 lean_object* l_Nat_repr(lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_reportMatcherResultErrors___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_forallTelescopeReducingAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_forInUnsafe_loop___at_Lean_pushScope___spec__1___rarg___lambda__1___closed__1;
 uint8_t l_Lean_LocalDecl_binderInfo(lean_object*);
@ -502,6 +499,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_pr
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_pushNewArg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkFVar(lean_object*);
+uint8_t l_List_elem___at_Lean_Occurrences_contains___spec__1(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMVarSyntaxMVarId___boxed(lean_object*);
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_isAuxDiscrName(lean_object*);
@ -521,6 +519,7 @@ lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_pos
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedTypeAndDiscrs___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_alreadyVisited___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___closed__4;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_resolveId_x3f_match__4(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars_loop_match__1___rarg(lean_object*, lean_object*, lean_object*);
@ -554,7 +553,7 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls__
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__3;
 lean_object* l_Lean_Elab_Term_elabMatch___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch_match__10(lean_object*);
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeSyntheticMVarsUsingDefault(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatchAltView___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -569,6 +568,7 @@ extern lean_object* l_Lean_Syntax_mkApp___closed__1;
 lean_object* l_Lean_Meta_mkEqRefl___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_term_x5b___x5d___closed__5;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwAmbiguous___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_redLength___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_ToDepElimPattern_State_newLocals___default;
 lean_object* l_Lean_Elab_Term_elabMVarWithIdKind___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@ -639,12 +639,12 @@ lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_13650____closed__4;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedTypeAndDiscrs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___lambda__1___boxed__const__1;
-extern lean_object* l_Array_instToStringArray___rarg___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_processExplicitArg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_processExplicitArg___closed__1;
 lean_object* l_Lean_Elab_Term_elabMatchAltView___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLocalDecl___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabImplicitLambda___spec__1___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__4;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processId_match__3(lean_object*);
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_261____closed__2;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_State_vars___default;
@ -699,6 +699,7 @@ lean_object* l_Lean_mkForall(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__4___closed__4;
 lean_object* l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withSynthesize___rarg(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapM___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_pushNewArg___closed__3;
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
@ -709,6 +710,7 @@ lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lea
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isAuxDiscrName___boxed(lean_object*);
 extern lean_object* l_myMacro____x40_Init_Notation___hyg_13650____closed__12;
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__2;
 lean_object* l_Lean_Expr_arrayLit_x3f(lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
 extern lean_object* l_Lean_Elab_Term_instInhabitedNamedArg;
@ -749,6 +751,7 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_resolveId_x3f_match__1___rarg(l
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processId(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_finalize___closed__2;
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_finalize___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__10;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_finalize___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
@ -814,7 +817,7 @@ uint8_t l_Lean_Expr_occurs(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch_match__13___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__5___lambda__2___closed__2;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_ToDepElimPattern_main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS_match__1(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__3;
@ -851,7 +854,7 @@ lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_1397_(lean_obj
 lean_object* l_Lean_Elab_Term_CollectPatternVars_CtorApp_Context_paramDeclIdx___default;
 lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_5686_(lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkSimpleThunk(lean_object*);
 lean_object* l_Lean_Meta_Match_counterExamplesToMessageData(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__14;
@ -23646,226 +23649,402 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
-lean_object* l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(lean_object* x_1) {
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-if (lean_obj_tag(x_1) == 0)
-{
-lean_object* x_2; 
-x_2 = lean_box(0);
-return x_2;
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_10 = lean_unsigned_to_nat(1u);
+x_11 = lean_nat_add(x_1, x_10);
+x_12 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_12, 0, x_11);
+x_13 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_ctor_set(x_13, 1, x_9);
+return x_13;
 }
-else
+}
+static lean_object* _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__1() {
+_start:
 {
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_1);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_4 = lean_ctor_get(x_1, 0);
-x_5 = lean_ctor_get(x_1, 1);
-x_6 = lean_unsigned_to_nat(1u);
-x_7 = lean_nat_add(x_4, x_6);
-lean_dec(x_4);
-x_8 = l_Nat_repr(x_7);
-x_9 = l_Array_instToStringArray___rarg___closed__1;
-x_10 = lean_string_append(x_9, x_8);
-lean_dec(x_8);
-x_11 = l_Lean_instInhabitedParserDescr___closed__1;
-x_12 = lean_string_append(x_10, x_11);
-x_13 = l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(x_5);
-lean_ctor_set(x_1, 1, x_13);
-lean_ctor_set(x_1, 0, x_12);
+lean_object* x_1; 
+x_1 = lean_alloc_closure((void*)(l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1___boxed), 9, 0);
 return x_1;
 }
+}
+static lean_object* _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("redundant alternative");
+return x_1;
+}
+}
+static lean_object* _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__2;
+x_2 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__3;
+x_2 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_2, 0, x_1);
+return x_2;
+}
+}
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+if (lean_obj_tag(x_2) == 0)
+{
+lean_object* x_11; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_3);
+lean_ctor_set(x_11, 1, x_10);
+return x_11;
+}
 else
 {
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_14 = lean_ctor_get(x_1, 0);
-x_15 = lean_ctor_get(x_1, 1);
-lean_inc(x_15);
-lean_inc(x_14);
-lean_dec(x_1);
-x_16 = lean_unsigned_to_nat(1u);
-x_17 = lean_nat_add(x_14, x_16);
-lean_dec(x_14);
-x_18 = l_Nat_repr(x_17);
-x_19 = l_Array_instToStringArray___rarg___closed__1;
-x_20 = lean_string_append(x_19, x_18);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; uint8_t x_15; 
+x_12 = lean_ctor_get(x_2, 0);
+x_13 = lean_ctor_get(x_2, 1);
+x_14 = l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__1;
+x_15 = l_List_elem___at_Lean_Occurrences_contains___spec__1(x_3, x_1);
+if (x_15 == 0)
+{
+lean_object* x_16; lean_object* x_17; 
+x_16 = lean_box(0);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_17 = lean_apply_9(x_14, x_3, x_16, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_17) == 0)
+{
+lean_object* x_18; 
+x_18 = lean_ctor_get(x_17, 0);
+lean_inc(x_18);
+if (lean_obj_tag(x_18) == 0)
+{
+uint8_t x_19; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_19 = !lean_is_exclusive(x_17);
+if (x_19 == 0)
+{
+lean_object* x_20; lean_object* x_21; 
+x_20 = lean_ctor_get(x_17, 0);
+lean_dec(x_20);
+x_21 = lean_ctor_get(x_18, 0);
+lean_inc(x_21);
 lean_dec(x_18);
-x_21 = l_Lean_instInhabitedParserDescr___closed__1;
-x_22 = lean_string_append(x_20, x_21);
-x_23 = l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(x_15);
-x_24 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_24, 0, x_22);
-lean_ctor_set(x_24, 1, x_23);
+lean_ctor_set(x_17, 0, x_21);
+return x_17;
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_22 = lean_ctor_get(x_17, 1);
+lean_inc(x_22);
+lean_dec(x_17);
+x_23 = lean_ctor_get(x_18, 0);
+lean_inc(x_23);
+lean_dec(x_18);
+x_24 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_24, 0, x_23);
+lean_ctor_set(x_24, 1, x_22);
 return x_24;
 }
 }
-}
-}
-lean_object* l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__2(lean_object* x_1) {
-_start:
+else
 {
-if (lean_obj_tag(x_1) == 0)
-{
-lean_object* x_2; 
-x_2 = lean_box(0);
-return x_2;
+lean_object* x_25; lean_object* x_26; 
+x_25 = lean_ctor_get(x_17, 1);
+lean_inc(x_25);
+lean_dec(x_17);
+x_26 = lean_ctor_get(x_18, 0);
+lean_inc(x_26);
+lean_dec(x_18);
+x_2 = x_13;
+x_3 = x_26;
+x_10 = x_25;
+goto _start;
+}
 }
 else
 {
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_1);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_4 = lean_ctor_get(x_1, 0);
-x_5 = lean_ctor_get(x_1, 1);
-x_6 = l_Lean_stringToMessageData(x_4);
+uint8_t x_28; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
 lean_dec(x_4);
-x_7 = l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__2(x_5);
-lean_ctor_set(x_1, 1, x_7);
-lean_ctor_set(x_1, 0, x_6);
-return x_1;
+x_28 = !lean_is_exclusive(x_17);
+if (x_28 == 0)
+{
+return x_17;
 }
 else
 {
-lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_8 = lean_ctor_get(x_1, 0);
-x_9 = lean_ctor_get(x_1, 1);
+lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_29 = lean_ctor_get(x_17, 0);
+x_30 = lean_ctor_get(x_17, 1);
+lean_inc(x_30);
+lean_inc(x_29);
+lean_dec(x_17);
+x_31 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_31, 0, x_29);
+lean_ctor_set(x_31, 1, x_30);
+return x_31;
+}
+}
+}
+else
+{
+lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
+x_32 = lean_ctor_get(x_12, 0);
+x_33 = lean_ctor_get(x_8, 0);
+lean_inc(x_33);
+x_34 = lean_ctor_get(x_8, 1);
+lean_inc(x_34);
+x_35 = lean_ctor_get(x_8, 2);
+lean_inc(x_35);
+x_36 = lean_ctor_get(x_8, 3);
+lean_inc(x_36);
+x_37 = lean_ctor_get(x_8, 4);
+lean_inc(x_37);
+x_38 = lean_ctor_get(x_8, 5);
+lean_inc(x_38);
+x_39 = l_Lean_replaceRef(x_32, x_36);
+lean_dec(x_36);
+x_40 = lean_alloc_ctor(0, 6, 0);
+lean_ctor_set(x_40, 0, x_33);
+lean_ctor_set(x_40, 1, x_34);
+lean_ctor_set(x_40, 2, x_35);
+lean_ctor_set(x_40, 3, x_39);
+lean_ctor_set(x_40, 4, x_37);
+lean_ctor_set(x_40, 5, x_38);
+x_41 = l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__4;
+x_42 = 2;
+x_43 = l_Lean_Elab_log___at___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___spec__3(x_41, x_42, x_4, x_5, x_6, x_7, x_40, x_9, x_10);
+lean_dec(x_40);
+x_44 = lean_ctor_get(x_43, 0);
+lean_inc(x_44);
+x_45 = lean_ctor_get(x_43, 1);
+lean_inc(x_45);
+lean_dec(x_43);
 lean_inc(x_9);
 lean_inc(x_8);
-lean_dec(x_1);
-x_10 = l_Lean_stringToMessageData(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_inc(x_4);
+x_46 = lean_apply_9(x_14, x_3, x_44, x_4, x_5, x_6, x_7, x_8, x_9, x_45);
+if (lean_obj_tag(x_46) == 0)
+{
+lean_object* x_47; 
+x_47 = lean_ctor_get(x_46, 0);
+lean_inc(x_47);
+if (lean_obj_tag(x_47) == 0)
+{
+uint8_t x_48; 
+lean_dec(x_9);
 lean_dec(x_8);
-x_11 = l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__2(x_9);
-x_12 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_12, 0, x_10);
-lean_ctor_set(x_12, 1, x_11);
-return x_12;
-}
-}
-}
-}
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_reportMatcherResultErrors___spec__3(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_48 = !lean_is_exclusive(x_46);
+if (x_48 == 0)
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; uint8_t x_16; 
-x_9 = lean_ctor_get(x_6, 3);
-x_10 = lean_ctor_get(x_2, 3);
-lean_inc(x_10);
-lean_inc(x_10);
-x_11 = l_Lean_Elab_getBetterRef(x_9, x_10);
-x_12 = l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(x_1, x_4, x_5, x_6, x_7, x_8);
-x_13 = lean_ctor_get(x_12, 0);
-lean_inc(x_13);
-x_14 = lean_ctor_get(x_12, 1);
-lean_inc(x_14);
-lean_dec(x_12);
-x_15 = l_Lean_Elab_addMacroStack___at_Lean_Elab_Term_instAddErrorMessageContextTermElabM___spec__1(x_13, x_10, x_2, x_3, x_4, x_5, x_6, x_7, x_14);
-lean_dec(x_2);
-lean_dec(x_10);
-x_16 = !lean_is_exclusive(x_15);
-if (x_16 == 0)
-{
-lean_object* x_17; lean_object* x_18; 
-x_17 = lean_ctor_get(x_15, 0);
-x_18 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_18, 0, x_11);
-lean_ctor_set(x_18, 1, x_17);
-lean_ctor_set_tag(x_15, 1);
-lean_ctor_set(x_15, 0, x_18);
-return x_15;
+lean_object* x_49; lean_object* x_50; 
+x_49 = lean_ctor_get(x_46, 0);
+lean_dec(x_49);
+x_50 = lean_ctor_get(x_47, 0);
+lean_inc(x_50);
+lean_dec(x_47);
+lean_ctor_set(x_46, 0, x_50);
+return x_46;
 }
 else
 {
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; 
-x_19 = lean_ctor_get(x_15, 0);
-x_20 = lean_ctor_get(x_15, 1);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_46, 1);
+lean_inc(x_51);
+lean_dec(x_46);
+x_52 = lean_ctor_get(x_47, 0);
+lean_inc(x_52);
+lean_dec(x_47);
+x_53 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_53, 0, x_52);
+lean_ctor_set(x_53, 1, x_51);
+return x_53;
+}
+}
+else
+{
+lean_object* x_54; lean_object* x_55; 
+x_54 = lean_ctor_get(x_46, 1);
+lean_inc(x_54);
+lean_dec(x_46);
+x_55 = lean_ctor_get(x_47, 0);
+lean_inc(x_55);
+lean_dec(x_47);
+x_2 = x_13;
+x_3 = x_55;
+x_10 = x_54;
+goto _start;
+}
+}
+else
+{
+uint8_t x_57; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_57 = !lean_is_exclusive(x_46);
+if (x_57 == 0)
+{
+return x_46;
+}
+else
+{
+lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_46, 0);
+x_59 = lean_ctor_get(x_46, 1);
+lean_inc(x_59);
+lean_inc(x_58);
+lean_dec(x_46);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_59);
+return x_60;
+}
+}
+}
+}
+}
+}
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; uint8_t x_12; 
+x_11 = lean_ctor_get(x_8, 0);
+lean_inc(x_11);
+x_12 = l_Lean_Elab_Term_ignoreUnusedAlts(x_11);
+lean_dec(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; uint8_t x_14; 
+x_13 = lean_ctor_get(x_1, 2);
+x_14 = l_List_isEmpty___rarg(x_13);
+if (x_14 == 0)
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_unsigned_to_nat(0u);
+x_16 = l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(x_13, x_2, x_15, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+if (lean_obj_tag(x_16) == 0)
+{
+uint8_t x_17; 
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; lean_object* x_19; 
+x_18 = lean_ctor_get(x_16, 0);
+lean_dec(x_18);
+x_19 = lean_box(0);
+lean_ctor_set(x_16, 0, x_19);
+return x_16;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_16, 1);
 lean_inc(x_20);
-lean_inc(x_19);
-lean_dec(x_15);
-x_21 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_21, 0, x_11);
-lean_ctor_set(x_21, 1, x_19);
-x_22 = lean_alloc_ctor(1, 2, 0);
+lean_dec(x_16);
+x_21 = lean_box(0);
+x_22 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_22, 0, x_21);
 lean_ctor_set(x_22, 1, x_20);
 return x_22;
 }
 }
-}
-static lean_object* _init_l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__1() {
-_start:
+else
 {
-lean_object* x_1; 
-x_1 = lean_mk_string("unused alternatives: ");
-return x_1;
-}
-}
-static lean_object* _init_l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__2() {
-_start:
+uint8_t x_23; 
+x_23 = !lean_is_exclusive(x_16);
+if (x_23 == 0)
 {
-lean_object* x_1; lean_object* x_2; 
-x_1 = l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__1;
-x_2 = l_Lean_stringToMessageData(x_1);
-return x_2;
-}
-}
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; uint8_t x_11; 
-x_10 = lean_ctor_get(x_7, 0);
-x_11 = l_Lean_Elab_Term_ignoreUnusedAlts(x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; uint8_t x_13; 
-x_12 = lean_ctor_get(x_1, 2);
-lean_inc(x_12);
-lean_dec(x_1);
-x_13 = l_List_isEmpty___rarg(x_12);
-if (x_13 == 0)
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; 
-x_14 = l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(x_12);
-x_15 = l_List_map___at_Lean_Elab_Term_reportMatcherResultErrors___spec__2(x_14);
-x_16 = l_Lean_MessageData_ofList(x_15);
-lean_dec(x_15);
-x_17 = l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__2;
-x_18 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_18, 0, x_17);
-lean_ctor_set(x_18, 1, x_16);
-x_19 = l_Lean_KernelException_toMessageData___closed__15;
-x_20 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_20, 0, x_18);
-lean_ctor_set(x_20, 1, x_19);
-x_21 = l_Lean_throwError___at_Lean_Elab_Term_reportMatcherResultErrors___spec__3(x_20, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
-return x_21;
+return x_16;
 }
 else
 {
-lean_object* x_22; lean_object* x_23; 
-lean_dec(x_12);
-lean_dec(x_3);
-x_22 = lean_box(0);
-x_23 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_23, 0, x_22);
-lean_ctor_set(x_23, 1, x_9);
-return x_23;
+lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+x_24 = lean_ctor_get(x_16, 0);
+x_25 = lean_ctor_get(x_16, 1);
+lean_inc(x_25);
+lean_inc(x_24);
+lean_dec(x_16);
+x_26 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_26, 0, x_24);
+lean_ctor_set(x_26, 1, x_25);
+return x_26;
+}
 }
 }
 else
 {
-lean_object* x_24; lean_object* x_25; 
-lean_dec(x_3);
-lean_dec(x_1);
-x_24 = lean_box(0);
-x_25 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_25, 1, x_9);
-return x_25;
+lean_object* x_27; lean_object* x_28; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_27 = lean_box(0);
+x_28 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_28, 0, x_27);
+lean_ctor_set(x_28, 1, x_10);
+return x_28;
+}
+}
+else
+{
+lean_object* x_29; lean_object* x_30; 
+lean_dec(x_9);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+x_29 = lean_box(0);
+x_30 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_30, 0, x_29);
+lean_ctor_set(x_30, 1, x_10);
+return x_30;
 }
 }
 }
@ -23886,94 +24065,106 @@ x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_9; uint8_t x_10; 
-x_9 = lean_ctor_get(x_1, 1);
-lean_inc(x_9);
-x_10 = l_List_isEmpty___rarg(x_9);
-if (x_10 == 0)
+lean_object* x_10; uint8_t x_11; 
+x_10 = lean_ctor_get(x_2, 1);
+lean_inc(x_10);
+x_11 = l_List_isEmpty___rarg(x_10);
+if (x_11 == 0)
 {
-lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; 
-lean_dec(x_1);
-x_11 = l_Lean_Meta_Match_counterExamplesToMessageData(x_9);
-x_12 = l_Lean_Elab_Term_reportMatcherResultErrors___closed__2;
-x_13 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_13, 0, x_12);
-lean_ctor_set(x_13, 1, x_11);
-x_14 = l_Lean_KernelException_toMessageData___closed__15;
-x_15 = lean_alloc_ctor(10, 2, 0);
-lean_ctor_set(x_15, 0, x_13);
-lean_ctor_set(x_15, 1, x_14);
-x_16 = l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_15, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-x_17 = !lean_is_exclusive(x_16);
-if (x_17 == 0)
-{
-return x_16;
-}
-else
-{
-lean_object* x_18; lean_object* x_19; lean_object* x_20; 
-x_18 = lean_ctor_get(x_16, 0);
-x_19 = lean_ctor_get(x_16, 1);
-lean_inc(x_19);
-lean_inc(x_18);
-lean_dec(x_16);
-x_20 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_20, 0, x_18);
-lean_ctor_set(x_20, 1, x_19);
-return x_20;
-}
-}
-else
-{
-lean_object* x_21; lean_object* x_22; 
-lean_dec(x_9);
-x_21 = lean_box(0);
-x_22 = l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(x_1, x_21, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-return x_22;
-}
-}
-}
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_reportMatcherResultErrors___spec__3___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
-_start:
-{
-lean_object* x_9; 
-x_9 = l_Lean_throwError___at_Lean_Elab_Term_reportMatcherResultErrors___spec__3(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
-lean_dec(x_7);
-lean_dec(x_6);
-lean_dec(x_5);
-lean_dec(x_4);
-lean_dec(x_3);
-return x_9;
-}
-}
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
-_start:
-{
-lean_object* x_10; 
-x_10 = l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; uint8_t x_18; 
+lean_dec(x_2);
+x_12 = l_Lean_Meta_Match_counterExamplesToMessageData(x_10);
+x_13 = l_Lean_Elab_Term_reportMatcherResultErrors___closed__2;
+x_14 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_12);
+x_15 = l_Lean_KernelException_toMessageData___closed__15;
+x_16 = lean_alloc_ctor(10, 2, 0);
+lean_ctor_set(x_16, 0, x_14);
+lean_ctor_set(x_16, 1, x_15);
+x_17 = l_Lean_throwError___at___private_Lean_Elab_Term_0__Lean_Elab_Term_applyAttributesCore___spec__1(x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
+x_18 = !lean_is_exclusive(x_17);
+if (x_18 == 0)
+{
+return x_17;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; lean_object* x_21; 
+x_19 = lean_ctor_get(x_17, 0);
+x_20 = lean_ctor_get(x_17, 1);
+lean_inc(x_20);
+lean_inc(x_19);
+lean_dec(x_17);
+x_21 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_21, 0, x_19);
+lean_ctor_set(x_21, 1, x_20);
+return x_21;
+}
+}
+else
+{
+lean_object* x_22; lean_object* x_23; 
+lean_dec(x_10);
+x_22 = lean_box(0);
+x_23 = l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(x_2, x_1, x_22, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 lean_dec(x_2);
-return x_10;
+return x_23;
 }
 }
-lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+}
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
 _start:
 {
-lean_object* x_9; 
-x_9 = l_Lean_Elab_Term_reportMatcherResultErrors(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_object* x_10; 
+x_10 = l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_8);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
-return x_9;
+lean_dec(x_2);
+lean_dec(x_1);
+return x_10;
+}
+}
+lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; 
+x_11 = l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_11;
+}
+}
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9, lean_object* x_10) {
+_start:
+{
+lean_object* x_11; 
+x_11 = l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+lean_dec(x_3);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_11;
+}
+}
+lean_object* l_Lean_Elab_Term_reportMatcherResultErrors___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8, lean_object* x_9) {
+_start:
+{
+lean_object* x_10; 
+x_10 = l_Lean_Elab_Term_reportMatcherResultErrors(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+lean_dec(x_1);
+return x_10;
 }
 }
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__1___rarg(lean_object* x_1, lean_object* x_2) {
@ -25472,6 +25663,7 @@ lean_inc(x_10);
 lean_inc(x_9);
 lean_inc(x_8);
 lean_inc(x_7);
+lean_inc(x_45);
 lean_inc(x_47);
 lean_inc(x_41);
 x_52 = l_Lean_Meta_Match_mkMatcher(x_50, x_41, x_47, x_45, x_7, x_8, x_9, x_10, x_51);
@ -25501,9 +25693,15 @@ lean_inc(x_58);
 x_59 = lean_ctor_get(x_57, 1);
 lean_inc(x_59);
 lean_dec(x_57);
+lean_inc(x_10);
+lean_inc(x_9);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_53);
-x_60 = l_Lean_Elab_Term_reportMatcherResultErrors(x_53, x_5, x_6, x_7, x_8, x_9, x_10, x_59);
+x_60 = l_Lean_Elab_Term_reportMatcherResultErrors(x_45, x_53, x_5, x_6, x_7, x_8, x_9, x_10, x_59);
+lean_dec(x_45);
 if (lean_obj_tag(x_60) == 0)
 {
 lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; uint8_t x_67; lean_object* x_68; lean_object* x_82; lean_object* x_83; lean_object* x_84; uint8_t x_85; 
@ -25666,6 +25864,7 @@ else
 {
 uint8_t x_98; 
 lean_dec(x_53);
+lean_dec(x_45);
 lean_dec(x_39);
 lean_dec(x_16);
 lean_dec(x_10);
@ -25698,6 +25897,7 @@ else
 {
 uint8_t x_102; 
 lean_dec(x_47);
+lean_dec(x_45);
 lean_dec(x_41);
 lean_dec(x_39);
 lean_dec(x_16);
@ -31476,10 +31676,14 @@ lean_mark_persistent(l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_5686__
 res = l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_5686_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__1 = _init_l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__1();
-lean_mark_persistent(l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__1);
-l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__2 = _init_l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__2();
-lean_mark_persistent(l_Lean_Elab_Term_reportMatcherResultErrors___lambda__1___closed__2);
+l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__1 = _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__1();
+lean_mark_persistent(l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__1);
+l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__2 = _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__2();
+lean_mark_persistent(l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__2);
+l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__3 = _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__3();
+lean_mark_persistent(l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__3);
+l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__4 = _init_l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__4();
+lean_mark_persistent(l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__4);
 l_Lean_Elab_Term_reportMatcherResultErrors___closed__1 = _init_l_Lean_Elab_Term_reportMatcherResultErrors___closed__1();
 lean_mark_persistent(l_Lean_Elab_Term_reportMatcherResultErrors___closed__1);
 l_Lean_Elab_Term_reportMatcherResultErrors___closed__2 = _init_l_Lean_Elab_Term_reportMatcherResultErrors___closed__2();
--- a/stage0/stdlib/Lean/Meta/Match/Match.c
+++ b/stage0/stdlib/Lean/Meta/Match/Match.c
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp.c
@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Lean.Meta.Tactic.Simp
-// Imports: Init Lean.Meta.Tactic.Simp.Basic
+// Imports: Init Lean.Meta.Tactic.Simp.SimpLemmas Lean.Meta.Tactic.Simp.Types Lean.Meta.Tactic.Simp.Main
 #include <lean/lean.h>
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@ -14,7 +14,9 @@
 extern "C" {
 #endif
 lean_object* initialize_Init(lean_object*);
-lean_object* initialize_Lean_Meta_Tactic_Simp_Basic(lean_object*);
+lean_object* initialize_Lean_Meta_Tactic_Simp_SimpLemmas(lean_object*);
+lean_object* initialize_Lean_Meta_Tactic_Simp_Types(lean_object*);
+lean_object* initialize_Lean_Meta_Tactic_Simp_Main(lean_object*);
 static bool _G_initialized = false;
 lean_object* initialize_Lean_Meta_Tactic_Simp(lean_object* w) {
 lean_object * res;
@ -23,7 +25,13 @@ _G_initialized = true;
 res = initialize_Init(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
-res = initialize_Lean_Meta_Tactic_Simp_Basic(lean_io_mk_world());
+res = initialize_Lean_Meta_Tactic_Simp_SimpLemmas(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = initialize_Lean_Meta_Tactic_Simp_Types(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = initialize_Lean_Meta_Tactic_Simp_Main(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/Main.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/Main.c
@ -0,0 +1,33 @@
+// Lean compiler output
+// Module: Lean.Meta.Tactic.Simp.Main
+// Imports: Init Lean.Meta.Tactic.Simp.Types
+#include <lean/lean.h>
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* initialize_Init(lean_object*);
+lean_object* initialize_Lean_Meta_Tactic_Simp_Types(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Lean_Meta_Tactic_Simp_Main(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
+_G_initialized = true;
+res = initialize_Init(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = initialize_Lean_Meta_Tactic_Simp_Types(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+return lean_io_result_mk_ok(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpLemmas.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/SimpLemmas.c
@ -1,5 +1,5 @@
 // Lean compiler output
-// Module: Lean.Meta.Tactic.Simp.Basic
+// Module: Lean.Meta.Tactic.Simp.SimpLemmas
 // Imports: Init Lean.ScopedEnvExtension Lean.Util.Recognizers Lean.Meta.Basic Lean.Meta.DiscrTree
 #include <lean/lean.h>
 #if defined(__clang__)
@ -15,40 +15,34 @@ extern "C" {
 #endif
 lean_object* l___private_Init_Data_Array_BinSearch_0__Array_binInsertAux___at_Lean_Meta_addSimpLemmaEntry___spec__15___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_binInsertM___at_Lean_Meta_addSimpLemmaEntry___spec__13___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__3(lean_object*);
 size_t l_USize_add(size_t, size_t);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_withNewMCtxDepthImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4;
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* lean_nat_div(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Meta_whnf___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_addSimpLemmaEntry(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__6;
 extern lean_object* l_Array_back___at___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___spec__2___rarg___closed__2;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 uint8_t l_USize_decEq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
 lean_object* l_Lean_ScopedEnvExtension_add___at_Lean_Meta_addSimpLemma___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_addSimpLemmaEntry___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____lambda__1(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__3;
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertVal___at_Lean_Meta_addSimpLemmaEntry___spec__10(lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__1;
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__3;
 lean_object* l_Lean_Meta_instInhabitedSimpLemmas;
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerSimpleScopedEnvExtension___rarg(lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__3___rarg(lean_object*, lean_object*);
 size_t l_USize_sub(size_t, size_t);
 extern lean_object* l_Array_empty___closed__1;
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__1;
 uint8_t l_Array_contains___at_Lean_Meta_addSimpLemmaEntry___spec__11(lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__2___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__3(lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAtCollisionNodeAux___at_Lean_Meta_addSimpLemmaEntry___spec__8(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__2;
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_appFn_x21(lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1;
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__2;
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Std_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
@ -70,9 +64,9 @@ lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Meta_getSimpLemmas___s
 lean_object* l_Lean_Meta_instToFormatSimpLemma_match__1___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t l___private_Lean_Meta_DiscrTreeTypes_0__Lean_Meta_DiscrTree_beqKey____x40_Lean_Meta_DiscrTreeTypes___hyg_34_(lean_object*, lean_object*);
 extern lean_object* l_Lean_registerTagAttribute___closed__5;
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__6;
 lean_object* l_Lean_getAttrParamOptPrio(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getSimpLemmas(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__5;
 lean_object* l_Lean_Meta_instToFormatSimpLemma(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_insertCore___at_Lean_Meta_addSimpLemmaEntry___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
@ -80,28 +74,29 @@ extern lean_object* l___private_Init_Data_Array_BinSearch_0__Array_binInsertAux_
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Array_contains___at_Lean_Meta_addSimpLemmaEntry___spec__11___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instToFormatSimpLemma___closed__2;
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__1(lean_object*);
 extern lean_object* l_Lean_Meta_DiscrTree_insertCore___rarg___closed__5;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 extern lean_object* l_Std_PersistentHashMap_insertAux___rarg___closed__3;
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__3;
 lean_object* l_Lean_ScopedEnvExtension_addLocalEntry___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__1;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Meta_addSimpLemmaEntry___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_createNodes___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_DiscrTree_root___default___closed__1;
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__2;
 lean_object* l_Lean_Meta_simpExtension;
 lean_object* l_Lean_Meta_simpExtension___closed__2;
 extern lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__2;
 lean_object* l_Lean_Meta_SimpLemma_globalName_x3f___default;
 extern lean_object* l_Lean_Meta_instMetaEvalMetaM___rarg___closed__2;
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__3___rarg(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_findAux___at_Lean_Meta_addSimpLemmaEntry___spec__3(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_Meta_instToFormatSimpLemma___closed__1;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1;
 extern lean_object* l_Lean_Meta_instMetaEvalMetaM___rarg___closed__1;
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_DiscrTree_0__Lean_Meta_DiscrTree_insertAux___at_Lean_Meta_addSimpLemmaEntry___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_addSimpLemma___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_back___at_Lean_Meta_DiscrTree_mkPathAux___spec__1(lean_object*);
@ -109,7 +104,7 @@ lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_getState___at_Lean_Meta_getSimpLemmas___spec__1(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_BinSearch_0__Array_binInsertAux___at_Lean_Meta_addSimpLemmaEntry___spec__15(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_addSimpLemma(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4;
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__3;
 uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_map___at_Lean_Meta_addSimpLemma___spec__1(lean_object*);
 lean_object* l_Lean_registerBuiltinAttribute(lean_object*, lean_object*);
@ -117,37 +112,41 @@ extern lean_object* l_Lean_KernelException_toMessageData___closed__15;
 uint8_t l_Array_isEmpty___rarg(lean_object*);
 uint8_t l_Lean_Expr_isConstOf(lean_object*, lean_object*);
 size_t l_USize_mul(size_t, size_t);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__4;
 lean_object* l_Lean_Meta_forallMetaTelescopeReducing___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__2(lean_object*);
 size_t lean_usize_of_nat(lean_object*);
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_insert___at_Lean_Meta_addSimpLemmaEntry___spec__5(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getSimpLemmas___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1;
 size_t l_USize_land(size_t, size_t);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instToFormatSimpLemma_match__1(lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_mkPath(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3;
 lean_object* l_Lean_getConstInfo___at_Lean_Meta_getParamNames___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81_(lean_object*);
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359_(lean_object*);
 lean_object* l_Std_fmt___at_Lean_Level_PP_Result_format___spec__1(lean_object*);
 lean_object* l_Lean_ConstantInfo_lparams(lean_object*);
 lean_object* l_Lean_Meta_instBEqSimpLemma___boxed(lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAux___at_Lean_Meta_addSimpLemmaEntry___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_DiscrTree_instInhabitedKey;
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_addSimpLemmaEntry___spec__2___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__2;
 lean_object* l_Lean_Meta_instInhabitedSimpLemma;
 uint8_t lean_expr_eqv(lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__1___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_DiscrTree_insertCore___rarg___closed__1;
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 uint8_t l_USize_decLe(size_t, size_t);
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__5;
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Meta_addSimpLemmaEntry___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_simpExtension___closed__3;
 lean_object* lean_panic_fn(lean_object*, lean_object*);
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__2(lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr___closed__1;
 lean_object* l_Array_binInsertM___at_Lean_Meta_addSimpLemmaEntry___spec__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__1;
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Meta_DiscrTree_Key_lt(lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedPersistentEnvExtension___closed__5;
 lean_object* l_Lean_Meta_getSimpLemmas___rarg___boxed(lean_object*, lean_object*);
@ -155,43 +154,44 @@ lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_SimpLemmas_discrTree___default___closed__1;
 lean_object* l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_addSimpLemmaEntry___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_simpExtension___lambda__1(lean_object*);
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_ScopedEnvExtension_getState___rarg___closed__3;
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1;
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__1;
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__2;
 extern lean_object* l_Lean_EnvExtensionInterfaceUnsafe_instInhabitedExt___closed__1;
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__4;
 extern size_t l_Std_PersistentHashMap_insertAux___rarg___closed__2;
 lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__1(lean_object*);
 lean_object* l_Lean_ScopedEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__2;
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Meta_addSimpLemmaEntry___spec__2(lean_object*, lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359_(lean_object*);
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81_(lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_simpExtension___lambda__1___boxed(lean_object*);
-lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____lambda__1(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__4;
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2;
 lean_object* l_Lean_mkLevelParam(lean_object*);
 lean_object* l_Lean_Meta_simpExtension___closed__1;
 lean_object* l_Array_back___at_Lean_Meta_addSimpLemmaEntry___spec__14___boxed(lean_object*);
 lean_object* lean_usize_to_nat(size_t);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_back___at_Lean_Meta_addSimpLemmaEntry___spec__14(lean_object*);
 lean_object* l_Lean_Meta_isProp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
-lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__2(lean_object*);
 uint8_t l_Lean_Meta_instBEqSimpLemma(lean_object*, lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l_Array_insertAt___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__2(lean_object*);
 size_t l_Lean_Meta_DiscrTree_Key_hash(lean_object*);
 lean_object* l_Lean_Meta_getSimpLemmas___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_DiscrTree_instInhabitedTrie___closed__1;
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__1;
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__4;
 lean_object* l_Lean_Meta_DiscrTree_empty(lean_object*);
 lean_object* l_Std_PersistentHashMap_insertAux_traverse___at_Lean_Meta_addSimpLemmaEntry___spec__7(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_DiscrTree_insertCore___at_Lean_Meta_addSimpLemmaEntry___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3;
 lean_object* l_Lean_ScopedEnvExtension_add___at_Lean_Meta_addSimpLemma___spec__2(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 static lean_object* _init_l_Lean_Meta_SimpLemma_globalName_x3f___default() {
 _start:
@ -1687,7 +1687,7 @@ lean_dec(x_2);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__1() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__1() {
 _start:
 {
 lean_object* x_1; 
@ -1695,17 +1695,17 @@ x_1 = lean_mk_string("simpExt");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__2() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__1;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__3() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__3() {
 _start:
 {
 lean_object* x_1; 
@ -1713,12 +1713,12 @@ x_1 = lean_alloc_closure((void*)(l_Lean_Meta_addSimpLemmaEntry), 2, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__4() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__2;
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__3;
+x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__2;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__3;
 x_3 = l_Lean_Meta_SimpLemmas_discrTree___default___closed__1;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
@ -1727,11 +1727,11 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81_(lean_object* x_1) {
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__4;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__4;
 x_3 = l_Lean_registerSimpleScopedEnvExtension___rarg(x_2, x_1);
 return x_3;
 }
@ -1791,7 +1791,7 @@ lean_dec(x_1);
 return x_2;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@ -1819,15 +1819,15 @@ return x_9;
 }
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__1(lean_object* x_1) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__1___rarg), 3, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__1___rarg), 3, 0);
 return x_2;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 if (lean_obj_tag(x_1) == 0)
@ -1860,15 +1860,15 @@ return x_11;
 }
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__2(lean_object* x_1) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__2___rarg), 3, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__2___rarg), 3, 0);
 return x_2;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__3___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__3___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
@ -1886,15 +1886,15 @@ x_7 = lean_apply_3(x_2, x_4, x_5, x_6);
 return x_7;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__3(lean_object* x_1) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__3(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey_match__3___rarg), 2, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey_match__3___rarg), 2, 0);
 return x_2;
 }
 }
-lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; uint8_t x_9; 
@ -1932,7 +1932,7 @@ return x_15;
 }
 }
 }
-lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
@ -1983,15 +1983,15 @@ return x_15;
 }
 }
 }
-lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__2(lean_object* x_1) {
+lean_object* l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg), 6, 0);
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg), 6, 0);
 return x_2;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1() {
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1() {
 _start:
 {
 lean_object* x_1; 
@ -1999,17 +1999,17 @@ x_1 = lean_mk_string("False");
 return x_1;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2() {
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1;
+x_2 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3() {
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3() {
 _start:
 {
 lean_object* x_1; 
@ -2017,16 +2017,16 @@ x_1 = lean_mk_string("invalid 'simp', unexpected type");
 return x_1;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4() {
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3;
+x_1 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; uint8_t x_12; 
@ -2050,7 +2050,7 @@ x_15 = l_Lean_Expr_isAppOfArity(x_9, x_13, x_14);
 if (x_15 == 0)
 {
 lean_object* x_16; uint8_t x_17; 
-x_16 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2;
+x_16 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2;
 x_17 = l_Lean_Expr_isConstOf(x_9, x_16);
 if (x_17 == 0)
 {
@ -2120,7 +2120,7 @@ else
 lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
 lean_dec(x_8);
 x_31 = l_Lean_indentExpr(x_9);
-x_32 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4;
+x_32 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4;
 x_33 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
@ -2128,7 +2128,7 @@ x_34 = l_Lean_KernelException_toMessageData___closed__15;
 x_35 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_35, 0, x_33);
 lean_ctor_set(x_35, 1, x_34);
-x_36 = l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__1(x_35, x_2, x_3, x_4, x_5, x_6);
+x_36 = l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__1(x_35, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
@ -2162,15 +2162,15 @@ return x_42;
 }
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1() {
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1), 6, 0);
+x_1 = lean_alloc_closure((void*)(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1), 6, 0);
 return x_1;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
@ -2181,15 +2181,15 @@ x_11 = lean_alloc_closure((void*)(l_Lean_Meta_forallMetaTelescopeReducing___boxe
 lean_closure_set(x_11, 0, x_1);
 lean_closure_set(x_11, 1, x_8);
 lean_closure_set(x_11, 2, x_10);
-x_12 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1;
+x_12 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1;
 x_13 = lean_alloc_closure((void*)(l_ReaderT_bind___at_Lean_Meta_instMonadLCtxMetaM___spec__2___rarg), 7, 2);
 lean_closure_set(x_13, 0, x_11);
 lean_closure_set(x_13, 1, x_12);
-x_14 = l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg(x_13, x_3, x_4, x_5, x_6, x_7);
+x_14 = l_Lean_Meta_withNewMCtxDepth___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__2___rarg(x_13, x_3, x_4, x_5, x_6, x_7);
 return x_14;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__1() {
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__1() {
 _start:
 {
 lean_object* x_1; 
@ -2197,16 +2197,16 @@ x_1 = lean_mk_string("invalid 'simp', proposition expected");
 return x_1;
 }
 }
-static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__2() {
+static lean_object* _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__1;
+x_1 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__1;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
@ -2243,7 +2243,7 @@ x_13 = lean_ctor_get(x_10, 1);
 lean_inc(x_13);
 lean_dec(x_10);
 x_14 = l_Lean_indentExpr(x_8);
-x_15 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__2;
+x_15 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__2;
 x_16 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_16, 0, x_15);
 lean_ctor_set(x_16, 1, x_14);
@ -2282,7 +2282,7 @@ x_24 = lean_ctor_get(x_10, 1);
 lean_inc(x_24);
 lean_dec(x_10);
 x_25 = lean_box(0);
-x_26 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2(x_8, x_25, x_2, x_3, x_4, x_5, x_24);
+x_26 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2(x_8, x_25, x_2, x_3, x_4, x_5, x_24);
 return x_26;
 }
 }
@ -2342,11 +2342,11 @@ return x_34;
 }
 }
 }
-lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; 
-x_7 = l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
+x_7 = l_Lean_throwError___at___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___spec__1(x_1, x_2, x_3, x_4, x_5, x_6);
 lean_dec(x_5);
 lean_dec(x_4);
 lean_dec(x_3);
@ -2354,11 +2354,11 @@ lean_dec(x_2);
 return x_7;
 }
 }
-lean_object* l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_2);
 return x_8;
 }
@ -2681,7 +2681,7 @@ lean_inc(x_6);
 lean_inc(x_5);
 lean_inc(x_4);
 lean_inc(x_14);
-x_15 = l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey(x_14, x_4, x_5, x_6, x_7, x_11);
+x_15 = l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey(x_14, x_4, x_5, x_6, x_7, x_11);
 if (lean_obj_tag(x_15) == 0)
 {
 lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; uint8_t x_22; 
@ -2808,7 +2808,7 @@ x_10 = l_Lean_Meta_addSimpLemma(x_1, x_9, x_3, x_4, x_5, x_6, x_7, x_8);
 return x_10;
 }
 }
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____lambda__1(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____lambda__1(lean_object* x_1, lean_object* x_2, uint8_t x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 lean_object* x_7; lean_object* x_8; lean_object* x_9; 
@ -2928,7 +2928,7 @@ return x_37;
 }
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__1() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__1() {
 _start:
 {
 lean_object* x_1; 
@ -2936,17 +2936,17 @@ x_1 = lean_mk_string("simp");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__2() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__1;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__3() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__3() {
 _start:
 {
 lean_object* x_1; 
@ -2954,12 +2954,12 @@ x_1 = lean_mk_string("simplification lemma");
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__4() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; uint8_t x_3; lean_object* x_4; 
-x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__2;
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__3;
+x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__2;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__3;
 x_3 = 0;
 x_4 = lean_alloc_ctor(0, 2, 1);
 lean_ctor_set(x_4, 0, x_1);
@ -2968,20 +2968,20 @@ lean_ctor_set_uint8(x_4, sizeof(void*)*2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__5() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__5() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____lambda__1___boxed), 6, 0);
+x_1 = lean_alloc_closure((void*)(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____lambda__1___boxed), 6, 0);
 return x_1;
 }
 }
-static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__6() {
+static lean_object* _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__4;
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__5;
+x_1 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__4;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__5;
 x_3 = l_Lean_registerTagAttribute___closed__5;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
@ -2990,22 +2990,22 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359_(lean_object* x_1) {
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359_(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; 
-x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__6;
+x_2 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__6;
 x_3 = l_Lean_registerBuiltinAttribute(x_2, x_1);
 return x_3;
 }
 }
-lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
+lean_object* l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6) {
 _start:
 {
 uint8_t x_7; lean_object* x_8; 
 x_7 = lean_unbox(x_3);
 lean_dec(x_3);
-x_8 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____lambda__1(x_1, x_2, x_7, x_4, x_5, x_6);
+x_8 = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____lambda__1(x_1, x_2, x_7, x_4, x_5, x_6);
 lean_dec(x_2);
 return x_8;
 }
@ -3124,7 +3124,7 @@ lean_object* initialize_Lean_Util_Recognizers(lean_object*);
 lean_object* initialize_Lean_Meta_Basic(lean_object*);
 lean_object* initialize_Lean_Meta_DiscrTree(lean_object*);
 static bool _G_initialized = false;
-lean_object* initialize_Lean_Meta_Tactic_Simp_Basic(lean_object* w) {
+lean_object* initialize_Lean_Meta_Tactic_Simp_SimpLemmas(lean_object* w) {
 lean_object * res;
 if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
 _G_initialized = true;
@ -3159,52 +3159,52 @@ l_Lean_Meta_SimpLemmas_discrTree___default = _init_l_Lean_Meta_SimpLemmas_discrT
 lean_mark_persistent(l_Lean_Meta_SimpLemmas_discrTree___default);
 l_Lean_Meta_instInhabitedSimpLemmas = _init_l_Lean_Meta_instInhabitedSimpLemmas();
 lean_mark_persistent(l_Lean_Meta_instInhabitedSimpLemmas);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__1 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__1();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__1);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__2 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__2();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__2);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__3 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__3();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__3);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__4 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__4();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81____closed__4);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__1 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__1();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__1);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__2 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__2();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__2);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__3 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__3();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__3);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__4 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__4();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81____closed__4);
 l_Lean_Meta_simpExtension___closed__1 = _init_l_Lean_Meta_simpExtension___closed__1();
 lean_mark_persistent(l_Lean_Meta_simpExtension___closed__1);
 l_Lean_Meta_simpExtension___closed__2 = _init_l_Lean_Meta_simpExtension___closed__2();
 lean_mark_persistent(l_Lean_Meta_simpExtension___closed__2);
 l_Lean_Meta_simpExtension___closed__3 = _init_l_Lean_Meta_simpExtension___closed__3();
 lean_mark_persistent(l_Lean_Meta_simpExtension___closed__3);
-res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_81_(lean_io_mk_world());
+res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_81_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 l_Lean_Meta_simpExtension = lean_io_result_get_value(res);
 lean_mark_persistent(l_Lean_Meta_simpExtension);
 lean_dec_ref(res);
-l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1);
-l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2 = _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2);
-l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3 = _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3);
-l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4 = _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4);
-l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1);
-l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__1();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__1);
-l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__2 = _init_l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__2();
-lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_Basic_0__Lean_Meta_mkSimpLemmaKey___closed__2);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__1 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__1();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__1);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__2 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__2();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__2);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__3 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__3();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__3);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__4 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__4();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__4);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__5 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__5();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__5);
-l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__6 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__6();
-lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359____closed__6);
-res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_Basic___hyg_359_(lean_io_mk_world());
+l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__1);
+l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2 = _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__2);
+l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3 = _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__3);
+l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4 = _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__1___closed__4);
+l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___lambda__2___closed__1);
+l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__1 = _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__1();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__1);
+l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__2 = _init_l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__2();
+lean_mark_persistent(l___private_Lean_Meta_Tactic_Simp_SimpLemmas_0__Lean_Meta_mkSimpLemmaKey___closed__2);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__1 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__1();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__1);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__2 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__2();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__2);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__3 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__3();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__3);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__4 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__4();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__4);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__5 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__5();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__5);
+l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__6 = _init_l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__6();
+lean_mark_persistent(l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359____closed__6);
+res = l_Lean_Meta_initFn____x40_Lean_Meta_Tactic_Simp_SimpLemmas___hyg_359_(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);
 return lean_io_result_mk_ok(lean_box(0));
--- a/stage0/stdlib/Lean/Meta/Tactic/Simp/Types.c
+++ b/stage0/stdlib/Lean/Meta/Tactic/Simp/Types.c
@ -0,0 +1,320 @@
+// Lean compiler output
+// Module: Lean.Meta.Tactic.Simp.Types
+// Imports: Init Lean.Meta.Tactic.Simp.SimpLemmas
+#include <lean/lean.h>
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* l_Lean_Meta_Simp_State_cache___default;
+lean_object* l_Lean_Meta_Simp_Methods_pre___default(lean_object*);
+uint8_t l_Lean_Meta_Simp_Config_ctorEq___default;
+uint8_t l_Lean_Meta_Simp_Config_memoize___default;
+lean_object* l_Lean_Meta_Simp_Methods_discharge_x3f___default(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Simp_Context_parent_x3f___default;
+uint8_t l_Lean_Meta_Simp_Config_contextual___default;
+lean_object* l_Lean_Meta_Simp_Methods_discharge_x3f___default___rarg(lean_object*);
+uint8_t l_Lean_Meta_Simp_Config_singlePass___default;
+lean_object* l_Lean_Meta_Simp_Config_maxSteps___default;
+uint8_t l_Lean_Meta_Simp_Config_zeta___default;
+lean_object* l_Lean_Meta_Simp_State_numSteps___default;
+lean_object* l_Lean_Meta_Simp_Methods_pre___default___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Std_mkHashMapImp___rarg(lean_object*);
+lean_object* l_Std_mkHashMap___at_Lean_Meta_Simp_State_cache___default___spec__1(lean_object*);
+lean_object* l_Lean_Meta_Simp_State_cache___default___closed__1;
+lean_object* l_Lean_Meta_Simp_Methods_pre___default___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Simp_Methods_post___default(lean_object*);
+uint8_t l_Lean_Meta_Simp_Config_eta___default;
+lean_object* l_Lean_Meta_Simp_Methods_discharge_x3f___default___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Simp_Methods_post___default___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Meta_Simp_Result_proof_x3f___default;
+lean_object* l_Lean_Meta_Simp_Methods_post___default___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+uint8_t l_Lean_Meta_Simp_Config_beta___default;
+uint8_t l_Lean_Meta_Simp_Config_proj___default;
+lean_object* l_Lean_Meta_Simp_defaultMaxSteps;
+static lean_object* _init_l_Lean_Meta_Simp_defaultMaxSteps() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_unsigned_to_nat(100000u);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Simp_Result_proof_x3f___default() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_box(0);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Simp_Config_maxSteps___default() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Meta_Simp_defaultMaxSteps;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_contextual___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 0;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_memoize___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_singlePass___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 0;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_zeta___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_beta___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_eta___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_proj___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
+static uint8_t _init_l_Lean_Meta_Simp_Config_ctorEq___default() {
+_start:
+{
+uint8_t x_1; 
+x_1 = 1;
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Simp_Context_parent_x3f___default() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_box(0);
+return x_1;
+}
+}
+lean_object* l_Std_mkHashMap___at_Lean_Meta_Simp_State_cache___default___spec__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Std_mkHashMapImp___rarg(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Meta_Simp_State_cache___default___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(8u);
+x_2 = l_Std_mkHashMapImp___rarg(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_Meta_Simp_State_cache___default() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Lean_Meta_Simp_State_cache___default___closed__1;
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_Meta_Simp_State_numSteps___default() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_unsigned_to_nat(0u);
+return x_1;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_pre___default___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_9 = lean_box(0);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_1);
+lean_ctor_set(x_10, 1, x_9);
+x_11 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_11, 0, x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_8);
+return x_12;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_pre___default(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_Simp_Methods_pre___default___rarg___boxed), 8, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_pre___default___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Lean_Meta_Simp_Methods_pre___default___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_9;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_post___default___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_9 = lean_box(0);
+x_10 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_10, 0, x_1);
+lean_ctor_set(x_10, 1, x_9);
+x_11 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_11, 0, x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_8);
+return x_12;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_post___default(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_Meta_Simp_Methods_post___default___rarg___boxed), 8, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_post___default___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Lean_Meta_Simp_Methods_post___default___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_9;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_discharge_x3f___default___rarg(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; lean_object* x_3; 
+x_2 = lean_box(0);
+x_3 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_3, 0, x_2);
+lean_ctor_set(x_3, 1, x_1);
+return x_3;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_discharge_x3f___default(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = lean_alloc_closure((void*)(l_Lean_Meta_Simp_Methods_discharge_x3f___default___rarg), 1, 0);
+return x_9;
+}
+}
+lean_object* l_Lean_Meta_Simp_Methods_discharge_x3f___default___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7, lean_object* x_8) {
+_start:
+{
+lean_object* x_9; 
+x_9 = l_Lean_Meta_Simp_Methods_discharge_x3f___default(x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
+lean_dec(x_8);
+lean_dec(x_7);
+lean_dec(x_6);
+lean_dec(x_5);
+lean_dec(x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_9;
+}
+}
+lean_object* initialize_Init(lean_object*);
+lean_object* initialize_Lean_Meta_Tactic_Simp_SimpLemmas(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Lean_Meta_Tactic_Simp_Types(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
+_G_initialized = true;
+res = initialize_Init(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = initialize_Lean_Meta_Tactic_Simp_SimpLemmas(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+l_Lean_Meta_Simp_defaultMaxSteps = _init_l_Lean_Meta_Simp_defaultMaxSteps();
+lean_mark_persistent(l_Lean_Meta_Simp_defaultMaxSteps);
+l_Lean_Meta_Simp_Result_proof_x3f___default = _init_l_Lean_Meta_Simp_Result_proof_x3f___default();
+lean_mark_persistent(l_Lean_Meta_Simp_Result_proof_x3f___default);
+l_Lean_Meta_Simp_Config_maxSteps___default = _init_l_Lean_Meta_Simp_Config_maxSteps___default();
+lean_mark_persistent(l_Lean_Meta_Simp_Config_maxSteps___default);
+l_Lean_Meta_Simp_Config_contextual___default = _init_l_Lean_Meta_Simp_Config_contextual___default();
+l_Lean_Meta_Simp_Config_memoize___default = _init_l_Lean_Meta_Simp_Config_memoize___default();
+l_Lean_Meta_Simp_Config_singlePass___default = _init_l_Lean_Meta_Simp_Config_singlePass___default();
+l_Lean_Meta_Simp_Config_zeta___default = _init_l_Lean_Meta_Simp_Config_zeta___default();
+l_Lean_Meta_Simp_Config_beta___default = _init_l_Lean_Meta_Simp_Config_beta___default();
+l_Lean_Meta_Simp_Config_eta___default = _init_l_Lean_Meta_Simp_Config_eta___default();
+l_Lean_Meta_Simp_Config_proj___default = _init_l_Lean_Meta_Simp_Config_proj___default();
+l_Lean_Meta_Simp_Config_ctorEq___default = _init_l_Lean_Meta_Simp_Config_ctorEq___default();
+l_Lean_Meta_Simp_Context_parent_x3f___default = _init_l_Lean_Meta_Simp_Context_parent_x3f___default();
+lean_mark_persistent(l_Lean_Meta_Simp_Context_parent_x3f___default);
+l_Lean_Meta_Simp_State_cache___default___closed__1 = _init_l_Lean_Meta_Simp_State_cache___default___closed__1();
+lean_mark_persistent(l_Lean_Meta_Simp_State_cache___default___closed__1);
+l_Lean_Meta_Simp_State_cache___default = _init_l_Lean_Meta_Simp_State_cache___default();
+lean_mark_persistent(l_Lean_Meta_Simp_State_cache___default);
+l_Lean_Meta_Simp_State_numSteps___default = _init_l_Lean_Meta_Simp_State_numSteps___default();
+lean_mark_persistent(l_Lean_Meta_Simp_State_numSteps___default);
+return lean_io_result_mk_ok(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
--- a/stage0/stdlib/Lean/Parser/Term.c
+++ b/stage0/stdlib/Lean/Parser/Term.c
--- a/stage0/stdlib/Lean/Parser/Transform.c
+++ b/stage0/stdlib/Lean/Parser/Transform.c
--- a/stage0/stdlib/Leanpkg.c
+++ b/stage0/stdlib/Leanpkg.c
--- a/stage0/stdlib/Leanpkg/Git.c
+++ b/stage0/stdlib/Leanpkg/Git.c
@ -0,0 +1,629 @@
+// Lean compiler output
+// Module: Leanpkg.Git
+// Imports: Init Leanpkg.LeanVersion
+#include <lean/lean.h>
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* l_Leanpkg_gitdefaultRevision___boxed(lean_object*);
+lean_object* l_Leanpkg_gitParseOriginRevision(lean_object*, lean_object*, lean_object*);
+lean_object* l_Leanpkg_gitParseRevision___closed__5;
+lean_object* lean_mk_empty_array_with_capacity(lean_object*);
+lean_object* l_Leanpkg_gitParseRevision(lean_object*, lean_object*, lean_object*);
+lean_object* l_Leanpkg_gitParseRevision___closed__6;
+lean_object* l_Leanpkg_gitdefaultRevision_match__1___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Leanpkg_upstreamGitBranch___closed__2;
+extern lean_object* l_Array_empty___closed__1;
+lean_object* l_Leanpkg_gitParseRevision___closed__2;
+extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
+lean_object* lean_array_push(lean_object*, lean_object*);
+lean_object* lean_string_append(lean_object*, lean_object*);
+lean_object* l_Leanpkg_gitParseRevision___closed__3;
+lean_object* l_Leanpkg_gitParseRevision___closed__1;
+lean_object* l_Leanpkg_gitLatestOriginRevision___closed__2;
+lean_object* l_Leanpkg_gitdefaultRevision_match__1(lean_object*);
+lean_object* l_Leanpkg_gitLatestOriginRevision___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Leanpkg_gitLatestOriginRevision___closed__1;
+lean_object* l_Leanpkg_gitRevisionExists___closed__1;
+lean_object* l_Leanpkg_gitParseOriginRevision___closed__1;
+lean_object* l_Leanpkg_gitParseRevision___closed__7;
+lean_object* l_Leanpkg_upstreamGitBranch___closed__1;
+lean_object* l_Leanpkg_gitParseOriginRevision___closed__3;
+lean_object* l_Leanpkg_gitRevisionExists(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Leanpkg_leanVersionString___closed__3;
+lean_object* l_Leanpkg_gitParseRevision___closed__8;
+lean_object* l_IO_Process_run(lean_object*, lean_object*);
+lean_object* l_Leanpkg_gitParseRevision___closed__4;
+extern uint8_t l_Lean_version_isRelease;
+lean_object* l_Leanpkg_gitParseOriginRevision___closed__2;
+lean_object* l_Leanpkg_upstreamGitBranch___closed__3;
+lean_object* l_Leanpkg_gitHeadRevision(lean_object*, lean_object*);
+lean_object* l_Leanpkg_gitLatestOriginRevision(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Leanpkg_leanVersionStringCore;
+lean_object* l_String_trim(lean_object*);
+lean_object* l_Leanpkg_gitdefaultRevision(lean_object*);
+extern lean_object* l_Lean_mkOptionalNode___closed__2;
+lean_object* l_Leanpkg_gitHeadRevision___closed__1;
+lean_object* l_Leanpkg_gitParseRevision___closed__9;
+lean_object* l_Leanpkg_upstreamGitBranch;
+static lean_object* _init_l_Leanpkg_upstreamGitBranch___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("Lean-");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_upstreamGitBranch___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_upstreamGitBranch___closed__1;
+x_2 = l_Leanpkg_leanVersionStringCore;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_upstreamGitBranch___closed__3() {
+_start:
+{
+uint8_t x_1; 
+x_1 = l_Lean_version_isRelease;
+if (x_1 == 0)
+{
+lean_object* x_2; 
+x_2 = l_Leanpkg_leanVersionString___closed__3;
+return x_2;
+}
+else
+{
+lean_object* x_3; 
+x_3 = l_Leanpkg_upstreamGitBranch___closed__2;
+return x_3;
+}
+}
+}
+static lean_object* _init_l_Leanpkg_upstreamGitBranch() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Leanpkg_upstreamGitBranch___closed__3;
+return x_1;
+}
+}
+lean_object* l_Leanpkg_gitdefaultRevision_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_4; lean_object* x_5; 
+lean_dec(x_3);
+x_4 = lean_box(0);
+x_5 = lean_apply_1(x_2, x_4);
+return x_5;
+}
+else
+{
+lean_object* x_6; lean_object* x_7; 
+lean_dec(x_2);
+x_6 = lean_ctor_get(x_1, 0);
+lean_inc(x_6);
+lean_dec(x_1);
+x_7 = lean_apply_1(x_3, x_6);
+return x_7;
+}
+}
+}
+lean_object* l_Leanpkg_gitdefaultRevision_match__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Leanpkg_gitdefaultRevision_match__1___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Leanpkg_gitdefaultRevision(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_2; 
+x_2 = l_Leanpkg_upstreamGitBranch;
+return x_2;
+}
+else
+{
+lean_object* x_3; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+return x_3;
+}
+}
+}
+lean_object* l_Leanpkg_gitdefaultRevision___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Leanpkg_gitdefaultRevision(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__1() {
+_start:
+{
+uint8_t x_1; lean_object* x_2; 
+x_1 = 1;
+x_2 = lean_alloc_ctor(0, 0, 3);
+lean_ctor_set_uint8(x_2, 0, x_1);
+lean_ctor_set_uint8(x_2, 1, x_1);
+lean_ctor_set_uint8(x_2, 2, x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = lean_unsigned_to_nat(4u);
+x_2 = lean_mk_empty_array_with_capacity(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__3() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("rev-parse");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_gitParseRevision___closed__2;
+x_2 = l_Leanpkg_gitParseRevision___closed__3;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__5() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("-q");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_gitParseRevision___closed__4;
+x_2 = l_Leanpkg_gitParseRevision___closed__5;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__7() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("--verify");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__8() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_gitParseRevision___closed__6;
+x_2 = l_Leanpkg_gitParseRevision___closed__7;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseRevision___closed__9() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("git");
+return x_1;
+}
+}
+lean_object* l_Leanpkg_gitParseRevision(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; 
+x_4 = l_Leanpkg_gitParseRevision___closed__8;
+x_5 = lean_array_push(x_4, x_2);
+x_6 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_6, 0, x_1);
+x_7 = l_Leanpkg_gitParseRevision___closed__1;
+x_8 = l_Leanpkg_gitParseRevision___closed__9;
+x_9 = l_Array_empty___closed__1;
+x_10 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_10, 0, x_7);
+lean_ctor_set(x_10, 1, x_8);
+lean_ctor_set(x_10, 2, x_5);
+lean_ctor_set(x_10, 3, x_6);
+lean_ctor_set(x_10, 4, x_9);
+x_11 = l_IO_Process_run(x_10, x_3);
+if (lean_obj_tag(x_11) == 0)
+{
+uint8_t x_12; 
+x_12 = !lean_is_exclusive(x_11);
+if (x_12 == 0)
+{
+lean_object* x_13; lean_object* x_14; 
+x_13 = lean_ctor_get(x_11, 0);
+x_14 = l_String_trim(x_13);
+lean_dec(x_13);
+lean_ctor_set(x_11, 0, x_14);
+return x_11;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; 
+x_15 = lean_ctor_get(x_11, 0);
+x_16 = lean_ctor_get(x_11, 1);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_dec(x_11);
+x_17 = l_String_trim(x_15);
+lean_dec(x_15);
+x_18 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_18, 0, x_17);
+lean_ctor_set(x_18, 1, x_16);
+return x_18;
+}
+}
+else
+{
+uint8_t x_19; 
+x_19 = !lean_is_exclusive(x_11);
+if (x_19 == 0)
+{
+return x_11;
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; 
+x_20 = lean_ctor_get(x_11, 0);
+x_21 = lean_ctor_get(x_11, 1);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_dec(x_11);
+x_22 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_22, 0, x_20);
+lean_ctor_set(x_22, 1, x_21);
+return x_22;
+}
+}
+}
+}
+static lean_object* _init_l_Leanpkg_gitHeadRevision___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("HEAD");
+return x_1;
+}
+}
+lean_object* l_Leanpkg_gitHeadRevision(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; 
+x_3 = l_Leanpkg_gitHeadRevision___closed__1;
+x_4 = l_Leanpkg_gitParseRevision(x_1, x_3, x_2);
+return x_4;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseOriginRevision___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("origin/");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseOriginRevision___closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("cannot find revision ");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_gitParseOriginRevision___closed__3() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string(" in repository ");
+return x_1;
+}
+}
+lean_object* l_Leanpkg_gitParseOriginRevision(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_4 = l_Leanpkg_gitParseOriginRevision___closed__1;
+x_5 = lean_string_append(x_4, x_2);
+x_6 = l_Leanpkg_gitParseOriginRevision___closed__2;
+x_7 = lean_string_append(x_6, x_2);
+x_8 = l_Leanpkg_gitParseOriginRevision___closed__3;
+x_9 = lean_string_append(x_7, x_8);
+x_10 = lean_string_append(x_9, x_1);
+x_11 = l_Lean_instInhabitedParserDescr___closed__1;
+x_12 = lean_string_append(x_10, x_11);
+x_13 = lean_alloc_ctor(18, 1, 0);
+lean_ctor_set(x_13, 0, x_12);
+lean_inc(x_1);
+x_14 = l_Leanpkg_gitParseRevision(x_1, x_5, x_3);
+if (lean_obj_tag(x_14) == 0)
+{
+lean_dec(x_13);
+lean_dec(x_2);
+lean_dec(x_1);
+return x_14;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; 
+x_15 = lean_ctor_get(x_14, 1);
+lean_inc(x_15);
+lean_dec(x_14);
+x_16 = l_Leanpkg_gitParseRevision(x_1, x_2, x_15);
+if (lean_obj_tag(x_16) == 0)
+{
+lean_dec(x_13);
+return x_16;
+}
+else
+{
+uint8_t x_17; 
+x_17 = !lean_is_exclusive(x_16);
+if (x_17 == 0)
+{
+lean_object* x_18; 
+x_18 = lean_ctor_get(x_16, 0);
+lean_dec(x_18);
+lean_ctor_set(x_16, 0, x_13);
+return x_16;
+}
+else
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_ctor_get(x_16, 1);
+lean_inc(x_19);
+lean_dec(x_16);
+x_20 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_20, 0, x_13);
+lean_ctor_set(x_20, 1, x_19);
+return x_20;
+}
+}
+}
+}
+}
+static lean_object* _init_l_Leanpkg_gitLatestOriginRevision___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("fetch");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_gitLatestOriginRevision___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_mkOptionalNode___closed__2;
+x_2 = l_Leanpkg_gitLatestOriginRevision___closed__1;
+x_3 = lean_array_push(x_1, x_2);
+return x_3;
+}
+}
+lean_object* l_Leanpkg_gitLatestOriginRevision(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
+lean_inc(x_1);
+x_4 = lean_alloc_ctor(1, 1, 0);
+lean_ctor_set(x_4, 0, x_1);
+x_5 = l_Leanpkg_gitParseRevision___closed__1;
+x_6 = l_Leanpkg_gitParseRevision___closed__9;
+x_7 = l_Leanpkg_gitLatestOriginRevision___closed__2;
+x_8 = l_Array_empty___closed__1;
+x_9 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_9, 0, x_5);
+lean_ctor_set(x_9, 1, x_6);
+lean_ctor_set(x_9, 2, x_7);
+lean_ctor_set(x_9, 3, x_4);
+lean_ctor_set(x_9, 4, x_8);
+x_10 = l_IO_Process_run(x_9, x_3);
+if (lean_obj_tag(x_10) == 0)
+{
+lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+x_11 = lean_ctor_get(x_10, 1);
+lean_inc(x_11);
+lean_dec(x_10);
+x_12 = l_Leanpkg_gitdefaultRevision(x_2);
+x_13 = l_Leanpkg_gitParseOriginRevision(x_1, x_12, x_11);
+return x_13;
+}
+else
+{
+uint8_t x_14; 
+lean_dec(x_1);
+x_14 = !lean_is_exclusive(x_10);
+if (x_14 == 0)
+{
+return x_10;
+}
+else
+{
+lean_object* x_15; lean_object* x_16; lean_object* x_17; 
+x_15 = lean_ctor_get(x_10, 0);
+x_16 = lean_ctor_get(x_10, 1);
+lean_inc(x_16);
+lean_inc(x_15);
+lean_dec(x_10);
+x_17 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_17, 0, x_15);
+lean_ctor_set(x_17, 1, x_16);
+return x_17;
+}
+}
+}
+}
+lean_object* l_Leanpkg_gitLatestOriginRevision___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_Leanpkg_gitLatestOriginRevision(x_1, x_2, x_3);
+lean_dec(x_2);
+return x_4;
+}
+}
+static lean_object* _init_l_Leanpkg_gitRevisionExists___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("^{commit}");
+return x_1;
+}
+}
+lean_object* l_Leanpkg_gitRevisionExists(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; 
+x_4 = l_Leanpkg_gitRevisionExists___closed__1;
+x_5 = lean_string_append(x_2, x_4);
+x_6 = l_Leanpkg_gitParseRevision(x_1, x_5, x_3);
+if (lean_obj_tag(x_6) == 0)
+{
+uint8_t x_7; 
+x_7 = !lean_is_exclusive(x_6);
+if (x_7 == 0)
+{
+lean_object* x_8; uint8_t x_9; lean_object* x_10; 
+x_8 = lean_ctor_get(x_6, 0);
+lean_dec(x_8);
+x_9 = 1;
+x_10 = lean_box(x_9);
+lean_ctor_set(x_6, 0, x_10);
+return x_6;
+}
+else
+{
+lean_object* x_11; uint8_t x_12; lean_object* x_13; lean_object* x_14; 
+x_11 = lean_ctor_get(x_6, 1);
+lean_inc(x_11);
+lean_dec(x_6);
+x_12 = 1;
+x_13 = lean_box(x_12);
+x_14 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_14, 0, x_13);
+lean_ctor_set(x_14, 1, x_11);
+return x_14;
+}
+}
+else
+{
+uint8_t x_15; 
+x_15 = !lean_is_exclusive(x_6);
+if (x_15 == 0)
+{
+lean_object* x_16; uint8_t x_17; lean_object* x_18; 
+x_16 = lean_ctor_get(x_6, 0);
+lean_dec(x_16);
+x_17 = 0;
+x_18 = lean_box(x_17);
+lean_ctor_set_tag(x_6, 0);
+lean_ctor_set(x_6, 0, x_18);
+return x_6;
+}
+else
+{
+lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; 
+x_19 = lean_ctor_get(x_6, 1);
+lean_inc(x_19);
+lean_dec(x_6);
+x_20 = 0;
+x_21 = lean_box(x_20);
+x_22 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_22, 0, x_21);
+lean_ctor_set(x_22, 1, x_19);
+return x_22;
+}
+}
+}
+}
+lean_object* initialize_Init(lean_object*);
+lean_object* initialize_Leanpkg_LeanVersion(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Leanpkg_Git(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
+_G_initialized = true;
+res = initialize_Init(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+res = initialize_Leanpkg_LeanVersion(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+l_Leanpkg_upstreamGitBranch___closed__1 = _init_l_Leanpkg_upstreamGitBranch___closed__1();
+lean_mark_persistent(l_Leanpkg_upstreamGitBranch___closed__1);
+l_Leanpkg_upstreamGitBranch___closed__2 = _init_l_Leanpkg_upstreamGitBranch___closed__2();
+lean_mark_persistent(l_Leanpkg_upstreamGitBranch___closed__2);
+l_Leanpkg_upstreamGitBranch___closed__3 = _init_l_Leanpkg_upstreamGitBranch___closed__3();
+lean_mark_persistent(l_Leanpkg_upstreamGitBranch___closed__3);
+l_Leanpkg_upstreamGitBranch = _init_l_Leanpkg_upstreamGitBranch();
+lean_mark_persistent(l_Leanpkg_upstreamGitBranch);
+l_Leanpkg_gitParseRevision___closed__1 = _init_l_Leanpkg_gitParseRevision___closed__1();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__1);
+l_Leanpkg_gitParseRevision___closed__2 = _init_l_Leanpkg_gitParseRevision___closed__2();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__2);
+l_Leanpkg_gitParseRevision___closed__3 = _init_l_Leanpkg_gitParseRevision___closed__3();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__3);
+l_Leanpkg_gitParseRevision___closed__4 = _init_l_Leanpkg_gitParseRevision___closed__4();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__4);
+l_Leanpkg_gitParseRevision___closed__5 = _init_l_Leanpkg_gitParseRevision___closed__5();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__5);
+l_Leanpkg_gitParseRevision___closed__6 = _init_l_Leanpkg_gitParseRevision___closed__6();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__6);
+l_Leanpkg_gitParseRevision___closed__7 = _init_l_Leanpkg_gitParseRevision___closed__7();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__7);
+l_Leanpkg_gitParseRevision___closed__8 = _init_l_Leanpkg_gitParseRevision___closed__8();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__8);
+l_Leanpkg_gitParseRevision___closed__9 = _init_l_Leanpkg_gitParseRevision___closed__9();
+lean_mark_persistent(l_Leanpkg_gitParseRevision___closed__9);
+l_Leanpkg_gitHeadRevision___closed__1 = _init_l_Leanpkg_gitHeadRevision___closed__1();
+lean_mark_persistent(l_Leanpkg_gitHeadRevision___closed__1);
+l_Leanpkg_gitParseOriginRevision___closed__1 = _init_l_Leanpkg_gitParseOriginRevision___closed__1();
+lean_mark_persistent(l_Leanpkg_gitParseOriginRevision___closed__1);
+l_Leanpkg_gitParseOriginRevision___closed__2 = _init_l_Leanpkg_gitParseOriginRevision___closed__2();
+lean_mark_persistent(l_Leanpkg_gitParseOriginRevision___closed__2);
+l_Leanpkg_gitParseOriginRevision___closed__3 = _init_l_Leanpkg_gitParseOriginRevision___closed__3();
+lean_mark_persistent(l_Leanpkg_gitParseOriginRevision___closed__3);
+l_Leanpkg_gitLatestOriginRevision___closed__1 = _init_l_Leanpkg_gitLatestOriginRevision___closed__1();
+lean_mark_persistent(l_Leanpkg_gitLatestOriginRevision___closed__1);
+l_Leanpkg_gitLatestOriginRevision___closed__2 = _init_l_Leanpkg_gitLatestOriginRevision___closed__2();
+lean_mark_persistent(l_Leanpkg_gitLatestOriginRevision___closed__2);
+l_Leanpkg_gitRevisionExists___closed__1 = _init_l_Leanpkg_gitRevisionExists___closed__1();
+lean_mark_persistent(l_Leanpkg_gitRevisionExists___closed__1);
+return lean_io_result_mk_ok(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
--- a/stage0/stdlib/Leanpkg/LeanVersion.c
+++ b/stage0/stdlib/Leanpkg/LeanVersion.c
@ -0,0 +1,384 @@
+// Lean compiler output
+// Module: Leanpkg.LeanVersion
+// Imports: Init
+#include <lean/lean.h>
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern lean_object* l_Lean_Name_toString___closed__1;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__2;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__9;
+lean_object* l_Leanpkg_leanVersionString___closed__4;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__8;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__6;
+extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__4;
+lean_object* lean_string_append(lean_object*, lean_object*);
+lean_object* l_Leanpkg_leanVersionStringCore___closed__5;
+uint8_t l_Leanpkg_leanVersionString___closed__2;
+extern lean_object* l_Lean_version_patch;
+extern lean_object* l_Lean_version_specialDesc;
+extern lean_object* l_Lean_version_major;
+uint8_t l_instDecidableNot___rarg(uint8_t);
+lean_object* l_Leanpkg_leanVersionString___closed__6;
+uint8_t l_Leanpkg_leanVersionString___closed__1;
+lean_object* l_Leanpkg_uiLeanVersionString;
+lean_object* l_Leanpkg_leanVersionString___closed__8;
+lean_object* l_Nat_repr(lean_object*);
+lean_object* l_Leanpkg_leanVersionString___closed__5;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__1;
+lean_object* l_Leanpkg_uiLeanVersionString___closed__5;
+lean_object* l_Leanpkg_leanVersionString___closed__3;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__3;
+lean_object* l_Leanpkg_uiLeanVersionString___closed__3;
+extern lean_object* l_Lean_version_minor;
+extern uint8_t l_Lean_version_isRelease;
+lean_object* l_Leanpkg_leanVersionString___closed__7;
+lean_object* l_Leanpkg_leanVersionString;
+lean_object* l_Leanpkg_uiLeanVersionString___closed__2;
+lean_object* l_Leanpkg_leanVersionStringCore;
+extern lean_object* l_prec_x28___x29___closed__7;
+lean_object* l_Leanpkg_leanVersionStringCore___closed__7;
+lean_object* l_Leanpkg_uiLeanVersionString___closed__1;
+lean_object* l_Leanpkg_uiLeanVersionString___closed__4;
+uint8_t lean_string_dec_eq(lean_object*, lean_object*);
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_version_major;
+x_2 = l_Nat_repr(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Lean_instInhabitedParserDescr___closed__1;
+x_2 = l_Leanpkg_leanVersionStringCore___closed__1;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_leanVersionStringCore___closed__2;
+x_2 = l_Lean_Name_toString___closed__1;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__4() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_version_minor;
+x_2 = l_Nat_repr(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__5() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_leanVersionStringCore___closed__3;
+x_2 = l_Leanpkg_leanVersionStringCore___closed__4;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_leanVersionStringCore___closed__5;
+x_2 = l_Lean_Name_toString___closed__1;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; 
+x_1 = l_Lean_version_patch;
+x_2 = l_Nat_repr(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__8() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_leanVersionStringCore___closed__6;
+x_2 = l_Leanpkg_leanVersionStringCore___closed__7;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore___closed__9() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_leanVersionStringCore___closed__8;
+x_2 = l_Lean_instInhabitedParserDescr___closed__1;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionStringCore() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Leanpkg_leanVersionStringCore___closed__9;
+return x_1;
+}
+}
+static uint8_t _init_l_Leanpkg_leanVersionString___closed__1() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; uint8_t x_3; 
+x_1 = l_Lean_version_specialDesc;
+x_2 = l_Lean_instInhabitedParserDescr___closed__1;
+x_3 = lean_string_dec_eq(x_1, x_2);
+return x_3;
+}
+}
+static uint8_t _init_l_Leanpkg_leanVersionString___closed__2() {
+_start:
+{
+uint8_t x_1; uint8_t x_2; 
+x_1 = l_Leanpkg_leanVersionString___closed__1;
+x_2 = l_instDecidableNot___rarg(x_1);
+return x_2;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionString___closed__3() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("master");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionString___closed__4() {
+_start:
+{
+uint8_t x_1; 
+x_1 = l_Leanpkg_leanVersionString___closed__2;
+if (x_1 == 0)
+{
+lean_object* x_2; 
+x_2 = l_Leanpkg_leanVersionString___closed__3;
+return x_2;
+}
+else
+{
+lean_object* x_3; 
+x_3 = l_Lean_version_specialDesc;
+return x_3;
+}
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionString___closed__5() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("leanprover/lean:");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionString___closed__6() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_leanVersionString___closed__5;
+x_2 = l_Leanpkg_leanVersionStringCore;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionString___closed__7() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_leanVersionString___closed__6;
+x_2 = l_Lean_instInhabitedParserDescr___closed__1;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionString___closed__8() {
+_start:
+{
+uint8_t x_1; 
+x_1 = l_Lean_version_isRelease;
+if (x_1 == 0)
+{
+lean_object* x_2; 
+x_2 = l_Leanpkg_leanVersionString___closed__4;
+return x_2;
+}
+else
+{
+lean_object* x_3; 
+x_3 = l_Leanpkg_leanVersionString___closed__7;
+return x_3;
+}
+}
+}
+static lean_object* _init_l_Leanpkg_leanVersionString() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Leanpkg_leanVersionString___closed__8;
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_uiLeanVersionString___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("master (");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_uiLeanVersionString___closed__2() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_uiLeanVersionString___closed__1;
+x_2 = l_Leanpkg_leanVersionStringCore;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_uiLeanVersionString___closed__3() {
+_start:
+{
+lean_object* x_1; lean_object* x_2; lean_object* x_3; 
+x_1 = l_Leanpkg_uiLeanVersionString___closed__2;
+x_2 = l_prec_x28___x29___closed__7;
+x_3 = lean_string_append(x_1, x_2);
+return x_3;
+}
+}
+static lean_object* _init_l_Leanpkg_uiLeanVersionString___closed__4() {
+_start:
+{
+uint8_t x_1; 
+x_1 = l_Leanpkg_leanVersionString___closed__2;
+if (x_1 == 0)
+{
+lean_object* x_2; 
+x_2 = l_Leanpkg_uiLeanVersionString___closed__3;
+return x_2;
+}
+else
+{
+lean_object* x_3; 
+x_3 = l_Lean_version_specialDesc;
+return x_3;
+}
+}
+}
+static lean_object* _init_l_Leanpkg_uiLeanVersionString___closed__5() {
+_start:
+{
+uint8_t x_1; 
+x_1 = l_Lean_version_isRelease;
+if (x_1 == 0)
+{
+lean_object* x_2; 
+x_2 = l_Leanpkg_uiLeanVersionString___closed__4;
+return x_2;
+}
+else
+{
+lean_object* x_3; 
+x_3 = l_Leanpkg_leanVersionStringCore;
+return x_3;
+}
+}
+}
+static lean_object* _init_l_Leanpkg_uiLeanVersionString() {
+_start:
+{
+lean_object* x_1; 
+x_1 = l_Leanpkg_uiLeanVersionString___closed__5;
+return x_1;
+}
+}
+lean_object* initialize_Init(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Leanpkg_LeanVersion(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
+_G_initialized = true;
+res = initialize_Init(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+l_Leanpkg_leanVersionStringCore___closed__1 = _init_l_Leanpkg_leanVersionStringCore___closed__1();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__1);
+l_Leanpkg_leanVersionStringCore___closed__2 = _init_l_Leanpkg_leanVersionStringCore___closed__2();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__2);
+l_Leanpkg_leanVersionStringCore___closed__3 = _init_l_Leanpkg_leanVersionStringCore___closed__3();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__3);
+l_Leanpkg_leanVersionStringCore___closed__4 = _init_l_Leanpkg_leanVersionStringCore___closed__4();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__4);
+l_Leanpkg_leanVersionStringCore___closed__5 = _init_l_Leanpkg_leanVersionStringCore___closed__5();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__5);
+l_Leanpkg_leanVersionStringCore___closed__6 = _init_l_Leanpkg_leanVersionStringCore___closed__6();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__6);
+l_Leanpkg_leanVersionStringCore___closed__7 = _init_l_Leanpkg_leanVersionStringCore___closed__7();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__7);
+l_Leanpkg_leanVersionStringCore___closed__8 = _init_l_Leanpkg_leanVersionStringCore___closed__8();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__8);
+l_Leanpkg_leanVersionStringCore___closed__9 = _init_l_Leanpkg_leanVersionStringCore___closed__9();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore___closed__9);
+l_Leanpkg_leanVersionStringCore = _init_l_Leanpkg_leanVersionStringCore();
+lean_mark_persistent(l_Leanpkg_leanVersionStringCore);
+l_Leanpkg_leanVersionString___closed__1 = _init_l_Leanpkg_leanVersionString___closed__1();
+l_Leanpkg_leanVersionString___closed__2 = _init_l_Leanpkg_leanVersionString___closed__2();
+l_Leanpkg_leanVersionString___closed__3 = _init_l_Leanpkg_leanVersionString___closed__3();
+lean_mark_persistent(l_Leanpkg_leanVersionString___closed__3);
+l_Leanpkg_leanVersionString___closed__4 = _init_l_Leanpkg_leanVersionString___closed__4();
+lean_mark_persistent(l_Leanpkg_leanVersionString___closed__4);
+l_Leanpkg_leanVersionString___closed__5 = _init_l_Leanpkg_leanVersionString___closed__5();
+lean_mark_persistent(l_Leanpkg_leanVersionString___closed__5);
+l_Leanpkg_leanVersionString___closed__6 = _init_l_Leanpkg_leanVersionString___closed__6();
+lean_mark_persistent(l_Leanpkg_leanVersionString___closed__6);
+l_Leanpkg_leanVersionString___closed__7 = _init_l_Leanpkg_leanVersionString___closed__7();
+lean_mark_persistent(l_Leanpkg_leanVersionString___closed__7);
+l_Leanpkg_leanVersionString___closed__8 = _init_l_Leanpkg_leanVersionString___closed__8();
+lean_mark_persistent(l_Leanpkg_leanVersionString___closed__8);
+l_Leanpkg_leanVersionString = _init_l_Leanpkg_leanVersionString();
+lean_mark_persistent(l_Leanpkg_leanVersionString);
+l_Leanpkg_uiLeanVersionString___closed__1 = _init_l_Leanpkg_uiLeanVersionString___closed__1();
+lean_mark_persistent(l_Leanpkg_uiLeanVersionString___closed__1);
+l_Leanpkg_uiLeanVersionString___closed__2 = _init_l_Leanpkg_uiLeanVersionString___closed__2();
+lean_mark_persistent(l_Leanpkg_uiLeanVersionString___closed__2);
+l_Leanpkg_uiLeanVersionString___closed__3 = _init_l_Leanpkg_uiLeanVersionString___closed__3();
+lean_mark_persistent(l_Leanpkg_uiLeanVersionString___closed__3);
+l_Leanpkg_uiLeanVersionString___closed__4 = _init_l_Leanpkg_uiLeanVersionString___closed__4();
+lean_mark_persistent(l_Leanpkg_uiLeanVersionString___closed__4);
+l_Leanpkg_uiLeanVersionString___closed__5 = _init_l_Leanpkg_uiLeanVersionString___closed__5();
+lean_mark_persistent(l_Leanpkg_uiLeanVersionString___closed__5);
+l_Leanpkg_uiLeanVersionString = _init_l_Leanpkg_uiLeanVersionString();
+lean_mark_persistent(l_Leanpkg_uiLeanVersionString);
+return lean_io_result_mk_ok(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
--- a/stage0/stdlib/Leanpkg/Manifest.c
+++ b/stage0/stdlib/Leanpkg/Manifest.c
--- a/stage0/stdlib/Leanpkg/Proc.c
+++ b/stage0/stdlib/Leanpkg/Proc.c
@ -0,0 +1,459 @@
+// Lean compiler output
+// Module: Leanpkg.Proc
+// Imports: Init
+#include <lean/lean.h>
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wunused-label"
+#elif defined(__GNUC__) && !defined(__CLANG__)
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+#pragma GCC diagnostic ignored "-Wunused-label"
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#endif
+#ifdef __cplusplus
+extern "C" {
+#endif
+lean_object* l_List_map___at_Leanpkg_execCmd___spec__1(lean_object*);
+lean_object* l_List_foldl___at_String_join___spec__1(lean_object*, lean_object*);
+extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
+lean_object* l_Leanpkg_execCmd(lean_object*, lean_object*);
+lean_object* l_Leanpkg_execCmd_match__1(lean_object*);
+lean_object* lean_string_append(lean_object*, lean_object*);
+lean_object* lean_io_process_spawn(lean_object*, lean_object*);
+lean_object* l_Leanpkg_execCmd_match__1___rarg(lean_object*, lean_object*);
+lean_object* l_Leanpkg_execCmd___closed__2;
+lean_object* l_Nat_repr(lean_object*);
+lean_object* l_Leanpkg_execCmd___closed__1;
+lean_object* lean_array_to_list(lean_object*, lean_object*);
+extern lean_object* l_Array_forInUnsafe_loop___at___private_Init_NotationExtra_0__Lean_mkHintBody___spec__1___closed__3;
+lean_object* l_Leanpkg_execCmd___closed__3;
+uint8_t l_UInt32_decEq(uint32_t, uint32_t);
+lean_object* l_String_intercalate(lean_object*, lean_object*);
+lean_object* l_Leanpkg_execCmd_match__2___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* lean_io_process_child_wait(lean_object*, lean_object*, lean_object*);
+lean_object* l_Leanpkg_execCmd_match__2(lean_object*);
+lean_object* l_IO_println___at_Lean_instEval___spec__1(lean_object*, lean_object*);
+lean_object* lean_uint32_to_nat(uint32_t);
+extern lean_object* l___private_Init_Data_Format_Basic_0__Std_Format_be___closed__1;
+lean_object* l_Leanpkg_execCmd_match__1___rarg(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_1, 0);
+lean_inc(x_3);
+x_4 = lean_ctor_get(x_1, 1);
+lean_inc(x_4);
+lean_dec(x_1);
+x_5 = lean_apply_2(x_2, x_3, x_4);
+return x_5;
+}
+}
+lean_object* l_Leanpkg_execCmd_match__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Leanpkg_execCmd_match__1___rarg), 2, 0);
+return x_2;
+}
+}
+lean_object* l_Leanpkg_execCmd_match__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_4; lean_object* x_5; 
+lean_dec(x_2);
+x_4 = lean_box(0);
+x_5 = lean_apply_1(x_3, x_4);
+return x_5;
+}
+else
+{
+lean_object* x_6; lean_object* x_7; 
+lean_dec(x_3);
+x_6 = lean_ctor_get(x_1, 0);
+lean_inc(x_6);
+lean_dec(x_1);
+x_7 = lean_apply_1(x_2, x_6);
+return x_7;
+}
+}
+}
+lean_object* l_Leanpkg_execCmd_match__2(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Leanpkg_execCmd_match__2___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_List_map___at_Leanpkg_execCmd___spec__1(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_2; 
+x_2 = lean_box(0);
+return x_2;
+}
+else
+{
+uint8_t x_3; 
+x_3 = !lean_is_exclusive(x_1);
+if (x_3 == 0)
+{
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+x_4 = lean_ctor_get(x_1, 0);
+x_5 = lean_ctor_get(x_1, 1);
+x_6 = l_List_map___at_Leanpkg_execCmd___spec__1(x_5);
+x_7 = lean_ctor_get(x_4, 0);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_4, 1);
+lean_inc(x_8);
+lean_dec(x_4);
+x_9 = l_Lean_instInhabitedParserDescr___closed__1;
+x_10 = lean_string_append(x_9, x_7);
+lean_dec(x_7);
+x_11 = l_Array_forInUnsafe_loop___at___private_Init_NotationExtra_0__Lean_mkHintBody___spec__1___closed__3;
+x_12 = lean_string_append(x_10, x_11);
+if (lean_obj_tag(x_8) == 0)
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; 
+x_13 = lean_string_append(x_12, x_9);
+x_14 = l___private_Init_Data_Format_Basic_0__Std_Format_be___closed__1;
+x_15 = lean_string_append(x_13, x_14);
+lean_ctor_set(x_1, 1, x_6);
+lean_ctor_set(x_1, 0, x_15);
+return x_1;
+}
+else
+{
+lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
+x_16 = lean_ctor_get(x_8, 0);
+lean_inc(x_16);
+lean_dec(x_8);
+x_17 = lean_string_append(x_12, x_16);
+lean_dec(x_16);
+x_18 = l___private_Init_Data_Format_Basic_0__Std_Format_be___closed__1;
+x_19 = lean_string_append(x_17, x_18);
+lean_ctor_set(x_1, 1, x_6);
+lean_ctor_set(x_1, 0, x_19);
+return x_1;
+}
+}
+else
+{
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; 
+x_20 = lean_ctor_get(x_1, 0);
+x_21 = lean_ctor_get(x_1, 1);
+lean_inc(x_21);
+lean_inc(x_20);
+lean_dec(x_1);
+x_22 = l_List_map___at_Leanpkg_execCmd___spec__1(x_21);
+x_23 = lean_ctor_get(x_20, 0);
+lean_inc(x_23);
+x_24 = lean_ctor_get(x_20, 1);
+lean_inc(x_24);
+lean_dec(x_20);
+x_25 = l_Lean_instInhabitedParserDescr___closed__1;
+x_26 = lean_string_append(x_25, x_23);
+lean_dec(x_23);
+x_27 = l_Array_forInUnsafe_loop___at___private_Init_NotationExtra_0__Lean_mkHintBody___spec__1___closed__3;
+x_28 = lean_string_append(x_26, x_27);
+if (lean_obj_tag(x_24) == 0)
+{
+lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
+x_29 = lean_string_append(x_28, x_25);
+x_30 = l___private_Init_Data_Format_Basic_0__Std_Format_be___closed__1;
+x_31 = lean_string_append(x_29, x_30);
+x_32 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_32, 0, x_31);
+lean_ctor_set(x_32, 1, x_22);
+return x_32;
+}
+else
+{
+lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_33 = lean_ctor_get(x_24, 0);
+lean_inc(x_33);
+lean_dec(x_24);
+x_34 = lean_string_append(x_28, x_33);
+lean_dec(x_33);
+x_35 = l___private_Init_Data_Format_Basic_0__Std_Format_be___closed__1;
+x_36 = lean_string_append(x_34, x_35);
+x_37 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_22);
+return x_37;
+}
+}
+}
+}
+}
+static lean_object* _init_l_Leanpkg_execCmd___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("> ");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_execCmd___closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("external command exited with status ");
+return x_1;
+}
+}
+static lean_object* _init_l_Leanpkg_execCmd___closed__3() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("    # in directory ");
+return x_1;
+}
+}
+lean_object* l_Leanpkg_execCmd(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; lean_object* x_66; 
+x_3 = lean_ctor_get(x_1, 4);
+lean_inc(x_3);
+x_4 = lean_array_to_list(lean_box(0), x_3);
+x_5 = l_List_map___at_Leanpkg_execCmd___spec__1(x_4);
+x_6 = l_Lean_instInhabitedParserDescr___closed__1;
+x_7 = l_List_foldl___at_String_join___spec__1(x_6, x_5);
+lean_dec(x_5);
+x_8 = lean_ctor_get(x_1, 1);
+lean_inc(x_8);
+x_9 = lean_ctor_get(x_1, 2);
+lean_inc(x_9);
+x_10 = lean_array_to_list(lean_box(0), x_9);
+x_11 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_11, 0, x_8);
+lean_ctor_set(x_11, 1, x_10);
+x_12 = l___private_Init_Data_Format_Basic_0__Std_Format_be___closed__1;
+x_13 = l_String_intercalate(x_12, x_11);
+x_14 = l_Leanpkg_execCmd___closed__1;
+x_15 = lean_string_append(x_14, x_7);
+lean_dec(x_7);
+x_66 = lean_ctor_get(x_1, 3);
+lean_inc(x_66);
+if (lean_obj_tag(x_66) == 0)
+{
+x_16 = x_13;
+goto block_65;
+}
+else
+{
+lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; 
+x_67 = lean_ctor_get(x_66, 0);
+lean_inc(x_67);
+lean_dec(x_66);
+x_68 = l_Leanpkg_execCmd___closed__3;
+x_69 = lean_string_append(x_13, x_68);
+x_70 = lean_string_append(x_69, x_67);
+lean_dec(x_67);
+x_16 = x_70;
+goto block_65;
+}
+block_65:
+{
+lean_object* x_17; lean_object* x_18; 
+x_17 = lean_string_append(x_15, x_16);
+lean_dec(x_16);
+x_18 = l_IO_println___at_Lean_instEval___spec__1(x_17, x_2);
+if (lean_obj_tag(x_18) == 0)
+{
+lean_object* x_19; lean_object* x_20; 
+x_19 = lean_ctor_get(x_18, 1);
+lean_inc(x_19);
+lean_dec(x_18);
+lean_inc(x_1);
+x_20 = lean_io_process_spawn(x_1, x_19);
+if (lean_obj_tag(x_20) == 0)
+{
+lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
+x_21 = lean_ctor_get(x_20, 0);
+lean_inc(x_21);
+x_22 = lean_ctor_get(x_20, 1);
+lean_inc(x_22);
+lean_dec(x_20);
+x_23 = lean_ctor_get(x_1, 0);
+lean_inc(x_23);
+lean_dec(x_1);
+x_24 = lean_io_process_child_wait(x_23, x_21, x_22);
+lean_dec(x_21);
+lean_dec(x_23);
+if (lean_obj_tag(x_24) == 0)
+{
+uint8_t x_25; 
+x_25 = !lean_is_exclusive(x_24);
+if (x_25 == 0)
+{
+lean_object* x_26; uint32_t x_27; uint32_t x_28; uint8_t x_29; 
+x_26 = lean_ctor_get(x_24, 0);
+x_27 = 0;
+x_28 = lean_unbox_uint32(x_26);
+x_29 = x_28 == x_27;
+if (x_29 == 0)
+{
+uint32_t x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; lean_object* x_36; 
+x_30 = lean_unbox_uint32(x_26);
+lean_dec(x_26);
+x_31 = lean_uint32_to_nat(x_30);
+x_32 = l_Nat_repr(x_31);
+x_33 = l_Leanpkg_execCmd___closed__2;
+x_34 = lean_string_append(x_33, x_32);
+lean_dec(x_32);
+x_35 = lean_string_append(x_34, x_6);
+x_36 = lean_alloc_ctor(18, 1, 0);
+lean_ctor_set(x_36, 0, x_35);
+lean_ctor_set_tag(x_24, 1);
+lean_ctor_set(x_24, 0, x_36);
+return x_24;
+}
+else
+{
+lean_object* x_37; 
+lean_dec(x_26);
+x_37 = lean_box(0);
+lean_ctor_set(x_24, 0, x_37);
+return x_24;
+}
+}
+else
+{
+lean_object* x_38; lean_object* x_39; uint32_t x_40; uint32_t x_41; uint8_t x_42; 
+x_38 = lean_ctor_get(x_24, 0);
+x_39 = lean_ctor_get(x_24, 1);
+lean_inc(x_39);
+lean_inc(x_38);
+lean_dec(x_24);
+x_40 = 0;
+x_41 = lean_unbox_uint32(x_38);
+x_42 = x_41 == x_40;
+if (x_42 == 0)
+{
+uint32_t x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; lean_object* x_49; lean_object* x_50; 
+x_43 = lean_unbox_uint32(x_38);
+lean_dec(x_38);
+x_44 = lean_uint32_to_nat(x_43);
+x_45 = l_Nat_repr(x_44);
+x_46 = l_Leanpkg_execCmd___closed__2;
+x_47 = lean_string_append(x_46, x_45);
+lean_dec(x_45);
+x_48 = lean_string_append(x_47, x_6);
+x_49 = lean_alloc_ctor(18, 1, 0);
+lean_ctor_set(x_49, 0, x_48);
+x_50 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_50, 0, x_49);
+lean_ctor_set(x_50, 1, x_39);
+return x_50;
+}
+else
+{
+lean_object* x_51; lean_object* x_52; 
+lean_dec(x_38);
+x_51 = lean_box(0);
+x_52 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_52, 0, x_51);
+lean_ctor_set(x_52, 1, x_39);
+return x_52;
+}
+}
+}
+else
+{
+uint8_t x_53; 
+x_53 = !lean_is_exclusive(x_24);
+if (x_53 == 0)
+{
+return x_24;
+}
+else
+{
+lean_object* x_54; lean_object* x_55; lean_object* x_56; 
+x_54 = lean_ctor_get(x_24, 0);
+x_55 = lean_ctor_get(x_24, 1);
+lean_inc(x_55);
+lean_inc(x_54);
+lean_dec(x_24);
+x_56 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_56, 0, x_54);
+lean_ctor_set(x_56, 1, x_55);
+return x_56;
+}
+}
+}
+else
+{
+uint8_t x_57; 
+lean_dec(x_1);
+x_57 = !lean_is_exclusive(x_20);
+if (x_57 == 0)
+{
+return x_20;
+}
+else
+{
+lean_object* x_58; lean_object* x_59; lean_object* x_60; 
+x_58 = lean_ctor_get(x_20, 0);
+x_59 = lean_ctor_get(x_20, 1);
+lean_inc(x_59);
+lean_inc(x_58);
+lean_dec(x_20);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_58);
+lean_ctor_set(x_60, 1, x_59);
+return x_60;
+}
+}
+}
+else
+{
+uint8_t x_61; 
+lean_dec(x_1);
+x_61 = !lean_is_exclusive(x_18);
+if (x_61 == 0)
+{
+return x_18;
+}
+else
+{
+lean_object* x_62; lean_object* x_63; lean_object* x_64; 
+x_62 = lean_ctor_get(x_18, 0);
+x_63 = lean_ctor_get(x_18, 1);
+lean_inc(x_63);
+lean_inc(x_62);
+lean_dec(x_18);
+x_64 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_64, 0, x_62);
+lean_ctor_set(x_64, 1, x_63);
+return x_64;
+}
+}
+}
+}
+}
+lean_object* initialize_Init(lean_object*);
+static bool _G_initialized = false;
+lean_object* initialize_Leanpkg_Proc(lean_object* w) {
+lean_object * res;
+if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
+_G_initialized = true;
+res = initialize_Init(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
+l_Leanpkg_execCmd___closed__1 = _init_l_Leanpkg_execCmd___closed__1();
+lean_mark_persistent(l_Leanpkg_execCmd___closed__1);
+l_Leanpkg_execCmd___closed__2 = _init_l_Leanpkg_execCmd___closed__2();
+lean_mark_persistent(l_Leanpkg_execCmd___closed__2);
+l_Leanpkg_execCmd___closed__3 = _init_l_Leanpkg_execCmd___closed__3();
+lean_mark_persistent(l_Leanpkg_execCmd___closed__3);
+return lean_io_result_mk_ok(lean_box(0));
+}
+#ifdef __cplusplus
+}
+#endif
--- a/stage0/stdlib/Leanpkg/Resolve.c
+++ b/stage0/stdlib/Leanpkg/Resolve.c
--- a/stage0/stdlib/Leanpkg/Toml.c
+++ b/stage0/stdlib/Leanpkg/Toml.c