chore: update stage0

stage0/src/Init/Core.lean

@@ -189,12 +189,6 @@ theorem id.def {α : Sort u} (a : α) : id a = a := rfl
 theorem Eq.substr {α : Sort u} {p : α → Prop} {a b : α} (h₁ : b = a) (h₂ : p a) : p b :=
   h₁ ▸ h₂
 
-theorem congr {α : Sort u} {β : Sort v} {f₁ f₂ : α → β} {a₁ a₂ : α} (h₁ : f₁ = f₂) (h₂ : a₁ = a₂) : f₁ a₁ = f₂ a₂ :=
-  h₁ ▸ h₂ ▸ rfl
-
-theorem congrFun {α : Sort u} {β : α → Sort v} {f g : ∀ x, β x} (h : f = g) (a : α) : f a = g a :=
-  h ▸ rfl
-
 theorem castEq {α : Sort u} (h : α = α) (a : α) : cast h a = a :=
   rfl
 

stage0/src/Init/Data/Int/Basic.lean

@@ -59,7 +59,14 @@ protected def mul (m n : @& Int) : Int :=
   | negSucc m, ofNat n   => negOfNat (succ m * n)
   | negSucc m, negSucc n => ofNat (succ m * succ n)
 
-@[defaultInstance]
+/-
+  The `Neg Int` default instance must have priority higher than `low` since
+  the default instance `OfNat Nat n` has `low` priority.
+  ```
+  #check -42
+  ```
+-/
+@[defaultInstance mid]
 instance : Neg Int where
   neg := Int.neg
 instance : Add Int where

stage0/src/Init/Data/OfScientific.lean

@@ -4,6 +4,7 @@ Released under Apache 2.0 license as described in the file LICENSE.
 Authors: Leonardo de Moura
 -/
 prelude
+import Init.Meta
 import Init.Data.Float
 import Init.Data.Nat
 
@@ -15,6 +16,13 @@ import Init.Data.Nat
 class OfScientific (α : Type u) where
   ofScientific : Nat → Bool → Nat → α
 
-@[defaultInstance low]
+/-
+  The `OfScientifi Float` must have priority higher than `mid` since
+  the default instance `Neg Int` has `mid` priority.
+  ```
+  #check -42.0 -- must be Float
+  ```
+-/
+@[defaultInstance mid+1]
 instance : OfScientific Float where
   ofScientific m s e := Float.ofScientific m s e

stage0/src/Init/Notation.lean

@@ -32,6 +32,7 @@ macro "maxPrec!" : term => `(1024)
 
 macro "default" : prio => `(1000)
 macro "low"     : prio => `(100)
+macro "mid"     : prio => `(1000)
 macro "high"    : prio => `(10000)
 macro "(" p:prio ")" : prio => p
 

stage0/src/Init/Prelude.lean

@@ -89,6 +89,12 @@ theorem Eq.symm {α : Sort u} {a b : α} (h : Eq a b) : Eq b a :=
 theorem congrArg {α : Sort u} {β : Sort v} {a₁ a₂ : α} (f : α → β) (h : Eq a₁ a₂) : Eq (f a₁) (f a₂) :=
   h ▸ rfl
 
+theorem congr {α : Sort u} {β : Sort v} {f₁ f₂ : α → β} {a₁ a₂ : α} (h₁ : Eq f₁ f₂) (h₂ : Eq a₁ a₂) : Eq (f₁ a₁) (f₂ a₂) :=
+  h₁ ▸ h₂ ▸ rfl
+
+theorem congrFun {α : Sort u} {β : α → Sort v} {f g : (x : α) →  β x} (h : Eq f g) (a : α) : Eq (f a) (g a) :=
+  h ▸ rfl
+
 /-
 Initialize the Quotient Module, which effectively adds the following definitions:
 

stage0/src/Lean/Compiler/IR/Basic.lean

@@ -392,34 +392,47 @@ def reshape (bs : Array FnBody) (term : FnBody) : FnBody :=
 @[export lean_ir_mk_alt] def mkAlt (n : Name) (cidx : Nat) (size : Nat) (usize : Nat) (ssize : Nat) (b : FnBody) : Alt :=
   Alt.ctor ⟨n, cidx, size, usize, ssize⟩ b
 
+/-- Extra information associated with a declaration. -/
+structure DeclInfo where
+  /-- If `some <blame>`, then declaration depends on `<blame>` which uses a `sorry` axiom. -/
+  sorryDep? : Option Name := none
+
 inductive Decl where
-  | fdecl  (f : FunId) (xs : Array Param) (ty : IRType) (b : FnBody)
-  | extern (f : FunId) (xs : Array Param) (ty : IRType) (ext : ExternAttrData)
+  | fdecl  (f : FunId) (xs : Array Param) (type : IRType) (body : FnBody) (info : DeclInfo)
+  | extern (f : FunId) (xs : Array Param) (type : IRType) (ext : ExternAttrData)
+  deriving Inhabited
 
 namespace Decl
 
-instance : Inhabited Decl :=
-  ⟨fdecl arbitrary arbitrary IRType.irrelevant arbitrary⟩
-
 def name : Decl → FunId
-  | Decl.fdecl f _ _ _  => f
-  | Decl.extern f _ _ _ => f
+  | Decl.fdecl f ..  => f
+  | Decl.extern f .. => f
 
 def params : Decl → Array Param
-  | Decl.fdecl _ xs _ _  => xs
-  | Decl.extern _ xs _ _ => xs
+  | Decl.fdecl (xs := xs) ..  => xs
+  | Decl.extern (xs := xs) .. => xs
 
 def resultType : Decl → IRType
-  | Decl.fdecl _ _ t _  => t
-  | Decl.extern _ _ t _ => t
+  | Decl.fdecl (type := t) ..  => t
+  | Decl.extern (type := t) .. => t
 
 def isExtern : Decl → Bool
-  | Decl.extern _ _ _ _ => true
+  | Decl.extern .. => true
   | _ => false
 
+def getInfo : Decl → DeclInfo
+  | Decl.fdecl (info := info) .. => info
+  | _ => {}
+
+def updateBody! (d : Decl) (bNew : FnBody) : Decl :=
+  match d with
+  | Decl.fdecl f xs t b info => Decl.fdecl f xs t bNew info
+  | _ => panic! "expected definition"
+
 end Decl
 
-@[export lean_ir_mk_decl] def mkDecl (f : FunId) (xs : Array Param) (ty : IRType) (b : FnBody) : Decl := Decl.fdecl f xs ty b
+@[export lean_ir_mk_decl] def mkDecl (f : FunId) (xs : Array Param) (ty : IRType) (b : FnBody) : Decl :=
+  Decl.fdecl f xs ty b {}
 
 @[export lean_ir_mk_extern_decl] def mkExternDecl (f : FunId) (xs : Array Param) (ty : IRType) (e : ExternAttrData) : Decl :=
   Decl.extern f xs ty e

stage0/src/Lean/Compiler/IR/Borrow.lean

@@ -88,9 +88,9 @@ partial def visitFnBody (fnid : FunId) : FnBody → StateM ParamMap Unit
       let (instr, b) := e.split
       visitFnBody fnid b
 
-  def visitDecls (env : Environment) (decls : Array Decl) : StateM ParamMap Unit :=
+def visitDecls (env : Environment) (decls : Array Decl) : StateM ParamMap Unit :=
   decls.forM fun decl => match decl with
-    | Decl.fdecl f xs _ b => do
+    | Decl.fdecl (f := f) (xs := xs) (body := b) .. => do
       let exported := isExport env f
       modify fun m => m.insert (ParamMap.Key.decl f) (initBorrowIfNotExported exported xs)
       visitFnBody f b
@@ -122,10 +122,10 @@ partial def visitFnBody (fn : FunId) (paramMap : ParamMap) : FnBody → FnBody
 
 def visitDecls (decls : Array Decl) (paramMap : ParamMap) : Array Decl :=
   decls.map fun decl => match decl with
-    | Decl.fdecl f xs ty b =>
+    | Decl.fdecl f xs ty b info =>
       let b := visitFnBody f paramMap b
       match paramMap.find? (ParamMap.Key.decl f) with
-      | some xs => Decl.fdecl f xs ty b
+      | some xs => Decl.fdecl f xs ty b info
       | none    => unreachable!
     | other => other
 
@@ -284,7 +284,7 @@ partial def collectFnBody : FnBody → M Unit
   | e                      => do unless e.isTerminal do collectFnBody e.body
 
 partial def collectDecl : Decl → M Unit
-  | Decl.fdecl f ys _ b   =>
+  | Decl.fdecl (f := f) (xs := ys) (body := b) .. =>
     withReader (fun ctx => let ctx := updateParamSet ctx ys; { ctx with currFn := f }) do
       collectFnBody b
       updateParamMap (ParamMap.Key.decl f)

stage0/src/Lean/Compiler/IR/Boxing.lean

@@ -61,12 +61,12 @@ def mkBoxedVersionAux (decl : Decl) : N Decl := do
   let newVDecls := newVDecls.push (FnBody.vdecl r decl.resultType (Expr.fap decl.name xs) arbitrary)
   let body ←
     if !decl.resultType.isScalar then
-      pure $ reshape newVDecls (FnBody.ret (Arg.var r))
+      pure <| reshape newVDecls (FnBody.ret (Arg.var r))
     else
       let newR ← N.mkFresh
       let newVDecls := newVDecls.push (FnBody.vdecl newR IRType.object (Expr.box decl.resultType r) arbitrary)
-      pure $ reshape newVDecls (FnBody.ret (Arg.var newR))
-  pure $ Decl.fdecl (mkBoxedName decl.name) qs IRType.object body
+      pure <| reshape newVDecls (FnBody.ret (Arg.var newR))
+  return Decl.fdecl (mkBoxedName decl.name) qs IRType.object body decl.getInfo
 
 def mkBoxedVersion (decl : Decl) : Decl :=
   (mkBoxedVersionAux decl).run' 1
@@ -199,11 +199,10 @@ def mkCast (x : VarId) (xType : IRType) (expectedType : IRType) : M Expr := do
     | none   => do
       let auxName  := ctx.f ++ ((`_boxed_const).appendIndexAfter s.nextAuxId)
       let auxConst := Expr.fap auxName #[]
-      let auxDecl  := Decl.fdecl auxName #[] expectedType body
-      modify fun s => {
-       s with
-       auxDecls     := s.auxDecls.push auxDecl,
-       auxDeclCache := s.auxDeclCache.cons body auxConst,
+      let auxDecl  := Decl.fdecl auxName #[] expectedType body {}
+      modify fun s => { s with
+       auxDecls     := s.auxDecls.push auxDecl
+       auxDeclCache := s.auxDeclCache.cons body auxConst
        nextAuxId    := s.nextAuxId + 1
       }
       pure auxConst
@@ -330,11 +329,11 @@ def run (env : Environment) (decls : Array Decl) : Array Decl :=
   let ctx : BoxingContext := { decls := decls, env := env }
   let decls := decls.foldl (init := #[]) fun newDecls decl =>
     match decl with
-    | Decl.fdecl f xs t b =>
+    | Decl.fdecl (f := f) (xs := xs) (type := t) (body := b) .. =>
       let nextIdx  := decl.maxIndex + 1
       let (b, s)   := (withParams xs (visitFnBody b) { ctx with f := f, resultType := t }).run { nextIdx := nextIdx }
       let newDecls := newDecls ++ s.auxDecls
-      let newDecl  := Decl.fdecl f xs t b
+      let newDecl  := decl.updateBody! b
       let newDecl  := newDecl.elimDead
       newDecls.push newDecl
     | d => newDecls.push d

stage0/src/Lean/Compiler/IR/Checker.lean

@@ -149,8 +149,8 @@ partial def checkFnBody : FnBody → M Unit
   | FnBody.unreachable      => pure ()
 
 def checkDecl : Decl → M Unit
-  | Decl.fdecl f xs t b  => withParams xs (checkFnBody b)
-  | Decl.extern f xs t _ => withParams xs (pure ())
+  | Decl.fdecl (xs := xs) (body := b) .. => withParams xs (checkFnBody b)
+  | Decl.extern (xs := xs) .. => withParams xs (pure ())
 
 end Checker
 

stage0/src/Lean/Compiler/IR/ElimDeadBranches.lean

@@ -239,7 +239,7 @@ def inferStep : M Bool := do
   modify fun s => { s with assignments := ctx.decls.map fun _ => {} }
   ctx.decls.size.foldM (init := false) fun idx modified => do
     match ctx.decls[idx] with
-    | Decl.fdecl fid ys _ b => do
+    | Decl.fdecl (xs := ys) (body := b) .. => do
       let s ← get
       let currVals := s.funVals[idx]
       withReader (fun ctx => { ctx with currFnIdx := idx }) do
@@ -271,8 +271,9 @@ partial def elimDeadAux (assignment : Assignment) : FnBody → FnBody
       let b := elimDeadAux assignment b
       instr.setBody b
 
-partial def elimDead (assignment : Assignment) : Decl → Decl
-  | Decl.fdecl fid ys t b => Decl.fdecl fid ys t $ elimDeadAux assignment b
+partial def elimDead (assignment : Assignment) (d : Decl) : Decl :=
+  match d with
+  | Decl.fdecl (body := b) .. => d.updateBody! <| elimDeadAux assignment b
   | other => other
 
 end UnreachableBranches

stage0/src/Lean/Compiler/IR/ElimDeadVars.lean

@@ -39,8 +39,9 @@ partial def FnBody.elimDead (b : FnBody) : FnBody :=
   reshapeWithoutDead bs term
 
 /-- Eliminate dead let-declarations and join points -/
-def Decl.elimDead : Decl → Decl
-  | Decl.fdecl f xs t b => Decl.fdecl f xs t b.elimDead
-  | other               => other
+def Decl.elimDead (d : Decl) : Decl :=
+  match d with
+  | Decl.fdecl (body := b) .. => d.updateBody! b.elimDead
+  | other => other
 
 end Lean.IR

stage0/src/Lean/Compiler/IR/EmitC.lean

@@ -133,7 +133,7 @@ def emitFnDecls : M Unit := do
 def emitMainFn : M Unit := do
   let d ← getDecl `main
   match d with
-  | Decl.fdecl f xs t b => do
+  | Decl.fdecl (f := f) (xs := xs) (type := t) (body := b) .. => do
     unless xs.size == 2 || xs.size == 1 do throw "invalid main function, incorrect arity when generating code"
     let env ← getEnv
     let usesLeanAPI := usesModuleFrom env `Lean
@@ -629,7 +629,7 @@ def emitDeclAux (d : Decl) : M Unit := do
   withReader (fun ctx => { ctx with jpMap := jpMap }) do
   unless hasInitAttr env d.name do
     match d with
-    | Decl.fdecl f xs t b =>
+    | Decl.fdecl (f := f) (xs := xs) (type := t) (body := b) .. =>
       let baseName ← toCName f;
       if xs.size == 0 then
         emit "static "

stage0/src/Lean/Compiler/IR/EmitUtil.lean

@@ -42,8 +42,8 @@ def collectInitDecl (fn : Name) : M Unit := do
   | _           => pure ()
 
 def collectDecl : Decl → M NameSet
-  | Decl.fdecl fn _ _ b  => collectInitDecl fn *> CollectUsedDecls.collectFnBody b *> get
-  | Decl.extern fn _ _ _ => collectInitDecl fn *> get
+  | Decl.fdecl (f := f) (body := b) .. => collectInitDecl f *> CollectUsedDecls.collectFnBody b *> get
+  | Decl.extern (f := f) .. => collectInitDecl f *> get
 
 end CollectUsedDecls
 
@@ -70,7 +70,7 @@ partial def collectFnBody : FnBody → Collector
   | e                       => if e.isTerminal then id else collectFnBody e.body
 
 def collectDecl : Decl → Collector
-  | Decl.fdecl _ xs _ b   => collectParams xs ∘ collectFnBody b
+  | Decl.fdecl (xs := xs) (body := b) .. => collectParams xs ∘ collectFnBody b
   | _ => id
 
 end CollectMaps

stage0/src/Lean/Compiler/IR/ExpandResetReuse.lean

@@ -30,7 +30,7 @@ end CollectProjMap
    This function assumes variable ids have been normalized -/
 def mkProjMap (d : Decl) : ProjMap :=
   match d with
-  | Decl.fdecl _ _ _ b => CollectProjMap.collectFnBody b {}
+  | Decl.fdecl (body := b) .. => CollectProjMap.collectFnBody b {}
   | _ => {}
 
 structure Context where
@@ -265,11 +265,11 @@ partial def searchAndExpand : FnBody → Array FnBody → M FnBody
 
 def main (d : Decl) : Decl :=
   match d with
-  | (Decl.fdecl f xs t b) =>
+  | Decl.fdecl (body := b) .. =>
     let m := mkProjMap d
     let nextIdx := d.maxIndex + 1
-    let b := (searchAndExpand b #[] { projMap := m }).run' nextIdx
-    Decl.fdecl f xs t b
+    let bNew := (searchAndExpand b #[] { projMap := m }).run' nextIdx
+    d.updateBody! bNew
   | d => d
 
 end ExpandResetReuse

stage0/src/Lean/Compiler/IR/Format.lean

@@ -121,8 +121,8 @@ instance : ToString FnBody := ⟨fun b => (format b).pretty⟩
 
 def formatDecl (decl : Decl) (indent : Nat := 2) : Format :=
   match decl with
-  | Decl.fdecl f xs ty b  => "def " ++ format f ++ formatParams xs ++ format " : " ++ format ty ++ " :=" ++ Format.nest indent (Format.line ++ formatFnBody b indent)
-  | Decl.extern f xs ty _ => "extern " ++ format f ++ formatParams xs ++ format " : " ++ format ty
+  | Decl.fdecl f xs ty b _  => "def " ++ format f ++ formatParams xs ++ format " : " ++ format ty ++ " :=" ++ Format.nest indent (Format.line ++ formatFnBody b indent)
+  | Decl.extern f xs ty _   => "extern " ++ format f ++ formatParams xs ++ format " : " ++ format ty
 
 instance : ToFormat Decl := ⟨formatDecl⟩
 

stage0/src/Lean/Compiler/IR/FreeVars.lean

@@ -72,8 +72,8 @@ partial def collectFnBody : FnBody → Collector
   | FnBody.unreachable      => skip
 
 partial def collectDecl : Decl → Collector
-  | Decl.fdecl _ xs _ b  => collectParams xs >> collectFnBody b
-  | Decl.extern _ xs _ _ => collectParams xs
+  | Decl.fdecl (xs := xs) (body := b) .. => collectParams xs >> collectFnBody b
+  | Decl.extern (xs := xs) ..            => collectParams xs
 
 end MaxIndex
 

stage0/src/Lean/Compiler/IR/NormIds.lean

@@ -24,8 +24,8 @@ partial def checkFnBody : FnBody → M Bool
   | b                       => if b.isTerminal then pure true else checkFnBody b.body
 
 partial def checkDecl : Decl → M Bool
-  | Decl.fdecl _ xs _ b  => checkParams xs <&&> checkFnBody b
-  | Decl.extern _ xs _ _ => checkParams xs
+  | Decl.fdecl (xs := xs) (body := b) .. => checkParams xs <&&> checkFnBody b
+  | Decl.extern (xs := xs) .. => checkParams xs
 
 end UniqueIds
 
@@ -112,9 +112,10 @@ partial def normFnBody : FnBody → N FnBody
   | FnBody.ret x           => return FnBody.ret (← normArg x)
   | FnBody.unreachable     => pure FnBody.unreachable
 
-def normDecl : Decl → N Decl
-  | Decl.fdecl f xs t b => withParams xs fun xs => Decl.fdecl f xs t <$> normFnBody b
-  | other               => pure other
+def normDecl (d : Decl) : N Decl :=
+  match d with
+  | Decl.fdecl (xs := xs) (body := b) .. => withParams xs fun xs => return d.updateBody! (← normFnBody b)
+  | other => pure other
 
 end NormalizeIds
 

stage0/src/Lean/Compiler/IR/PushProj.lean

@@ -49,8 +49,9 @@ partial def FnBody.pushProj (b : FnBody) : FnBody :=
   | other => reshape bs term
 
 /-- Push projections inside `case` branches. -/
-def Decl.pushProj : Decl → Decl
-  | Decl.fdecl f xs t b => (Decl.fdecl f xs t b.pushProj).normalizeIds
-  | other               => other
+def Decl.pushProj (d : Decl) : Decl :=
+  match d with
+  | Decl.fdecl (body := b) .. => d.updateBody! b.pushProj |>.normalizeIds
+  | other => other
 
 end Lean.IR

stage0/src/Lean/Compiler/IR/RC.lean

@@ -271,13 +271,14 @@ partial def visitFnBody : FnBody → Context → (FnBody × LiveVarSet)
   | FnBody.unreachable, _ => (FnBody.unreachable, {})
   | other, ctx => (other, {}) -- unreachable if well-formed
 
-partial def visitDecl (env : Environment) (decls : Array Decl) : Decl → Decl
-  | Decl.fdecl f xs t b   =>
+partial def visitDecl (env : Environment) (decls : Array Decl) (d : Decl) : Decl :=
+  match d with
+  | Decl.fdecl (xs := xs) (body := b) .. =>
     let ctx : Context  := { env := env, decls := decls }
     let ctx := updateVarInfoWithParams ctx xs
     let (b, bLiveVars) := visitFnBody b ctx
     let b := addDecForDeadParams ctx xs b bLiveVars
-    Decl.fdecl f xs t b
+    d.updateBody! b
   | other => other
 
 end ExplicitRC

stage0/src/Lean/Compiler/IR/ResetReuse.lean

@@ -148,11 +148,12 @@ end ResetReuse
 
 open ResetReuse
 
-def Decl.insertResetReuse : Decl → Decl
-  | d@(Decl.fdecl f xs t b) =>
+def Decl.insertResetReuse (d : Decl) : Decl :=
+  match d with
+  | Decl.fdecl (body := b) ..=>
     let nextIndex := d.maxIndex + 1
-    let b         := (R b {}).run' nextIndex
-    Decl.fdecl f xs t b
+    let bNew      := (R b {}).run' nextIndex
+    d.updateBody! bNew
   | other => other
 
 end Lean.IR

stage0/src/Lean/Compiler/IR/SimpCase.lean

@@ -66,8 +66,9 @@ partial def FnBody.simpCase (b : FnBody) : FnBody :=
   - Remove unreachable branches.
   - Remove `case` if there is only one branch.
   - Merge most common branches using `Alt.default`. -/
-def Decl.simpCase : Decl → Decl
-  | Decl.fdecl f xs t b => Decl.fdecl f xs t b.simpCase
-  | other               => other
+def Decl.simpCase (d : Decl) : Decl :=
+  match d with
+  | Decl.fdecl (body := b) .. => d.updateBody! b.simpCase
+  | other => other
 
 end Lean.IR

stage0/src/Lean/Meta/Basic.lean

@@ -262,14 +262,14 @@ def mkFreshExprMVarWithId (mvarId : MVarId) (type? : Option Expr := none) (kind
     let type ← mkFreshExprMVar (mkSort u)
     mkFreshExprMVarWithIdCore mvarId type kind userName
 
+def getTransparency : MetaM TransparencyMode :=
+  return (← getConfig).transparency
+
 def shouldReduceAll : MetaM Bool :=
-  return (← read).config.transparency == TransparencyMode.all
+  return (← getTransparency) == TransparencyMode.all
 
 def shouldReduceReducibleOnly : MetaM Bool :=
-  return (← read).config.transparency == TransparencyMode.reducible
-
-def getTransparency : MetaM TransparencyMode :=
-  return (← read).config.transparency
+  return (← getTransparency) == TransparencyMode.reducible
 
 def getMVarDecl (mvarId : MVarId) : MetaM MetavarDecl := do
   let mctx ← getMCtx
@@ -432,7 +432,7 @@ def getTheoremInfo (info : ConstantInfo) : MetaM (Option ConstantInfo) := do
     return none
 
 private def getDefInfoTemp (info : ConstantInfo) : MetaM (Option ConstantInfo) := do
-  match (← read).config.transparency with
+  match (← getTransparency) with
   | TransparencyMode.all => return some info
   | TransparencyMode.default => return some info
   | _ =>
@@ -922,9 +922,15 @@ def normalizeLevel (u : Level) : MetaM Level := do
 def assignLevelMVar (mvarId : MVarId) (u : Level) : MetaM Unit := do
   modifyMCtx fun mctx => mctx.assignLevel mvarId u
 
-def whnfD [MonadLiftT MetaM n] (e : Expr) : n Expr :=
+def whnfR (e : Expr) : MetaM Expr :=
+  withTransparency TransparencyMode.reducible <| whnf e
+
+def whnfD (e : Expr) : MetaM Expr :=
   withTransparency TransparencyMode.default <| whnf e
 
+def whnfI (e : Expr) : MetaM Expr :=
+  withTransparency TransparencyMode.instances <| whnf e
+
 def setInlineAttribute (declName : Name) (kind := Compiler.InlineAttributeKind.inline): MetaM Unit := do
   let env ← getEnv
   match Compiler.setInlineAttribute env declName kind with

stage0/src/Lean/Meta/ForEachExpr.lean

@@ -41,7 +41,7 @@ partial def visit (fn : Expr → MetaM Bool) (e : Expr) : M Unit :=
       | Expr.forallE _ _ _ _   => visitBinder fn #[] 0 e
       | Expr.lam _ _ _ _       => visitBinder fn #[] 0 e
       | Expr.letE _ _ _ _ _    => visitBinder fn #[] 0 e
-      | Expr.app f a _         => do visit fn f; visit fn a
+      | Expr.app f a _         => visit fn f; visit fn a
       | Expr.mdata _ b _       => visit fn b
       | Expr.proj _ _ b _      => visit fn b
       | _                      => pure ()
@@ -50,15 +50,12 @@ end
 
 end ForEachExpr
 
-def forEachExprImp' (e : Expr) (f : Expr → MetaM Bool) : MetaM Unit :=
+/-- Similar to `Expr.forEach'`, but creates free variables whenever going inside of a binder. -/
+def forEachExpr' (e : Expr) (f : Expr → MetaM Bool) : MetaM Unit :=
   ForEachExpr.visit f e |>.run
 
-/-- Similar to `Expr.forEach'`, but creates free variables whenever going inside of a binder. -/
-def forEachExpr' {m} [MonadLiftT MetaM m] (e : Expr) (f : Expr → MetaM Bool) : m Unit :=
-  liftM $ forEachExprImp' e f
-
 /-- Similar to `Expr.forEach`, but creates free variables whenever going inside of a binder. -/
-def forEachExpr {m} [MonadLiftT MetaM m] (e : Expr) (f : Expr → MetaM Unit) : m Unit :=
+def forEachExpr (e : Expr) (f : Expr → MetaM Unit) : MetaM Unit :=
   forEachExpr' e fun e => do
     f e
     pure true

stage0/src/Lean/Meta/InferType.lean

@@ -95,7 +95,7 @@ private def inferConstType (c : Name) (us : List Level) : MetaM Expr := do
 
 private def inferProjType (structName : Name) (idx : Nat) (e : Expr) : MetaM Expr := do
   let failed {α} : Unit → MetaM α := fun _ =>
-    throwError! "invalide projection{indentExpr (mkProj structName idx e)}"
+    throwError! "invalid projection{indentExpr (mkProj structName idx e)}"
   let structType ← inferType e
   let structType ← whnf structType
   matchConstStruct structType.getAppFn failed fun structVal structLvls ctorVal =>

stage0/src/Lean/Meta/SizeOf.lean

@@ -131,30 +131,117 @@ partial def mkSizeOfFn (recName : Name) (declName : Name): MetaM Unit := do
 
 /--
   Create `sizeOf` functions for all inductive datatypes in the mutual inductive declaration containing `typeName`
-  The resulting array contains the generated functions names.
+  The resulting array contains the generated functions names. The `NameMap` maps recursor names into the generated function names.
   There is a function for each element of the mutual inductive declaration, and for auxiliary recursors for nested inductive types.
 -/
-def mkSizeOfFns (typeName : Name) : MetaM (Array Name) := do
+def mkSizeOfFns (typeName : Name) : MetaM (Array Name × NameMap Name) := do
   let indInfo ← getConstInfoInduct typeName
   let recInfo ← getConstInfoRec (mkRecName typeName)
   let numExtra := recInfo.numMotives - indInfo.all.length -- numExtra > 0 for nested inductive types
   let mut result := #[]
   let baseName := indInfo.all.head! ++ `_sizeOf -- we use the first inductive type as the base name for `sizeOf` functions
   let mut i := 1
+  let mut recMap : NameMap Name := {}
   for indTypeName in indInfo.all do
     let sizeOfName := baseName.appendIndexAfter i
-    mkSizeOfFn (mkRecName indTypeName) sizeOfName
+    let recName := mkRecName indTypeName
+    mkSizeOfFn recName sizeOfName
+    recMap := recMap.insert recName sizeOfName
     result := result.push sizeOfName
     i := i + 1
   for j in [:numExtra] do
     let recName := (mkRecName indInfo.all.head!).appendIndexAfter (j+1)
     let sizeOfName := baseName.appendIndexAfter i
     mkSizeOfFn recName sizeOfName
+    recMap := recMap.insert recName sizeOfName
     result := result.push sizeOfName
     i := i + 1
-  return result
+  return (result, recMap)
 
-private def mkSizeOfSpecTheorem (indInfo : InductiveVal) (sizeOfFns : Array Name) (ctorName : Name) : MetaM Unit := do
+/- SizeOf spec theorem for nested inductive types -/
+namespace SizeOfSpecNested
+
+structure Context where
+  indInfo    : InductiveVal
+  sizeOfFns  : Array Name
+  ctorName   : Name
+  params     : Array Expr
+  localInsts : Array Expr
+  recMap     : NameMap Name -- mapping from recursor name into `_sizeOf_<idx>` function name (see `mkSizeOfFns`)
+
+abbrev M := ReaderT Context MetaM
+
+def throwUnexpected {α} (msg : MessageData) : M α := do
+  throwError! "failed to generate sizeOf lemma for {(← read).ctorName} (use `set_option genSizeOfSpec false` to disable lemma generation), {msg}"
+
+def throwFailed {α} : M α := do
+  throwError! "failed to generate sizeOf lemma for {(← read).ctorName}, (use `set_option genSizeOfSpec false` to disable lemma generation)"
+
+/-- Convert a recursor application into a `_sizeOf_<idx>` application. -/
+private def recToSizeOf (e : Expr) : M Expr := do
+  matchConstRec e.getAppFn (fun _ => throwFailed) fun info us => do
+    match (← read).recMap.find? info.name with
+    | none => throwUnexpected m!"expected recursor application {indentExpr e}"
+    | some sizeOfName =>
+      let args    := e.getAppArgs
+      let indices := args[info.getFirstIndexIdx : info.getFirstIndexIdx + info.numIndices]
+      let major   := args[info.getMajorIdx]
+      return mkAppN (mkConst sizeOfName us.tail!) ((← read).params ++ (← read).localInsts ++ indices ++ #[major])
+
+/--
+  Generate proof for `C._sizeOf_<idx> t = sizeOf t` where `C._sizeOf_<idx>` is a auxiliary function
+  generated for a nested inductive type in `C`.
+  For example, given
+  ```lean
+  inductive Expr where
+    | app (f : String) (args : List Expr)
+  ```
+  We generate the auxiliary function `Expr._sizeOf_1 : List Expr → Nat`.
+  To generate the `sizeOf` spec lemma
+  ```
+  sizeOf (Expr.app f args) = 1 + sizeOf f + sizeOf args
+  ```
+  we need an auxiliary lemma for showing `Expr._sizeOf_1 args = sizeOf args`.
+  Recall that `sizeOf (Expr.app f args)` is definitionally equal to `1 + sizeOf f + Expr._sizeOf_1 args`, but
+  `Expr._sizeOf_1 args` is **not** definitionally equal to `sizeOf args`. We need a proof by induction.
+-/
+private def mkSizeOfAuxLemma (lhs rhs : Expr) : M Expr := do
+  -- TODO
+  mkSorry (← mkEq lhs rhs) true
+
+/- Prove SizeOf spec lemma of the form `sizeOf <ctor-application> = 1 + sizeOf <field_1> + ... + sizeOf <field_n> -/
+partial def main (lhs rhs : Expr) : M Expr := do
+  if (← isDefEq lhs rhs) then
+    mkEqRefl rhs
+  else
+    /- Expand lhs and rhs to obtain `Nat.add` applications -/
+    let lhs ← whnfI lhs            -- Expand `sizeOf (ctor ...)` into `_sizeOf_<idx>` application
+    let lhs ← unfoldDefinition lhs -- Unfold `_sizeOf_<idx>` application into `HAdd.hAdd` application
+    loop lhs rhs
+where
+  loop (lhs rhs : Expr) : M Expr := do
+    trace[Meta.sizeOf.loop]! "{lhs} =?= {rhs}"
+    if (← isDefEq lhs rhs) then
+      mkEqRefl rhs
+    else
+      match (← whnfI lhs).natAdd?, (← whnfI rhs).natAdd? with
+      | some (a₁, b₁), some (a₂, b₂) =>
+        let p₁ ← loop a₁ a₂
+        let p₂ ← step b₁ b₂
+        mkCongr (← mkCongrArg (mkConst ``Nat.add) p₁) p₂
+      | _, _ =>
+        throwUnexpected m!"expected 'Nat.add' application, lhs is {indentExpr lhs}\nrhs is{indentExpr rhs}"
+
+  step (lhs rhs : Expr) : M Expr := do
+    if (← isDefEq lhs rhs) then
+      mkEqRefl rhs
+    else
+      let lhs ← recToSizeOf lhs
+      mkSizeOfAuxLemma lhs rhs
+
+end SizeOfSpecNested
+
+private def mkSizeOfSpecTheorem (indInfo : InductiveVal) (sizeOfFns : Array Name) (recMap : NameMap Name) (ctorName : Name) : MetaM Unit := do
   let ctorInfo ← getConstInfoCtor ctorName
   let us := ctorInfo.levelParams.map mkLevelParam
   forallTelescopeReducing ctorInfo.type fun xs _ => do
@@ -173,7 +260,9 @@ private def mkSizeOfSpecTheorem (indInfo : InductiveVal) (sizeOfFns : Array Name
       let thmType ← mkForallFVars thmParams target
       let thmValue ←
         if indInfo.isNested then
-          return () -- TODO
+          SizeOfSpecNested.main lhs rhs |>.run {
+            indInfo := indInfo, sizeOfFns := sizeOfFns, ctorName := ctorName, params := params, localInsts := localInsts, recMap := recMap
+          }
         else
           mkEqRefl rhs
       let thmValue ← mkLambdaFVars thmParams thmValue
@@ -184,11 +273,11 @@ private def mkSizeOfSpecTheorem (indInfo : InductiveVal) (sizeOfFns : Array Name
         value       := thmValue
       }
 
-private def mkSizeOfSpecTheorems (indTypeNames : Array Name) (sizeOfFns : Array Name) : MetaM Unit := do
+private def mkSizeOfSpecTheorems (indTypeNames : Array Name) (sizeOfFns : Array Name) (recMap : NameMap Name) : MetaM Unit := do
   for indTypeName in indTypeNames do
     let indInfo ← getConstInfoInduct indTypeName
     for ctorName in indInfo.ctors do
-      mkSizeOfSpecTheorem indInfo sizeOfFns ctorName
+      mkSizeOfSpecTheorem indInfo sizeOfFns recMap ctorName
   return ()
 
 builtin_initialize
@@ -205,7 +294,7 @@ def mkSizeOfInstances (typeName : Name) : MetaM Unit := do
   if (← getEnv).contains ``SizeOf && generateSizeOfInstance (← getOptions) && !(← isInductivePredicate typeName) then
     let indInfo ← getConstInfoInduct typeName
     unless indInfo.isUnsafe do
-      let fns ← mkSizeOfFns typeName
+      let (fns, recMap) ← mkSizeOfFns typeName
       for indTypeName in indInfo.all, fn in fns do
         let indInfo ← getConstInfoInduct indTypeName
         forallTelescopeReducing indInfo.type fun xs _ =>
@@ -231,7 +320,7 @@ def mkSizeOfInstances (typeName : Name) : MetaM Unit := do
               }
               addInstance instDeclName AttributeKind.global (evalPrio! default)
       if generateSizeOfSpec (← getOptions) then
-        mkSizeOfSpecTheorems indInfo.all.toArray fns
+        mkSizeOfSpecTheorems indInfo.all.toArray fns recMap
 
 builtin_initialize
   registerTraceClass `Meta.sizeOf

stage0/src/Lean/Meta/WHNF.lean

@@ -5,6 +5,7 @@ Authors: Leonardo de Moura
 -/
 import Lean.ToExpr
 import Lean.AuxRecursor
+import Lean.ProjFns
 import Lean.Meta.Basic
 import Lean.Meta.LevelDefEq
 import Lean.Meta.GetConst
@@ -32,7 +33,7 @@ private def useSmartUnfolding (opts : Options) : Bool :=
    =========================== -/
 def isAuxDef (constName : Name) : MetaM Bool := do
   let env ← getEnv
-  pure (isAuxRecursor env constName || isNoConfusion env constName)
+  return isAuxRecursor env constName || isNoConfusion env constName
 
 @[inline] private def matchConstAux {α} (e : Expr) (failK : Unit → MetaM α) (k : ConstantInfo → List Level → MetaM α) : MetaM α :=
   match e with
@@ -47,14 +48,15 @@ def isAuxDef (constName : Name) : MetaM Bool := do
 
 private def getFirstCtor (d : Name) : MetaM (Option Name) := do
   let some (ConstantInfo.inductInfo { ctors := ctor::_, ..}) ← getConstNoEx? d | pure none
-  pure (some ctor)
+  return some ctor
 
 private def mkNullaryCtor (type : Expr) (nparams : Nat) : MetaM (Option Expr) :=
   match type.getAppFn with
   | Expr.const d lvls _ => do
     let (some ctor) ← getFirstCtor d | pure none
-    pure $ mkAppN (mkConst ctor lvls) (type.getAppArgs.shrink nparams)
-  | _ => pure none
+    return mkAppN (mkConst ctor lvls) (type.getAppArgs.shrink nparams)
+  | _ =>
+    return none
 
 def toCtorIfLit : Expr → Expr
   | Expr.lit (Literal.natVal v) _ =>
@@ -66,7 +68,7 @@ def toCtorIfLit : Expr → Expr
 
 private def getRecRuleFor (recVal : RecursorVal) (major : Expr) : Option RecursorRule :=
   match major.getAppFn with
-  | Expr.const fn _ _ => recVal.rules.find? $ fun r => r.ctor == fn
+  | Expr.const fn _ _ => recVal.rules.find? fun r => r.ctor == fn
   | _                 => none
 
 private def toCtorWhenK (recVal : RecursorVal) (major : Expr) : MetaM (Option Expr) := do
@@ -74,16 +76,16 @@ private def toCtorWhenK (recVal : RecursorVal) (major : Expr) : MetaM (Option Ex
   let majorType ← whnf majorType
   let majorTypeI := majorType.getAppFn
   if !majorTypeI.isConstOf recVal.getInduct then
-    pure none
+    return none
   else if majorType.hasExprMVar && majorType.getAppArgs[recVal.numParams:].any Expr.hasExprMVar then
-    pure none
+    return none
   else do
     let (some newCtorApp) ← mkNullaryCtor majorType recVal.numParams | pure none
     let newType ← inferType newCtorApp
     if (← isDefEq majorType newType) then
-      pure newCtorApp
+      return newCtorApp
     else
-      pure none
+      return none
 
 /-- Auxiliary function for reducing recursor applications. -/
 private def reduceRec {α} (recVal : RecursorVal) (recLvls : List Level) (recArgs : Array Expr) (failK : Unit → MetaM α) (successK : Expr → MetaM α) : MetaM α :=
@@ -148,7 +150,7 @@ mutual
   private partial def isRecStuck? (recVal : RecursorVal) (recLvls : List Level) (recArgs : Array Expr) : MetaM (Option MVarId) :=
     if recVal.k then
       -- TODO: improve this case
-      pure none
+      return none
     else do
       let majorIdx := recVal.getMajorIdx
       if h : majorIdx < recArgs.size then do
@@ -156,7 +158,7 @@ mutual
         let major ← whnf major
         getStuckMVar? major
       else
-        pure none
+        return none
 
   private partial def isQuotRecStuck? (recVal : QuotVal) (recLvls : List Level) (recArgs : Array Expr) : MetaM (Option MVarId) :=
     let process? (majorPos : Nat) : MetaM (Option MVarId) :=
@@ -165,11 +167,11 @@ mutual
         let major ← whnf major
         getStuckMVar? major
       else
-        pure none
+        return none
     match recVal.kind with
     | QuotKind.lift => process? 5
     | QuotKind.ind  => process? 4
-    | _             => pure none
+    | _             => return none
 
   /-- Return `some (Expr.mvar mvarId)` if metavariable `mvarId` is blocking reduction. -/
   partial def getStuckMVar? : Expr → MetaM (Option MVarId)
@@ -183,15 +185,15 @@ mutual
     | e@(Expr.app f _ _) =>
       let f := f.getAppFn
       match f with
-      | Expr.mvar mvarId _       => pure (some mvarId)
+      | Expr.mvar mvarId _       => return some mvarId
       | Expr.const fName fLvls _ => do
         let cinfo? ← getConstNoEx? fName
         match cinfo? with
         | some $ ConstantInfo.recInfo recVal  => isRecStuck? recVal fLvls e.getAppArgs
         | some $ ConstantInfo.quotInfo recVal => isQuotRecStuck? recVal fLvls e.getAppArgs
-        | _                                => pure none
-      | _ => pure none
-    | _ => pure none
+        | _                                => return none
+      | _ => return none
+    | _ => return none
 end
 
 /- ===========================
@@ -199,33 +201,34 @@ end
    =========================== -/
 
 /-- Auxiliary combinator for handling easy WHNF cases. It takes a function for handling the "hard" cases as an argument -/
-@[specialize] private partial def whnfEasyCases : Expr → (Expr → MetaM Expr) → MetaM Expr
-  | e@(Expr.forallE _ _ _ _), _ => pure e
-  | e@(Expr.lam _ _ _ _),     _ => pure e
-  | e@(Expr.sort _ _),        _ => pure e
-  | e@(Expr.lit _ _),         _ => pure e
-  | e@(Expr.bvar _ _),        _ => unreachable!
-  | Expr.mdata _ e _,         k => whnfEasyCases e k
-  | e@(Expr.letE _ _ _ _ _),  k => k e
-  | e@(Expr.fvar fvarId _),   k => do
+@[specialize] private partial def whnfEasyCases (e : Expr) (k : Expr → MetaM Expr) : MetaM Expr := do
+  match e with
+  | Expr.forallE ..    => return e
+  | Expr.lam ..        => return e
+  | Expr.sort ..       => return e
+  | Expr.lit ..        => return e
+  | Expr.bvar ..       => unreachable!
+  | Expr.letE ..       => k e
+  | Expr.const ..      => k e
+  | Expr.app ..        => k e
+  | Expr.proj ..       => k e
+  | Expr.mdata _ e _   => whnfEasyCases e k
+  | Expr.fvar fvarId _ =>
     let decl ← getLocalDecl fvarId
     match decl with
-    | LocalDecl.cdecl _ _ _ _ _        => pure e
+    | LocalDecl.cdecl .. => return e
     | LocalDecl.ldecl _ _ _ _ v nonDep =>
       let cfg ← getConfig
       if nonDep && !cfg.zetaNonDep then
-        pure e
+        return e
       else
         when cfg.trackZeta do
           modify fun s => { s with zetaFVarIds := s.zetaFVarIds.insert fvarId }
         whnfEasyCases v k
-  | e@(Expr.mvar mvarId _),   k => do
+  | Expr.mvar mvarId _ =>
     match (← getExprMVarAssignment? mvarId) with
     | some v => whnfEasyCases v k
-    | none   => pure e
-  | e@(Expr.const _ _ _),     k => k e
-  | e@(Expr.app _ _ _),       k => k e
-  | e@(Expr.proj _ _ _ _),    k => k e
+    | none   => return e
 
 /-- Return true iff term is of the form `idRhs ...` -/
 private def isIdRhsApp (e : Expr) : Bool :=
@@ -248,7 +251,8 @@ private def extractIdRhs (e : Expr) : Expr :=
 
 @[specialize] private def deltaBetaDefinition {α} (c : ConstantInfo) (lvls : List Level) (revArgs : Array Expr)
     (failK : Unit → α) (successK : Expr → α) : α :=
-  if c.lparams.length != lvls.length then failK ()
+  if c.lparams.length != lvls.length then
+    failK ()
   else
     let val := c.instantiateValueLevelParams lvls
     let val := val.betaRev revArgs
@@ -262,12 +266,13 @@ inductive ReduceMatcherResult where
 
 def reduceMatcher? (e : Expr) : MetaM ReduceMatcherResult := do
   match e.getAppFn with
-  | Expr.const declName declLevels _ => do
-    let some info ← getMatcherInfo? declName | pure ReduceMatcherResult.notMatcher
+  | Expr.const declName declLevels _ =>
+    let some info ← getMatcherInfo? declName
+      | return ReduceMatcherResult.notMatcher
     let args := e.getAppArgs
     let prefixSz := info.numParams + 1 + info.numDiscrs
     if args.size < prefixSz + info.numAlts then
-      pure ReduceMatcherResult.partialApp
+      return ReduceMatcherResult.partialApp
     else
       let constInfo ← getConstInfo declName
       let f := constInfo.instantiateValueLevelParams declLevels
@@ -294,14 +299,14 @@ def project? (e : Expr) (i : Nat) : MetaM (Option Expr) := do
     let numArgs := e.getAppNumArgs
     let idx := ctorVal.numParams + i
     if idx < numArgs then
-      pure (some (e.getArg! idx))
+      return some (e.getArg! idx)
     else
-      pure none
+      return none
 
 def reduceProj? (e : Expr) : MetaM (Option Expr) := do
   match e with
   | Expr.proj _ i c _ => project? c i
-  | _ => return none
+  | _                 => return none
 
 /--
   Apply beta-reduction, zeta-reduction (i.e., unfold let local-decls), iota-reduction,
@@ -351,61 +356,91 @@ mutual
       if (← Meta.synthPending mvarId) then
         whnfUntilIdRhs e
       else
-        pure e -- failed because metavariable is blocking reduction
+        return e -- failed because metavariable is blocking reduction
     | _ =>
       if isIdRhsApp e then
-        pure e -- done
+        return e -- done
       else
         match (← unfoldDefinition? e) with
         | some e => whnfUntilIdRhs e
         | none   => pure e -- failed because of symbolic argument
 
+  /--
+    Auxiliary method for unfolding a class projection when transparency is set to `TransparencyMode.instances`.
+    Recall that that class instance projections are not marked with `[reducible]` because we want them to be
+    in "reducible canonical form".
+  -/
+  private partial def unfoldProjInst (e : Expr) : MetaM (Option Expr) := do
+    if (← getTransparency) != TransparencyMode.instances then
+      return none
+    else
+      match e.getAppFn with
+      | Expr.const declName .. =>
+        match (← getProjectionFnInfo? declName) with
+        | some { fromClass := true, .. } =>
+          match (← withDefault <| unfoldDefinition? e) with
+          | none   => return none
+          | some e =>
+            match (← reduceProj? e.getAppFn) with
+            | none   => return none
+            | some r => return mkAppN r e.getAppArgs
+        | _ => return none
+      | _ => return none
+
   /-- Unfold definition using "smart unfolding" if possible. -/
   partial def unfoldDefinition? (e : Expr) : MetaM (Option Expr) :=
     match e with
     | Expr.app f _ _ =>
-      matchConstAux f.getAppFn (fun _ => pure none) fun fInfo fLvls => do
+      matchConstAux f.getAppFn (fun _ => unfoldProjInst e) fun fInfo fLvls => do
         if fInfo.lparams.length != fLvls.length then
-          pure none
+          return none
         else
           let unfoldDefault (_ : Unit) : MetaM (Option Expr) :=
             if fInfo.hasValue then
               deltaBetaDefinition fInfo fLvls e.getAppRevArgs (fun _ => pure none) (fun e => pure (some e))
             else
-              pure none
+              return none
           if useSmartUnfolding (← getOptions) then
             let fAuxInfo? ← getConstNoEx? (mkSmartUnfoldingNameFor fInfo.name)
             match fAuxInfo? with
-            | some $ fAuxInfo@(ConstantInfo.defnInfo _) =>
-              deltaBetaDefinition fAuxInfo fLvls e.getAppRevArgs (fun _ => pure none) $ fun e₁ => do
+            | some fAuxInfo@(ConstantInfo.defnInfo _) =>
+              deltaBetaDefinition fAuxInfo fLvls e.getAppRevArgs (fun _ => pure none) fun e₁ => do
                 let e₂ ← whnfUntilIdRhs e₁
                 if isIdRhsApp e₂ then
-                  pure (some (extractIdRhs e₂))
+                  return some (extractIdRhs e₂)
                 else
-                  pure none
+                  return none
             | _ => unfoldDefault ()
           else
             unfoldDefault ()
     | Expr.const name lvls _ => do
       let (some (cinfo@(ConstantInfo.defnInfo _))) ← getConstNoEx? name | pure none
-      deltaDefinition cinfo lvls (fun _ => pure none) (fun e => pure (some e))
-    | _ => pure none
+      deltaDefinition cinfo lvls
+        (fun _ => pure none)
+        (fun e => pure (some e))
+    | _ => return none
 end
 
+def unfoldDefinition (e : Expr) : MetaM Expr := do
+  let some e ← unfoldDefinition? e | throwError! "failed to unfold definition{indentExpr e}"
+  return e
+
 @[specialize] partial def whnfHeadPred (e : Expr) (pred : Expr → MetaM Bool) : MetaM Expr :=
   whnfEasyCases e fun e => do
     let e ← whnfCore e
     if (← pred e) then
         match (← unfoldDefinition? e) with
         | some e => whnfHeadPred e pred
-        | none   => pure e
+        | none   => return e
     else
-      pure e
+      return e
 
 def whnfUntil (e : Expr) (declName : Name) : MetaM (Option Expr) := do
-  let e ← whnfHeadPred e (fun e => pure $ !e.isAppOf declName)
-  if e.isAppOf declName then pure e
-  else pure none
+  let e ← whnfHeadPred e (fun e => return !e.isAppOf declName)
+  if e.isAppOf declName then
+    return e
+  else
+    return none
 
 /-- Try to reduce matcher/recursor/quot applications. We say they are all "morally" recursor applications. -/
 def reduceRecMatcher? (e : Expr) : MetaM (Option Expr) := do
@@ -413,16 +448,16 @@ def reduceRecMatcher? (e : Expr) : MetaM (Option Expr) := do
     return none
   else match (← reduceMatcher? e) with
     | ReduceMatcherResult.reduced e => return e
-    | _ => matchConstAux e.getAppFn (fun _ => pure none) fun cinfo lvls =>
+    | _ => matchConstAux e.getAppFn (fun _ => pure none) fun cinfo lvls => do
       match cinfo with
       | ConstantInfo.recInfo «rec»  => reduceRec «rec» lvls e.getAppArgs (fun _ => pure none) (fun e => pure (some e))
       | ConstantInfo.quotInfo «rec» => reduceQuotRec «rec» lvls e.getAppArgs (fun _ => pure none) (fun e => pure (some e))
-      | c@(ConstantInfo.defnInfo _) => do
+      | c@(ConstantInfo.defnInfo _) =>
         if (← isAuxDef c.name) then
           deltaBetaDefinition c lvls e.getAppRevArgs (fun _ => pure none) (fun e => pure (some e))
         else
-          pure none
-      | _ => pure none
+          return none
+      | _ => return none
 
 unsafe def reduceBoolNativeUnsafe (constName : Name) : MetaM Bool := evalConstCheck Bool `Bool constName
 unsafe def reduceNatNativeUnsafe (constName : Name) : MetaM Nat := evalConstCheck Nat `Nat constName
@@ -433,44 +468,45 @@ def reduceNative? (e : Expr) : MetaM (Option Expr) :=
   match e with
   | Expr.app (Expr.const fName _ _) (Expr.const argName _ _) _ =>
     if fName == `Lean.reduceBool then do
-      let b ← reduceBoolNative argName
-      pure $ toExpr b
+      return toExpr (← reduceBoolNative argName)
     else if fName == `Lean.reduceNat then do
-      let n ← reduceNatNative argName
-      pure $ toExpr n
+      return toExpr (← reduceNatNative argName)
     else
-      pure none
-  | _ => pure none
+      return none
+  | _ =>
+    return none
 
 @[inline] def withNatValue {α} (a : Expr) (k : Nat → MetaM (Option α)) : MetaM (Option α) := do
   let a ← whnf a
   match a with
   | Expr.const `Nat.zero _ _      => k 0
   | Expr.lit (Literal.natVal v) _ => k v
-  | _                             => pure none
+  | _                             => return none
 
 def reduceUnaryNatOp (f : Nat → Nat) (a : Expr) : MetaM (Option Expr) :=
   withNatValue a fun a =>
-  pure $ mkNatLit $ f a
+  return mkNatLit <| f a
 
 def reduceBinNatOp (f : Nat → Nat → Nat) (a b : Expr) : MetaM (Option Expr) :=
   withNatValue a fun a =>
   withNatValue b fun b => do
   trace[Meta.isDefEq.whnf.reduceBinOp]! "{a} op {b}"
-  pure $ mkNatLit $ f a b
+  return mkNatLit <| f a b
 
 def reduceBinNatPred (f : Nat → Nat → Bool) (a b : Expr) : MetaM (Option Expr) := do
   withNatValue a fun a =>
   withNatValue b fun b =>
-  pure $ toExpr $ f a b
+  return toExpr <| f a b
 
 def reduceNat? (e : Expr) : MetaM (Option Expr) :=
   if e.hasFVar || e.hasMVar then
-    pure none
+    return none
   else match e with
     | Expr.app (Expr.const fn _ _) a _                  =>
-      if fn == `Nat.succ then reduceUnaryNatOp Nat.succ a
-      else pure none
+      if fn == `Nat.succ then
+        reduceUnaryNatOp Nat.succ a
+      else
+        return none
     | Expr.app (Expr.app (Expr.const fn _ _) a1 _) a2 _ =>
       if fn == `Nat.add then reduceBinNatOp Nat.add a1 a2
       else if fn == `Nat.sub then reduceBinNatOp Nat.sub a1 a2
@@ -479,8 +515,9 @@ def reduceNat? (e : Expr) : MetaM (Option Expr) :=
       else if fn == `Nat.mod then reduceBinNatOp Nat.mod a1 a2
       else if fn == `Nat.beq then reduceBinNatPred Nat.beq a1 a2
       else if fn == `Nat.ble then reduceBinNatPred Nat.ble a1 a2
-      else pure none
-    | _ => pure none
+      else return none
+    | _ =>
+      return none
 
 
 @[inline] private def useWHNFCache (e : Expr) : MetaM Bool := do

stage0/src/Lean/PrettyPrinter/Delaborator/Builtins.lean

@@ -590,4 +590,10 @@ def delabDo : Delab := whenPPOption getPPNotation do
   let items ← elems.toArray.mapM (`(doSeqItem|$(·):doElem))
   `(do $items:doSeqItem*)
 
+@[builtinDelab app.sorryAx]
+def delabSorryAx : Delab := whenPPOption getPPNotation do
+  unless (← getExpr).isAppOfArity ``sorryAx 2 do
+    failure
+  `(sorry)
+
 end Lean.PrettyPrinter.Delaborator

stage0/src/Lean/ReducibilityAttrs.lean

@@ -9,7 +9,7 @@ namespace Lean
 
 inductive ReducibilityStatus where
   | reducible | semireducible | irreducible
-  deriving Inhabited
+  deriving Inhabited, Repr
 
 builtin_initialize reducibilityAttrs : EnumAttributes ReducibilityStatus ←
   registerEnumAttributes `reducibility

stage0/src/Lean/Util/Recognizers.lean

@@ -44,6 +44,9 @@ namespace Expr
 @[inline] def heq? (p : Expr) : Option (Expr × Expr × Expr × Expr) :=
   p.app4? ``HEq
 
+def natAdd? (e : Expr) : Option (Expr × Expr) :=
+  e.app2? ``Nat.add
+
 @[inline] def arrow? : Expr → Option (Expr × Expr)
   | Expr.forallE _ α β _ => if β.hasLooseBVars then none else some (α, β)
   | _                    => none

stage0/src/Leanpkg.lean

@@ -95,8 +95,8 @@ def buildImports (imports : List String) (leanArgs : List String) : IO Unit := d
   IO.println cfg.leanPath
   IO.println cfg.leanSrcPath
 
-def build (leanArgs : List String) : IO Unit := do
-  execMake [] leanArgs (← configure).leanPath
+def build (makeArgs leanArgs : List String) : IO Unit := do
+  execMake makeArgs leanArgs (← configure).leanPath
 
 def initGitignoreContents :=
   "/build
@@ -127,17 +127,17 @@ def usage :=
 
 Usage: leanpkg <command>
 
-configure              download and build dependencies and print resulting LEAN_PATH
-build [-- <Lean-args>] configure and build *.olean files
-init <name>            create a Lean package in the current directory
+init <name>      create a Lean package in the current directory
+configure        download and build dependencies
+build [<args>]   configure and build *.olean files
 
 See `leanpkg help <command>` for more information on a specific command."
 
 def main : (cmd : String) → (leanpkgArgs leanArgs : List String) → IO Unit
+  | "init",      [Name], []        => init Name
   | "configure", [],     []        => discard <| configure
   | "print-paths", leanpkgArgs, leanArgs => buildImports leanpkgArgs leanArgs
-  | "build",     _,      leanArgs  => build leanArgs
-  | "init",      [Name], []        => init Name
+  | "build",     makeArgs, leanArgs  => build makeArgs leanArgs
   | "help",      ["configure"], [] => IO.println "Download dependencies
 
 Usage:
@@ -152,12 +152,21 @@ is made of local dependencies."
   | "help",       ["build"], []    => IO.println "download dependencies and build *.olean files
 
 Usage:
-  leanpkg build [-- <lean-args>]
+  leanpkg build [<leanmake-args>] [-- <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."
+This command invokes `leanpkg configure` followed by `leanmake <leanmake-args> LEAN_OPTS=<lean-args>`.
+If defined, the `package.timeout` configuration value is passed to Lean via its `-T` parameter.
+If no <lean-args> are given, only .olean files will be produced in `build/`. If `lib` or `bin`
+is passed instead, the extracted C code is compiled with `c++` and a static library in `build/lib`
+or an executable in `build/bin`, respectively, is created. `leanpkg build bin` requires a declaration
+of name `main` in the root namespace, which must return `IO Unit` or `IO UInt32` (the exit code) and
+may accept the program's command line arguments as a `List String` parameter.
+
+NOTE: building and linking dependent libraries currently has to be done manually, e.g.
+```
+$ (cd a; leanpkg build lib)
+$ (cd b; leanpkg build bin LINK_OPTS=../a/build/lib/libA.a)
+```"
   | "help",       ["init"], []     => IO.println "Create a new Lean package in the current directory
 
 Usage:

stage0/src/bin/leanc.in

@@ -10,12 +10,14 @@
 # * `-U LEAN_MULTI_THREAD` can be used to optimize programs not making use of multi-threading
 # * `-print-cflags`: print C compiler flags necessary for building against the Lean runtime and abort
 # * `-print-ldlags`: print C compiler flags necessary for statically linking against the Lean library and abort
+# * Set the `LEANC_GMP` environment variable to a path to `libgmp.a` (or `-l:libgmp.a` on Linux) to link GMP statically.
+#   Beware of the licensing consequences since GMP is LGPL.
 
 set -e
 bindir=$(dirname $0)
 
 cflags=("-I$bindir/../include")
-ldflags=("-L$bindir/../lib/lean" "-lgmp" @LEANC_EXTRA_FLAGS@)
+ldflags=("-L$bindir/../lib/lean" "${LEANC_GMP:--lgmp}" @LEANC_EXTRA_FLAGS@)
 ldflags_ext=(@LEANC_STATIC_LINKER_FLAGS@)
 for arg in "$@"; do
     # passed -shared ~> switch to shared linker flags

stage0/src/include/lean/lean.h

@@ -310,6 +310,7 @@ static inline unsigned lean_get_slot_idx(unsigned sz) {
 void * lean_alloc_small(unsigned sz, unsigned slot_idx);
 void lean_free_small(void * p);
 unsigned lean_small_mem_size(void * p);
+void lean_inc_heartbeat();
 
 static inline lean_object * lean_alloc_small_object(unsigned sz) {
 #ifdef LEAN_SMALL_ALLOCATOR
@@ -318,6 +319,7 @@ static inline lean_object * lean_alloc_small_object(unsigned sz) {
     assert(sz <= LEAN_MAX_SMALL_OBJECT_SIZE);
     return (lean_object*)lean_alloc_small(sz, slot_idx);
 #else
+    lean_inc_heartbeat();
     void * mem = malloc(sizeof(size_t) + sz);
     if (mem == 0) lean_panic_out_of_memory();
     *(size_t*)mem = sz;

stage0/src/library/constructions/projection.cpp

@@ -98,7 +98,7 @@ environment mk_projections(environment const & env, name const & n, buffer<name>
         expr proj_val  = mk_proj(n, i, c);
         proj_val = lctx.mk_lambda(proj_args, proj_val);
         declaration new_d = mk_definition_inferring_unsafe(env, proj_name, lvl_params, proj_type, proj_val,
-                                                         reducibility_hints::mk_abbreviation());
+                                                           reducibility_hints::mk_abbreviation());
         new_env = new_env.add(new_d);
         if (!inst_implicit)
             new_env = set_reducible(new_env, proj_name, reducible_status::Reducible, true);

stage0/src/runtime/alloc.cpp

@@ -389,9 +389,17 @@ extern "C" void * lean_alloc_small(unsigned sz, unsigned slot_idx) {
     return r;
 }
 
+/* Helper function for increasing hearbeat even when LEAN_SMALL_ALLOCATOR is not defined */
+extern "C" void lean_inc_heartbeat() {
+    if (g_heap)
+        g_heap->m_heartbeat++;
+}
+
 uint64_t get_num_heartbeats() {
-    lean_assert(g_heap);
-    return g_heap->m_heartbeat;
+    if (g_heap)
+        return g_heap->m_heartbeat;
+    else
+        return 0;
 }
 
 void * alloc(size_t sz) {
@@ -447,10 +455,8 @@ extern "C" unsigned lean_small_mem_size(void * o) {
 }
 
 void initialize_alloc() {
-#ifdef LEAN_SMALL_ALLOCATOR
     g_heap_manager = new heap_manager();
     init_heap(true);
-#endif
 }
 
 void finalize_alloc() {

stage0/src/stdlib.make.in

@@ -1,7 +1,10 @@
 SHELL := /usr/bin/env bash -euo pipefail
 
 # any absolute path to the stdlib breaks the Makefile
-# undefine LEAN_PATH
+LEAN_PATH=
+
+# link GMP statically if STATIC=ON
+LEANC_GMP="${GMP_LIBRARIES}"
 
 # LEAN_OPTS: don't use native code (except for primitives) since it is from the previous stage
 # MORE_DEPS: rebuild the stdlib whenever the compiler has changed

stage0/stdlib/Init/Coe.c

@@ -80,11 +80,9 @@ lean_object* l_instHOrElse__2___rarg(lean_object*, lean_object*, lean_object*, l
 lean_object* l_optionCoe___rarg(lean_object*);
 lean_object* l_instHAppend__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_hasOfNatOfCoe(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(lean_object*);
 lean_object* l_instHMod__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_coeOfDep___rarg(lean_object*);
 lean_object* l_instHAdd__1(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_coeOfTC(lean_object*, lean_object*);
 uint8_t l_coeDecidableEq(uint8_t);
 lean_object* l_term_u2191_____closed__1;
@@ -101,11 +99,13 @@ extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_coe(lean_object*, lean_object*, lean_object*);
 lean_object* l_coeDecidableEq___boxed(lean_object*);
 lean_object* l_instCoeTail__1(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_coeOfDep___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_instHMod__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_coeTrans___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 lean_object* l_optionCoe(lean_object*);
+lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(lean_object*);
 lean_object* l_instHMod__2(lean_object*, lean_object*);
 lean_object* l_instHAppend__2(lean_object*, lean_object*);
 lean_object* l_coeM(lean_object*, lean_object*, lean_object*);
@@ -448,7 +448,7 @@ x_24 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_24, 0, x_23);
 lean_ctor_set(x_24, 1, x_22);
 x_25 = lean_array_push(x_21, x_24);
-x_26 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_26 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
@@ -485,7 +485,7 @@ x_41 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_41, 0, x_40);
 lean_ctor_set(x_41, 1, x_39);
 x_42 = lean_array_push(x_38, x_41);
-x_43 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_43 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_44 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_44, 0, x_43);
 lean_ctor_set(x_44, 1, x_42);
@@ -501,7 +501,7 @@ lean_object* l_unexpand____x40_Init_Coe___hyg_149_(lean_object* x_1, lean_object
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -557,7 +557,7 @@ lean_object* x_18; lean_object* x_19; lean_object* x_20; uint8_t x_21;
 x_18 = lean_unsigned_to_nat(0u);
 x_19 = l_Lean_Syntax_getArg(x_8, x_18);
 lean_dec(x_8);
-x_20 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_20 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_21 = !lean_is_exclusive(x_20);
 if (x_21 == 0)
 {

stage0/stdlib/Init/Control/Basic.c

@@ -14,14 +14,14 @@
 extern "C" {
 #endif
 lean_object* l_term___x3c_x7c_x7c_x3e_____closed__3;
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611____closed__2;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613____closed__2;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_term___x3c_x26_x3e__;
 lean_object* l_term___x3c_x7c_x7c_x3e__;
 lean_object* l_instMonadControlT___rarg___lambda__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_control___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_unexpand____x40_Init_Control_Basic___hyg_576_(lean_object*, lean_object*);
-lean_object* l_unexpand____x40_Init_Control_Basic___hyg_916_(lean_object*, lean_object*);
+lean_object* l_unexpand____x40_Init_Control_Basic___hyg_578_(lean_object*, lean_object*);
+lean_object* l_unexpand____x40_Init_Control_Basic___hyg_918_(lean_object*, lean_object*);
 lean_object* l_unexpand____x40_Init_Control_Basic___hyg_38_(lean_object*, lean_object*);
 lean_object* l_term___x3c_x7c_x7c_x3e_____closed__5;
 lean_object* l_guard___rarg(lean_object*, lean_object*, uint8_t);
@@ -57,7 +57,7 @@ lean_object* l_andM___rarg(lean_object*, lean_object*, lean_object*, lean_object
 lean_object* l_term___x3c_x26_x3e_____closed__1;
 lean_object* l_instOrElse___rarg(lean_object*);
 lean_object* l_unless___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611____closed__6;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613____closed__6;
 lean_object* l_instMonadControlT___rarg___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_optional___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_term___x3c_x26_x26_x3e_____closed__5;
@@ -71,25 +71,22 @@ lean_object* l_instMonadFunctorT___rarg___lambda__1(lean_object*, lean_object*,
 lean_object* l_notM___rarg___closed__1;
 lean_object* l_guard___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Control_Basic___hyg_57____closed__7;
-lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(lean_object*);
 lean_object* l_term___x3c_x26_x3e_____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1;
 lean_object* l_orM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_orM_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951____closed__6;
 extern lean_object* l_term_x2d_____closed__5;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953____closed__6;
 lean_object* l_myMacro____x40_Init_Control_Basic___hyg_57____closed__3;
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611_(lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613_(lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Control_Basic___hyg_57_(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951_(lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953_(lean_object*, lean_object*, lean_object*);
 lean_object* l_instMonadControlT__1___rarg___lambda__2(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__10;
 extern lean_object* l_term___xd7_____closed__5;
 lean_object* l_bool___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953____closed__3;
 lean_object* l_instMonadControlT___rarg___lambda__5(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951____closed__3;
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_notM(lean_object*);
 lean_object* l_instMonadControlT___rarg___lambda__2(lean_object*, lean_object*, lean_object*);
@@ -97,34 +94,37 @@ lean_object* l_bool(lean_object*, lean_object*);
 lean_object* l_term___x3c_x26_x26_x3e_____closed__2;
 lean_object* l_myMacro____x40_Init_Control_Basic___hyg_57____closed__5;
 lean_object* l_instMonadControlT__1___rarg___lambda__2___closed__1;
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951____closed__5;
 lean_object* l_myMacro____x40_Init_Control_Basic___hyg_57____closed__6;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953____closed__5;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Functor_mapRev___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_instToBoolBool(uint8_t);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_11944____closed__5;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4;
 lean_object* l_term___x3c_x26_x3e_____closed__3;
 lean_object* l_instMonadControlT__1___rarg___closed__1;
 lean_object* l_instMonadControlT___rarg(lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4;
+lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(lean_object*);
 lean_object* l_orM___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1;
 lean_object* l_term___x3c_x26_x3e_____closed__6;
 lean_object* l_instMonadControlT__1___rarg___lambda__1(lean_object*, lean_object*);
 lean_object* l_optional___rarg___lambda__1(lean_object*);
 lean_object* l_orM___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951____closed__2;
 lean_object* l_term___x3c_x7c_x7c_x3e_____closed__4;
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953____closed__2;
 lean_object* l_andM___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_andM_match__1(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12018____closed__5;
 lean_object* l_term___x3c_x26_x26_x3e_____closed__6;
 lean_object* l_bool___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_orM_match__1___rarg(uint8_t, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611____closed__5;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613____closed__5;
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611____closed__3;
 lean_object* l_term___x3c_x26_x26_x3e_____closed__4;
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613____closed__3;
 lean_object* l_unless(lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 lean_object* l_unless___rarg(lean_object*, lean_object*, uint8_t, lean_object*);
@@ -276,7 +276,7 @@ static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_57____closed
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_11944____closed__5;
+x_1 = l_myMacro____x40_Init_Notation___hyg_12018____closed__5;
 x_2 = l_myMacro____x40_Init_Control_Basic___hyg_57____closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -361,7 +361,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -399,7 +399,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -415,7 +415,7 @@ lean_object* l_unexpand____x40_Init_Control_Basic___hyg_38_(lean_object* x_1, le
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -473,7 +473,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -1002,7 +1002,7 @@ x_1 = l_term___x3c_x7c_x7c_x3e_____closed__6;
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -1010,22 +1010,22 @@ x_1 = lean_mk_string("orM");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__2() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1;
+x_1 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__3() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1;
+x_1 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__2;
+x_3 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1033,41 +1033,41 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1;
+x_2 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__5() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4;
+x_2 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4;
 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;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__6() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__5;
+x_2 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__5;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_611_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_613_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -1104,10 +1104,10 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_2, 1);
 lean_inc(x_16);
 lean_dec(x_2);
-x_17 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4;
+x_17 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4;
 x_18 = l_Lean_addMacroScope(x_16, x_17, x_15);
-x_19 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__3;
-x_20 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__6;
+x_19 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__3;
+x_20 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__6;
 x_21 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_21, 0, x_14);
 lean_ctor_set(x_21, 1, x_19);
@@ -1122,7 +1122,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -1142,10 +1142,10 @@ lean_inc(x_33);
 x_34 = lean_ctor_get(x_2, 1);
 lean_inc(x_34);
 lean_dec(x_2);
-x_35 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4;
+x_35 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4;
 x_36 = l_Lean_addMacroScope(x_34, x_35, x_33);
-x_37 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__3;
-x_38 = l_myMacro____x40_Init_Control_Basic___hyg_611____closed__6;
+x_37 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__3;
+x_38 = l_myMacro____x40_Init_Control_Basic___hyg_613____closed__6;
 x_39 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_39, 0, x_31);
 lean_ctor_set(x_39, 1, x_37);
@@ -1160,7 +1160,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -1172,11 +1172,11 @@ return x_49;
 }
 }
 }
-lean_object* l_unexpand____x40_Init_Control_Basic___hyg_576_(lean_object* x_1, lean_object* x_2) {
+lean_object* l_unexpand____x40_Init_Control_Basic___hyg_578_(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -1234,7 +1234,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -1456,7 +1456,7 @@ x_1 = l_term___x3c_x26_x26_x3e_____closed__6;
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -1464,22 +1464,22 @@ x_1 = lean_mk_string("andM");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__2() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1;
+x_1 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__3() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1;
+x_1 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__2;
+x_3 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -1487,41 +1487,41 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1;
+x_2 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__5() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4;
+x_2 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4;
 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;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__6() {
+static lean_object* _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__5;
+x_2 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__5;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l_myMacro____x40_Init_Control_Basic___hyg_951_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_myMacro____x40_Init_Control_Basic___hyg_953_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -1558,10 +1558,10 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_2, 1);
 lean_inc(x_16);
 lean_dec(x_2);
-x_17 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4;
+x_17 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4;
 x_18 = l_Lean_addMacroScope(x_16, x_17, x_15);
-x_19 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__3;
-x_20 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__6;
+x_19 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__3;
+x_20 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__6;
 x_21 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_21, 0, x_14);
 lean_ctor_set(x_21, 1, x_19);
@@ -1576,7 +1576,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -1596,10 +1596,10 @@ lean_inc(x_33);
 x_34 = lean_ctor_get(x_2, 1);
 lean_inc(x_34);
 lean_dec(x_2);
-x_35 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4;
+x_35 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4;
 x_36 = l_Lean_addMacroScope(x_34, x_35, x_33);
-x_37 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__3;
-x_38 = l_myMacro____x40_Init_Control_Basic___hyg_951____closed__6;
+x_37 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__3;
+x_38 = l_myMacro____x40_Init_Control_Basic___hyg_953____closed__6;
 x_39 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_39, 0, x_31);
 lean_ctor_set(x_39, 1, x_37);
@@ -1614,7 +1614,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -1626,11 +1626,11 @@ return x_49;
 }
 }
 }
-lean_object* l_unexpand____x40_Init_Control_Basic___hyg_916_(lean_object* x_1, lean_object* x_2) {
+lean_object* l_unexpand____x40_Init_Control_Basic___hyg_918_(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -1688,7 +1688,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -2020,18 +2020,18 @@ l_term___x3c_x7c_x7c_x3e_____closed__6 = _init_l_term___x3c_x7c_x7c_x3e_____clos
 lean_mark_persistent(l_term___x3c_x7c_x7c_x3e_____closed__6);
 l_term___x3c_x7c_x7c_x3e__ = _init_l_term___x3c_x7c_x7c_x3e__();
 lean_mark_persistent(l_term___x3c_x7c_x7c_x3e__);
-l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1 = _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_611____closed__1);
-l_myMacro____x40_Init_Control_Basic___hyg_611____closed__2 = _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__2();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_611____closed__2);
-l_myMacro____x40_Init_Control_Basic___hyg_611____closed__3 = _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__3();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_611____closed__3);
-l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4 = _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_611____closed__4);
-l_myMacro____x40_Init_Control_Basic___hyg_611____closed__5 = _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__5();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_611____closed__5);
-l_myMacro____x40_Init_Control_Basic___hyg_611____closed__6 = _init_l_myMacro____x40_Init_Control_Basic___hyg_611____closed__6();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_611____closed__6);
+l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1 = _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_613____closed__1);
+l_myMacro____x40_Init_Control_Basic___hyg_613____closed__2 = _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__2();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_613____closed__2);
+l_myMacro____x40_Init_Control_Basic___hyg_613____closed__3 = _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__3();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_613____closed__3);
+l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4 = _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_613____closed__4);
+l_myMacro____x40_Init_Control_Basic___hyg_613____closed__5 = _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__5();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_613____closed__5);
+l_myMacro____x40_Init_Control_Basic___hyg_613____closed__6 = _init_l_myMacro____x40_Init_Control_Basic___hyg_613____closed__6();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_613____closed__6);
 l_term___x3c_x26_x26_x3e_____closed__1 = _init_l_term___x3c_x26_x26_x3e_____closed__1();
 lean_mark_persistent(l_term___x3c_x26_x26_x3e_____closed__1);
 l_term___x3c_x26_x26_x3e_____closed__2 = _init_l_term___x3c_x26_x26_x3e_____closed__2();
@@ -2046,18 +2046,18 @@ l_term___x3c_x26_x26_x3e_____closed__6 = _init_l_term___x3c_x26_x26_x3e_____clos
 lean_mark_persistent(l_term___x3c_x26_x26_x3e_____closed__6);
 l_term___x3c_x26_x26_x3e__ = _init_l_term___x3c_x26_x26_x3e__();
 lean_mark_persistent(l_term___x3c_x26_x26_x3e__);
-l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1 = _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_951____closed__1);
-l_myMacro____x40_Init_Control_Basic___hyg_951____closed__2 = _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__2();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_951____closed__2);
-l_myMacro____x40_Init_Control_Basic___hyg_951____closed__3 = _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__3();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_951____closed__3);
-l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4 = _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_951____closed__4);
-l_myMacro____x40_Init_Control_Basic___hyg_951____closed__5 = _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__5();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_951____closed__5);
-l_myMacro____x40_Init_Control_Basic___hyg_951____closed__6 = _init_l_myMacro____x40_Init_Control_Basic___hyg_951____closed__6();
-lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_951____closed__6);
+l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1 = _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_953____closed__1);
+l_myMacro____x40_Init_Control_Basic___hyg_953____closed__2 = _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__2();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_953____closed__2);
+l_myMacro____x40_Init_Control_Basic___hyg_953____closed__3 = _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__3();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_953____closed__3);
+l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4 = _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_953____closed__4);
+l_myMacro____x40_Init_Control_Basic___hyg_953____closed__5 = _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__5();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_953____closed__5);
+l_myMacro____x40_Init_Control_Basic___hyg_953____closed__6 = _init_l_myMacro____x40_Init_Control_Basic___hyg_953____closed__6();
+lean_mark_persistent(l_myMacro____x40_Init_Control_Basic___hyg_953____closed__6);
 l_notM___rarg___closed__1 = _init_l_notM___rarg___closed__1();
 lean_mark_persistent(l_notM___rarg___closed__1);
 l_instMonadControlT__1___rarg___lambda__2___closed__1 = _init_l_instMonadControlT__1___rarg___lambda__2___closed__1();

stage0/stdlib/Init/Core.c

@@ -53,6 +53,7 @@ extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Eq_ndrecOn___rarg(lean_object*);
 lean_object* l_term___x21_x3d_____closed__2;
 lean_object* l_instHasLessProd(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Core___hyg_1792____closed__2;
 lean_object* l_term___u2260_____closed__1;
 lean_object* l_Quot_liftOn___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_instDecidableEqProd_match__2(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -75,11 +76,13 @@ lean_object* l_term___u2260_____closed__5;
 lean_object* l_term___x21_x3d_____closed__3;
 lean_object* l_term___u2260_____closed__3;
 lean_object* l_prodHasDecidableLt___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Core___hyg_1792____closed__4;
 lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_Quotient_recOnSubsingleton___rarg(lean_object*, lean_object*);
 lean_object* l_Task_get___boxed(lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_172____closed__1;
 lean_object* l_Task_map___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Core___hyg_1792____closed__1;
 lean_object* l_instDecidableEqProd_match__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Decidable_byCases___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_term___u2248__;
@@ -111,6 +114,7 @@ lean_object* l_Subtype_instDecidableEqSubtype___rarg(lean_object*, lean_object*,
 lean_object* l_term___x3c_x2d_x3e_____closed__6;
 lean_object* l_Quotient_mk___boxed(lean_object*, lean_object*);
 lean_object* l_instDecidableEqQuotient___boxed(lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Core___hyg_1792____closed__6;
 lean_object* l_instDecidableDite___rarg(uint8_t, lean_object*, lean_object*);
 lean_object* l_term___u2260_____closed__6;
 lean_object* l_Eq_mpr(lean_object*, lean_object*, lean_object*);
@@ -132,11 +136,10 @@ lean_object* l_instDecidableEqQuotient_match__1(lean_object*, lean_object*, lean
 lean_object* l_Quot_hrecOn(lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_960_(lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_428_(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Core___hyg_1855_(lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Core___hyg_1792_(lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_1371_(lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_172_(lean_object*, lean_object*, lean_object*);
 lean_object* l_Task_Priority_dedicated;
-lean_object* l_myMacro____x40_Init_Core___hyg_1855____closed__5;
 lean_object* l_instDecidableEqProd_match__3___rarg(lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_172____closed__4;
 lean_object* l_Sum_inhabitedRight___rarg(lean_object*);
@@ -157,18 +160,16 @@ lean_object* l_Quotient_hrecOn___boxed(lean_object*, lean_object*, lean_object*)
 lean_object* l_Quotient_rec(lean_object*, lean_object*, lean_object*);
 lean_object* l_Quotient_liftOn_u2082___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_960____closed__1;
-lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(lean_object*);
 lean_object* l_instInhabitedNonScalar;
 lean_object* l_instDecidableIte_match__1___rarg(uint8_t, lean_object*, lean_object*);
 lean_object* l_unexpand____x40_Init_Core___hyg_941_(lean_object*, lean_object*);
 lean_object* l_unexpand____x40_Init_Core___hyg_1352_(lean_object*, lean_object*);
 lean_object* l_unexpand____x40_Init_Core___hyg_409_(lean_object*, lean_object*);
 lean_object* l_unexpand____x40_Init_Core___hyg_153_(lean_object*, lean_object*);
-lean_object* l_unexpand____x40_Init_Core___hyg_1836_(lean_object*, lean_object*);
+lean_object* l_unexpand____x40_Init_Core___hyg_1773_(lean_object*, lean_object*);
 lean_object* l_instDecidableIff(lean_object*, lean_object*);
 uint8_t l_instDecidableIff___rarg(uint8_t, uint8_t);
 lean_object* l_term___x3c_x2d_x3e_____closed__5;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_instDecidableIte_match__1(lean_object*, lean_object*);
 lean_object* l_term___u2194__;
 uint8_t l_strictOr(uint8_t, uint8_t);
@@ -205,21 +206,23 @@ lean_object* l_Subtype_instInhabitedSubtype___rarg___boxed(lean_object*, lean_ob
 lean_object* l_Decidable_byCases_match__1___rarg(uint8_t, lean_object*, lean_object*);
 lean_object* l_instInhabitedProd___rarg(lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_1371____closed__6;
-lean_object* l_myMacro____x40_Init_Core___hyg_1855____closed__3;
 uint8_t l_instInhabitedBool;
 uint8_t l_instDecidableFalse;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_instDecidableArrow(lean_object*, lean_object*);
 lean_object* l_term___x3c_x2d_x3e_____closed__2;
 lean_object* l_prodHasDecidableLt___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Quotient_mk___rarg(lean_object*);
 lean_object* l_Prod_map___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_task_bind(lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Core___hyg_1792____closed__3;
 lean_object* l_instDecidableEqProd_match__4___rarg(lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Core___hyg_1792____closed__5;
 uint8_t l_bne___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Core___hyg_1855____closed__6;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 lean_object* l_instDecidableEqSum(lean_object*, lean_object*);
 lean_object* l_Subtype_instInhabitedSubtype(lean_object*, lean_object*);
+lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(lean_object*);
 lean_object* l_Quot_recOnSubsingleton___rarg(lean_object*, lean_object*);
 lean_object* l_Sum_inhabitedLeft(lean_object*, lean_object*);
 lean_object* l_Quotient_mk___rarg___boxed(lean_object*);
@@ -232,7 +235,6 @@ lean_object* l_instDecidableEqProd(lean_object*, lean_object*);
 lean_object* l_Quot_liftOn(lean_object*, lean_object*, lean_object*);
 lean_object* l_term___u2194_____closed__6;
 lean_object* l_instDecidableDite___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Core___hyg_1855____closed__1;
 lean_object* l_prodHasDecidableLt___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Quot_rec(lean_object*, lean_object*, lean_object*);
 lean_object* l_Decidable_byCases_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -255,7 +257,6 @@ lean_object* l_Prod_map(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_term___x21_x3d_____closed__4;
 lean_object* l_instDecidableEqProd_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Quot_indep___rarg(lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Core___hyg_1855____closed__2;
 lean_object* l_Eq_mp___rarg___boxed(lean_object*);
 lean_object* l_term___u2248_____closed__3;
 lean_object* l_Decidable_byCases___rarg(uint8_t, lean_object*, lean_object*);
@@ -297,7 +298,6 @@ lean_object* lean_task_get_own(lean_object*);
 lean_object* l_instInhabitedPUnit;
 uint8_t l_decidableOfDecidableOfIff___rarg(uint8_t, lean_object*);
 lean_object* l_term___u2194_____closed__3;
-lean_object* l_myMacro____x40_Init_Core___hyg_1855____closed__4;
 lean_object* l_instDecidableIte_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_myMacro____x40_Init_Core___hyg_172____closed__3;
 lean_object* lean_thunk_bind(lean_object*, lean_object*);
@@ -625,7 +625,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -663,7 +663,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -679,7 +679,7 @@ lean_object* l_unexpand____x40_Init_Core___hyg_153_(lean_object* x_1, lean_objec
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -737,7 +737,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -915,7 +915,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -953,7 +953,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -969,7 +969,7 @@ lean_object* l_unexpand____x40_Init_Core___hyg_409_(lean_object* x_1, lean_objec
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -1027,7 +1027,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -1296,7 +1296,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -1334,7 +1334,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -1350,7 +1350,7 @@ lean_object* l_unexpand____x40_Init_Core___hyg_941_(lean_object* x_1, lean_objec
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -1408,7 +1408,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -1779,7 +1779,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -1817,7 +1817,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -1833,7 +1833,7 @@ lean_object* l_unexpand____x40_Init_Core___hyg_1352_(lean_object* x_1, lean_obje
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -1891,7 +1891,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -2062,7 +2062,7 @@ x_1 = l_term___u2260_____closed__6;
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1855____closed__1() {
+static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1792____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -2070,22 +2070,22 @@ x_1 = lean_mk_string("Ne");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1855____closed__2() {
+static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1792____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Core___hyg_1855____closed__1;
+x_1 = l_myMacro____x40_Init_Core___hyg_1792____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1855____closed__3() {
+static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1792____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_myMacro____x40_Init_Core___hyg_1855____closed__1;
+x_1 = l_myMacro____x40_Init_Core___hyg_1792____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_myMacro____x40_Init_Core___hyg_1855____closed__2;
+x_3 = l_myMacro____x40_Init_Core___hyg_1792____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2093,41 +2093,41 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1855____closed__4() {
+static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1792____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Core___hyg_1855____closed__1;
+x_2 = l_myMacro____x40_Init_Core___hyg_1792____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1855____closed__5() {
+static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1792____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Core___hyg_1855____closed__4;
+x_2 = l_myMacro____x40_Init_Core___hyg_1792____closed__4;
 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;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1855____closed__6() {
+static lean_object* _init_l_myMacro____x40_Init_Core___hyg_1792____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Core___hyg_1855____closed__5;
+x_2 = l_myMacro____x40_Init_Core___hyg_1792____closed__5;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l_myMacro____x40_Init_Core___hyg_1855_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_myMacro____x40_Init_Core___hyg_1792_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2164,10 +2164,10 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_2, 1);
 lean_inc(x_16);
 lean_dec(x_2);
-x_17 = l_myMacro____x40_Init_Core___hyg_1855____closed__4;
+x_17 = l_myMacro____x40_Init_Core___hyg_1792____closed__4;
 x_18 = l_Lean_addMacroScope(x_16, x_17, x_15);
-x_19 = l_myMacro____x40_Init_Core___hyg_1855____closed__3;
-x_20 = l_myMacro____x40_Init_Core___hyg_1855____closed__6;
+x_19 = l_myMacro____x40_Init_Core___hyg_1792____closed__3;
+x_20 = l_myMacro____x40_Init_Core___hyg_1792____closed__6;
 x_21 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_21, 0, x_14);
 lean_ctor_set(x_21, 1, x_19);
@@ -2182,7 +2182,7 @@ x_27 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_27, 0, x_26);
 lean_ctor_set(x_27, 1, x_25);
 x_28 = lean_array_push(x_23, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_29 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -2202,10 +2202,10 @@ lean_inc(x_33);
 x_34 = lean_ctor_get(x_2, 1);
 lean_inc(x_34);
 lean_dec(x_2);
-x_35 = l_myMacro____x40_Init_Core___hyg_1855____closed__4;
+x_35 = l_myMacro____x40_Init_Core___hyg_1792____closed__4;
 x_36 = l_Lean_addMacroScope(x_34, x_35, x_33);
-x_37 = l_myMacro____x40_Init_Core___hyg_1855____closed__3;
-x_38 = l_myMacro____x40_Init_Core___hyg_1855____closed__6;
+x_37 = l_myMacro____x40_Init_Core___hyg_1792____closed__3;
+x_38 = l_myMacro____x40_Init_Core___hyg_1792____closed__6;
 x_39 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_39, 0, x_31);
 lean_ctor_set(x_39, 1, x_37);
@@ -2220,7 +2220,7 @@ x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_44);
 lean_ctor_set(x_45, 1, x_43);
 x_46 = lean_array_push(x_41, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_47 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -2232,11 +2232,11 @@ return x_49;
 }
 }
 }
-lean_object* l_unexpand____x40_Init_Core___hyg_1836_(lean_object* x_1, lean_object* x_2) {
+lean_object* l_unexpand____x40_Init_Core___hyg_1773_(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; uint8_t x_4; 
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_inc(x_1);
 x_4 = l_Lean_Syntax_isOfKind(x_1, x_3);
 if (x_4 == 0)
@@ -2294,7 +2294,7 @@ x_19 = lean_unsigned_to_nat(0u);
 x_20 = l_Lean_Syntax_getArg(x_8, x_19);
 x_21 = l_Lean_Syntax_getArg(x_8, x_7);
 lean_dec(x_8);
-x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2098____spec__1(x_2);
+x_22 = l_Lean_MonadRef_mkInfoFromRefPos___at_unexpand____x40_Init_Notation___hyg_2172____spec__1(x_2);
 x_23 = !lean_is_exclusive(x_22);
 if (x_23 == 0)
 {
@@ -4191,18 +4191,18 @@ l_term___u2260_____closed__6 = _init_l_term___u2260_____closed__6();
 lean_mark_persistent(l_term___u2260_____closed__6);
 l_term___u2260__ = _init_l_term___u2260__();
 lean_mark_persistent(l_term___u2260__);
-l_myMacro____x40_Init_Core___hyg_1855____closed__1 = _init_l_myMacro____x40_Init_Core___hyg_1855____closed__1();
-lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1855____closed__1);
-l_myMacro____x40_Init_Core___hyg_1855____closed__2 = _init_l_myMacro____x40_Init_Core___hyg_1855____closed__2();
-lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1855____closed__2);
-l_myMacro____x40_Init_Core___hyg_1855____closed__3 = _init_l_myMacro____x40_Init_Core___hyg_1855____closed__3();
-lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1855____closed__3);
-l_myMacro____x40_Init_Core___hyg_1855____closed__4 = _init_l_myMacro____x40_Init_Core___hyg_1855____closed__4();
-lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1855____closed__4);
-l_myMacro____x40_Init_Core___hyg_1855____closed__5 = _init_l_myMacro____x40_Init_Core___hyg_1855____closed__5();
-lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1855____closed__5);
-l_myMacro____x40_Init_Core___hyg_1855____closed__6 = _init_l_myMacro____x40_Init_Core___hyg_1855____closed__6();
-lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1855____closed__6);
+l_myMacro____x40_Init_Core___hyg_1792____closed__1 = _init_l_myMacro____x40_Init_Core___hyg_1792____closed__1();
+lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1792____closed__1);
+l_myMacro____x40_Init_Core___hyg_1792____closed__2 = _init_l_myMacro____x40_Init_Core___hyg_1792____closed__2();
+lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1792____closed__2);
+l_myMacro____x40_Init_Core___hyg_1792____closed__3 = _init_l_myMacro____x40_Init_Core___hyg_1792____closed__3();
+lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1792____closed__3);
+l_myMacro____x40_Init_Core___hyg_1792____closed__4 = _init_l_myMacro____x40_Init_Core___hyg_1792____closed__4();
+lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1792____closed__4);
+l_myMacro____x40_Init_Core___hyg_1792____closed__5 = _init_l_myMacro____x40_Init_Core___hyg_1792____closed__5();
+lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1792____closed__5);
+l_myMacro____x40_Init_Core___hyg_1792____closed__6 = _init_l_myMacro____x40_Init_Core___hyg_1792____closed__6();
+lean_mark_persistent(l_myMacro____x40_Init_Core___hyg_1792____closed__6);
 l_instDecidableTrue = _init_l_instDecidableTrue();
 l_instDecidableFalse = _init_l_instDecidableFalse();
 l_instInhabitedProp = _init_l_instInhabitedProp();

stage0/stdlib/Init/Data/Array/Basic.c

@@ -330,7 +330,6 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Array_concatMap___spec__1___rarg(lea
 lean_object* l_Array_append(lean_object*);
 lean_object* l_Array_instToStringArray(lean_object*);
 lean_object* l_Array_foldrM_fold_match__1___boxed(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_Array_forInUnsafe_loop___at_Array_findM_x3f___spec__1___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_Array_findSome_x21___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyMUnsafe_any___at_Array_any___spec__1___rarg(lean_object*, lean_object*, size_t, size_t);
@@ -416,14 +415,12 @@ lean_object* l_Array_findSome_x3f(lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Array_allM___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_swapAt_x21___rarg___closed__3;
 lean_object* l_Array_instReprArray(lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__6;
 lean_object* l___private_Init_Data_Array_Basic_0__Array_allDiffAux(lean_object*);
 lean_object* l_Array_zip(lean_object*, lean_object*);
 lean_object* l_ReaderT_instMonadReaderT___rarg___lambda__4___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlM_loop(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forIn_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_term_x5b___x5d___closed__5;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_10131____closed__5;
 lean_object* l_Array_shrink_loop___rarg(lean_object*, lean_object*);
 lean_object* l_Array_mapIdxM_map___at_Array_mapIdx___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_findSomeRevM_x3f_find_match__1(lean_object*, lean_object*);
@@ -437,6 +434,7 @@ lean_object* l_Array_partition_match__2(lean_object*, lean_object*);
 lean_object* l_Array_filterMapM(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_foldl___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_indexOf_x3f(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Array_partition___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_mapIdxM_map_match__1(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_isEqv___rarg(lean_object*, lean_object*, lean_object*);
@@ -500,10 +498,10 @@ lean_object* l_Array_findSomeRevM_x3f_find___at_Array_findSomeRev_x3f___spec__1_
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterM___spec__1___rarg___lambda__2(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_append___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_concatMapM___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__1;
 lean_object* l_Array_mapIdx___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_findSomeRev_x3f___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_findSomeRevM_x3f_find___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__6;
 lean_object* l_Array_forRevM(lean_object*, lean_object*);
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_0__Array_allDiffAuxAux_match__1(lean_object*, lean_object*, lean_object*);
@@ -558,14 +556,15 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterM___spec__1___rarg(lean_
 lean_object* l_Array_instInhabitedArray(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Array_partition___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___lambda__3(lean_object*, size_t, lean_object*, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__4;
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Array_allM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Array_forIn_loop_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlM_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrM_fold___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_filterMap___spec__2(lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5;
 lean_object* l_Array_findIdx_x3f_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__7;
 lean_object* l_Array_forIn_loop_match__1(lean_object*, lean_object*);
 lean_object* l_Array_findSomeRevM_x3f_find___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Data_Array_Basic_0__Array_allDiffAuxAux_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -577,6 +576,7 @@ lean_object* l_Array_forInUnsafe_loop___at_Array_find_x3f___spec__1___rarg(lean_
 lean_object* l_Array_foldlMUnsafe_fold___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_redLength_match__1(lean_object*, lean_object*);
 lean_object* l_Array_findSome_x21___rarg(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_10205____closed__5;
 lean_object* l_Array_findSomeRevM_x3f_find(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__2___rarg(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_instEmptyCollectionArray(lean_object*);
@@ -590,14 +590,15 @@ lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__1___rarg___boxe
 lean_object* l_Array_filterM(lean_object*, lean_object*);
 lean_object* l_Array_getEvenElems_match__1(lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_concatMapM___spec__1___rarg___lambda__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__2;
 lean_object* l_Array_filterM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_filterMapM___at_Array_filterMap___spec__1(lean_object*, lean_object*);
 uint8_t l_Array_allDiff___rarg(lean_object*, lean_object*);
 lean_object* l_Array_isEqv___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findSome_x3f___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__1;
 lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__3;
 lean_object* l_ReaderT_instMonadExceptOfReaderT___rarg___lambda__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Array_findIdxM_x3f___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_insertAt(lean_object*);
@@ -612,9 +613,8 @@ lean_object* l_Array_insertAt___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findM_x3f_match__3(lean_object*, lean_object*);
 lean_object* l_Array_findIdxM_x3f_match__2(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Array_map___spec__1___rarg(lean_object*, size_t, size_t, lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606_(lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607_(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_contains___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5;
 lean_object* lean_nat_to_int(lean_object*);
 lean_object* l_Array_eraseIdxSzAux_match__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold___at_Array_toList___spec__1___rarg(lean_object*, size_t, size_t, lean_object*);
@@ -626,11 +626,12 @@ lean_object* l_Array_findSomeM_x3f___rarg___closed__1;
 lean_object* l_Array_zipWithAux___at_Array_zip___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Array_forM___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_mapIdxM_map___at_Array_mapIdx___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__7;
 lean_object* l_Array_findSomeM_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_findIdxM_x3f___rarg___closed__1;
 lean_object* l_Array_isEqvAux_match__1___rarg(uint8_t, lean_object*, lean_object*);
 lean_object* l_Array_toArrayLit___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__4;
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__3;
 lean_object* l_Array_findM_x3f_match__3___rarg(lean_object*);
 lean_object* l_Array_anyMUnsafe___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_getEvenElems_match__1___rarg(lean_object*, lean_object*);
@@ -641,7 +642,6 @@ extern lean_object* l_term_x5b___x5d___closed__3;
 lean_object* l_Array_foldrMUnsafe_fold___at_Array_forRevM___spec__2___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_any___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Array_findSomeM_x3f___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__2;
 lean_object* l_Array_foldrMUnsafe_fold___at_Array_foldr___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_isEqvAux_match__1(lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -8084,7 +8084,7 @@ x_1 = l_term_x23_x5b___x2c_x5d___closed__7;
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__1() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -8092,22 +8092,22 @@ x_1 = lean_mk_string("List.toArray");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__2() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__1;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__3() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__1;
+x_1 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__2;
+x_3 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -8115,7 +8115,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__4() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -8123,41 +8123,41 @@ x_1 = lean_mk_string("toArray");
 return x_1;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_10131____closed__5;
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__4;
+x_1 = l_myMacro____x40_Init_Notation___hyg_10205____closed__5;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__6() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5;
 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;
 }
 }
-static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__7() {
+static lean_object* _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__6;
+x_2 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__6;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -8194,10 +8194,10 @@ lean_inc(x_14);
 x_15 = lean_ctor_get(x_2, 1);
 lean_inc(x_15);
 lean_dec(x_2);
-x_16 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5;
+x_16 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5;
 x_17 = l_Lean_addMacroScope(x_15, x_16, x_14);
-x_18 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__3;
-x_19 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__7;
+x_18 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__3;
+x_19 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__7;
 lean_inc(x_13);
 x_20 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_20, 0, x_13);
@@ -8233,7 +8233,7 @@ x_36 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_36, 0, x_27);
 lean_ctor_set(x_36, 1, x_35);
 x_37 = lean_array_push(x_22, x_36);
-x_38 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_38 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_39 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_39, 0, x_38);
 lean_ctor_set(x_39, 1, x_37);
@@ -8253,10 +8253,10 @@ lean_inc(x_42);
 x_43 = lean_ctor_get(x_2, 1);
 lean_inc(x_43);
 lean_dec(x_2);
-x_44 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5;
+x_44 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5;
 x_45 = l_Lean_addMacroScope(x_43, x_44, x_42);
-x_46 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__3;
-x_47 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__7;
+x_46 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__3;
+x_47 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__7;
 lean_inc(x_40);
 x_48 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_48, 0, x_40);
@@ -8292,7 +8292,7 @@ x_64 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_64, 0, x_55);
 lean_ctor_set(x_64, 1, x_63);
 x_65 = lean_array_push(x_50, x_64);
-x_66 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_66 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_67 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_67, 0, x_66);
 lean_ctor_set(x_67, 1, x_65);
@@ -10634,20 +10634,20 @@ l_term_x23_x5b___x2c_x5d___closed__7 = _init_l_term_x23_x5b___x2c_x5d___closed__
 lean_mark_persistent(l_term_x23_x5b___x2c_x5d___closed__7);
 l_term_x23_x5b___x2c_x5d = _init_l_term_x23_x5b___x2c_x5d();
 lean_mark_persistent(l_term_x23_x5b___x2c_x5d);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__1 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__1();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__1);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__2 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__2();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__2);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__3 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__3();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__3);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__4 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__4();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__4);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__6 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__6();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__6);
-l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__7 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__7();
-lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__7);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__1 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__1();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__1);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__2 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__2();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__2);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__3 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__3();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__3);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__4 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__4();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__4);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__6 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__6();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__6);
+l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__7 = _init_l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__7();
+lean_mark_persistent(l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__7);
 l_Array_partition___rarg___closed__1 = _init_l_Array_partition___rarg___closed__1();
 lean_mark_persistent(l_Array_partition___rarg___closed__1);
 l_Array_insertAt___rarg___closed__1 = _init_l_Array_insertAt___rarg___closed__1();

stage0/stdlib/Init/Data/Array/Subarray.c

@@ -15,44 +15,44 @@ extern "C" {
 #endif
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__4;
 lean_object* l_Array_foldrMUnsafe_fold___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_forM___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_instCoeSubarrayArray___closed__1;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__9;
 lean_object* l_Subarray_forInUnsafe_loop___at_Array_ofSubarray___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__4;
 uint8_t l_Array_anyMUnsafe_any___at_Subarray_any___spec__1___rarg(lean_object*, lean_object*, size_t, size_t);
 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_Array_term_____x5b___x3a___x5d___closed__8;
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_forRevM___spec__2___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__4;
 lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_forM___spec__1___rarg___lambda__1(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774_(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914_(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915_(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634_(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_any___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Subarray_foldr(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 lean_object* l_Array_extract___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__1;
 size_t l_USize_sub(size_t, size_t);
 extern lean_object* l_Array_empty___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l_Subarray_anyM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_instHAppendSubarraySubarrayArray(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_foldr___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Subarray_forInUnsafe_loop_match__1___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__5;
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l_Subarray_forM(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
 lean_object* l_Subarray_forInUnsafe_loop___at_Array_ofSubarray___spec__1(lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_all___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_utf8_byte_size(lean_object*);
@@ -60,62 +60,60 @@ lean_object* l_Subarray_foldlM___rarg(lean_object*, lean_object*, lean_object*,
 lean_object* l_Array_term_____x5b___x3a_x5d___closed__1;
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_any___spec__1(lean_object*);
 uint8_t l_USize_decLt(size_t, size_t);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__5;
 lean_object* l_Array_instCoeSubarrayArray(lean_object*);
 lean_object* l_Subarray_foldl___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_allM___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_myMacro____x40_Init_Notation___hyg_109____spec__1(lean_object*, lean_object*);
 lean_object* l_Array_term_____x5b___x3a_x5d___closed__3;
 lean_object* l_Subarray_any___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__8;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__12;
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__1;
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__9;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__7;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__1;
 lean_object* l_Subarray_anyM(lean_object*, lean_object*);
 extern lean_object* l_term_x5b___x5d___closed__10;
 lean_object* l_Subarray_all___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Subarray_toArray___rarg(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
 uint8_t l_Subarray_any___rarg(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__6;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__9;
 lean_object* l_Subarray_forIn___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_foldr___spec__2___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__7;
 lean_object* l_Array_term_____x5b_x3a___x5d___closed__3;
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__6;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__8;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__2;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__2;
 lean_object* l_Subarray_toArray___rarg___boxed(lean_object*);
 lean_object* l_Subarray_forInUnsafe_loop(lean_object*, lean_object*, lean_object*);
 lean_object* l_Subarray_forInUnsafe_loop_match__1(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
 lean_object* l_Subarray_forInUnsafe_loop___at_Array_ofSubarray___spec__1___rarg(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_forM___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3;
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_allM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Subarray_toArray(lean_object*);
 lean_object* l_Subarray_forInUnsafe_loop___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_foldl___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_object* l_Array_term_____x5b___x3a_x5d;
 lean_object* l_Subarray_forInUnsafe(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__2;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1;
 lean_object* l_Array_term_____x5b___x3a___x5d;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 lean_object* l_Array_anyMUnsafe_any___at_Array_allM___spec__1___rarg___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Subarray_forInUnsafe_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_foldl___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__2;
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__11;
 extern lean_object* l_Lean_numLitKind___closed__2;
 lean_object* l_Subarray_foldl(lean_object*, lean_object*);
 lean_object* l_Subarray_all(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7;
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_allM___spec__1___rarg___lambda__1(size_t, lean_object*, lean_object*, lean_object*, lean_object*, size_t, uint8_t);
 lean_object* l_Subarray_foldr___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_ofSubarray(lean_object*);
 lean_object* l_Array_term_____x5b_x3a___x5d___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__6;
 lean_object* l_Subarray_forInUnsafe_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__10;
 lean_object* l_Array_term_____x5b_x3a___x5d___closed__2;
@@ -130,17 +128,18 @@ lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Subarray_allM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_all___spec__1(lean_object*);
 lean_object* l_Subarray_foldrM___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7;
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__7;
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Array_term_____x5b_x3a___x5d___closed__1;
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__6;
 lean_object* l_Array_ofSubarray___rarg___boxed(lean_object*);
 lean_object* l_Subarray_foldlM(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_term_____x5b_x3a___x5d___closed__5;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Subarray_foldrM(lean_object*, lean_object*, lean_object*);
 lean_object* l_Subarray_forInUnsafe_loop___rarg___lambda__1(lean_object*, size_t, lean_object*, lean_object*, size_t, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__11;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__3;
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_forRevM___spec__2(lean_object*, lean_object*);
 lean_object* l_Subarray_any(lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_foldr___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -152,15 +151,14 @@ lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_foldr___spec__2(lean_object
 lean_object* l_Array_term_____x5b_x3a___x5d;
 lean_object* l_Subarray_forRevM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_foldr___spec__1___rarg(lean_object*, lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 lean_object* l_Subarray_forM___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__11;
 lean_object* l_Array_ofSubarray___rarg(lean_object*);
 lean_object* l_instHAppendSubarraySubarrayArray___rarg(lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__10;
 extern lean_object* l_term_x5b___x5d___closed__4;
 uint8_t l_Subarray_all___rarg(lean_object*, lean_object*);
 lean_object* l_instHAppendSubarraySubarrayArray___rarg___boxed(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_forRevM___spec__1___rarg(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_term_____x5b___x3a_x5d___closed__2;
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
@@ -168,18 +166,20 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_forM___spec__1___rarg___lam
 lean_object* l_Subarray_forRevM(lean_object*, lean_object*);
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__13;
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_forRevM___spec__1(lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__10;
 lean_object* l_Array_foldrMUnsafe_fold___at_Subarray_forRevM___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__6;
 uint8_t l_Array_anyMUnsafe_any___at_Subarray_all___spec__1___rarg(lean_object*, lean_object*, size_t, size_t);
 lean_object* l_Subarray_foldl___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__3;
 lean_object* l_Subarray_forIn___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_term_____x5b___x3a_x5d___closed__4;
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__5;
 lean_object* l_Subarray_allM(lean_object*, lean_object*);
 lean_object* l_Array_term_____x5b___x3a___x5d___closed__3;
 lean_object* l_Subarray_foldr___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774____closed__1;
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775____closed__1;
 lean_object* l_Array_foldlMUnsafe_fold___at_Subarray_forM___spec__1(lean_object*, lean_object*);
 lean_object* l_Subarray_forIn(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Subarray_allM___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t);
@@ -1954,7 +1954,7 @@ static lean_object* _init_l_Array_term_____x5b___x3a___x5d___closed__10() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_1 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_2 = lean_alloc_ctor(5, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -2160,7 +2160,7 @@ x_1 = l_Array_term_____x5b_x3a___x5d___closed__6;
 return x_1;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__1() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -2168,22 +2168,22 @@ x_1 = lean_mk_string("Array.toSubarray");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__2() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__1;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__1;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__2;
+x_3 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2191,7 +2191,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__4() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__4() {
 _start:
 {
 lean_object* x_1; 
@@ -2199,41 +2199,41 @@ x_1 = lean_mk_string("toSubarray");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_term_____x5b___x3a___x5d___closed__2;
-x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__4;
+x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__6() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 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;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__6;
+x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__6;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2272,10 +2272,10 @@ lean_inc(x_17);
 x_18 = lean_ctor_get(x_2, 1);
 lean_inc(x_18);
 lean_dec(x_2);
-x_19 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_19 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 x_20 = l_Lean_addMacroScope(x_18, x_19, x_17);
-x_21 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3;
-x_22 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7;
+x_21 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3;
+x_22 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7;
 x_23 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_23, 0, x_16);
 lean_ctor_set(x_23, 1, x_21);
@@ -2291,7 +2291,7 @@ x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
 x_31 = lean_array_push(x_25, x_30);
-x_32 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_32 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_33 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
@@ -2311,10 +2311,10 @@ lean_inc(x_36);
 x_37 = lean_ctor_get(x_2, 1);
 lean_inc(x_37);
 lean_dec(x_2);
-x_38 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_38 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 x_39 = l_Lean_addMacroScope(x_37, x_38, x_36);
-x_40 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3;
-x_41 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7;
+x_40 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3;
+x_41 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7;
 x_42 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_42, 0, x_34);
 lean_ctor_set(x_42, 1, x_40);
@@ -2330,7 +2330,7 @@ x_49 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_49, 0, x_48);
 lean_ctor_set(x_49, 1, x_47);
 x_50 = lean_array_push(x_44, x_49);
-x_51 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_51 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_52 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_52, 0, x_51);
 lean_ctor_set(x_52, 1, x_50);
@@ -2342,7 +2342,7 @@ return x_53;
 }
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774____closed__1() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -2350,7 +2350,7 @@ x_1 = lean_mk_string("0");
 return x_1;
 }
 }
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2387,10 +2387,10 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_2, 1);
 lean_inc(x_16);
 lean_dec(x_2);
-x_17 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_17 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 x_18 = l_Lean_addMacroScope(x_16, x_17, x_15);
-x_19 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3;
-x_20 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7;
+x_19 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3;
+x_20 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7;
 lean_inc(x_14);
 x_21 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_21, 0, x_14);
@@ -2400,7 +2400,7 @@ lean_ctor_set(x_21, 3, x_20);
 x_22 = l_Array_empty___closed__1;
 x_23 = lean_array_push(x_22, x_21);
 x_24 = lean_array_push(x_22, x_9);
-x_25 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774____closed__1;
+x_25 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775____closed__1;
 x_26 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_26, 0, x_14);
 lean_ctor_set(x_26, 1, x_25);
@@ -2416,7 +2416,7 @@ x_33 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
 x_34 = lean_array_push(x_23, x_33);
-x_35 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_35 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_36 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_36, 0, x_35);
 lean_ctor_set(x_36, 1, x_34);
@@ -2436,10 +2436,10 @@ lean_inc(x_39);
 x_40 = lean_ctor_get(x_2, 1);
 lean_inc(x_40);
 lean_dec(x_2);
-x_41 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_41 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 x_42 = l_Lean_addMacroScope(x_40, x_41, x_39);
-x_43 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3;
-x_44 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7;
+x_43 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3;
+x_44 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7;
 lean_inc(x_37);
 x_45 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_45, 0, x_37);
@@ -2449,7 +2449,7 @@ lean_ctor_set(x_45, 3, x_44);
 x_46 = l_Array_empty___closed__1;
 x_47 = lean_array_push(x_46, x_45);
 x_48 = lean_array_push(x_46, x_9);
-x_49 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774____closed__1;
+x_49 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775____closed__1;
 x_50 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_50, 0, x_37);
 lean_ctor_set(x_50, 1, x_49);
@@ -2465,7 +2465,7 @@ x_57 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_57, 0, x_56);
 lean_ctor_set(x_57, 1, x_55);
 x_58 = lean_array_push(x_47, x_57);
-x_59 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_59 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_60 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_60, 0, x_59);
 lean_ctor_set(x_60, 1, x_58);
@@ -2477,7 +2477,7 @@ return x_61;
 }
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1() {
 _start:
 {
 lean_object* x_1; 
@@ -2485,22 +2485,22 @@ x_1 = lean_mk_string("a");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__2() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__3() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__2;
+x_3 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__2;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2508,41 +2508,41 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1;
+x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__5() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 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;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__6() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__5;
+x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__5;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_2);
 lean_ctor_set(x_3, 1, x_1);
 return x_3;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__7() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__7() {
 _start:
 {
 lean_object* x_1; 
@@ -2550,22 +2550,22 @@ x_1 = lean_mk_string("a.size");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__8() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__7;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__7;
 x_2 = lean_string_utf8_byte_size(x_1);
 return x_2;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__9() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__9() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__7;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__7;
 x_2 = lean_unsigned_to_nat(0u);
-x_3 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__8;
+x_3 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__8;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2573,7 +2573,7 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__10() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__10() {
 _start:
 {
 lean_object* x_1; 
@@ -2581,17 +2581,17 @@ x_1 = lean_mk_string("size");
 return x_1;
 }
 }
-static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__11() {
+static lean_object* _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__11() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
-x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__10;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
+x_2 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__10;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
 }
-lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915_(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; uint8_t x_5; 
@@ -2628,19 +2628,19 @@ lean_inc(x_15);
 x_16 = lean_ctor_get(x_2, 1);
 lean_inc(x_16);
 lean_dec(x_2);
-x_17 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_17 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_14);
 x_18 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_18, 0, x_14);
 lean_ctor_set(x_18, 1, x_17);
 x_19 = l_Array_empty___closed__1;
 x_20 = lean_array_push(x_19, x_18);
-x_21 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_21 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 lean_inc(x_15);
 lean_inc(x_16);
 x_22 = l_Lean_addMacroScope(x_16, x_21, x_15);
 x_23 = lean_box(0);
-x_24 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__3;
+x_24 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__3;
 lean_inc(x_14);
 x_25 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_25, 0, x_14);
@@ -2648,28 +2648,28 @@ lean_ctor_set(x_25, 1, x_24);
 lean_ctor_set(x_25, 2, x_22);
 lean_ctor_set(x_25, 3, x_23);
 x_26 = lean_array_push(x_19, x_25);
-x_27 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_27 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_inc(x_26);
 x_28 = lean_array_push(x_26, x_27);
 x_29 = lean_array_push(x_28, x_27);
-x_30 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_30 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_14);
 x_31 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_31, 0, x_14);
 lean_ctor_set(x_31, 1, x_30);
 x_32 = lean_array_push(x_29, x_31);
 x_33 = lean_array_push(x_32, x_9);
-x_34 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_34 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_35 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_35, 0, x_34);
 lean_ctor_set(x_35, 1, x_33);
 x_36 = lean_array_push(x_19, x_35);
-x_37 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_37 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_38 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_36);
 x_39 = lean_array_push(x_20, x_38);
-x_40 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_40 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_inc(x_14);
 x_41 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_41, 0, x_14);
@@ -2680,12 +2680,12 @@ x_44 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_44, 0, x_43);
 lean_ctor_set(x_44, 1, x_42);
 x_45 = lean_array_push(x_39, x_44);
-x_46 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_46 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 lean_inc(x_15);
 lean_inc(x_16);
 x_47 = l_Lean_addMacroScope(x_16, x_46, x_15);
-x_48 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3;
-x_49 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__6;
+x_48 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3;
+x_49 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__6;
 lean_inc(x_14);
 x_50 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_50, 0, x_14);
@@ -2694,9 +2694,9 @@ lean_ctor_set(x_50, 2, x_47);
 lean_ctor_set(x_50, 3, x_49);
 x_51 = lean_array_push(x_19, x_50);
 x_52 = lean_array_push(x_26, x_11);
-x_53 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__11;
+x_53 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__11;
 x_54 = l_Lean_addMacroScope(x_16, x_53, x_15);
-x_55 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__9;
+x_55 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__9;
 x_56 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_56, 0, x_14);
 lean_ctor_set(x_56, 1, x_55);
@@ -2707,12 +2707,12 @@ x_58 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_58, 0, x_43);
 lean_ctor_set(x_58, 1, x_57);
 x_59 = lean_array_push(x_51, x_58);
-x_60 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_60 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_61 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_61, 0, x_60);
 lean_ctor_set(x_61, 1, x_59);
 x_62 = lean_array_push(x_45, x_61);
-x_63 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_63 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_64 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_64, 0, x_63);
 lean_ctor_set(x_64, 1, x_62);
@@ -2732,19 +2732,19 @@ lean_inc(x_67);
 x_68 = lean_ctor_get(x_2, 1);
 lean_inc(x_68);
 lean_dec(x_2);
-x_69 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_69 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_65);
 x_70 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_70, 0, x_65);
 lean_ctor_set(x_70, 1, x_69);
 x_71 = l_Array_empty___closed__1;
 x_72 = lean_array_push(x_71, x_70);
-x_73 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_73 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 lean_inc(x_67);
 lean_inc(x_68);
 x_74 = l_Lean_addMacroScope(x_68, x_73, x_67);
 x_75 = lean_box(0);
-x_76 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__3;
+x_76 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__3;
 lean_inc(x_65);
 x_77 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_77, 0, x_65);
@@ -2752,28 +2752,28 @@ lean_ctor_set(x_77, 1, x_76);
 lean_ctor_set(x_77, 2, x_74);
 lean_ctor_set(x_77, 3, x_75);
 x_78 = lean_array_push(x_71, x_77);
-x_79 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_79 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_inc(x_78);
 x_80 = lean_array_push(x_78, x_79);
 x_81 = lean_array_push(x_80, x_79);
-x_82 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_82 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_65);
 x_83 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_83, 0, x_65);
 lean_ctor_set(x_83, 1, x_82);
 x_84 = lean_array_push(x_81, x_83);
 x_85 = lean_array_push(x_84, x_9);
-x_86 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_86 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_87 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_87, 0, x_86);
 lean_ctor_set(x_87, 1, x_85);
 x_88 = lean_array_push(x_71, x_87);
-x_89 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_89 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_90 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_90, 0, x_89);
 lean_ctor_set(x_90, 1, x_88);
 x_91 = lean_array_push(x_72, x_90);
-x_92 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_92 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_inc(x_65);
 x_93 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_93, 0, x_65);
@@ -2784,12 +2784,12 @@ x_96 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_96, 0, x_95);
 lean_ctor_set(x_96, 1, x_94);
 x_97 = lean_array_push(x_91, x_96);
-x_98 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5;
+x_98 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5;
 lean_inc(x_67);
 lean_inc(x_68);
 x_99 = l_Lean_addMacroScope(x_68, x_98, x_67);
-x_100 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3;
-x_101 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__6;
+x_100 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3;
+x_101 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__6;
 lean_inc(x_65);
 x_102 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_102, 0, x_65);
@@ -2798,9 +2798,9 @@ lean_ctor_set(x_102, 2, x_99);
 lean_ctor_set(x_102, 3, x_101);
 x_103 = lean_array_push(x_71, x_102);
 x_104 = lean_array_push(x_78, x_11);
-x_105 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__11;
+x_105 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__11;
 x_106 = l_Lean_addMacroScope(x_68, x_105, x_67);
-x_107 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__9;
+x_107 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__9;
 x_108 = lean_alloc_ctor(3, 4, 0);
 lean_ctor_set(x_108, 0, x_65);
 lean_ctor_set(x_108, 1, x_107);
@@ -2811,12 +2811,12 @@ x_110 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_110, 0, x_95);
 lean_ctor_set(x_110, 1, x_109);
 x_111 = lean_array_push(x_103, x_110);
-x_112 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_112 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_113 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_113, 0, x_112);
 lean_ctor_set(x_113, 1, x_111);
 x_114 = lean_array_push(x_97, x_113);
-x_115 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_115 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_116 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_116, 0, x_115);
 lean_ctor_set(x_116, 1, x_114);
@@ -2947,44 +2947,44 @@ l_Array_term_____x5b_x3a___x5d___closed__6 = _init_l_Array_term_____x5b_x3a___x5
 lean_mark_persistent(l_Array_term_____x5b_x3a___x5d___closed__6);
 l_Array_term_____x5b_x3a___x5d = _init_l_Array_term_____x5b_x3a___x5d();
 lean_mark_persistent(l_Array_term_____x5b_x3a___x5d);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__1 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__1();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__1);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__2 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__2();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__2);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__3);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__4 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__4();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__4);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__5);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__6 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__6();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__6);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_633____closed__7);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774____closed__1 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774____closed__1();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_774____closed__1);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__2 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__2();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__2);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__3 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__3();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__3);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__5 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__5();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__5);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__6 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__6();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__6);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__7 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__7();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__7);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__8 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__8();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__8);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__9 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__9();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__9);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__10 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__10();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__10);
-l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__11 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__11();
-lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__11);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__1 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__1();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__1);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__2 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__2();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__2);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__3);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__4 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__4();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__4);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__5);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__6 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__6();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__6);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_634____closed__7);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775____closed__1 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775____closed__1();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_775____closed__1);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__2 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__2();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__2);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__3 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__3();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__3);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__5 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__5();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__5);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__6 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__6();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__6);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__7 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__7();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__7);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__8 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__8();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__8);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__9 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__9();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__9);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__10 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__10();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__10);
+l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__11 = _init_l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__11();
+lean_mark_persistent(l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__11);
 return lean_io_result_mk_ok(lean_box(0));
 }
 #ifdef __cplusplus

stage0/stdlib/Init/Data/Format/Macro.c

@@ -20,6 +20,7 @@ lean_object* l_Std_termF_x21_____closed__7;
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__6;
 lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__14;
+lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(lean_object*, lean_object*);
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__10;
 lean_object* l_Std_termF_x21__;
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__3;
@@ -44,7 +45,6 @@ lean_object* l_Std_termF_x21_____closed__6;
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__2;
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__8;
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__1;
-lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(lean_object*, lean_object*);
 lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__4;
 static lean_object* _init_l_Std_termF_x21_____closed__1() {
 _start:
@@ -310,7 +310,7 @@ lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_o
 x_8 = lean_unsigned_to_nat(1u);
 x_9 = l_Lean_Syntax_getArg(x_1, x_8);
 lean_dec(x_1);
-x_10 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_2, x_3);
+x_10 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_2, x_3);
 x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
 x_12 = lean_ctor_get(x_10, 1);
@@ -331,7 +331,7 @@ lean_ctor_set(x_19, 0, x_11);
 lean_ctor_set(x_19, 1, x_17);
 lean_ctor_set(x_19, 2, x_16);
 lean_ctor_set(x_19, 3, x_18);
-x_20 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_2, x_12);
+x_20 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_2, x_12);
 x_21 = lean_ctor_get(x_20, 0);
 lean_inc(x_21);
 x_22 = lean_ctor_get(x_20, 1);

stage0/stdlib/Init/Data/OfScientific.c

@@ -1,6 +1,6 @@
 // Lean compiler output
 // Module: Init.Data.OfScientific
-// Imports: Init.Data.Float Init.Data.Nat
+// Imports: Init.Meta Init.Data.Float Init.Data.Nat
 #include <lean/lean.h>
 #if defined(__clang__)
 #pragma clang diagnostic ignored "-Wunused-parameter"
@@ -35,6 +35,7 @@ x_6 = lean_box_float(x_5);
 return x_6;
 }
 }
+lean_object* initialize_Init_Meta(lean_object*);
 lean_object* initialize_Init_Data_Float(lean_object*);
 lean_object* initialize_Init_Data_Nat(lean_object*);
 static bool _G_initialized = false;
@@ -42,6 +43,9 @@ lean_object* initialize_Init_Data_OfScientific(lean_object* w) {
 lean_object * res;
 if (_G_initialized) return lean_io_result_mk_ok(lean_box(0));
 _G_initialized = true;
+res = initialize_Init_Meta(lean_io_mk_world());
+if (lean_io_result_is_error(res)) return res;
+lean_dec_ref(res);
 res = initialize_Init_Data_Float(lean_io_mk_world());
 if (lean_io_result_is_error(res)) return res;
 lean_dec_ref(res);

stage0/stdlib/Init/Data/Range.c

@@ -15,7 +15,6 @@ extern "C" {
 #endif
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__11;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_807____closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_Std_Range_term_x5b___x3a___x3a___x5d___closed__3;
 lean_object* l_Std_Range_term_x5b___x3a___x3a___x5d___closed__5;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
@@ -25,7 +24,7 @@ lean_object* l_Std_Range_term_x5b_x3a___x5d___closed__11;
 lean_object* l_Std_Range_term_x5b_x3a___x5d___closed__9;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Std_Range_term_x5b___x3a___x5d___closed__7;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l_Std_Range_term_x5b_x3a___x3a___x5d;
 lean_object* l_Std_Range_step___default;
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -40,8 +39,10 @@ lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_myMacro____x40_Init_Notation___hyg_109____spec__1(lean_object*, lean_object*);
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__21;
 lean_object* l_Std_Range_term_x5b___x3a___x5d___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__2;
 lean_object* l_Std_Range_forIn_loop_match__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 extern lean_object* l_term_x5b___x5d___closed__10;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* l_Std_Range_term_x5b___x3a___x3a___x5d;
@@ -66,16 +67,15 @@ lean_object* l_Std_Range_term_x5b_x3a___x5d___closed__2;
 lean_object* l_Std_Range_forIn_loop___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_term_x5b_x3a___x3a___x5d___closed__5;
 lean_object* l_Std_Range_forIn_loop___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_object* l_Std_Range_term_x5b_x3a___x5d___closed__5;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__5;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__15;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__14;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__18;
 lean_object* l_Std_Range_term_x5b_x3a___x5d___closed__3;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__22;
 lean_object* l_Std_Range_term_x5b___x3a___x5d___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l_Std_Range_term_x5b___x3a___x5d___closed__5;
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__10;
 extern lean_object* l_termDepIfThenElse___closed__14;
@@ -84,7 +84,6 @@ lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__6;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_807____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
 lean_object* l_Std_Range_term_x5b_x3a___x5d___closed__6;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__3;
 lean_object* l_Std_Range_term_x5b___x3a___x3a___x5d___closed__2;
@@ -101,6 +100,7 @@ lean_object* l_Std_Range_forIn_loop_match__2(lean_object*);
 lean_object* l_Std_Range_term_x5b___x3a___x5d;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__4;
 extern lean_object* l_term_x5b___x5d___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__10;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__20;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__9;
@@ -109,6 +109,7 @@ lean_object* l_Std_Range_term_x5b_x3a___x5d;
 lean_object* l_Std_Range_term_x5b_x3a___x3a___x5d___closed__6;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_807____closed__5;
 lean_object* l_Std_Range_forIn(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__19;
 lean_object* l_Std_Range_forIn_loop_match__1(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
@@ -117,7 +118,6 @@ lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__1;
 lean_object* l_Std_Range_term_x5b_x3a___x5d___closed__7;
 lean_object* l_Std_Range_term_x5b___x3a___x5d___closed__6;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__9;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__2;
 lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__4;
 lean_object* l_Std_Range_forIn_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -424,7 +424,7 @@ static lean_object* _init_l_Std_Range_term_x5b_x3a___x5d___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_1 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_2 = lean_alloc_ctor(5, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -766,7 +766,7 @@ static lean_object* _init_l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_1 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_2 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -784,7 +784,7 @@ static lean_object* _init_l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_1 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_2 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -802,7 +802,7 @@ static lean_object* _init_l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_1 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_2 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__5;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -895,7 +895,7 @@ static lean_object* _init_l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_1 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_2 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__14;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -906,7 +906,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__15;
-x_2 = l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
+x_2 = l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -1020,7 +1020,7 @@ lean_ctor_set(x_16, 0, x_12);
 lean_ctor_set(x_16, 1, x_15);
 x_17 = l_Array_empty___closed__1;
 x_18 = lean_array_push(x_17, x_16);
-x_19 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_19 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_20 = lean_array_push(x_18, x_19);
 x_21 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__10;
 lean_inc(x_13);
@@ -1041,7 +1041,7 @@ x_29 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_29, 0, x_28);
 lean_ctor_set(x_29, 1, x_27);
 x_30 = lean_array_push(x_17, x_29);
-x_31 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_31 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_12);
 x_32 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_32, 0, x_12);
@@ -1065,7 +1065,7 @@ lean_ctor_set(x_42, 1, x_41);
 x_43 = lean_array_push(x_20, x_42);
 x_44 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_45 = lean_array_push(x_43, x_44);
-x_46 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_46 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_12);
 x_47 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_47, 0, x_12);
@@ -1118,7 +1118,7 @@ lean_ctor_set(x_67, 0, x_62);
 lean_ctor_set(x_67, 1, x_66);
 x_68 = l_Array_empty___closed__1;
 x_69 = lean_array_push(x_68, x_67);
-x_70 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_70 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_71 = lean_array_push(x_69, x_70);
 x_72 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__10;
 lean_inc(x_64);
@@ -1139,7 +1139,7 @@ x_80 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_80, 0, x_79);
 lean_ctor_set(x_80, 1, x_78);
 x_81 = lean_array_push(x_68, x_80);
-x_82 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_82 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_62);
 x_83 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_83, 0, x_62);
@@ -1163,7 +1163,7 @@ lean_ctor_set(x_93, 1, x_92);
 x_94 = lean_array_push(x_71, x_93);
 x_95 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_96 = lean_array_push(x_94, x_95);
-x_97 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_97 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_62);
 x_98 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_98, 0, x_62);
@@ -1344,7 +1344,7 @@ lean_ctor_set(x_18, 0, x_14);
 lean_ctor_set(x_18, 1, x_17);
 x_19 = l_Array_empty___closed__1;
 x_20 = lean_array_push(x_19, x_18);
-x_21 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_21 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_22 = lean_array_push(x_20, x_21);
 x_23 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__4;
 lean_inc(x_15);
@@ -1365,7 +1365,7 @@ x_31 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_31, 0, x_30);
 lean_ctor_set(x_31, 1, x_29);
 x_32 = lean_array_push(x_19, x_31);
-x_33 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_33 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_14);
 x_34 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_34, 0, x_14);
@@ -1378,7 +1378,7 @@ x_38 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_36);
 x_39 = lean_array_push(x_19, x_38);
-x_40 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_40 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_14);
 x_41 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_41, 0, x_14);
@@ -1428,7 +1428,7 @@ lean_ctor_set(x_64, 1, x_63);
 x_65 = lean_array_push(x_22, x_64);
 x_66 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_67 = lean_array_push(x_65, x_66);
-x_68 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_68 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_14);
 x_69 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_69, 0, x_14);
@@ -1481,7 +1481,7 @@ lean_ctor_set(x_89, 0, x_84);
 lean_ctor_set(x_89, 1, x_88);
 x_90 = l_Array_empty___closed__1;
 x_91 = lean_array_push(x_90, x_89);
-x_92 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_92 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_93 = lean_array_push(x_91, x_92);
 x_94 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__4;
 lean_inc(x_86);
@@ -1502,7 +1502,7 @@ x_102 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_102, 0, x_101);
 lean_ctor_set(x_102, 1, x_100);
 x_103 = lean_array_push(x_90, x_102);
-x_104 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_104 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_84);
 x_105 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_105, 0, x_84);
@@ -1515,7 +1515,7 @@ x_109 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_109, 0, x_108);
 lean_ctor_set(x_109, 1, x_107);
 x_110 = lean_array_push(x_90, x_109);
-x_111 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_111 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_84);
 x_112 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_112, 0, x_84);
@@ -1565,7 +1565,7 @@ lean_ctor_set(x_135, 1, x_134);
 x_136 = lean_array_push(x_93, x_135);
 x_137 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_138 = lean_array_push(x_136, x_137);
-x_139 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_139 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_84);
 x_140 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_140, 0, x_84);
@@ -1724,7 +1724,7 @@ lean_ctor_set(x_20, 0, x_16);
 lean_ctor_set(x_20, 1, x_19);
 x_21 = l_Array_empty___closed__1;
 x_22 = lean_array_push(x_21, x_20);
-x_23 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_23 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_24 = lean_array_push(x_22, x_23);
 x_25 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__4;
 lean_inc(x_17);
@@ -1745,7 +1745,7 @@ x_33 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
 x_34 = lean_array_push(x_21, x_33);
-x_35 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_35 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_16);
 x_36 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_36, 0, x_16);
@@ -1758,7 +1758,7 @@ x_40 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_40, 0, x_39);
 lean_ctor_set(x_40, 1, x_38);
 x_41 = lean_array_push(x_21, x_40);
-x_42 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_42 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_16);
 x_43 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_43, 0, x_16);
@@ -1839,7 +1839,7 @@ lean_ctor_set(x_82, 1, x_81);
 x_83 = lean_array_push(x_24, x_82);
 x_84 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_85 = lean_array_push(x_83, x_84);
-x_86 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_86 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_16);
 x_87 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_87, 0, x_16);
@@ -1892,7 +1892,7 @@ lean_ctor_set(x_107, 0, x_102);
 lean_ctor_set(x_107, 1, x_106);
 x_108 = l_Array_empty___closed__1;
 x_109 = lean_array_push(x_108, x_107);
-x_110 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_110 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_111 = lean_array_push(x_109, x_110);
 x_112 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_494____closed__4;
 lean_inc(x_104);
@@ -1913,7 +1913,7 @@ x_120 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_120, 0, x_119);
 lean_ctor_set(x_120, 1, x_118);
 x_121 = lean_array_push(x_108, x_120);
-x_122 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_122 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_102);
 x_123 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_123, 0, x_102);
@@ -1926,7 +1926,7 @@ x_127 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_127, 0, x_126);
 lean_ctor_set(x_127, 1, x_125);
 x_128 = lean_array_push(x_108, x_127);
-x_129 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_129 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_102);
 x_130 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_130, 0, x_102);
@@ -2007,7 +2007,7 @@ lean_ctor_set(x_169, 1, x_168);
 x_170 = lean_array_push(x_111, x_169);
 x_171 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_172 = lean_array_push(x_170, x_171);
-x_173 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_173 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_102);
 x_174 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_174, 0, x_102);
@@ -2089,7 +2089,7 @@ lean_ctor_set(x_18, 0, x_14);
 lean_ctor_set(x_18, 1, x_17);
 x_19 = l_Array_empty___closed__1;
 x_20 = lean_array_push(x_19, x_18);
-x_21 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_21 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_22 = lean_array_push(x_20, x_21);
 x_23 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__10;
 lean_inc(x_15);
@@ -2110,7 +2110,7 @@ x_31 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_31, 0, x_30);
 lean_ctor_set(x_31, 1, x_29);
 x_32 = lean_array_push(x_19, x_31);
-x_33 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_33 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_14);
 x_34 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_34, 0, x_14);
@@ -2123,7 +2123,7 @@ x_38 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_36);
 x_39 = lean_array_push(x_19, x_38);
-x_40 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_40 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_14);
 x_41 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_41, 0, x_14);
@@ -2173,7 +2173,7 @@ lean_ctor_set(x_64, 1, x_63);
 x_65 = lean_array_push(x_22, x_64);
 x_66 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_67 = lean_array_push(x_65, x_66);
-x_68 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_68 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_14);
 x_69 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_69, 0, x_14);
@@ -2226,7 +2226,7 @@ lean_ctor_set(x_89, 0, x_84);
 lean_ctor_set(x_89, 1, x_88);
 x_90 = l_Array_empty___closed__1;
 x_91 = lean_array_push(x_90, x_89);
-x_92 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_92 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_93 = lean_array_push(x_91, x_92);
 x_94 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__10;
 lean_inc(x_86);
@@ -2247,7 +2247,7 @@ x_102 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_102, 0, x_101);
 lean_ctor_set(x_102, 1, x_100);
 x_103 = lean_array_push(x_90, x_102);
-x_104 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_104 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_84);
 x_105 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_105, 0, x_84);
@@ -2260,7 +2260,7 @@ x_109 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_109, 0, x_108);
 lean_ctor_set(x_109, 1, x_107);
 x_110 = lean_array_push(x_90, x_109);
-x_111 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_111 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_84);
 x_112 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_112, 0, x_84);
@@ -2310,7 +2310,7 @@ lean_ctor_set(x_135, 1, x_134);
 x_136 = lean_array_push(x_93, x_135);
 x_137 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__16;
 x_138 = lean_array_push(x_136, x_137);
-x_139 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_139 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_84);
 x_140 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_140, 0, x_84);

stage0/stdlib/Init/Data/Repr.c

@@ -140,7 +140,6 @@ lean_object* l_instReprList__1___rarg___boxed(lean_object*, lean_object*, lean_o
 lean_object* l_Nat_toSuperscriptString(lean_object*);
 uint32_t l_Nat_digitChar(lean_object*);
 extern lean_object* l_Std_Format_paren___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
 lean_object* l_instReprAtomString;
 lean_object* l_instReprId__1(lean_object*);
 lean_object* l_instReprIterator_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -210,6 +209,7 @@ lean_object* l_instReprSigma___rarg___closed__4;
 lean_object* lean_string_length(lean_object*);
 lean_object* l_instReprTupleProd_match__1___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Std_Format_sbracket___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_object* l_instReprDecidable___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Repr_addAppParen___boxed(lean_object*, lean_object*);
 lean_object* l_reprStr(lean_object*);
@@ -1088,7 +1088,7 @@ static lean_object* _init_l_instReprProd___rarg___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_1 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;

stage0/stdlib/Init/Data/ToString/Macro.c

@@ -22,6 +22,7 @@ lean_object* l_myMacro____x40_Init_Data_ToString_Macro___hyg_23____closed__7;
 lean_object* l_termS_x21_____closed__3;
 lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_termS_x21_____closed__2;
+lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(lean_object*, lean_object*);
 extern lean_object* l_Lean_instQuoteSubstring___closed__1;
 extern lean_object* l_Lean_instQuoteSubstring___closed__2;
 lean_object* l_Lean_Syntax_expandInterpolatedStr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -47,7 +48,6 @@ lean_object* l_myMacro____x40_Init_Data_ToString_Macro___hyg_23____closed__12;
 uint8_t l_Lean_Syntax_isOfKind(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 lean_object* l_termS_x21__;
-lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(lean_object*, lean_object*);
 static lean_object* _init_l_termS_x21_____closed__1() {
 _start:
 {
@@ -314,7 +314,7 @@ lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_o
 x_8 = lean_unsigned_to_nat(1u);
 x_9 = l_Lean_Syntax_getArg(x_1, x_8);
 lean_dec(x_1);
-x_10 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_2, x_3);
+x_10 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_2, x_3);
 x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
 x_12 = lean_ctor_get(x_10, 1);
@@ -335,7 +335,7 @@ lean_ctor_set(x_19, 0, x_11);
 lean_ctor_set(x_19, 1, x_17);
 lean_ctor_set(x_19, 2, x_16);
 lean_ctor_set(x_19, 3, x_18);
-x_20 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_2, x_12);
+x_20 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_2, x_12);
 x_21 = lean_ctor_get(x_20, 0);
 lean_inc(x_21);
 x_22 = lean_ctor_get(x_20, 1);

stage0/stdlib/Init/Meta.c

@@ -118,7 +118,6 @@ uint32_t l_Lean_idEndEscape;
 lean_object* l_Lean_Syntax_SepArray_instCoeTailSepArrayArraySyntax(lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar___boxed__const__5;
 extern lean_object* l_instReprBool___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Lean_isIdRest___boxed(lean_object*);
 lean_object* l_Lean_instQuoteProd(lean_object*, lean_object*);
 lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*);
@@ -142,7 +141,6 @@ extern lean_object* l_Array_getEvenElems___rarg___closed__1;
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeHexDigit___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_setTailInfo(lean_object*, lean_object*);
 lean_object* l_Lean_instQuoteArray(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
 lean_object* lean_string_utf8_extract(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_instQuoteProd_match__1(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_5935____closed__1;
@@ -160,6 +158,7 @@ lean_object* l_Array_filterSepElems___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_mkIdentFrom___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_5935____closed__17;
 lean_object* l_Lean_Syntax_setHeadInfo(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 extern lean_object* l_instReprBool___closed__2;
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_5935____closed__8;
 lean_object* l_Lean_instQuoteBool___closed__1;
@@ -180,10 +179,12 @@ lean_object* l_Lean_isSubScriptAlnum___boxed(lean_object*);
 lean_object* l_Array_mapSepElems(lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__4;
 lean_object* l_Lean_Name_instReprName(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 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*);
 extern lean_object* l_instReprBool___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 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*);
@@ -191,6 +192,7 @@ lean_object* l_Lean_instQuoteSubstring___closed__1;
 lean_object* lean_string_utf8_next(lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_5935____closed__15;
 lean_object* l_Lean_Syntax_isAtom_match__1(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2450____closed__4;
 lean_object* l_Lean_instQuoteSubstring___closed__2;
 lean_object* l_Lean_Syntax_isLit_x3f___boxed(lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__8;
@@ -234,6 +236,7 @@ lean_object* l_Lean_Syntax_mkStrLit___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_mkApp_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_expandInterpolatedStr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_numLitKind;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 lean_object* l_Lean_Syntax_expandInterpolatedStrChunks_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_instQuoteString(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeDecimalLitAux(lean_object*, lean_object*, lean_object*);
@@ -290,7 +293,6 @@ lean_object* l_Lean_mkFreshId___rarg(lean_object*, lean_object*);
 lean_object* l_String_capitalize(lean_object*);
 lean_object* l_Lean_evalOptPrec_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_NameGenerator_next(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_10131____closed__7;
 lean_object* l_Lean_Syntax_setHeadInfo_match__1(lean_object*);
 lean_object* l_Lean_Syntax_decodeCharLit___boxed(lean_object*);
 lean_object* l_Lean_Syntax_decodeNatLitVal_x3f(lean_object*);
@@ -350,10 +352,8 @@ lean_object* l___private_Init_Meta_0__Array_filterSepElemsMAux___rarg___lambda__
 lean_object* l_Lean_Syntax_decodeScientificLitVal_x3f_decodeAfterExp(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, 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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_Lean_mkOptionalNode(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_version_getPatch___boxed(lean_object*);
-extern lean_object* l_Lean_myMacro____x40_Init_Notation___hyg_14568____closed__5;
 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*);
@@ -374,6 +374,7 @@ lean_object* l_Lean_version_minor___closed__1;
 lean_object* l_Lean_mkCIdentFromRef___rarg___lambda__1(lean_object*, 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*);
+extern lean_object* l_Lean_myMacro____x40_Init_Notation___hyg_14642____closed__5;
 lean_object* l_Lean_Name_appendBefore_match__1(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeNameLitAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_isNumericSubscript___boxed(lean_object*);
@@ -390,7 +391,6 @@ 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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 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;
@@ -452,6 +452,7 @@ 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;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Lean_Syntax_isIdent_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkHole(lean_object*);
 lean_object* l_Lean_Syntax_expandInterpolatedStr___lambda__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -491,7 +492,6 @@ lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeHexLitAux_match__1(lean_
 lean_object* l_Lean_Name_appendBefore_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_5935____closed__20;
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_5935_(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
 lean_object* l_Lean_mkSepArray_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_instQuoteSubstring___closed__4;
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_beqConfig____x40_Init_Meta___hyg_5784____boxed(lean_object*, lean_object*);
@@ -520,6 +520,7 @@ lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_expandInterpolatedStr___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkCIdentFromRef___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar___boxed__const__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_10205____closed__7;
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeHexLitAux_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar___boxed__const__1;
 lean_object* l_Lean_Syntax_getTailInfo_x3f(lean_object*);
@@ -601,6 +602,7 @@ lean_object* lean_nat_mod(lean_object*, lean_object*);
 lean_object* l_Lean_SourceInfo_getPos_x3f(lean_object*, uint8_t);
 lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__3;
 lean_object* l___private_Init_Meta_0__Array_filterSepElemsMAux___at_Array_filterSepElems___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5;
 lean_object* l_Lean_Meta_Simp_instBEqConfig___closed__1;
 lean_object* l_Lean_instQuoteProd___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isScientificLit_x3f_match__1(lean_object*);
@@ -621,7 +623,7 @@ lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4612_(lean_object*, lean_obje
 lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4501_(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4744_(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_myMacro____x40_Init_Meta___hyg_4119_(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 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*);
@@ -633,7 +635,6 @@ lean_object* l_Lean_Syntax_decodeQuotedChar_match__4(lean_object*);
 lean_object* l_Lean_mkSepArray___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isNone_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_decodeQuotedChar_match__5___rarg(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2376____closed__4;
 lean_object* l___private_Init_Meta_0__Lean_Meta_Simp_reprConfig____x40_Init_Meta___hyg_5935____closed__26;
 lean_object* l_Lean_instQuoteName___closed__1;
 lean_object* l___private_Init_Meta_0__Lean_Syntax_updateLast_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -651,7 +652,6 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_mkSepArray___spec__1___closed__1
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrLit_loop_match__1(lean_object*);
 lean_object* l___private_Init_Meta_0__Lean_Syntax_decodeInterpStrLit_loop(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getOptional_x3f_match__1(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5;
 lean_object* lean_nat_to_int(lean_object*);
 uint8_t l_Lean_Syntax_isToken(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_isFieldIdx_x3f___boxed(lean_object*);
@@ -1791,7 +1791,7 @@ lean_inc(x_3);
 x_4 = lean_ctor_get(x_1, 1);
 lean_inc(x_4);
 lean_dec(x_1);
-x_5 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_5 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_6 = lean_string_append(x_4, x_5);
 x_7 = l_Nat_repr(x_2);
 x_8 = lean_string_append(x_6, x_7);
@@ -1803,7 +1803,7 @@ else
 {
 lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
 x_10 = l_Nat_repr(x_2);
-x_11 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_11 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_12 = lean_string_append(x_11, x_10);
 lean_dec(x_10);
 x_13 = lean_name_mk_string(x_1, x_12);
@@ -5052,11 +5052,11 @@ lean_object* l_Lean_mkHole(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; 
-x_2 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_2 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_3 = l_Lean_mkAtomFrom(x_1, x_2);
 x_4 = l_Lean_mkOptionalNode___closed__2;
 x_5 = lean_array_push(x_4, x_3);
-x_6 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_6 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_7 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_7, 0, x_6);
 lean_ctor_set(x_7, 1, x_5);
@@ -5235,7 +5235,7 @@ lean_ctor_set(x_7, 1, x_2);
 x_8 = l_Lean_Syntax_mkApp___closed__1;
 x_9 = lean_array_push(x_8, x_1);
 x_10 = lean_array_push(x_9, x_7);
-x_11 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_11 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_12 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_12, 0, x_11);
 lean_ctor_set(x_12, 1, x_10);
@@ -9442,7 +9442,7 @@ static lean_object* _init_l_Lean_instQuoteProd___rarg___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_2376____closed__4;
+x_1 = l_myMacro____x40_Init_Notation___hyg_2450____closed__4;
 x_2 = l_Lean_instQuoteProd___rarg___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -9513,7 +9513,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_myMacro____x40_Init_Notation___hyg_14568____closed__5;
+x_2 = l_Lean_myMacro____x40_Init_Notation___hyg_14642____closed__5;
 x_3 = l_Lean_mkCIdentFrom(x_1, x_2);
 return x_3;
 }
@@ -9542,7 +9542,7 @@ x_7 = l___private_Init_Meta_0__Lean_quoteList___rarg(x_1, x_5);
 x_8 = l_Lean_Syntax_mkApp___closed__1;
 x_9 = lean_array_push(x_8, x_6);
 x_10 = lean_array_push(x_9, x_7);
-x_11 = l_myMacro____x40_Init_Notation___hyg_10131____closed__7;
+x_11 = l_myMacro____x40_Init_Notation___hyg_10205____closed__7;
 x_12 = l_Lean_Syntax_mkCApp(x_11, x_10);
 return x_12;
 }
@@ -9581,7 +9581,7 @@ x_3 = lean_array_to_list(lean_box(0), x_2);
 x_4 = l___private_Init_Meta_0__Lean_quoteList___rarg(x_1, x_3);
 x_5 = l_Lean_mkOptionalNode___closed__2;
 x_6 = lean_array_push(x_5, x_4);
-x_7 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3606____closed__5;
+x_7 = l_myMacro____x40_Init_Data_Array_Basic___hyg_3607____closed__5;
 x_8 = l_Lean_Syntax_mkCApp(x_7, x_6);
 return x_8;
 }
@@ -13119,7 +13119,7 @@ x_12 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_12, 0, x_11);
 lean_ctor_set(x_12, 1, x_10);
 x_13 = lean_array_push(x_9, x_12);
-x_14 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_14 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_15 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_15, 0, x_14);
 lean_ctor_set(x_15, 1, x_13);
@@ -13140,7 +13140,7 @@ x_21 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_21, 0, x_20);
 lean_ctor_set(x_21, 1, x_19);
 x_22 = lean_array_push(x_18, x_21);
-x_23 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_23 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_24 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_24, 0, x_23);
 lean_ctor_set(x_24, 1, x_22);
@@ -13193,14 +13193,14 @@ lean_ctor_set(x_16, 1, x_15);
 x_17 = l_Array_empty___closed__1;
 x_18 = lean_array_push(x_17, x_16);
 x_19 = lean_array_push(x_17, x_10);
-x_20 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_20 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_14);
 x_21 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_21, 0, x_14);
 lean_ctor_set(x_21, 1, x_20);
 x_22 = lean_array_push(x_17, x_21);
 x_23 = lean_array_push(x_22, x_2);
-x_24 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_24 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_25 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_25, 0, x_24);
 lean_ctor_set(x_25, 1, x_23);
@@ -13219,7 +13219,7 @@ x_33 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_33, 0, x_14);
 lean_ctor_set(x_33, 1, x_32);
 x_34 = lean_array_push(x_31, x_33);
-x_35 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_35 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_36 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_36, 0, x_35);
 lean_ctor_set(x_36, 1, x_34);
@@ -13242,14 +13242,14 @@ lean_ctor_set(x_40, 1, x_39);
 x_41 = l_Array_empty___closed__1;
 x_42 = lean_array_push(x_41, x_40);
 x_43 = lean_array_push(x_41, x_10);
-x_44 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_44 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_37);
 x_45 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_45, 0, x_37);
 lean_ctor_set(x_45, 1, x_44);
 x_46 = lean_array_push(x_41, x_45);
 x_47 = lean_array_push(x_46, x_2);
-x_48 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_48 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_49 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_49, 0, x_48);
 lean_ctor_set(x_49, 1, x_47);
@@ -13268,7 +13268,7 @@ x_57 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_57, 0, x_37);
 lean_ctor_set(x_57, 1, x_56);
 x_58 = lean_array_push(x_55, x_57);
-x_59 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_59 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_60 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_60, 0, x_59);
 lean_ctor_set(x_60, 1, x_58);

stage0/stdlib/Init/System/IO.c

@@ -100,7 +100,6 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_IO_FS_Handle_write(lean_object*);
 lean_object* l_IO_print(lean_object*);
 lean_object* l_IO_FS_Stream_ofBuffer___elambda__5(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 extern lean_object* l_termS_x21_____closed__3;
 lean_object* l_Lean_instEvalUnit(lean_object*);
 lean_object* l_IO_FS_Handle_flush___rarg(lean_object*, lean_object*);
@@ -119,7 +118,6 @@ extern lean_object* l_Lean_interpolatedStrKind;
 lean_object* l_IO_Process_SpawnArgs_args___default;
 uint32_t l_IO_AccessRight_flags___closed__6;
 lean_object* l_IO_FS_Handle_readToEnd___rarg(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
 lean_object* l_IO_ofExcept_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_instMonadLiftSTRealWorldEIO_match__1___boxed(lean_object*, lean_object*);
 lean_object* l_IO_isDir(lean_object*);
@@ -140,6 +138,7 @@ lean_object* lean_io_getenv(lean_object*, lean_object*);
 uint32_t l_IO_AccessRight_flags___closed__13;
 lean_object* l_IO_Process_SpawnArgs_cwd___default;
 lean_object* l_Lean_instEvalUnit___boxed(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 lean_object* l_IO_instMonadLiftSTRealWorldEIO_match__1(lean_object*, uint8_t);
 lean_object* l_Lean_instEval__1(lean_object*);
 lean_object* l_IO_FS_Handle_getLine___at_IO_Process_output___spec__2(lean_object*, lean_object*);
@@ -160,6 +159,7 @@ lean_object* l_IO_instMonadLiftSTRealWorldEIO(lean_object*, lean_object*);
 lean_object* l_IO_FS_Stream_ofBuffer(lean_object*);
 lean_object* l_IO_FS_Stream_ofHandle___elambda__4___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_setStderr(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* lean_io_bind_task(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_FS_Handle_readBinToEnd_loop___rarg___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_termPrintln_x21_______closed__5;
@@ -190,6 +190,7 @@ lean_object* l_IO_sleep___lambda__1(lean_object*, lean_object*);
 uint32_t l_IO_AccessRight_flags___closed__2;
 lean_object* l_IO_Process_SpawnArgs_env___default;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 lean_object* l_EStateM_bind___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Task_Priority_dedicated;
 lean_object* l_IO_eprintln___at___private_Init_System_IO_0__IO_eprintlnAux___spec__1(lean_object*, lean_object*);
@@ -202,7 +203,6 @@ lean_object* l_IO_FS_Stream_ofBuffer___elambda__1___boxed(lean_object*, lean_obj
 lean_object* l_IO_getStderr___rarg___closed__1;
 lean_object* lean_io_current_dir(lean_object*);
 lean_object* l_myMacro____x40_Init_System_IO___hyg_2797____closed__19;
-extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1;
 lean_object* l_IO_Prim_fopenFlags___closed__10;
 lean_object* l_ByteArray_extract(lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_from_utf8_unchecked(lean_object*);
@@ -241,6 +241,7 @@ lean_object* l_IO_getNumHeartbeats___boxed(lean_object*, lean_object*);
 lean_object* l_IO_eprint(lean_object*);
 lean_object* l_EIO_toIO_x27___rarg(lean_object*, lean_object*);
 lean_object* lean_format_pretty(lean_object*, lean_object*);
+extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1;
 lean_object* l_EStateM_instMonadFinallyEStateM(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_FS_Stream_ofHandle___elambda__2___boxed(lean_object*, lean_object*);
 lean_object* l_IO_initializing___boxed(lean_object*);
@@ -262,7 +263,6 @@ lean_object* l_IO_FS_Handle_mk___rarg(lean_object*, lean_object*, uint8_t, uint8
 lean_object* l_IO_sleep___lambda__1___boxed(lean_object*, lean_object*);
 extern lean_object* l_instMonadEST___closed__1;
 lean_object* l_IO_println___rarg(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_IO_Process_spawn___boxed(lean_object*, lean_object*);
 lean_object* l_IO_getStdout___rarg___closed__1;
 lean_object* l_IO_FS_Stream_ofHandle___elambda__5___boxed(lean_object*, lean_object*);
@@ -282,10 +282,10 @@ lean_object* l_instInhabitedEIO(lean_object*, lean_object*);
 lean_object* l_IO_FS_Stream_ofBuffer_match__1___rarg(lean_object*, lean_object*, lean_object*);
 uint32_t l_IO_AccessRight_flags___closed__11;
 lean_object* l_myMacro____x40_Init_System_IO___hyg_2797____closed__7;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__10;
 lean_object* l_IO_FS_Handle_read(lean_object*);
 lean_object* lean_io_has_finished(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1264____closed__6;
 lean_object* l_String_dropRight(lean_object*, lean_object*);
 lean_object* l_EIO_catchExceptions(lean_object*, lean_object*);
 extern lean_object* l_termDepIfThenElse___closed__14;
@@ -325,6 +325,7 @@ lean_object* l_IO_Prim_setAccessRights___boxed(lean_object*, lean_object*, lean_
 lean_object* l_IO_FS_Handle_readToEnd_read___at_IO_Process_output___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_isDir___rarg(lean_object*, lean_object*);
 lean_object* l_IO_getEnv(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Lean_instEvalIO___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_sleep___boxed(lean_object*, lean_object*);
 lean_object* l_IO_FS_Stream_ofHandle___elambda__1(lean_object*, lean_object*, lean_object*);
@@ -341,7 +342,6 @@ lean_object* l_IO_wait___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l_IO_FS_Stream_ofBuffer___elambda__3(lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_Prim_currentDir___boxed(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
 lean_object* l_IO_Prim_fopenFlags___closed__5;
 lean_object* lean_get_stdout(lean_object*);
 lean_object* l_IO_FS_Stream_ofHandle___elambda__3(lean_object*, lean_object*, lean_object*);
@@ -374,6 +374,7 @@ lean_object* l_IO_println___at_Lean_instEval__1___spec__1(lean_object*, lean_obj
 lean_object* l_instInhabitedEIO___rarg(lean_object*);
 lean_object* lean_get_set_stdin(lean_object*, lean_object*);
 lean_object* l_IO_FS_Handle_getLine___at_IO_Process_output___spec__2___boxed(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_EStateM_instInhabitedEStateM___rarg(lean_object*, lean_object*);
 lean_object* l_instOrElseEIO(lean_object*, lean_object*);
 lean_object* l_IO_eprint___at_IO_eprintln___spec__1(lean_object*, lean_object*);
@@ -393,7 +394,6 @@ lean_object* lean_io_remove_file(lean_object*, lean_object*);
 uint32_t l_UInt32_lor(uint32_t, uint32_t);
 lean_object* l_IO_Prim_fopenFlags___closed__4;
 lean_object* l_IO_appPath(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1190____closed__6;
 lean_object* lean_io_initializing(lean_object*);
 lean_object* l_IO_FS_writeBinFile___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_FS_Stream_ofHandle___elambda__6___boxed(lean_object*, lean_object*);
@@ -1557,7 +1557,7 @@ static lean_object* _init_l_IO_Prim_fopenFlags___closed__12() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1;
 x_2 = l_IO_Prim_fopenFlags___closed__2;
 x_3 = lean_string_append(x_1, x_2);
 return x_3;
@@ -1567,7 +1567,7 @@ static lean_object* _init_l_IO_Prim_fopenFlags___closed__13() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__1;
+x_1 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__1;
 x_2 = l_IO_Prim_fopenFlags___closed__4;
 x_3 = lean_string_append(x_1, x_2);
 return x_3;
@@ -6751,7 +6751,7 @@ static lean_object* _init_l_termPrintln_x21_______closed__5() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_1190____closed__6;
+x_1 = l_myMacro____x40_Init_Notation___hyg_1264____closed__6;
 x_2 = l_termS_x21_____closed__7;
 x_3 = l_termDepIfThenElse___closed__14;
 x_4 = lean_alloc_ctor(2, 3, 0);
@@ -7069,12 +7069,12 @@ x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
 x_31 = lean_array_push(x_27, x_30);
-x_32 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_32 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_33 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
 x_34 = lean_array_push(x_20, x_33);
-x_35 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_35 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_15);
 x_36 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_36, 0, x_15);
@@ -7112,7 +7112,7 @@ x_52 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_52, 0, x_32);
 lean_ctor_set(x_52, 1, x_51);
 x_53 = lean_array_push(x_37, x_52);
-x_54 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_54 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_55 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_55, 0, x_54);
 lean_ctor_set(x_55, 1, x_53);
@@ -7130,7 +7130,7 @@ x_62 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_62, 0, x_15);
 lean_ctor_set(x_62, 1, x_61);
 x_63 = lean_array_push(x_60, x_62);
-x_64 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_64 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_65 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_65, 0, x_64);
 lean_ctor_set(x_65, 1, x_63);
@@ -7176,12 +7176,12 @@ x_82 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_82, 0, x_81);
 lean_ctor_set(x_82, 1, x_80);
 x_83 = lean_array_push(x_79, x_82);
-x_84 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_84 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_85 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_85, 0, x_84);
 lean_ctor_set(x_85, 1, x_83);
 x_86 = lean_array_push(x_72, x_85);
-x_87 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_87 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_66);
 x_88 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_88, 0, x_66);
@@ -7219,7 +7219,7 @@ x_104 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_104, 0, x_84);
 lean_ctor_set(x_104, 1, x_103);
 x_105 = lean_array_push(x_89, x_104);
-x_106 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_106 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_107 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_107, 0, x_106);
 lean_ctor_set(x_107, 1, x_105);
@@ -7237,7 +7237,7 @@ x_114 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_114, 0, x_66);
 lean_ctor_set(x_114, 1, x_113);
 x_115 = lean_array_push(x_112, x_114);
-x_116 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_116 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_117 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_117, 0, x_116);
 lean_ctor_set(x_117, 1, x_115);
@@ -7293,7 +7293,7 @@ x_139 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_139, 0, x_138);
 lean_ctor_set(x_139, 1, x_137);
 x_140 = lean_array_push(x_126, x_139);
-x_141 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_141 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_142 = lean_array_push(x_140, x_141);
 x_143 = l_Lean_nullKind___closed__2;
 x_144 = lean_alloc_ctor(1, 2, 0);
@@ -7308,7 +7308,7 @@ lean_ctor_set(x_147, 0, x_121);
 lean_ctor_set(x_147, 1, x_146);
 lean_inc(x_147);
 x_148 = lean_array_push(x_145, x_147);
-x_149 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_149 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_150 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_150, 0, x_149);
 lean_ctor_set(x_150, 1, x_148);
@@ -7317,12 +7317,12 @@ x_152 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_152, 0, x_143);
 lean_ctor_set(x_152, 1, x_151);
 x_153 = lean_array_push(x_133, x_152);
-x_154 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_154 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_155 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_155, 0, x_154);
 lean_ctor_set(x_155, 1, x_153);
 x_156 = lean_array_push(x_126, x_155);
-x_157 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_157 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_121);
 x_158 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_158, 0, x_121);
@@ -7359,7 +7359,7 @@ x_174 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_174, 0, x_154);
 lean_ctor_set(x_174, 1, x_173);
 x_175 = lean_array_push(x_159, x_174);
-x_176 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_176 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_177 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_177, 0, x_176);
 lean_ctor_set(x_177, 1, x_175);
@@ -7424,7 +7424,7 @@ x_204 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_204, 0, x_203);
 lean_ctor_set(x_204, 1, x_202);
 x_205 = lean_array_push(x_191, x_204);
-x_206 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_206 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_207 = lean_array_push(x_205, x_206);
 x_208 = l_Lean_nullKind___closed__2;
 x_209 = lean_alloc_ctor(1, 2, 0);
@@ -7439,7 +7439,7 @@ lean_ctor_set(x_212, 0, x_185);
 lean_ctor_set(x_212, 1, x_211);
 lean_inc(x_212);
 x_213 = lean_array_push(x_210, x_212);
-x_214 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_214 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_215 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_215, 0, x_214);
 lean_ctor_set(x_215, 1, x_213);
@@ -7448,12 +7448,12 @@ x_217 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_217, 0, x_208);
 lean_ctor_set(x_217, 1, x_216);
 x_218 = lean_array_push(x_198, x_217);
-x_219 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_219 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_220 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_220, 0, x_219);
 lean_ctor_set(x_220, 1, x_218);
 x_221 = lean_array_push(x_191, x_220);
-x_222 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_222 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_185);
 x_223 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_223, 0, x_185);
@@ -7490,7 +7490,7 @@ x_239 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_239, 0, x_219);
 lean_ctor_set(x_239, 1, x_238);
 x_240 = lean_array_push(x_224, x_239);
-x_241 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_241 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_242 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_242, 0, x_241);
 lean_ctor_set(x_242, 1, x_240);

stage0/stdlib/Init/Util.c

@@ -24,7 +24,6 @@ lean_object* l_withPtrEq___rarg(lean_object*, lean_object*);
 lean_object* l_withPtrEqUnsafe(lean_object*);
 lean_object* lean_dbg_trace(lean_object*, lean_object*);
 lean_object* l_Monad_seqRight___default___rarg___lambda__1___boxed(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_withPtrEqDecEq___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_withPtrEq___boxed(lean_object*, lean_object*, lean_object*);
@@ -32,6 +31,7 @@ lean_object* l_withPtrEqDecEq_match__1___rarg___boxed(lean_object*, lean_object*
 lean_object* l_withPtrEqDecEq_match__1___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_withPtrEqDecEq(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_dbgTraceVal___rarg(lean_object*, lean_object*);
 lean_object* l___private_Init_Util_0__mkPanicMessage(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_panicWithPos___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -130,7 +130,7 @@ _start:
 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; 
 x_5 = l___private_Init_Util_0__mkPanicMessage___closed__1;
 x_6 = lean_string_append(x_5, x_1);
-x_7 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_7 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_8 = lean_string_append(x_6, x_7);
 x_9 = l_Nat_repr(x_2);
 x_10 = lean_string_append(x_8, x_9);
@@ -191,7 +191,7 @@ x_7 = lean_string_append(x_6, x_2);
 x_8 = l___private_Init_Data_Format_Basic_0__Std_Format_be___closed__1;
 x_9 = lean_string_append(x_7, x_8);
 x_10 = lean_string_append(x_9, x_1);
-x_11 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_11 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_12 = lean_string_append(x_10, x_11);
 x_13 = l_Nat_repr(x_3);
 x_14 = lean_string_append(x_12, x_13);

stage0/stdlib/Lean/Compiler/ConstFolding.c

@@ -18,7 +18,6 @@ lean_object* l_Lean_Compiler_unFoldFns___closed__3;
 lean_object* l_Lean_Compiler_preUIntBinFoldFns___closed__5;
 lean_object* l_Lean_Compiler_mkNatLe(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_preUIntBinFoldFns___closed__14;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_4943____closed__7;
 extern lean_object* l_Nat_instDivNat___closed__1;
 lean_object* l_Lean_Compiler_foldNatBinPred___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_numScalarTypes;
@@ -62,7 +61,9 @@ lean_object* l_Lean_Compiler_preUIntBinFoldFns;
 lean_object* l_Lean_Compiler_foldStrictAnd___boxed(lean_object*);
 lean_object* l_Lean_Compiler_natFoldFns;
 lean_object* l_Lean_Compiler_preUIntBinFoldFns___closed__25;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_4497____closed__7;
 lean_object* l_List_append___rarg(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_6045____closed__4;
 lean_object* l_Lean_Compiler_boolFoldFns___closed__5;
 lean_object* l_Lean_Compiler_foldUIntSub(uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_foldToNat___rarg(lean_object*);
@@ -95,6 +96,7 @@ lean_object* l_Lean_Compiler_foldNatMul___boxed(lean_object*);
 lean_object* l_Lean_Compiler_binFoldFns___closed__2;
 lean_object* l_Lean_Compiler_preUIntBinFoldFns___closed__22;
 lean_object* l_Lean_Compiler_NumScalarTypeInfo_toNatFn___default___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_5017____closed__7;
 lean_object* l_Lean_Compiler_uintFoldToNatFns;
 lean_object* l_Lean_Compiler_foldNatDecLe___closed__1;
 extern lean_object* l_Lean_instQuoteBool___closed__1;
@@ -277,7 +279,6 @@ lean_object* l_Lean_Compiler_natFoldFns___closed__36;
 lean_object* l_Lean_Compiler_numScalarTypes___closed__10;
 lean_object* l_Lean_Compiler_natFoldFns___closed__35;
 lean_object* l_Lean_Compiler_findBinFoldFn___boxed(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_4423____closed__7;
 lean_object* l_Lean_Compiler_natFoldFns___closed__17;
 lean_object* l_Lean_Compiler_preUIntBinFoldFns___closed__3;
 lean_object* l_Lean_Compiler_natPowThreshold;
@@ -343,7 +344,6 @@ extern lean_object* l_Nat_instModNat___closed__1;
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Compiler_foldNatDecEq___boxed(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
 lean_object* l_Lean_Compiler_boolFoldFns___closed__10;
 lean_object* l_Lean_Compiler_uintBinFoldFns_match__1(lean_object*);
 lean_object* l_Lean_Compiler_toDecidableExpr___closed__2;
@@ -2283,7 +2283,7 @@ static lean_object* _init_l_Lean_Compiler_mkNatEq___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
+x_1 = l_myMacro____x40_Init_Notation___hyg_6045____closed__4;
 x_2 = l_Lean_Compiler_mkNatEq___closed__1;
 x_3 = l_Lean_mkConst(x_1, x_2);
 return x_3;
@@ -2347,7 +2347,7 @@ static lean_object* _init_l_Lean_Compiler_mkNatLt___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_4943____closed__7;
+x_1 = l_myMacro____x40_Init_Notation___hyg_5017____closed__7;
 x_2 = l_Lean_Compiler_mkNatLt___closed__1;
 x_3 = l_Lean_mkConst(x_1, x_2);
 return x_3;
@@ -2418,7 +2418,7 @@ static lean_object* _init_l_Lean_Compiler_mkNatLe___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_4423____closed__7;
+x_1 = l_myMacro____x40_Init_Notation___hyg_4497____closed__7;
 x_2 = l_Lean_Compiler_mkNatLt___closed__1;
 x_3 = l_Lean_mkConst(x_1, x_2);
 return x_3;

stage0/stdlib/Lean/Compiler/IR/Basic.c

@@ -18,7 +18,7 @@ lean_object* l_Lean_IR_LocalContext_getValue___boxed(lean_object*, lean_object*)
 lean_object* l_Lean_IR_FnBody_body___boxed(lean_object*);
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_IR_AltCore_mmodifyBody_match__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_IR_Decl_instInhabitedDecl;
+lean_object* l_Lean_IR_Decl_updateBody_x21___closed__1;
 lean_object* l_Lean_IR_reshapeAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_addParamsRename(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_FnBody_alphaEqv_match__3(lean_object*);
@@ -47,11 +47,13 @@ lean_object* l_Lean_IR_LitVal_beq___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_IR_LocalContext_isParam_match__1(lean_object*);
 lean_object* l_Lean_IR_AltCore_mmodifyBody___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_IR_LocalContext_isJP(lean_object*, lean_object*);
+lean_object* l_Lean_IR_DeclInfo_sorryDep_x3f___default;
 lean_object* l_Lean_IR_FnBody_alphaEqv_match__3___rarg(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*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_IRType_isStruct_match__1(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_IR_LocalContext_addParams___spec__1(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_IR_instBEqFnBody___closed__1;
 extern lean_object* l_Array_empty___closed__1;
+extern lean_object* l_Lean_instInhabitedExternAttrData___closed__1;
 lean_object* l_Lean_IR_modifyJPs_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_instAlphaEqvVarId___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_mmodifyJPs___spec__1___rarg___lambda__1(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*);
@@ -75,6 +77,8 @@ lean_object* lean_ir_mk_str_expr(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_IR_addParamsRename___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_FnBody_setBody_match__1___rarg(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_IR_Decl_updateBody_x21_match__1(lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21___closed__2;
 lean_object* l_Lean_IR_AltCore_setBody_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_instAlphaEqvExpr___closed__1;
 lean_object* l_Lean_IR_IRType_isIrrelevant___boxed(lean_object*);
@@ -114,13 +118,13 @@ extern lean_object* l_Lean_instQuoteBool___closed__5;
 lean_object* l_Array_isEqvAux___at_Lean_IR_args_alphaEqv___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_setBlack___rarg(lean_object*);
 lean_object* l_Lean_IR_Arg_beq_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_getInfo_match__1(lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* lean_ir_mk_papp_expr(lean_object*, lean_object*);
 lean_object* l_Std_RBNode_find___at_Lean_IR_LocalContext_isJP___spec__1(lean_object*, lean_object*);
 lean_object* l_Std_RBNode_del___at_Lean_IR_LocalContext_eraseJoinPointDecl___spec__2(lean_object*, lean_object*);
 uint8_t l_Lean_IR_args_alphaEqv(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
-lean_object* l_Lean_IR_Decl_instInhabitedDecl___closed__1;
 uint8_t l_Lean_IR_VarId_alphaEqv(lean_object*, lean_object*, lean_object*);
 lean_object* lean_ir_mk_fapp_expr(lean_object*, lean_object*);
 lean_object* l_Lean_IR_LocalContext_isLocalVar___boxed(lean_object*, lean_object*);
@@ -154,6 +158,7 @@ uint8_t l_Lean_IR_FnBody_isTerminal(lean_object*);
 lean_object* l_Array_isEqvAux___at_Lean_IR_FnBody_alphaEqv___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_instInhabitedArg___closed__1;
 lean_object* l_Lean_IR_Decl_params___boxed(lean_object*);
+lean_object* l_Lean_IR_Decl_getInfo___boxed(lean_object*);
 uint8_t l_Lean_IR_FnBody_beq(lean_object*, lean_object*);
 lean_object* l_Std_RBNode_balRight___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Std_RBNode_isBlack___rarg(lean_object*);
@@ -176,9 +181,12 @@ uint8_t l_Array_isEqvAux___at_Lean_IR_IRType_beq___spec__2(lean_object*, lean_ob
 lean_object* l_Lean_IR_instInhabitedFnBody;
 lean_object* l_Lean_IR_AltCore_mmodifyBody_match__1(lean_object*);
 extern lean_object* l_Array_swapAt_x21___rarg___closed__2;
+lean_object* l_Lean_IR_Decl_updateBody_x21___closed__4;
+lean_object* l_Lean_IR_Decl_getInfo(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_mmodifyJPs___spec__1(lean_object*);
 lean_object* l_Lean_IR_push(lean_object*, lean_object*);
 lean_object* l_Lean_IR_Expr_alphaEqv___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_instInhabitedDecl;
 lean_object* lean_ir_mk_alt(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_mkIf(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_FnBody_split(lean_object*);
@@ -217,6 +225,7 @@ lean_object* l_Lean_IR_CtorInfo_beq_match__1(lean_object*);
 lean_object* l_Lean_IR_MData_empty;
 lean_object* l_Lean_IR_mmodifyJPs_match__1(lean_object*);
 lean_object* lean_ir_mk_extern_decl(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21___closed__3;
 lean_object* lean_ir_mk_ctor_expr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_IR_LocalContext_contains(lean_object*, lean_object*);
 lean_object* l_Lean_IR_instToFormatVarId(lean_object*);
@@ -261,6 +270,7 @@ lean_object* l_Lean_IR_LocalContext_getJPBody_match__1(lean_object*);
 lean_object* l_Lean_IR_mkIndexSet(lean_object*);
 lean_object* l_Lean_IR_reshape(lean_object*, lean_object*);
 lean_object* l_Lean_IR_instAlphaEqvVarId;
+lean_object* l_Lean_IR_instInhabitedDecl___closed__1;
 lean_object* l_Lean_IR_instBEqCtorInfo;
 uint8_t l_Array_isEqvAux___at_Lean_IR_IRType_beq___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_Decl_resultType___boxed(lean_object*);
@@ -272,11 +282,13 @@ lean_object* l_Lean_IR_Decl_params_match__1___rarg(lean_object*, lean_object*, l
 lean_object* l_Lean_IR_IRType_instBEqIRType;
 lean_object* l_Lean_IR_IRType_beq_match__1(lean_object*);
 lean_object* l_Lean_IR_IRType_isScalar_match__1(lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* lean_ir_mk_uset(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_instInhabitedVarId;
 lean_object* l_Lean_IR_modifyJPs(lean_object*, lean_object*);
 lean_object* l_Lean_IR_Decl_name_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_LocalContext_isParam___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_instToStringJoinPointId(lean_object*);
 lean_object* lean_ir_mk_ret(lean_object*);
 lean_object* lean_ir_mk_sproj_expr(lean_object*, lean_object*, lean_object*);
@@ -285,6 +297,7 @@ lean_object* l_Lean_IR_instBEqArg___closed__1;
 lean_object* l_Lean_IR_CtorInfo_beq_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_LocalContext_getJPBody(lean_object*, lean_object*);
 lean_object* lean_ir_mk_sset(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_getInfo_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_instInhabitedAlt;
 lean_object* l_Lean_IR_FnBody_resetBody(lean_object*);
 lean_object* l_Lean_IR_FnBody_alphaEqv_match__2(lean_object*);
@@ -4455,15 +4468,23 @@ lean_ctor_set(x_8, 1, x_6);
 return x_8;
 }
 }
-static lean_object* _init_l_Lean_IR_Decl_instInhabitedDecl___closed__1() {
+static lean_object* _init_l_Lean_IR_DeclInfo_sorryDep_x3f___default() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_box(0);
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_IR_instInhabitedDecl___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_1 = lean_box(0);
 x_2 = l_Array_empty___closed__1;
-x_3 = lean_box(6);
-x_4 = lean_box(13);
-x_5 = lean_alloc_ctor(0, 4, 0);
+x_3 = lean_box(0);
+x_4 = l_Lean_instInhabitedExternAttrData___closed__1;
+x_5 = lean_alloc_ctor(1, 4, 0);
 lean_ctor_set(x_5, 0, x_1);
 lean_ctor_set(x_5, 1, x_2);
 lean_ctor_set(x_5, 2, x_3);
@@ -4471,11 +4492,11 @@ lean_ctor_set(x_5, 3, x_4);
 return x_5;
 }
 }
-static lean_object* _init_l_Lean_IR_Decl_instInhabitedDecl() {
+static lean_object* _init_l_Lean_IR_instInhabitedDecl() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_IR_Decl_instInhabitedDecl___closed__1;
+x_1 = l_Lean_IR_instInhabitedDecl___closed__1;
 return x_1;
 }
 }
@@ -4484,7 +4505,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -4494,25 +4515,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }
@@ -4547,7 +4570,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -4557,25 +4580,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }
@@ -4610,7 +4635,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -4620,25 +4645,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }
@@ -4731,16 +4758,206 @@ x_3 = lean_box(x_2);
 return x_3;
 }
 }
+lean_object* l_Lean_IR_Decl_getInfo_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_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+lean_dec(x_3);
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+x_5 = lean_ctor_get(x_1, 1);
+lean_inc(x_5);
+x_6 = lean_ctor_get(x_1, 2);
+lean_inc(x_6);
+x_7 = lean_ctor_get(x_1, 3);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
+}
+else
+{
+lean_object* x_10; 
+lean_dec(x_2);
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
+}
+}
+}
+lean_object* l_Lean_IR_Decl_getInfo_match__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_IR_Decl_getInfo_match__1___rarg), 3, 0);
+return x_2;
+}
+}
+lean_object* l_Lean_IR_Decl_getInfo(lean_object* x_1) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+lean_object* x_2; 
+x_2 = lean_ctor_get(x_1, 4);
+lean_inc(x_2);
+return x_2;
+}
+else
+{
+lean_object* x_3; 
+x_3 = lean_box(0);
+return x_3;
+}
+}
+}
+lean_object* l_Lean_IR_Decl_getInfo___boxed(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = l_Lean_IR_Decl_getInfo(x_1);
+lean_dec(x_1);
+return x_2;
+}
+}
+lean_object* l_Lean_IR_Decl_updateBody_x21_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_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+lean_dec(x_3);
+x_4 = lean_ctor_get(x_1, 0);
+lean_inc(x_4);
+x_5 = lean_ctor_get(x_1, 1);
+lean_inc(x_5);
+x_6 = lean_ctor_get(x_1, 2);
+lean_inc(x_6);
+x_7 = lean_ctor_get(x_1, 3);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
+}
+else
+{
+lean_object* x_10; 
+lean_dec(x_2);
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
+}
+}
+}
+lean_object* l_Lean_IR_Decl_updateBody_x21_match__1(lean_object* x_1) {
+_start:
+{
+lean_object* x_2; 
+x_2 = lean_alloc_closure((void*)(l_Lean_IR_Decl_updateBody_x21_match__1___rarg), 3, 0);
+return x_2;
+}
+}
+static lean_object* _init_l_Lean_IR_Decl_updateBody_x21___closed__1() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("Lean.Compiler.IR.Basic");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_IR_Decl_updateBody_x21___closed__2() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("Lean.IR.Decl.updateBody!");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_IR_Decl_updateBody_x21___closed__3() {
+_start:
+{
+lean_object* x_1; 
+x_1 = lean_mk_string("expected definition");
+return x_1;
+}
+}
+static lean_object* _init_l_Lean_IR_Decl_updateBody_x21___closed__4() {
+_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_IR_Decl_updateBody_x21___closed__1;
+x_2 = l_Lean_IR_Decl_updateBody_x21___closed__2;
+x_3 = lean_unsigned_to_nat(430u);
+x_4 = lean_unsigned_to_nat(9u);
+x_5 = l_Lean_IR_Decl_updateBody_x21___closed__3;
+x_6 = l___private_Init_Util_0__mkPanicMessageWithDecl(x_1, x_2, x_3, x_4, x_5);
+return x_6;
+}
+}
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+if (lean_obj_tag(x_1) == 0)
+{
+uint8_t x_3; 
+x_3 = !lean_is_exclusive(x_1);
+if (x_3 == 0)
+{
+lean_object* x_4; 
+x_4 = lean_ctor_get(x_1, 3);
+lean_dec(x_4);
+lean_ctor_set(x_1, 3, x_2);
+return x_1;
+}
+else
+{
+lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
+x_5 = lean_ctor_get(x_1, 0);
+x_6 = lean_ctor_get(x_1, 1);
+x_7 = lean_ctor_get(x_1, 2);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
+lean_inc(x_7);
+lean_inc(x_6);
+lean_inc(x_5);
+lean_dec(x_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_2);
+lean_ctor_set(x_9, 4, x_8);
+return x_9;
+}
+}
+else
+{
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_dec(x_2);
+lean_dec(x_1);
+x_10 = l_Lean_IR_instInhabitedDecl;
+x_11 = l_Lean_IR_Decl_updateBody_x21___closed__4;
+x_12 = lean_panic_fn(x_10, x_11);
+return x_12;
+}
+}
+}
 lean_object* lean_ir_mk_decl(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; 
-x_5 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_5, 0, x_1);
-lean_ctor_set(x_5, 1, x_2);
-lean_ctor_set(x_5, 2, x_3);
-lean_ctor_set(x_5, 3, x_4);
-return x_5;
+lean_object* x_5; lean_object* x_6; 
+x_5 = lean_box(0);
+x_6 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_6, 0, x_1);
+lean_ctor_set(x_6, 1, x_2);
+lean_ctor_set(x_6, 2, x_3);
+lean_ctor_set(x_6, 3, x_4);
+lean_ctor_set(x_6, 4, x_5);
+return x_6;
 }
 }
 lean_object* lean_ir_mk_extern_decl(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
@@ -17258,10 +17475,20 @@ l_Lean_IR_AltCore_mmodifyBody___rarg___closed__1 = _init_l_Lean_IR_AltCore_mmodi
 lean_mark_persistent(l_Lean_IR_AltCore_mmodifyBody___rarg___closed__1);
 l_Lean_IR_reshapeAux___closed__1 = _init_l_Lean_IR_reshapeAux___closed__1();
 lean_mark_persistent(l_Lean_IR_reshapeAux___closed__1);
-l_Lean_IR_Decl_instInhabitedDecl___closed__1 = _init_l_Lean_IR_Decl_instInhabitedDecl___closed__1();
-lean_mark_persistent(l_Lean_IR_Decl_instInhabitedDecl___closed__1);
-l_Lean_IR_Decl_instInhabitedDecl = _init_l_Lean_IR_Decl_instInhabitedDecl();
-lean_mark_persistent(l_Lean_IR_Decl_instInhabitedDecl);
+l_Lean_IR_DeclInfo_sorryDep_x3f___default = _init_l_Lean_IR_DeclInfo_sorryDep_x3f___default();
+lean_mark_persistent(l_Lean_IR_DeclInfo_sorryDep_x3f___default);
+l_Lean_IR_instInhabitedDecl___closed__1 = _init_l_Lean_IR_instInhabitedDecl___closed__1();
+lean_mark_persistent(l_Lean_IR_instInhabitedDecl___closed__1);
+l_Lean_IR_instInhabitedDecl = _init_l_Lean_IR_instInhabitedDecl();
+lean_mark_persistent(l_Lean_IR_instInhabitedDecl);
+l_Lean_IR_Decl_updateBody_x21___closed__1 = _init_l_Lean_IR_Decl_updateBody_x21___closed__1();
+lean_mark_persistent(l_Lean_IR_Decl_updateBody_x21___closed__1);
+l_Lean_IR_Decl_updateBody_x21___closed__2 = _init_l_Lean_IR_Decl_updateBody_x21___closed__2();
+lean_mark_persistent(l_Lean_IR_Decl_updateBody_x21___closed__2);
+l_Lean_IR_Decl_updateBody_x21___closed__3 = _init_l_Lean_IR_Decl_updateBody_x21___closed__3();
+lean_mark_persistent(l_Lean_IR_Decl_updateBody_x21___closed__3);
+l_Lean_IR_Decl_updateBody_x21___closed__4 = _init_l_Lean_IR_Decl_updateBody_x21___closed__4();
+lean_mark_persistent(l_Lean_IR_Decl_updateBody_x21___closed__4);
 l_Lean_IR_instInhabitedIndexSet = _init_l_Lean_IR_instInhabitedIndexSet();
 lean_mark_persistent(l_Lean_IR_instInhabitedIndexSet);
 l_Lean_IR_instAlphaEqvVarId___closed__1 = _init_l_Lean_IR_instAlphaEqvVarId___closed__1();

stage0/stdlib/Lean/Compiler/IR/Borrow.c

@@ -21,7 +21,6 @@ size_t l_USize_add(size_t, size_t);
 extern lean_object* l_Lean_Name_getString_x21___closed__3;
 lean_object* l_Lean_IR_Borrow_ParamMap_fmt___closed__2;
 uint8_t l_Lean_IR_Borrow_OwnedSet_beq(lean_object*, lean_object*);
-extern lean_object* l_Lean_IR_Decl_instInhabitedDecl;
 lean_object* l_Lean_IR_Borrow_ownArg_match__1(lean_object*);
 lean_object* l_Lean_IR_Borrow_mkInitParamMap___closed__1;
 lean_object* l_Lean_IR_Borrow_ownParamsUsingArgs_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -52,7 +51,6 @@ lean_object* l_Lean_IR_Borrow_preserveTailCall_match__1___rarg(lean_object*, lea
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_IR_Borrow_InitParamMap_visitDecls(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_IR_Borrow_0__Lean_IR_Borrow_ParamMap_beqKey____x40_Lean_Compiler_IR_Borrow___hyg_128__match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Lean_IR_Borrow_OwnedSet_contains___boxed(lean_object*, lean_object*);
 lean_object* l_Std_RBNode_findCore___at_Lean_IR_UniqueIds_checkId___spec__1(lean_object*, lean_object*);
 lean_object* l_Std_HashMapImp_insert___at_Lean_IR_Borrow_OwnedSet_insert___spec__1(lean_object*, lean_object*, lean_object*);
@@ -89,6 +87,7 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_Borrow_updateParamMap___spec__1
 extern lean_object* l_Int_Int_pow___closed__1;
 lean_object* l_Lean_IR_Borrow_BorrowInfState_owned___default;
 lean_object* l_Lean_IR_Borrow_OwnedSet_beq_match__1___rarg(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Lean_IR_Borrow_instToFormatParamMap___closed__1;
 lean_object* l_Std_AssocList_find_x3f___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___spec__2(lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_IR_Borrow_InitParamMap_visitFnBody___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -144,6 +143,7 @@ lean_object* l_Lean_IR_Borrow_getParamInfo_match__1___rarg(lean_object*, lean_ob
 lean_object* l_Lean_IR_Borrow_collectDecl(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_Borrow_ApplyParamMap_visitFnBody_match__3(lean_object*);
 lean_object* l_Lean_IR_Borrow_ownArgs(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_IR_instInhabitedDecl;
 lean_object* l_Lean_IR_Borrow_InitParamMap_initBorrow(lean_object*);
 lean_object* l_Nat_forM_loop___at_Lean_IR_Borrow_ownParamsUsingArgs___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_Borrow_infer(lean_object*, lean_object*);
@@ -1068,7 +1068,7 @@ static lean_object* _init_l_Std_AssocList_foldlM___at_Lean_IR_Borrow_ParamMap_fm
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_1 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -2001,7 +2001,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -2011,16 +2011,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -2723,7 +2725,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -2733,16 +2735,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -2801,108 +2805,114 @@ uint8_t x_13;
 x_13 = !lean_is_exclusive(x_10);
 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_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 = lean_ctor_get(x_10, 0);
 x_15 = lean_ctor_get(x_10, 2);
 x_16 = lean_ctor_get(x_10, 3);
-x_17 = lean_ctor_get(x_10, 1);
-lean_dec(x_17);
-lean_inc(x_14);
-x_18 = l_Lean_IR_Borrow_ApplyParamMap_visitFnBody(x_14, x_1, x_16);
-lean_inc(x_14);
-x_19 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_19, 0, x_14);
-x_20 = l_Std_HashMapImp_find_x3f___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___spec__1(x_1, x_19);
-lean_dec(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; lean_object* x_25; 
+x_17 = lean_ctor_get(x_10, 4);
+x_18 = lean_ctor_get(x_10, 1);
 lean_dec(x_18);
+lean_inc(x_14);
+x_19 = l_Lean_IR_Borrow_ApplyParamMap_visitFnBody(x_14, x_1, x_16);
+lean_inc(x_14);
+x_20 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_20, 0, x_14);
+x_21 = l_Std_HashMapImp_find_x3f___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___spec__1(x_1, x_20);
+lean_dec(x_20);
+if (lean_obj_tag(x_21) == 0)
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; lean_object* x_26; 
+lean_dec(x_19);
 lean_free_object(x_10);
+lean_dec(x_17);
 lean_dec(x_15);
 lean_dec(x_14);
-x_21 = l_Lean_IR_Decl_instInhabitedDecl;
-x_22 = l_Array_mapMUnsafe_map___at_Lean_IR_Borrow_ApplyParamMap_visitDecls___spec__1___closed__2;
-x_23 = lean_panic_fn(x_21, x_22);
-x_24 = x_23;
-x_25 = lean_array_uset(x_9, x_3, x_24);
+x_22 = l_Lean_IR_instInhabitedDecl;
+x_23 = l_Array_mapMUnsafe_map___at_Lean_IR_Borrow_ApplyParamMap_visitDecls___spec__1___closed__2;
+x_24 = lean_panic_fn(x_22, x_23);
+x_25 = x_24;
+x_26 = lean_array_uset(x_9, x_3, x_25);
 x_3 = x_12;
-x_4 = x_25;
+x_4 = x_26;
 goto _start;
 }
 else
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; 
-x_27 = lean_ctor_get(x_20, 0);
-lean_inc(x_27);
-lean_dec(x_20);
-lean_ctor_set(x_10, 3, x_18);
-lean_ctor_set(x_10, 1, x_27);
-x_28 = x_10;
-x_29 = lean_array_uset(x_9, x_3, x_28);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; 
+x_28 = lean_ctor_get(x_21, 0);
+lean_inc(x_28);
+lean_dec(x_21);
+lean_ctor_set(x_10, 3, x_19);
+lean_ctor_set(x_10, 1, x_28);
+x_29 = x_10;
+x_30 = lean_array_uset(x_9, x_3, x_29);
 x_3 = x_12;
-x_4 = x_29;
+x_4 = x_30;
 goto _start;
 }
 }
 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; 
-x_31 = lean_ctor_get(x_10, 0);
-x_32 = lean_ctor_get(x_10, 2);
-x_33 = lean_ctor_get(x_10, 3);
+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; 
+x_32 = lean_ctor_get(x_10, 0);
+x_33 = lean_ctor_get(x_10, 2);
+x_34 = lean_ctor_get(x_10, 3);
+x_35 = lean_ctor_get(x_10, 4);
+lean_inc(x_35);
+lean_inc(x_34);
 lean_inc(x_33);
 lean_inc(x_32);
-lean_inc(x_31);
 lean_dec(x_10);
-lean_inc(x_31);
-x_34 = l_Lean_IR_Borrow_ApplyParamMap_visitFnBody(x_31, x_1, x_33);
-lean_inc(x_31);
-x_35 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_35, 0, x_31);
-x_36 = l_Std_HashMapImp_find_x3f___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___spec__1(x_1, x_35);
-lean_dec(x_35);
-if (lean_obj_tag(x_36) == 0)
+lean_inc(x_32);
+x_36 = l_Lean_IR_Borrow_ApplyParamMap_visitFnBody(x_32, x_1, x_34);
+lean_inc(x_32);
+x_37 = lean_alloc_ctor(0, 1, 0);
+lean_ctor_set(x_37, 0, x_32);
+x_38 = l_Std_HashMapImp_find_x3f___at_Lean_IR_Borrow_ApplyParamMap_visitFnBody___spec__1(x_1, x_37);
+lean_dec(x_37);
+if (lean_obj_tag(x_38) == 0)
 {
-lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; 
-lean_dec(x_34);
-lean_dec(x_32);
-lean_dec(x_31);
-x_37 = l_Lean_IR_Decl_instInhabitedDecl;
-x_38 = l_Array_mapMUnsafe_map___at_Lean_IR_Borrow_ApplyParamMap_visitDecls___spec__1___closed__2;
-x_39 = lean_panic_fn(x_37, x_38);
-x_40 = x_39;
-x_41 = lean_array_uset(x_9, x_3, x_40);
-x_3 = x_12;
-x_4 = x_41;
-goto _start;
-}
-else
-{
-lean_object* x_43; lean_object* x_44; lean_object* x_45; lean_object* x_46; 
-x_43 = lean_ctor_get(x_36, 0);
-lean_inc(x_43);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; 
 lean_dec(x_36);
-x_44 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_44, 0, x_31);
-lean_ctor_set(x_44, 1, x_43);
-lean_ctor_set(x_44, 2, x_32);
-lean_ctor_set(x_44, 3, x_34);
-x_45 = x_44;
-x_46 = lean_array_uset(x_9, x_3, x_45);
+lean_dec(x_35);
+lean_dec(x_33);
+lean_dec(x_32);
+x_39 = l_Lean_IR_instInhabitedDecl;
+x_40 = l_Array_mapMUnsafe_map___at_Lean_IR_Borrow_ApplyParamMap_visitDecls___spec__1___closed__2;
+x_41 = lean_panic_fn(x_39, x_40);
+x_42 = x_41;
+x_43 = lean_array_uset(x_9, x_3, x_42);
 x_3 = x_12;
-x_4 = x_46;
+x_4 = x_43;
+goto _start;
+}
+else
+{
+lean_object* x_45; lean_object* x_46; lean_object* x_47; lean_object* x_48; 
+x_45 = lean_ctor_get(x_38, 0);
+lean_inc(x_45);
+lean_dec(x_38);
+x_46 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_46, 0, x_32);
+lean_ctor_set(x_46, 1, x_45);
+lean_ctor_set(x_46, 2, x_33);
+lean_ctor_set(x_46, 3, x_36);
+lean_ctor_set(x_46, 4, x_35);
+x_47 = x_46;
+x_48 = lean_array_uset(x_9, x_3, x_47);
+x_3 = x_12;
+x_4 = x_48;
 goto _start;
 }
 }
 }
 else
 {
-lean_object* x_48; lean_object* x_49; 
-x_48 = x_10;
-x_49 = lean_array_uset(x_9, x_3, x_48);
+lean_object* x_50; lean_object* x_51; 
+x_50 = x_10;
+x_51 = lean_array_uset(x_9, x_3, x_50);
 x_3 = x_12;
-x_4 = x_49;
+x_4 = x_51;
 goto _start;
 }
 }
@@ -5450,7 +5460,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -5460,16 +5470,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }

stage0/stdlib/Lean/Compiler/IR/Boxing.c

@@ -42,7 +42,7 @@ extern lean_object* l_Array_empty___closed__1;
 lean_object* l_Lean_IR_ExplicitBoxing_withJDecl(lean_object*);
 extern lean_object* l_Lean_closureMaxArgs;
 lean_object* l_Lean_IR_ExplicitBoxing_withParams(lean_object*);
-lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_LocalContext_getJPParams(lean_object*, lean_object*);
 uint8_t l_Lean_IR_CtorInfo_isScalar(lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -87,11 +87,11 @@ uint8_t l_Lean_isExtern(lean_object*, lean_object*);
 lean_object* l_Lean_IR_AltCore_mmodifyBody___at_Lean_IR_ExplicitBoxing_visitFnBody___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_IR_Boxing_0__Lean_IR_ExplicitBoxing_isExpensiveConstantValueBoxing(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_castArgsIfNeeded(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_IR_Decl_instInhabitedDecl___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___spec__1(size_t, size_t, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_mkCast___closed__4;
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_castArgsIfNeededAux_match__2(lean_object*);
+lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_mkCast___closed__2;
 lean_object* l___private_Lean_Compiler_IR_Boxing_0__Lean_IR_ExplicitBoxing_isExpensiveConstantValueBoxing_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_getScrutineeType_match__2___rarg(uint8_t, lean_object*, lean_object*);
@@ -116,6 +116,7 @@ lean_object* l_Array_anyMUnsafe_any___at_Lean_IR_ExplicitBoxing_requiresBoxedVer
 uint8_t l_Lean_IR_IRType_beq(lean_object*, lean_object*);
 lean_object* l_Lean_IR_findEnvDecl_x27(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_castArgsIfNeeded___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_getInfo(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_IR_ExplicitBoxing_boxArgsIfNeeded___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_getJPParams_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_explicitBoxing(lean_object*, lean_object*, lean_object*);
@@ -171,6 +172,7 @@ lean_object* l_Lean_IR_ExplicitBoxing_visitFnBody(lean_object*, lean_object*, le
 uint8_t l_Lean_IR_ExplicitBoxing_isBoxedName(lean_object*);
 lean_object* l_Lean_IR_reshape(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_getEnv___boxed(lean_object*, lean_object*);
+extern lean_object* l_Lean_IR_instInhabitedDecl___closed__1;
 lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersion(lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_unboxResultIfNeeded___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_LocalContext_addLocal(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -178,6 +180,7 @@ lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux_match__2(lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_eqvTypes___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_run_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_getResultType(lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_castArgsIfNeededAux___at_Lean_IR_ExplicitBoxing_castArgsIfNeeded___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitBoxing_BoxingState_nextAuxId___default;
 lean_object* l_Lean_IR_ExplicitBoxing_getVarType_match__1(lean_object*);
@@ -782,22 +785,24 @@ return x_73;
 }
 }
 }
-lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
-x_5 = l_Lean_IR_ExplicitBoxing_mkBoxedName___closed__1;
-x_6 = lean_name_mk_string(x_1, x_5);
-x_7 = lean_box(7);
-x_8 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_8, 0, x_6);
-lean_ctor_set(x_8, 1, x_2);
-lean_ctor_set(x_8, 2, x_7);
-lean_ctor_set(x_8, 3, x_3);
-x_9 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_9, 0, x_8);
-lean_ctor_set(x_9, 1, x_4);
-return x_9;
+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_6 = l_Lean_IR_ExplicitBoxing_mkBoxedName___closed__1;
+x_7 = lean_name_mk_string(x_1, x_6);
+x_8 = l_Lean_IR_Decl_getInfo(x_2);
+x_9 = lean_box(7);
+x_10 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_10, 0, x_7);
+lean_ctor_set(x_10, 1, x_3);
+lean_ctor_set(x_10, 2, x_9);
+lean_ctor_set(x_10, 3, x_4);
+lean_ctor_set(x_10, 4, x_8);
+x_11 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_11, 0, x_10);
+lean_ctor_set(x_11, 1, x_5);
+return x_11;
 }
 }
 static lean_object* _init_l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___closed__1() {
@@ -890,7 +895,7 @@ lean_ctor_set(x_31, 0, x_22);
 x_32 = lean_alloc_ctor(11, 1, 0);
 lean_ctor_set(x_32, 0, x_31);
 x_33 = l_Lean_IR_reshape(x_29, x_32);
-x_34 = l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(x_25, x_12, x_33, x_23);
+x_34 = l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(x_25, x_1, x_12, x_33, x_23);
 return x_34;
 }
 else
@@ -918,7 +923,7 @@ lean_ctor_set(x_42, 0, x_36);
 x_43 = lean_alloc_ctor(11, 1, 0);
 lean_ctor_set(x_43, 0, x_42);
 x_44 = l_Lean_IR_reshape(x_41, x_43);
-x_45 = l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(x_25, x_12, x_44, x_37);
+x_45 = l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(x_25, x_1, x_12, x_44, x_37);
 return x_45;
 }
 }
@@ -946,6 +951,15 @@ lean_dec(x_1);
 return x_7;
 }
 }
+lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+_start:
+{
+lean_object* x_6; 
+x_6 = l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___lambda__1(x_1, x_2, x_3, x_4, x_5);
+lean_dec(x_2);
+return x_6;
+}
+}
 lean_object* l_Lean_IR_ExplicitBoxing_mkBoxedVersionAux___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -1796,7 +1810,7 @@ x_6 = l_Lean_IR_findEnvDecl_x27(x_4, x_1, x_5);
 if (lean_obj_tag(x_6) == 0)
 {
 lean_object* x_7; lean_object* x_8; 
-x_7 = l_Lean_IR_Decl_instInhabitedDecl___closed__1;
+x_7 = l_Lean_IR_instInhabitedDecl___closed__1;
 x_8 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_8, 0, x_7);
 lean_ctor_set(x_8, 1, x_3);
@@ -2622,7 +2636,7 @@ uint8_t x_34;
 x_34 = !lean_is_exclusive(x_20);
 if (x_34 == 0)
 {
-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; lean_object* x_42; lean_object* 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_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; lean_object* x_42; lean_object* 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; 
 x_35 = lean_ctor_get(x_20, 3);
 lean_dec(x_35);
 x_36 = lean_ctor_get(x_20, 2);
@@ -2641,185 +2655,191 @@ lean_inc(x_42);
 x_44 = lean_alloc_ctor(6, 2, 0);
 lean_ctor_set(x_44, 0, x_42);
 lean_ctor_set(x_44, 1, x_43);
+x_45 = lean_box(0);
 lean_inc(x_28);
-x_45 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_45, 0, x_42);
-lean_ctor_set(x_45, 1, x_43);
-lean_ctor_set(x_45, 2, x_3);
-lean_ctor_set(x_45, 3, x_28);
-x_46 = lean_array_push(x_30, x_45);
+x_46 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_46, 0, x_42);
+lean_ctor_set(x_46, 1, x_43);
+lean_ctor_set(x_46, 2, x_3);
+lean_ctor_set(x_46, 3, x_28);
+lean_ctor_set(x_46, 4, x_45);
+x_47 = lean_array_push(x_30, x_46);
 lean_inc(x_44);
-x_47 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_47, 0, x_28);
-lean_ctor_set(x_47, 1, x_44);
-lean_ctor_set(x_47, 2, x_31);
-x_48 = lean_nat_add(x_32, x_23);
+x_48 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_48, 0, x_28);
+lean_ctor_set(x_48, 1, x_44);
+lean_ctor_set(x_48, 2, x_31);
+x_49 = lean_nat_add(x_32, x_23);
 lean_dec(x_32);
-lean_ctor_set(x_20, 3, x_48);
-lean_ctor_set(x_20, 2, x_47);
-lean_ctor_set(x_20, 1, x_46);
+lean_ctor_set(x_20, 3, x_49);
+lean_ctor_set(x_20, 2, x_48);
+lean_ctor_set(x_20, 1, x_47);
 lean_ctor_set(x_6, 0, x_44);
 return x_6;
 }
 else
 {
-lean_object* x_49; lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; 
+lean_object* x_50; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
 lean_dec(x_20);
-x_49 = lean_ctor_get(x_4, 0);
-x_50 = l_Lean_IR_ExplicitBoxing_mkCast___closed__4;
+x_50 = lean_ctor_get(x_4, 0);
+x_51 = l_Lean_IR_ExplicitBoxing_mkCast___closed__4;
 lean_inc(x_32);
-x_51 = l_Lean_Name_appendIndexAfter(x_50, x_32);
-x_52 = l_Lean_Name_append(x_49, x_51);
-x_53 = l_Array_empty___closed__1;
-lean_inc(x_52);
-x_54 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_54, 0, x_52);
-lean_ctor_set(x_54, 1, x_53);
+x_52 = l_Lean_Name_appendIndexAfter(x_51, x_32);
+x_53 = l_Lean_Name_append(x_50, x_52);
+x_54 = l_Array_empty___closed__1;
+lean_inc(x_53);
+x_55 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_55, 0, x_53);
+lean_ctor_set(x_55, 1, x_54);
+x_56 = lean_box(0);
 lean_inc(x_28);
-x_55 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_55, 0, x_52);
-lean_ctor_set(x_55, 1, x_53);
-lean_ctor_set(x_55, 2, x_3);
-lean_ctor_set(x_55, 3, x_28);
-x_56 = lean_array_push(x_30, x_55);
-lean_inc(x_54);
-x_57 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_57, 0, x_28);
+x_57 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_57, 0, x_53);
 lean_ctor_set(x_57, 1, x_54);
-lean_ctor_set(x_57, 2, x_31);
-x_58 = lean_nat_add(x_32, x_23);
+lean_ctor_set(x_57, 2, x_3);
+lean_ctor_set(x_57, 3, x_28);
+lean_ctor_set(x_57, 4, x_56);
+x_58 = lean_array_push(x_30, x_57);
+lean_inc(x_55);
+x_59 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_59, 0, x_28);
+lean_ctor_set(x_59, 1, x_55);
+lean_ctor_set(x_59, 2, x_31);
+x_60 = lean_nat_add(x_32, x_23);
 lean_dec(x_32);
-x_59 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_59, 0, x_29);
-lean_ctor_set(x_59, 1, x_56);
-lean_ctor_set(x_59, 2, x_57);
-lean_ctor_set(x_59, 3, x_58);
-lean_ctor_set(x_6, 1, x_59);
-lean_ctor_set(x_6, 0, x_54);
+x_61 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_61, 0, x_29);
+lean_ctor_set(x_61, 1, x_58);
+lean_ctor_set(x_61, 2, x_59);
+lean_ctor_set(x_61, 3, x_60);
+lean_ctor_set(x_6, 1, x_61);
+lean_ctor_set(x_6, 0, x_55);
 return x_6;
 }
 }
 else
 {
-lean_object* x_60; 
+lean_object* x_62; 
 lean_dec(x_32);
 lean_dec(x_31);
 lean_dec(x_30);
 lean_dec(x_29);
 lean_dec(x_28);
 lean_dec(x_3);
-x_60 = lean_ctor_get(x_33, 0);
-lean_inc(x_60);
+x_62 = lean_ctor_get(x_33, 0);
+lean_inc(x_62);
 lean_dec(x_33);
-lean_ctor_set(x_6, 0, x_60);
+lean_ctor_set(x_6, 0, x_62);
 return x_6;
 }
 }
 else
 {
-lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; 
-x_61 = lean_ctor_get(x_6, 1);
-lean_inc(x_61);
+lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; 
+x_63 = lean_ctor_get(x_6, 1);
+lean_inc(x_63);
 lean_dec(x_6);
-x_62 = lean_ctor_get(x_7, 0);
-lean_inc(x_62);
+x_64 = lean_ctor_get(x_7, 0);
+lean_inc(x_64);
 lean_dec(x_7);
-x_63 = lean_unsigned_to_nat(1u);
+x_65 = lean_unsigned_to_nat(1u);
 lean_inc(x_2);
-x_64 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_64, 0, x_2);
-lean_ctor_set(x_64, 1, x_63);
-x_65 = lean_unsigned_to_nat(2u);
-x_66 = l_Lean_IR_ExplicitBoxing_mkCast___closed__2;
+x_66 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_66, 0, x_2);
+lean_ctor_set(x_66, 1, x_65);
+x_67 = lean_unsigned_to_nat(2u);
+x_68 = l_Lean_IR_ExplicitBoxing_mkCast___closed__2;
 lean_inc(x_3);
-x_67 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_67, 0, x_65);
-lean_ctor_set(x_67, 1, x_3);
-lean_ctor_set(x_67, 2, x_64);
-lean_ctor_set(x_67, 3, x_66);
-x_68 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_68, 0, x_63);
-lean_ctor_set(x_68, 1, x_2);
-lean_ctor_set(x_68, 2, x_62);
-lean_ctor_set(x_68, 3, x_67);
-x_69 = lean_ctor_get(x_61, 0);
-lean_inc(x_69);
-x_70 = lean_ctor_get(x_61, 1);
+x_69 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_69, 0, x_67);
+lean_ctor_set(x_69, 1, x_3);
+lean_ctor_set(x_69, 2, x_66);
+lean_ctor_set(x_69, 3, x_68);
+x_70 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_70, 0, x_65);
+lean_ctor_set(x_70, 1, x_2);
+lean_ctor_set(x_70, 2, x_64);
+lean_ctor_set(x_70, 3, x_69);
+x_71 = lean_ctor_get(x_63, 0);
+lean_inc(x_71);
+x_72 = lean_ctor_get(x_63, 1);
+lean_inc(x_72);
+x_73 = lean_ctor_get(x_63, 2);
+lean_inc(x_73);
+x_74 = lean_ctor_get(x_63, 3);
+lean_inc(x_74);
+lean_inc(x_73);
 lean_inc(x_70);
-x_71 = lean_ctor_get(x_61, 2);
-lean_inc(x_71);
-x_72 = lean_ctor_get(x_61, 3);
-lean_inc(x_72);
-lean_inc(x_71);
-lean_inc(x_68);
-x_73 = l_Std_AssocList_find_x3f___at_Lean_IR_ExplicitBoxing_mkCast___spec__1(x_68, x_71);
-if (lean_obj_tag(x_73) == 0)
+x_75 = l_Std_AssocList_find_x3f___at_Lean_IR_ExplicitBoxing_mkCast___spec__1(x_70, x_73);
+if (lean_obj_tag(x_75) == 0)
 {
-lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; 
-if (lean_is_exclusive(x_61)) {
- lean_ctor_release(x_61, 0);
- lean_ctor_release(x_61, 1);
- lean_ctor_release(x_61, 2);
- lean_ctor_release(x_61, 3);
- x_74 = x_61;
+lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean_object* x_88; lean_object* x_89; 
+if (lean_is_exclusive(x_63)) {
+ lean_ctor_release(x_63, 0);
+ lean_ctor_release(x_63, 1);
+ lean_ctor_release(x_63, 2);
+ lean_ctor_release(x_63, 3);
+ x_76 = x_63;
 } else {
- lean_dec_ref(x_61);
- x_74 = lean_box(0);
+ lean_dec_ref(x_63);
+ x_76 = lean_box(0);
 }
-x_75 = lean_ctor_get(x_4, 0);
-x_76 = l_Lean_IR_ExplicitBoxing_mkCast___closed__4;
-lean_inc(x_72);
-x_77 = l_Lean_Name_appendIndexAfter(x_76, x_72);
-x_78 = l_Lean_Name_append(x_75, x_77);
-x_79 = l_Array_empty___closed__1;
-lean_inc(x_78);
-x_80 = lean_alloc_ctor(6, 2, 0);
-lean_ctor_set(x_80, 0, x_78);
-lean_ctor_set(x_80, 1, x_79);
-lean_inc(x_68);
-x_81 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_81, 0, x_78);
-lean_ctor_set(x_81, 1, x_79);
-lean_ctor_set(x_81, 2, x_3);
-lean_ctor_set(x_81, 3, x_68);
-x_82 = lean_array_push(x_70, x_81);
+x_77 = lean_ctor_get(x_4, 0);
+x_78 = l_Lean_IR_ExplicitBoxing_mkCast___closed__4;
+lean_inc(x_74);
+x_79 = l_Lean_Name_appendIndexAfter(x_78, x_74);
+x_80 = l_Lean_Name_append(x_77, x_79);
+x_81 = l_Array_empty___closed__1;
 lean_inc(x_80);
-x_83 = lean_alloc_ctor(1, 3, 0);
-lean_ctor_set(x_83, 0, x_68);
-lean_ctor_set(x_83, 1, x_80);
-lean_ctor_set(x_83, 2, x_71);
-x_84 = lean_nat_add(x_72, x_63);
-lean_dec(x_72);
-if (lean_is_scalar(x_74)) {
- x_85 = lean_alloc_ctor(0, 4, 0);
+x_82 = lean_alloc_ctor(6, 2, 0);
+lean_ctor_set(x_82, 0, x_80);
+lean_ctor_set(x_82, 1, x_81);
+x_83 = lean_box(0);
+lean_inc(x_70);
+x_84 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_84, 0, x_80);
+lean_ctor_set(x_84, 1, x_81);
+lean_ctor_set(x_84, 2, x_3);
+lean_ctor_set(x_84, 3, x_70);
+lean_ctor_set(x_84, 4, x_83);
+x_85 = lean_array_push(x_72, x_84);
+lean_inc(x_82);
+x_86 = lean_alloc_ctor(1, 3, 0);
+lean_ctor_set(x_86, 0, x_70);
+lean_ctor_set(x_86, 1, x_82);
+lean_ctor_set(x_86, 2, x_73);
+x_87 = lean_nat_add(x_74, x_65);
+lean_dec(x_74);
+if (lean_is_scalar(x_76)) {
+ x_88 = lean_alloc_ctor(0, 4, 0);
 } else {
- x_85 = x_74;
+ x_88 = x_76;
 }
-lean_ctor_set(x_85, 0, x_69);
-lean_ctor_set(x_85, 1, x_82);
-lean_ctor_set(x_85, 2, x_83);
-lean_ctor_set(x_85, 3, x_84);
-x_86 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_86, 0, x_80);
-lean_ctor_set(x_86, 1, x_85);
-return x_86;
+lean_ctor_set(x_88, 0, x_71);
+lean_ctor_set(x_88, 1, x_85);
+lean_ctor_set(x_88, 2, x_86);
+lean_ctor_set(x_88, 3, x_87);
+x_89 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_89, 0, x_82);
+lean_ctor_set(x_89, 1, x_88);
+return x_89;
 }
 else
 {
-lean_object* x_87; lean_object* x_88; 
+lean_object* x_90; lean_object* x_91; 
+lean_dec(x_74);
+lean_dec(x_73);
 lean_dec(x_72);
 lean_dec(x_71);
 lean_dec(x_70);
-lean_dec(x_69);
-lean_dec(x_68);
 lean_dec(x_3);
-x_87 = lean_ctor_get(x_73, 0);
-lean_inc(x_87);
-lean_dec(x_73);
-x_88 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_88, 0, x_87);
-lean_ctor_set(x_88, 1, x_61);
-return x_88;
+x_90 = lean_ctor_get(x_75, 0);
+lean_inc(x_90);
+lean_dec(x_75);
+x_91 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_91, 0, x_90);
+lean_ctor_set(x_91, 1, x_63);
+return x_91;
 }
 }
 }
@@ -8644,7 +8664,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -8654,16 +8674,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -8688,7 +8710,7 @@ x_10 = 1;
 x_11 = x_5 + x_10;
 if (lean_obj_tag(x_9) == 0)
 {
-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_object* x_12; lean_object* x_13; 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; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; 
 x_12 = lean_ctor_get(x_9, 0);
 lean_inc(x_12);
 x_13 = lean_ctor_get(x_9, 1);
@@ -8700,113 +8722,51 @@ lean_inc(x_15);
 x_16 = lean_unsigned_to_nat(0u);
 lean_inc(x_9);
 x_17 = l_Lean_IR_MaxIndex_collectDecl(x_9, x_16);
-x_18 = !lean_is_exclusive(x_9);
-if (x_18 == 0)
-{
-lean_object* x_19; 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; lean_object* x_29; lean_object* 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_19 = lean_ctor_get(x_9, 3);
-lean_dec(x_19);
-x_20 = lean_ctor_get(x_9, 2);
-lean_dec(x_20);
-x_21 = lean_ctor_get(x_9, 1);
-lean_dec(x_21);
-x_22 = lean_ctor_get(x_9, 0);
-lean_dec(x_22);
-x_23 = lean_unsigned_to_nat(1u);
-x_24 = lean_nat_add(x_17, x_23);
+x_18 = lean_unsigned_to_nat(1u);
+x_19 = lean_nat_add(x_17, x_18);
 lean_dec(x_17);
-x_25 = lean_box(0);
-x_26 = l_Array_empty___closed__1;
-x_27 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_27, 0, x_24);
-lean_ctor_set(x_27, 1, x_26);
-lean_ctor_set(x_27, 2, x_25);
-lean_ctor_set(x_27, 3, x_23);
+x_20 = lean_box(0);
+x_21 = l_Array_empty___closed__1;
+x_22 = lean_alloc_ctor(0, 4, 0);
+lean_ctor_set(x_22, 0, x_19);
+lean_ctor_set(x_22, 1, x_21);
+lean_ctor_set(x_22, 2, x_20);
+lean_ctor_set(x_22, 3, x_18);
 lean_inc(x_3);
-x_28 = l_Lean_IR_LocalContext_addParams(x_3, x_13);
+x_23 = l_Lean_IR_LocalContext_addParams(x_3, x_13);
+lean_dec(x_13);
 lean_inc(x_1);
 lean_inc(x_2);
-lean_inc(x_14);
-lean_inc(x_12);
-x_29 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_29, 0, x_12);
-lean_ctor_set(x_29, 1, x_28);
-lean_ctor_set(x_29, 2, x_14);
-lean_ctor_set(x_29, 3, x_2);
-lean_ctor_set(x_29, 4, x_1);
-x_30 = l_Lean_IR_ExplicitBoxing_visitFnBody(x_15, x_29, x_27);
-x_31 = lean_ctor_get(x_30, 0);
-lean_inc(x_31);
-x_32 = lean_ctor_get(x_30, 1);
-lean_inc(x_32);
-lean_dec(x_30);
-x_33 = lean_ctor_get(x_32, 1);
-lean_inc(x_33);
-lean_dec(x_32);
-x_34 = l_Array_append___rarg(x_7, x_33);
-lean_dec(x_33);
-lean_ctor_set(x_9, 3, x_31);
-x_35 = l_Lean_IR_Decl_elimDead(x_9);
-x_36 = lean_array_push(x_34, x_35);
+x_24 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_24, 0, x_12);
+lean_ctor_set(x_24, 1, x_23);
+lean_ctor_set(x_24, 2, x_14);
+lean_ctor_set(x_24, 3, x_2);
+lean_ctor_set(x_24, 4, x_1);
+x_25 = l_Lean_IR_ExplicitBoxing_visitFnBody(x_15, x_24, x_22);
+x_26 = lean_ctor_get(x_25, 0);
+lean_inc(x_26);
+x_27 = lean_ctor_get(x_25, 1);
+lean_inc(x_27);
+lean_dec(x_25);
+x_28 = lean_ctor_get(x_27, 1);
+lean_inc(x_28);
+lean_dec(x_27);
+x_29 = l_Array_append___rarg(x_7, x_28);
+lean_dec(x_28);
+x_30 = l_Lean_IR_Decl_updateBody_x21(x_9, x_26);
+x_31 = l_Lean_IR_Decl_elimDead(x_30);
+x_32 = lean_array_push(x_29, x_31);
 x_5 = x_11;
-x_7 = x_36;
+x_7 = x_32;
 goto _start;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* 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; lean_object* x_51; lean_object* x_52; 
-lean_dec(x_9);
-x_38 = lean_unsigned_to_nat(1u);
-x_39 = lean_nat_add(x_17, x_38);
-lean_dec(x_17);
-x_40 = lean_box(0);
-x_41 = l_Array_empty___closed__1;
-x_42 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_42, 0, x_39);
-lean_ctor_set(x_42, 1, x_41);
-lean_ctor_set(x_42, 2, x_40);
-lean_ctor_set(x_42, 3, x_38);
-lean_inc(x_3);
-x_43 = l_Lean_IR_LocalContext_addParams(x_3, x_13);
-lean_inc(x_1);
-lean_inc(x_2);
-lean_inc(x_14);
-lean_inc(x_12);
-x_44 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_44, 0, x_12);
-lean_ctor_set(x_44, 1, x_43);
-lean_ctor_set(x_44, 2, x_14);
-lean_ctor_set(x_44, 3, x_2);
-lean_ctor_set(x_44, 4, x_1);
-x_45 = l_Lean_IR_ExplicitBoxing_visitFnBody(x_15, x_44, x_42);
-x_46 = lean_ctor_get(x_45, 0);
-lean_inc(x_46);
-x_47 = lean_ctor_get(x_45, 1);
-lean_inc(x_47);
-lean_dec(x_45);
-x_48 = lean_ctor_get(x_47, 1);
-lean_inc(x_48);
-lean_dec(x_47);
-x_49 = l_Array_append___rarg(x_7, x_48);
-lean_dec(x_48);
-x_50 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_50, 0, x_12);
-lean_ctor_set(x_50, 1, x_13);
-lean_ctor_set(x_50, 2, x_14);
-lean_ctor_set(x_50, 3, x_46);
-x_51 = l_Lean_IR_Decl_elimDead(x_50);
-x_52 = lean_array_push(x_49, x_51);
+lean_object* x_34; 
+x_34 = lean_array_push(x_7, x_9);
 x_5 = x_11;
-x_7 = x_52;
-goto _start;
-}
-}
-else
-{
-lean_object* x_54; 
-x_54 = lean_array_push(x_7, x_9);
-x_5 = x_11;
-x_7 = x_54;
+x_7 = x_34;
 goto _start;
 }
 }

stage0/stdlib/Lean/Compiler/IR/Checker.c

@@ -6903,7 +6903,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -6913,25 +6913,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }

stage0/stdlib/Lean/Compiler/IR/CtorLayout.c

@@ -16,10 +16,10 @@ extern "C" {
 lean_object* l_Lean_IR_CtorFieldInfo_format___closed__7;
 lean_object* l_Std_fmt___at_Lean_Position_instToFormatPosition___spec__1(lean_object*);
 extern lean_object* l_Std_Format_join___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__35;
 lean_object* l_Lean_IR_CtorFieldInfo_format_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_CtorFieldInfo_format___closed__6;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Std_fmt___at_Lean_IR_CtorFieldInfo_format___spec__1(lean_object*);
 lean_object* l_Lean_IR_CtorFieldInfo_format___closed__5;
 extern lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatArg___closed__2;
@@ -176,7 +176,7 @@ static lean_object* _init_l_Lean_IR_CtorFieldInfo_format___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_1 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;

stage0/stdlib/Lean/Compiler/IR/ElimDeadBranches.c

@@ -30,7 +30,6 @@ lean_object* l_Lean_IR_UnreachableBranches_initFn____x40_Lean_Compiler_IR_ElimDe
 lean_object* l_Lean_IR_UnreachableBranches_functionSummariesExt___closed__5;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_UnreachableBranches_Value_truncate___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_IR_UnreachableBranches_inferStep___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_Lean_IR_Decl_instInhabitedDecl;
 lean_object* l_Lean_IR_UnreachableBranches_elimDeadAux_match__1(lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*, lean_object*, lean_object*);
@@ -197,6 +196,7 @@ lean_object* l_Lean_IR_UnreachableBranches_findArgValue___boxed(lean_object*, le
 lean_object* l_Function_comp___rarg(lean_object*, lean_object*, lean_object*);
 size_t l_USize_shiftLeft(size_t, size_t);
 lean_object* l_List_foldr___at_Lean_IR_UnreachableBranches_Value_beq___spec__4___boxed(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_IR_instInhabitedDecl;
 lean_object* l___private_Lean_Compiler_IR_ElimDeadBranches_0__Lean_IR_UnreachableBranches_resetNestedJPParams_match__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_IR_UnreachableBranches_initFn____x40_Lean_Compiler_IR_ElimDeadBranches___hyg_540____spec__19___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_UnreachableBranches_elimDead___boxed(lean_object*, lean_object*);
@@ -293,6 +293,7 @@ uint8_t l_Std_AssocList_contains___at_Lean_IR_UnreachableBranches_initFn____x40_
 lean_object* l_List_foldr___at_Lean_IR_UnreachableBranches_Value_beq___spec__5___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_UnreachableBranches_elimDead(lean_object*, lean_object*);
 lean_object* l_Lean_IR_UnreachableBranches_interpExpr_match__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* l_Std_AssocList_find_x3f___at_Lean_IR_UnreachableBranches_getFunctionSummary_x3f___spec__6(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_UnreachableBranches_Value_truncate___spec__3(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_IR_UnreachableBranches_inferMain(lean_object*, lean_object*);
@@ -8163,7 +8164,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -8173,25 +8174,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }
@@ -8290,7 +8293,7 @@ lean_dec(x_4);
 x_12 = lean_nat_sub(x_3, x_11);
 x_13 = lean_nat_sub(x_12, x_10);
 lean_dec(x_12);
-x_14 = l_Lean_IR_Decl_instInhabitedDecl;
+x_14 = l_Lean_IR_instInhabitedDecl;
 x_15 = lean_array_get(x_14, x_1, x_13);
 if (lean_obj_tag(x_15) == 0)
 {
@@ -9179,7 +9182,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -9189,16 +9192,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -9215,36 +9220,12 @@ _start:
 {
 if (lean_obj_tag(x_2) == 0)
 {
-uint8_t x_3; 
-x_3 = !lean_is_exclusive(x_2);
-if (x_3 == 0)
-{
-lean_object* x_4; lean_object* x_5; 
-x_4 = lean_ctor_get(x_2, 3);
-x_5 = l_Lean_IR_UnreachableBranches_elimDeadAux(x_1, x_4);
-lean_ctor_set(x_2, 3, x_5);
-return x_2;
-}
-else
-{
-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_6 = lean_ctor_get(x_2, 0);
-x_7 = lean_ctor_get(x_2, 1);
-x_8 = lean_ctor_get(x_2, 2);
-x_9 = lean_ctor_get(x_2, 3);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_dec(x_2);
-x_10 = l_Lean_IR_UnreachableBranches_elimDeadAux(x_1, x_9);
-x_11 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_11, 0, x_6);
-lean_ctor_set(x_11, 1, x_7);
-lean_ctor_set(x_11, 2, x_8);
-lean_ctor_set(x_11, 3, x_10);
-return x_11;
-}
+lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_3 = lean_ctor_get(x_2, 3);
+lean_inc(x_3);
+x_4 = l_Lean_IR_UnreachableBranches_elimDeadAux(x_1, x_3);
+x_5 = l_Lean_IR_Decl_updateBody_x21(x_2, x_4);
+return x_5;
 }
 else
 {
@@ -9297,7 +9278,7 @@ lean_dec(x_4);
 x_10 = lean_nat_add(x_9, x_8);
 x_11 = lean_nat_sub(x_3, x_10);
 lean_dec(x_10);
-x_12 = l_Lean_IR_Decl_instInhabitedDecl;
+x_12 = l_Lean_IR_instInhabitedDecl;
 x_13 = lean_array_get(x_12, x_1, x_11);
 x_14 = l_Lean_IR_Decl_name(x_13);
 lean_dec(x_13);

stage0/stdlib/Lean/Compiler/IR/ElimDeadVars.c

@@ -41,6 +41,7 @@ lean_object* l_Lean_IR_reshapeWithoutDead(lean_object*, lean_object*);
 lean_object* l_Lean_IR_Decl_elimDead(lean_object*);
 lean_object* l_Lean_IR_FnBody_setBody(lean_object*, lean_object*);
 lean_object* l_Lean_IR_FnBody_flatten(lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* lean_array_pop(lean_object*);
 lean_object* l_Lean_IR_FnBody_elimDead_match__1(lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
@@ -540,7 +541,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -550,16 +551,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -576,36 +579,12 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-uint8_t x_2; 
-x_2 = !lean_is_exclusive(x_1);
-if (x_2 == 0)
-{
-lean_object* x_3; lean_object* x_4; 
-x_3 = lean_ctor_get(x_1, 3);
-x_4 = l_Lean_IR_FnBody_elimDead(x_3);
-lean_ctor_set(x_1, 3, x_4);
-return x_1;
-}
-else
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = lean_ctor_get(x_1, 2);
-x_8 = lean_ctor_get(x_1, 3);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_dec(x_1);
-x_9 = l_Lean_IR_FnBody_elimDead(x_8);
-x_10 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_10, 0, x_5);
-lean_ctor_set(x_10, 1, x_6);
-lean_ctor_set(x_10, 2, x_7);
-lean_ctor_set(x_10, 3, x_9);
-return x_10;
-}
+lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_2 = lean_ctor_get(x_1, 3);
+lean_inc(x_2);
+x_3 = l_Lean_IR_FnBody_elimDead(x_2);
+x_4 = l_Lean_IR_Decl_updateBody_x21(x_1, x_3);
+return x_4;
 }
 else
 {

stage0/stdlib/Lean/Compiler/IR/EmitC.c

@@ -37,6 +37,7 @@ lean_object* l_Lean_IR_EmitC_emitMarkPersistent___boxed(lean_object*, lean_objec
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Std_HashMapImp_find_x3f___at_Lean_IR_EmitC_getJPParams___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_IR_EmitC_emitMainFn___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_object* l_Lean_IR_EmitC_emitUnbox___closed__4;
 lean_object* l_Lean_IR_EmitC_emitFileHeader___closed__4;
 lean_object* l_Lean_IR_EmitC_emitInc___lambda__1___closed__1;
@@ -133,8 +134,6 @@ lean_object* l_Lean_IR_EmitC_emitMarkPersistent(lean_object*, lean_object*, lean
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_IR_EmitC_emitMainFn___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_EmitC_emitApp___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* lean_ir_emit_c(lean_object*, lean_object*);
 uint8_t l_Nat_anyAux___at_Lean_IR_EmitC_overwriteParam___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_EmitC_emitApp___closed__5;
@@ -211,6 +210,7 @@ lean_object* l_Lean_IR_EmitC_toCInitName___boxed(lean_object*, lean_object*, lea
 lean_object* l_Lean_IR_EmitC_emitLns___at_Lean_IR_EmitC_emitMainFn___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_EmitC_emitFileHeader___closed__25;
 lean_object* l_List_forM___at_Lean_IR_EmitC_emitFnDecls___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Lean_IR_EmitC_emitJmp___closed__1;
 lean_object* l_Lean_IR_EmitC_getDecl_match__1(lean_object*);
 lean_object* l_Lean_IR_EmitC_toCInitName___closed__1;
@@ -2284,7 +2284,7 @@ lean_object* l_Lean_IR_EmitC_emitFnDeclAux___lambda__1(lean_object* x_1, lean_ob
 _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; 
-x_4 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_4 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_5 = lean_string_append(x_3, x_4);
 x_6 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_7 = lean_string_append(x_5, x_6);
@@ -3080,7 +3080,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -3090,16 +3090,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -6133,7 +6135,7 @@ x_24 = l_Lean_IR_EmitC_emitArg(x_16, x_5, x_23);
 x_25 = lean_ctor_get(x_24, 1);
 lean_inc(x_25);
 lean_dec(x_24);
-x_26 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_26 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_27 = lean_string_append(x_25, x_26);
 x_28 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_29 = lean_string_append(x_27, x_28);
@@ -6184,7 +6186,7 @@ x_16 = lean_string_append(x_15, x_14);
 lean_dec(x_14);
 x_17 = lean_string_append(x_13, x_16);
 lean_dec(x_16);
-x_18 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_18 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_19 = lean_string_append(x_17, x_18);
 x_20 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_21 = lean_string_append(x_19, x_20);
@@ -6207,7 +6209,7 @@ x_28 = lean_string_append(x_27, x_26);
 lean_dec(x_26);
 x_29 = lean_string_append(x_25, x_28);
 lean_dec(x_28);
-x_30 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_30 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_31 = lean_string_append(x_29, x_30);
 x_32 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_33 = lean_string_append(x_31, x_32);
@@ -7043,7 +7045,7 @@ x_21 = lean_ctor_get(x_20, 1);
 lean_inc(x_21);
 lean_dec(x_20);
 x_22 = lean_string_append(x_21, x_10);
-x_23 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_23 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_24 = lean_string_append(x_22, x_23);
 x_25 = lean_string_append(x_24, x_14);
 x_26 = l_Lean_IR_EmitC_emitMainFn___lambda__1___closed__4;
@@ -7182,7 +7184,7 @@ lean_inc(x_29);
 lean_dec(x_28);
 x_30 = lean_string_append(x_29, x_12);
 lean_dec(x_12);
-x_31 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_31 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_32 = lean_string_append(x_30, x_31);
 x_33 = lean_string_append(x_32, x_16);
 if (x_4 == 0)
@@ -8103,7 +8105,7 @@ x_26 = l_Lean_expandExternPattern(x_24, x_25);
 lean_dec(x_25);
 x_27 = lean_string_append(x_6, x_26);
 lean_dec(x_26);
-x_28 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_28 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_29 = lean_string_append(x_27, x_28);
 x_30 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_31 = lean_string_append(x_29, x_30);
@@ -9612,7 +9614,7 @@ lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; lean
 x_11 = lean_ctor_get(x_9, 1);
 x_12 = lean_ctor_get(x_9, 0);
 lean_dec(x_12);
-x_13 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_13 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_14 = lean_string_append(x_11, x_13);
 x_15 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_16 = lean_string_append(x_14, x_15);
@@ -9627,7 +9629,7 @@ lean_object* x_18; lean_object* x_19; lean_object* x_20; lean_object* x_21; lean
 x_18 = lean_ctor_get(x_9, 1);
 lean_inc(x_18);
 lean_dec(x_9);
-x_19 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_19 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_20 = lean_string_append(x_18, x_19);
 x_21 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_22 = lean_string_append(x_20, x_21);
@@ -10645,7 +10647,7 @@ x_25 = l_Lean_IR_EmitC_emitArg(x_16, x_5, x_24);
 x_26 = lean_ctor_get(x_25, 1);
 lean_inc(x_26);
 lean_dec(x_25);
-x_27 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_27 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_28 = lean_string_append(x_26, x_27);
 x_29 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_30 = lean_string_append(x_28, x_29);
@@ -10722,7 +10724,7 @@ x_27 = l_Lean_IR_EmitC_emitArg(x_16, x_5, x_26);
 x_28 = lean_ctor_get(x_27, 1);
 lean_inc(x_28);
 lean_dec(x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_29 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_30 = lean_string_append(x_28, x_29);
 x_31 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_32 = lean_string_append(x_30, x_31);
@@ -10797,7 +10799,7 @@ x_24 = lean_string_append(x_22, x_23);
 x_25 = l_Nat_repr(x_12);
 x_26 = lean_string_append(x_24, x_25);
 lean_dec(x_25);
-x_27 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_27 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_28 = lean_string_append(x_26, x_27);
 x_29 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_30 = lean_string_append(x_28, x_29);
@@ -11755,7 +11757,7 @@ x_9 = lean_string_append(x_8, x_7);
 lean_dec(x_7);
 x_10 = lean_string_append(x_3, x_9);
 lean_dec(x_9);
-x_11 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_11 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_12 = lean_string_append(x_10, x_11);
 x_13 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_14 = lean_string_append(x_12, x_13);
@@ -12218,7 +12220,7 @@ lean_object* x_97; lean_object* x_98; lean_object* x_99; lean_object* x_100; lea
 x_97 = lean_ctor_get(x_95, 1);
 x_98 = lean_ctor_get(x_95, 0);
 lean_dec(x_98);
-x_99 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_99 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_100 = lean_string_append(x_97, x_99);
 x_101 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_102 = lean_string_append(x_100, x_101);
@@ -12233,7 +12235,7 @@ lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107;
 x_104 = lean_ctor_get(x_95, 1);
 lean_inc(x_104);
 lean_dec(x_95);
-x_105 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_105 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_106 = lean_string_append(x_104, x_105);
 x_107 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_108 = lean_string_append(x_106, x_107);
@@ -12308,7 +12310,7 @@ lean_dec(x_9);
 x_14 = l_Nat_repr(x_13);
 x_15 = lean_string_append(x_12, x_14);
 lean_dec(x_14);
-x_16 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_16 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_17 = lean_string_append(x_15, x_16);
 x_18 = l___private_Init_Data_Format_Basic_0__Std_Format_pushNewline___closed__1;
 x_19 = lean_string_append(x_17, x_18);
@@ -12743,7 +12745,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -12753,16 +12755,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }

stage0/stdlib/Lean/Compiler/IR/EmitUtil.c

@@ -735,7 +735,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -745,25 +745,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }
@@ -1967,7 +1969,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -1977,16 +1979,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }

stage0/stdlib/Lean/Compiler/IR/ExpandResetReuse.c

@@ -140,6 +140,7 @@ lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_ExpandResetReuse_reuseToCtor___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExpandResetReuse_reuseToCtor___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExpandResetReuse_releaseUnreadFields_match__1___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExpandResetReuse_CollectProjMap_collectFnBody_match__1(lean_object*);
 lean_object* l_Lean_IR_ExpandResetReuse_mkFresh___rarg(lean_object*);
 lean_object* lean_array_pop(lean_object*);
@@ -826,7 +827,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -836,16 +837,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -4880,7 +4883,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -4890,16 +4893,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -4916,62 +4921,24 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-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; uint8_t x_9; 
-x_2 = lean_ctor_get(x_1, 0);
+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; lean_object* x_11; 
+x_2 = lean_ctor_get(x_1, 3);
 lean_inc(x_2);
-x_3 = lean_ctor_get(x_1, 1);
-lean_inc(x_3);
-x_4 = lean_ctor_get(x_1, 2);
-lean_inc(x_4);
-x_5 = lean_ctor_get(x_1, 3);
-lean_inc(x_5);
 lean_inc(x_1);
-x_6 = l_Lean_IR_ExpandResetReuse_mkProjMap(x_1);
-x_7 = lean_unsigned_to_nat(0u);
+x_3 = l_Lean_IR_ExpandResetReuse_mkProjMap(x_1);
+x_4 = lean_unsigned_to_nat(0u);
 lean_inc(x_1);
-x_8 = l_Lean_IR_MaxIndex_collectDecl(x_1, x_7);
-x_9 = !lean_is_exclusive(x_1);
-if (x_9 == 0)
-{
-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_17; lean_object* x_18; 
-x_10 = lean_ctor_get(x_1, 3);
-lean_dec(x_10);
-x_11 = lean_ctor_get(x_1, 2);
-lean_dec(x_11);
-x_12 = lean_ctor_get(x_1, 1);
-lean_dec(x_12);
-x_13 = lean_ctor_get(x_1, 0);
-lean_dec(x_13);
-x_14 = lean_unsigned_to_nat(1u);
-x_15 = lean_nat_add(x_8, x_14);
-lean_dec(x_8);
-x_16 = l_Array_empty___closed__1;
-x_17 = l_Lean_IR_ExpandResetReuse_searchAndExpand(x_5, x_16, x_6, x_15);
-x_18 = lean_ctor_get(x_17, 0);
-lean_inc(x_18);
-lean_dec(x_17);
-lean_ctor_set(x_1, 3, x_18);
-return x_1;
-}
-else
-{
-lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-lean_dec(x_1);
-x_19 = lean_unsigned_to_nat(1u);
-x_20 = lean_nat_add(x_8, x_19);
-lean_dec(x_8);
-x_21 = l_Array_empty___closed__1;
-x_22 = l_Lean_IR_ExpandResetReuse_searchAndExpand(x_5, x_21, x_6, x_20);
-x_23 = lean_ctor_get(x_22, 0);
-lean_inc(x_23);
-lean_dec(x_22);
-x_24 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_24, 0, x_2);
-lean_ctor_set(x_24, 1, x_3);
-lean_ctor_set(x_24, 2, x_4);
-lean_ctor_set(x_24, 3, x_23);
-return x_24;
-}
+x_5 = l_Lean_IR_MaxIndex_collectDecl(x_1, x_4);
+x_6 = lean_unsigned_to_nat(1u);
+x_7 = lean_nat_add(x_5, x_6);
+lean_dec(x_5);
+x_8 = l_Array_empty___closed__1;
+x_9 = l_Lean_IR_ExpandResetReuse_searchAndExpand(x_2, x_8, x_3, x_7);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+lean_dec(x_9);
+x_11 = l_Lean_IR_Decl_updateBody_x21(x_1, x_10);
+return x_11;
 }
 else
 {

stage0/stdlib/Lean/Compiler/IR/Format.c

@@ -20,6 +20,7 @@ lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatCtorInfo___clo
 lean_object* l_Lean_IR_formatFnBodyHead___closed__3;
 lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatExpr___closed__18;
 size_t l_USize_add(size_t, size_t);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatExpr___closed__30;
 lean_object* l_Lean_IR_instToFormatIRType___closed__1;
 lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatExpr___closed__24;
@@ -59,7 +60,6 @@ lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatExpr_match__1_
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatExpr___closed__5;
 extern lean_object* l_instReprSigma___rarg___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
 lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatExpr___closed__28;
 lean_object* l_Lean_IR_instToFormatFnBody;
 lean_object* l___private_Lean_Compiler_IR_Format_0__Lean_IR_formatExpr___closed__14;
@@ -4454,7 +4454,7 @@ static lean_object* _init_l_Lean_IR_formatFnBody_loop___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_1 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_2 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_2, 0, x_1);
 return x_2;
@@ -5259,7 +5259,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -5269,25 +5269,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }

stage0/stdlib/Lean/Compiler/IR/FreeVars.c

@@ -1982,7 +1982,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -1992,25 +1992,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }

stage0/stdlib/Lean/Compiler/IR/NormIds.c

@@ -65,8 +65,6 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_FnBody_replaceVar___spec__8(lea
 uint8_t l_Lean_IR_FnBody_isTerminal(lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_IR_UniqueIds_checkFnBody___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_UniqueIds_checkDecl_match__1___rarg(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_NormalizeIds_normDecl___spec__1(lean_object*, size_t, size_t, lean_object*);
-lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_NormalizeIds_normDecl___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_UniqueIds_checkDecl_match__1(lean_object*);
 lean_object* l_Lean_IR_NormalizeIds_normArg___boxed(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_FnBody_replaceVar___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -107,6 +105,7 @@ lean_object* l_Lean_IR_NormalizeIds_normArg_match__1___rarg(lean_object*, lean_o
 lean_object* l_Lean_IR_NormalizeIds_instMonadLiftMN___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_MapVars_mapExpr___at_Lean_IR_FnBody_replaceVar___spec__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_IR_UniqueIds_checkFnBody___spec__1(lean_object*, size_t, size_t, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_NormalizeIds_normFnBody___spec__1(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_FnBody_replaceVar___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_MapVars_mapArgs___at_Lean_IR_FnBody_replaceVar___spec__9___boxed(lean_object*, lean_object*, lean_object*);
@@ -867,7 +866,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -877,25 +876,27 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
+lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
 lean_dec(x_2);
-x_9 = lean_ctor_get(x_1, 0);
-lean_inc(x_9);
-x_10 = lean_ctor_get(x_1, 1);
+x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
-x_11 = lean_ctor_get(x_1, 2);
+x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_1, 3);
+x_12 = lean_ctor_get(x_1, 2);
 lean_inc(x_12);
+x_13 = lean_ctor_get(x_1, 3);
+lean_inc(x_13);
 lean_dec(x_1);
-x_13 = lean_apply_4(x_3, x_9, x_10, x_11, x_12);
-return x_13;
+x_14 = lean_apply_4(x_3, x_10, x_11, x_12, x_13);
+return x_14;
 }
 }
 }
@@ -3958,7 +3959,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -3968,16 +3969,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -3989,209 +3992,102 @@ x_2 = lean_alloc_closure((void*)(l_Lean_IR_NormalizeIds_normDecl_match__1___rarg
 return x_2;
 }
 }
-lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_NormalizeIds_normDecl___spec__1(lean_object* x_1, size_t x_2, size_t x_3, lean_object* x_4) {
-_start:
-{
-uint8_t x_5; 
-x_5 = x_3 < x_2;
-if (x_5 == 0)
-{
-lean_object* x_6; 
-x_6 = x_4;
-return x_6;
-}
-else
-{
-lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; uint8_t x_11; 
-x_7 = lean_array_uget(x_4, x_3);
-x_8 = lean_unsigned_to_nat(0u);
-x_9 = lean_array_uset(x_4, x_3, x_8);
-x_10 = x_7;
-x_11 = !lean_is_exclusive(x_10);
-if (x_11 == 0)
-{
-lean_object* x_12; lean_object* x_13; size_t x_14; size_t x_15; lean_object* x_16; lean_object* x_17; 
-x_12 = lean_ctor_get(x_10, 0);
-x_13 = l_Lean_IR_NormalizeIds_normIndex(x_12, x_1);
-lean_dec(x_12);
-lean_ctor_set(x_10, 0, x_13);
-x_14 = 1;
-x_15 = x_3 + x_14;
-x_16 = x_10;
-x_17 = lean_array_uset(x_9, x_3, x_16);
-x_3 = x_15;
-x_4 = x_17;
-goto _start;
-}
-else
-{
-lean_object* x_19; uint8_t x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; size_t x_24; size_t x_25; lean_object* x_26; lean_object* x_27; 
-x_19 = lean_ctor_get(x_10, 0);
-x_20 = lean_ctor_get_uint8(x_10, sizeof(void*)*2);
-x_21 = lean_ctor_get(x_10, 1);
-lean_inc(x_21);
-lean_inc(x_19);
-lean_dec(x_10);
-x_22 = l_Lean_IR_NormalizeIds_normIndex(x_19, x_1);
-lean_dec(x_19);
-x_23 = lean_alloc_ctor(0, 2, 1);
-lean_ctor_set(x_23, 0, x_22);
-lean_ctor_set(x_23, 1, x_21);
-lean_ctor_set_uint8(x_23, sizeof(void*)*2, x_20);
-x_24 = 1;
-x_25 = x_3 + x_24;
-x_26 = x_23;
-x_27 = lean_array_uset(x_9, x_3, x_26);
-x_3 = x_25;
-x_4 = x_27;
-goto _start;
-}
-}
-}
-}
 lean_object* l_Lean_IR_NormalizeIds_normDecl(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_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_27; lean_object* x_28; uint8_t x_29; 
-x_4 = lean_ctor_get(x_1, 0);
+lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_18; lean_object* x_19; uint8_t x_20; 
+x_4 = lean_ctor_get(x_1, 1);
 lean_inc(x_4);
-x_5 = lean_ctor_get(x_1, 1);
+x_5 = lean_ctor_get(x_1, 3);
 lean_inc(x_5);
-x_6 = lean_ctor_get(x_1, 2);
-lean_inc(x_6);
-x_7 = lean_ctor_get(x_1, 3);
-lean_inc(x_7);
-if (lean_is_exclusive(x_1)) {
- lean_ctor_release(x_1, 0);
- lean_ctor_release(x_1, 1);
- lean_ctor_release(x_1, 2);
- lean_ctor_release(x_1, 3);
- x_8 = x_1;
-} else {
- lean_dec_ref(x_1);
- x_8 = lean_box(0);
-}
-x_27 = lean_array_get_size(x_5);
-x_28 = lean_unsigned_to_nat(0u);
-x_29 = lean_nat_dec_lt(x_28, x_27);
-if (x_29 == 0)
+x_18 = lean_array_get_size(x_4);
+x_19 = lean_unsigned_to_nat(0u);
+x_20 = lean_nat_dec_lt(x_19, x_18);
+if (x_20 == 0)
 {
-lean_object* x_30; 
-lean_dec(x_27);
-x_30 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_30, 0, x_2);
-lean_ctor_set(x_30, 1, x_3);
-x_9 = x_30;
-goto block_26;
-}
-else
-{
-uint8_t x_31; 
-x_31 = lean_nat_dec_le(x_27, x_27);
-if (x_31 == 0)
-{
-lean_object* x_32; 
-lean_dec(x_27);
-x_32 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_32, 0, x_2);
-lean_ctor_set(x_32, 1, x_3);
-x_9 = x_32;
-goto block_26;
-}
-else
-{
-size_t x_33; size_t x_34; lean_object* x_35; 
-x_33 = 0;
-x_34 = lean_usize_of_nat(x_27);
-lean_dec(x_27);
-x_35 = l_Array_foldlMUnsafe_fold___at_Lean_IR_NormalizeIds_withParams___spec__2(x_5, x_33, x_34, x_2, x_3);
-x_9 = x_35;
-goto block_26;
-}
-}
-block_26:
-{
-lean_object* x_10; lean_object* x_11; lean_object* x_12; size_t x_13; size_t x_14; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; uint8_t x_19; 
-x_10 = lean_ctor_get(x_9, 0);
-lean_inc(x_10);
-x_11 = lean_ctor_get(x_9, 1);
-lean_inc(x_11);
-lean_dec(x_9);
-x_12 = lean_array_get_size(x_5);
-x_13 = lean_usize_of_nat(x_12);
-lean_dec(x_12);
-x_14 = 0;
-x_15 = x_5;
-x_16 = l_Array_mapMUnsafe_map___at_Lean_IR_NormalizeIds_normDecl___spec__1(x_10, x_13, x_14, x_15);
-x_17 = x_16;
-x_18 = l_Lean_IR_NormalizeIds_normFnBody(x_7, x_10, x_11);
-x_19 = !lean_is_exclusive(x_18);
-if (x_19 == 0)
-{
-lean_object* x_20; lean_object* x_21; 
-x_20 = lean_ctor_get(x_18, 0);
-if (lean_is_scalar(x_8)) {
- x_21 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_21 = x_8;
-}
-lean_ctor_set(x_21, 0, x_4);
-lean_ctor_set(x_21, 1, x_17);
-lean_ctor_set(x_21, 2, x_6);
-lean_ctor_set(x_21, 3, x_20);
-lean_ctor_set(x_18, 0, x_21);
-return x_18;
-}
-else
-{
-lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
-x_22 = lean_ctor_get(x_18, 0);
-x_23 = lean_ctor_get(x_18, 1);
-lean_inc(x_23);
-lean_inc(x_22);
+lean_object* x_21; 
 lean_dec(x_18);
-if (lean_is_scalar(x_8)) {
- x_24 = lean_alloc_ctor(0, 4, 0);
-} else {
- x_24 = x_8;
+lean_dec(x_4);
+x_21 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_21, 0, x_2);
+lean_ctor_set(x_21, 1, x_3);
+x_6 = x_21;
+goto block_17;
 }
-lean_ctor_set(x_24, 0, x_4);
-lean_ctor_set(x_24, 1, x_17);
-lean_ctor_set(x_24, 2, x_6);
-lean_ctor_set(x_24, 3, x_22);
-x_25 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_25, 0, x_24);
-lean_ctor_set(x_25, 1, x_23);
-return x_25;
+else
+{
+uint8_t x_22; 
+x_22 = lean_nat_dec_le(x_18, x_18);
+if (x_22 == 0)
+{
+lean_object* x_23; 
+lean_dec(x_18);
+lean_dec(x_4);
+x_23 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_23, 0, x_2);
+lean_ctor_set(x_23, 1, x_3);
+x_6 = x_23;
+goto block_17;
+}
+else
+{
+size_t x_24; size_t x_25; lean_object* x_26; 
+x_24 = 0;
+x_25 = lean_usize_of_nat(x_18);
+lean_dec(x_18);
+x_26 = l_Array_foldlMUnsafe_fold___at_Lean_IR_NormalizeIds_withParams___spec__2(x_4, x_24, x_25, x_2, x_3);
+lean_dec(x_4);
+x_6 = x_26;
+goto block_17;
+}
+}
+block_17:
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; uint8_t x_10; 
+x_7 = lean_ctor_get(x_6, 0);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_6, 1);
+lean_inc(x_8);
+lean_dec(x_6);
+x_9 = l_Lean_IR_NormalizeIds_normFnBody(x_5, x_7, x_8);
+x_10 = !lean_is_exclusive(x_9);
+if (x_10 == 0)
+{
+lean_object* x_11; lean_object* x_12; 
+x_11 = lean_ctor_get(x_9, 0);
+x_12 = l_Lean_IR_Decl_updateBody_x21(x_1, x_11);
+lean_ctor_set(x_9, 0, x_12);
+return x_9;
+}
+else
+{
+lean_object* x_13; lean_object* x_14; lean_object* x_15; lean_object* x_16; 
+x_13 = lean_ctor_get(x_9, 0);
+x_14 = lean_ctor_get(x_9, 1);
+lean_inc(x_14);
+lean_inc(x_13);
+lean_dec(x_9);
+x_15 = l_Lean_IR_Decl_updateBody_x21(x_1, x_13);
+x_16 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_16, 0, x_15);
+lean_ctor_set(x_16, 1, x_14);
+return x_16;
 }
 }
 }
 else
 {
-lean_object* x_36; 
+lean_object* x_27; 
 lean_dec(x_2);
-x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_1);
-lean_ctor_set(x_36, 1, x_3);
-return x_36;
+x_27 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_27, 0, x_1);
+lean_ctor_set(x_27, 1, x_3);
+return x_27;
 }
 }
 }
-lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_NormalizeIds_normDecl___spec__1___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-size_t x_5; size_t x_6; lean_object* x_7; 
-x_5 = lean_unbox_usize(x_2);
-lean_dec(x_2);
-x_6 = lean_unbox_usize(x_3);
-lean_dec(x_3);
-x_7 = l_Array_mapMUnsafe_map___at_Lean_IR_NormalizeIds_normDecl___spec__1(x_1, x_5, x_6, x_4);
-lean_dec(x_1);
-return x_7;
-}
-}
 lean_object* l_Lean_IR_Decl_normalizeIds(lean_object* x_1) {
 _start:
 {

stage0/stdlib/Lean/Compiler/IR/PushProj.c

@@ -69,6 +69,7 @@ lean_object* l_Lean_IR_mkIndexSet(lean_object*);
 lean_object* l_Lean_IR_reshape(lean_object*, lean_object*);
 lean_object* l_Array_mapIdxM_map___at_Lean_IR_pushProjs___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapIdxM_map___at_Lean_IR_pushProjs___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* lean_array_pop(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_pushProjs___spec__3(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_IR_Decl_pushProj(lean_object*);
@@ -1636,7 +1637,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -1646,16 +1647,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -1672,41 +1675,16 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-uint8_t x_2; 
-x_2 = !lean_is_exclusive(x_1);
-if (x_2 == 0)
-{
-lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_3 = lean_ctor_get(x_1, 3);
-x_4 = l_Lean_IR_FnBody_pushProj(x_3);
-lean_ctor_set(x_1, 3, x_4);
-x_5 = l_Lean_IR_Decl_normalizeIds(x_1);
+lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
+x_2 = lean_ctor_get(x_1, 3);
+lean_inc(x_2);
+x_3 = l_Lean_IR_FnBody_pushProj(x_2);
+x_4 = l_Lean_IR_Decl_updateBody_x21(x_1, x_3);
+x_5 = l_Lean_IR_Decl_normalizeIds(x_4);
 return x_5;
 }
 else
 {
-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_6 = lean_ctor_get(x_1, 0);
-x_7 = lean_ctor_get(x_1, 1);
-x_8 = lean_ctor_get(x_1, 2);
-x_9 = lean_ctor_get(x_1, 3);
-lean_inc(x_9);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_dec(x_1);
-x_10 = l_Lean_IR_FnBody_pushProj(x_9);
-x_11 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_11, 0, x_6);
-lean_ctor_set(x_11, 1, x_7);
-lean_ctor_set(x_11, 2, x_8);
-lean_ctor_set(x_11, 3, x_10);
-x_12 = l_Lean_IR_Decl_normalizeIds(x_11);
-return x_12;
-}
-}
-else
-{
 return x_1;
 }
 }

stage0/stdlib/Lean/Compiler/IR/RC.c

@@ -24,7 +24,6 @@ lean_object* l_Lean_IR_ExplicitRC_visitFnBody_match__2(lean_object*);
 uint8_t l_Lean_IR_ExplicitRC_VarInfo_persistent___default;
 lean_object* l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_isBorrowParamAux_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitRC_getDecl___boxed(lean_object*, lean_object*);
-extern lean_object* l_Lean_IR_Decl_instInhabitedDecl;
 lean_object* l_Lean_IR_ExplicitRC_visitFnBody_match__6(lean_object*);
 lean_object* l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addIncBeforeAux___at___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addIncBefore___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitRC_getDecl___closed__1;
@@ -135,6 +134,7 @@ lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Compiler_IR_RC_0__Lea
 lean_object* l_Lean_IR_ExplicitRC_visitFnBody_match__9(lean_object*);
 lean_object* l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addIncBeforeAux___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_explicitRC___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_IR_instInhabitedDecl;
 lean_object* l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_isBorrowParamAux___at___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addIncBeforeConsumeAll___spec__4___boxed(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_ExplicitRC_visitFnBody___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addDecAfterFullApp_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -191,6 +191,7 @@ lean_object* l_Lean_IR_ExplicitRC_visitDecl_match__1(lean_object*);
 lean_object* l_Std_RBNode_ins___at___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_updateRefUsingCtorInfo___spec__2(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitRC_visitFnBody_match__6___rarg(lean_object*, lean_object*);
 lean_object* l_Std_RBNode_findCore___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitRC_visitFnBody_match__5(lean_object*);
 lean_object* l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addDecForAlt(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ExplicitRC_getVarInfo(lean_object*, lean_object*);
@@ -374,7 +375,7 @@ x_5 = l_Lean_IR_findEnvDecl_x27(x_3, x_2, x_4);
 if (lean_obj_tag(x_5) == 0)
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; 
-x_6 = l_Lean_IR_Decl_instInhabitedDecl;
+x_6 = l_Lean_IR_instInhabitedDecl;
 x_7 = l_Lean_IR_ExplicitRC_getDecl___closed__3;
 x_8 = lean_panic_fn(x_6, x_7);
 return x_8;
@@ -7885,7 +7886,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -7895,16 +7896,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -7921,71 +7924,32 @@ _start:
 {
 if (lean_obj_tag(x_3) == 0)
 {
-uint8_t x_4; 
-x_4 = !lean_is_exclusive(x_3);
-if (x_4 == 0)
-{
-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_5 = lean_ctor_get(x_3, 1);
-x_6 = lean_ctor_get(x_3, 3);
-x_7 = lean_box(0);
-x_8 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_8, 0, x_1);
-lean_ctor_set(x_8, 1, x_2);
-lean_ctor_set(x_8, 2, x_7);
-lean_ctor_set(x_8, 3, x_7);
-lean_ctor_set(x_8, 4, x_7);
-x_9 = l_Lean_IR_ExplicitRC_updateVarInfoWithParams(x_8, x_5);
-lean_inc(x_9);
-x_10 = l_Lean_IR_ExplicitRC_visitFnBody(x_6, x_9);
-x_11 = lean_ctor_get(x_10, 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_3, 1);
+lean_inc(x_4);
+x_5 = lean_ctor_get(x_3, 3);
+lean_inc(x_5);
+x_6 = lean_box(0);
+x_7 = lean_alloc_ctor(0, 5, 0);
+lean_ctor_set(x_7, 0, x_1);
+lean_ctor_set(x_7, 1, x_2);
+lean_ctor_set(x_7, 2, x_6);
+lean_ctor_set(x_7, 3, x_6);
+lean_ctor_set(x_7, 4, x_6);
+x_8 = l_Lean_IR_ExplicitRC_updateVarInfoWithParams(x_7, x_4);
+lean_inc(x_8);
+x_9 = l_Lean_IR_ExplicitRC_visitFnBody(x_5, x_8);
+x_10 = lean_ctor_get(x_9, 0);
+lean_inc(x_10);
+x_11 = lean_ctor_get(x_9, 1);
 lean_inc(x_11);
-x_12 = lean_ctor_get(x_10, 1);
-lean_inc(x_12);
-lean_dec(x_10);
-x_13 = l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addDecForDeadParams(x_9, x_5, x_11, x_12);
-lean_dec(x_12);
 lean_dec(x_9);
-lean_ctor_set(x_3, 3, x_13);
-return x_3;
-}
-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; lean_object* x_25; 
-x_14 = lean_ctor_get(x_3, 0);
-x_15 = lean_ctor_get(x_3, 1);
-x_16 = lean_ctor_get(x_3, 2);
-x_17 = lean_ctor_get(x_3, 3);
-lean_inc(x_17);
-lean_inc(x_16);
-lean_inc(x_15);
-lean_inc(x_14);
-lean_dec(x_3);
-x_18 = lean_box(0);
-x_19 = lean_alloc_ctor(0, 5, 0);
-lean_ctor_set(x_19, 0, x_1);
-lean_ctor_set(x_19, 1, x_2);
-lean_ctor_set(x_19, 2, x_18);
-lean_ctor_set(x_19, 3, x_18);
-lean_ctor_set(x_19, 4, x_18);
-x_20 = l_Lean_IR_ExplicitRC_updateVarInfoWithParams(x_19, x_15);
-lean_inc(x_20);
-x_21 = l_Lean_IR_ExplicitRC_visitFnBody(x_17, x_20);
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-x_23 = lean_ctor_get(x_21, 1);
-lean_inc(x_23);
-lean_dec(x_21);
-x_24 = l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addDecForDeadParams(x_20, x_15, x_22, x_23);
-lean_dec(x_23);
-lean_dec(x_20);
-x_25 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_25, 0, x_14);
-lean_ctor_set(x_25, 1, x_15);
-lean_ctor_set(x_25, 2, x_16);
-lean_ctor_set(x_25, 3, x_24);
-return x_25;
-}
+x_12 = l___private_Lean_Compiler_IR_RC_0__Lean_IR_ExplicitRC_addDecForDeadParams(x_8, x_4, x_10, x_11);
+lean_dec(x_11);
+lean_dec(x_4);
+lean_dec(x_8);
+x_13 = l_Lean_IR_Decl_updateBody_x21(x_3, x_12);
+return x_13;
 }
 else
 {

stage0/stdlib/Lean/Compiler/IR/ResetReuse.c

@@ -79,6 +79,7 @@ lean_object* l_Lean_IR_FnBody_hasLiveVar(lean_object*, lean_object*, lean_object
 lean_object* l_Lean_IR_ResetReuse_R_match__3___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_IR_HasIndex_visitFnBody(lean_object*, lean_object*);
 lean_object* l_Lean_Name_getPrefix(lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Compiler_IR_ResetReuse_0__Lean_IR_ResetReuse_Dmain___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_IR_ResetReuse_R(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Compiler_IR_ResetReuse_0__Lean_IR_ResetReuse_S___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*);
@@ -2748,7 +2749,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -2758,15 +2759,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
-x_8 = lean_apply_5(x_2, x_1, x_4, x_5, x_6, x_7);
-return x_8;
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -2783,60 +2787,22 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; uint8_t x_8; 
-x_2 = lean_ctor_get(x_1, 0);
+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; 
+x_2 = lean_ctor_get(x_1, 3);
 lean_inc(x_2);
-x_3 = lean_ctor_get(x_1, 1);
-lean_inc(x_3);
-x_4 = lean_ctor_get(x_1, 2);
-lean_inc(x_4);
-x_5 = lean_ctor_get(x_1, 3);
-lean_inc(x_5);
-x_6 = lean_unsigned_to_nat(0u);
+x_3 = lean_unsigned_to_nat(0u);
 lean_inc(x_1);
-x_7 = l_Lean_IR_MaxIndex_collectDecl(x_1, x_6);
-x_8 = !lean_is_exclusive(x_1);
-if (x_8 == 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; lean_object* x_16; lean_object* x_17; 
-x_9 = lean_ctor_get(x_1, 3);
-lean_dec(x_9);
-x_10 = lean_ctor_get(x_1, 2);
-lean_dec(x_10);
-x_11 = lean_ctor_get(x_1, 1);
-lean_dec(x_11);
-x_12 = lean_ctor_get(x_1, 0);
-lean_dec(x_12);
-x_13 = lean_unsigned_to_nat(1u);
-x_14 = lean_nat_add(x_7, x_13);
-lean_dec(x_7);
-x_15 = lean_box(0);
-x_16 = l_Lean_IR_ResetReuse_R(x_5, x_15, x_14);
-x_17 = lean_ctor_get(x_16, 0);
-lean_inc(x_17);
-lean_dec(x_16);
-lean_ctor_set(x_1, 3, x_17);
-return x_1;
-}
-else
-{
-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_dec(x_1);
-x_18 = lean_unsigned_to_nat(1u);
-x_19 = lean_nat_add(x_7, x_18);
-lean_dec(x_7);
-x_20 = lean_box(0);
-x_21 = l_Lean_IR_ResetReuse_R(x_5, x_20, x_19);
-x_22 = lean_ctor_get(x_21, 0);
-lean_inc(x_22);
-lean_dec(x_21);
-x_23 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_23, 0, x_2);
-lean_ctor_set(x_23, 1, x_3);
-lean_ctor_set(x_23, 2, x_4);
-lean_ctor_set(x_23, 3, x_22);
-return x_23;
-}
+x_4 = l_Lean_IR_MaxIndex_collectDecl(x_1, x_3);
+x_5 = lean_unsigned_to_nat(1u);
+x_6 = lean_nat_add(x_4, x_5);
+lean_dec(x_4);
+x_7 = lean_box(0);
+x_8 = l_Lean_IR_ResetReuse_R(x_2, x_7, x_6);
+x_9 = lean_ctor_get(x_8, 0);
+lean_inc(x_9);
+lean_dec(x_8);
+x_10 = l_Lean_IR_Decl_updateBody_x21(x_1, x_9);
+return x_10;
 }
 else
 {

stage0/stdlib/Lean/Compiler/IR/SimpCase.c

@@ -66,6 +66,7 @@ lean_object* l_Lean_IR_reshape(lean_object*, lean_object*);
 lean_object* l_Array_back___at_Lean_IR_ensureHasDefault___spec__1___boxed(lean_object*);
 lean_object* l_Lean_IR_Decl_simpCase_match__1(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_IR_FnBody_simpCase___spec__1(size_t, size_t, lean_object*);
+lean_object* l_Lean_IR_Decl_updateBody_x21(lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_IR_SimpCase_0__Lean_IR_getOccsOf___boxed(lean_object*, lean_object*);
 uint8_t l_Array_anyMUnsafe_any___at_Lean_IR_ensureHasDefault___spec__2(lean_object*, size_t, size_t);
 lean_object* lean_array_pop(lean_object*);
@@ -1200,7 +1201,7 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; 
+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_dec(x_3);
 x_4 = lean_ctor_get(x_1, 0);
 lean_inc(x_4);
@@ -1210,16 +1211,18 @@ x_6 = lean_ctor_get(x_1, 2);
 lean_inc(x_6);
 x_7 = lean_ctor_get(x_1, 3);
 lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 4);
+lean_inc(x_8);
 lean_dec(x_1);
-x_8 = lean_apply_4(x_2, x_4, x_5, x_6, x_7);
-return x_8;
+x_9 = lean_apply_5(x_2, x_4, x_5, x_6, x_7, x_8);
+return x_9;
 }
 else
 {
-lean_object* x_9; 
+lean_object* x_10; 
 lean_dec(x_2);
-x_9 = lean_apply_1(x_3, x_1);
-return x_9;
+x_10 = lean_apply_1(x_3, x_1);
+return x_10;
 }
 }
 }
@@ -1236,36 +1239,12 @@ _start:
 {
 if (lean_obj_tag(x_1) == 0)
 {
-uint8_t x_2; 
-x_2 = !lean_is_exclusive(x_1);
-if (x_2 == 0)
-{
-lean_object* x_3; lean_object* x_4; 
-x_3 = lean_ctor_get(x_1, 3);
-x_4 = l_Lean_IR_FnBody_simpCase(x_3);
-lean_ctor_set(x_1, 3, x_4);
-return x_1;
-}
-else
-{
-lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
-x_5 = lean_ctor_get(x_1, 0);
-x_6 = lean_ctor_get(x_1, 1);
-x_7 = lean_ctor_get(x_1, 2);
-x_8 = lean_ctor_get(x_1, 3);
-lean_inc(x_8);
-lean_inc(x_7);
-lean_inc(x_6);
-lean_inc(x_5);
-lean_dec(x_1);
-x_9 = l_Lean_IR_FnBody_simpCase(x_8);
-x_10 = lean_alloc_ctor(0, 4, 0);
-lean_ctor_set(x_10, 0, x_5);
-lean_ctor_set(x_10, 1, x_6);
-lean_ctor_set(x_10, 2, x_7);
-lean_ctor_set(x_10, 3, x_9);
-return x_10;
-}
+lean_object* x_2; lean_object* x_3; lean_object* x_4; 
+x_2 = lean_ctor_get(x_1, 3);
+lean_inc(x_2);
+x_3 = l_Lean_IR_FnBody_simpCase(x_2);
+x_4 = l_Lean_IR_Decl_updateBody_x21(x_1, x_3);
+return x_4;
 }
 else
 {

stage0/stdlib/Lean/Compiler/NameMangling.c

@@ -22,6 +22,7 @@ extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
 lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_String_mangleAux_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_String_mangleAux_match__1(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* l_Nat_repr(lean_object*);
@@ -42,7 +43,6 @@ lean_object* lean_string_length(lean_object*);
 lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_String_mangleAux___closed__3;
 lean_object* lean_nat_mod(lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_mangleAux_match__1(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
 lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_Name_mangleAux_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Compiler_NameMangling_0__Lean_String_mangleAux_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_uint32_to_nat(uint32_t);
@@ -363,7 +363,7 @@ else
 {
 lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; 
 x_6 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_mangleAux(x_3);
-x_7 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_7 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_8 = lean_string_append(x_6, x_7);
 x_9 = lean_string_append(x_8, x_5);
 lean_dec(x_5);
@@ -379,7 +379,7 @@ x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
 lean_dec(x_1);
 x_12 = l___private_Lean_Compiler_NameMangling_0__Lean_Name_mangleAux(x_10);
-x_13 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_13 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_14 = lean_string_append(x_12, x_13);
 x_15 = l_Nat_repr(x_11);
 x_16 = lean_string_append(x_14, x_15);

stage0/stdlib/Lean/Data/Json/Parser.c

@@ -39,7 +39,6 @@ lean_object* l_Lean_Json_Parser_num___lambda__5(lean_object*, lean_object*, lean
 extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
 lean_object* l_Lean_Quickparse_instMonadQuickparse___closed__7;
 extern lean_object* l_instReprBool___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 extern lean_object* l_String_quote___closed__2;
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
@@ -57,6 +56,7 @@ lean_object* l_Lean_Quickparse_instMonadQuickparse___closed__2;
 lean_object* l_Lean_Json_Parser_escapedChar___boxed__const__6;
 extern lean_object* l_Int_Int_pow___closed__1;
 lean_object* l_Lean_Json_Parser_escapedChar___boxed__const__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Lean_Quickparse_expect(lean_object*, lean_object*);
 lean_object* l_Lean_Json_Parser_anyCore___rarg___closed__6;
 lean_object* l_Lean_Quickparse_expect___boxed(lean_object*, lean_object*);
@@ -3888,7 +3888,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Json_Parser_lookahead___rarg___closed__1;
-x_2 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_2 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_3 = lean_string_append(x_1, x_2);
 return x_3;
 }

stage0/stdlib/Lean/Data/Json/Printer.c

@@ -30,7 +30,6 @@ lean_object* l_Lean_JsonNumber_toString(lean_object*);
 extern lean_object* l_instReprProd___rarg___closed__2;
 extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
 extern lean_object* l_instReprBool___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 extern lean_object* l_String_quote___closed__2;
 lean_object* lean_array_get_size(lean_object*);
 lean_object* lean_string_append(lean_object*, lean_object*);
@@ -43,6 +42,7 @@ extern lean_object* l_instReprBool___closed__2;
 uint8_t l_USize_decLt(size_t, size_t);
 extern lean_object* l_instReprBool___closed__4;
 lean_object* l_Lean_Json_render___closed__8;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l___private_Lean_Data_Json_Printer_0__Lean_Json_escapeAux(lean_object*, uint32_t);
 lean_object* l_Lean_Json_render___closed__1;
 extern lean_object* l_Char_quoteCore___closed__2;
@@ -56,7 +56,6 @@ lean_object* lean_array_to_list(lean_object*, lean_object*);
 lean_object* l_Lean_Json_renderString___boxed(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Json_compress___spec__1(size_t, size_t, lean_object*);
 uint32_t l_Nat_digitChar(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__22;
 lean_object* l_Std_Format_joinSep___rarg(lean_object*, lean_object*, lean_object*);
 size_t lean_usize_of_nat(lean_object*);
@@ -79,6 +78,7 @@ lean_object* l_Lean_Json_pretty(lean_object*, lean_object*);
 lean_object* l_Lean_Json_render(lean_object*);
 lean_object* lean_string_length(lean_object*);
 extern lean_object* l_Std_Format_sbracket___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_object* l_Std_RBNode_fold___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_fold___at_Lean_Json_compress___spec__2(lean_object*, lean_object*);
 lean_object* lean_nat_mod(lean_object*, lean_object*);
@@ -428,7 +428,7 @@ _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; uint8_t x_12; lean_object* x_13; lean_object* x_14; 
 x_4 = l_Lean_Json_renderString(x_2);
-x_5 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_5 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_6 = lean_string_append(x_4, x_5);
 x_7 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_7, 0, x_6);
@@ -830,7 +830,7 @@ lean_dec(x_4);
 x_9 = l_Lean_instInhabitedParserDescr___closed__1;
 x_10 = lean_string_append(x_9, x_8);
 lean_dec(x_8);
-x_11 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_11 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_12 = lean_string_append(x_10, x_11);
 x_13 = l_Lean_Json_compress(x_5);
 x_14 = lean_string_append(x_12, x_13);
@@ -906,7 +906,7 @@ x_14 = x_10;
 x_15 = l_Array_mapMUnsafe_map___at_Lean_Json_compress___spec__1(x_12, x_13, x_14);
 x_16 = x_15;
 x_17 = lean_array_to_list(lean_box(0), x_16);
-x_18 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_18 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 x_19 = l_String_intercalate(x_18, x_17);
 x_20 = l_term_x5b___x5d___closed__3;
 x_21 = lean_string_append(x_20, x_19);
@@ -923,7 +923,7 @@ lean_inc(x_24);
 lean_dec(x_1);
 x_25 = lean_box(0);
 x_26 = l_Std_RBNode_fold___at_Lean_Json_compress___spec__2(x_25, x_24);
-x_27 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_27 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 x_28 = l_String_intercalate(x_27, x_26);
 x_29 = l_addParenHeuristic___closed__1;
 x_30 = lean_string_append(x_29, x_28);

stage0/stdlib/Lean/Elab/App.c

@@ -129,7 +129,6 @@ lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_propagateEx
 lean_object* l_Lean_Elab_Term_throwInvalidNamedArg_match__1___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 extern lean_object* l_Lean_MessageData_nil;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Lean_Elab_Term_elabApp_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_anyNamedArgDependsOnCurrent___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_App_0__Lean_Elab_Term_elabAppLValsAux_loop_match__1___rarg(lean_object*, lean_object*);
@@ -190,6 +189,7 @@ lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_finalize_ma
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_processExplictArg___spec__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_hasOptAutoParams___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_Meta_withoutPostponingUniverseConstraintsImp___at_Lean_Elab_Term_elabApp___spec__1___lambda__1(lean_object*, 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_12336____closed__8;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_isNextArgHole(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getMainModule___rarg(lean_object*, lean_object*);
@@ -226,6 +226,7 @@ lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppArgs___closed__1
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___spec__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*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_instToStringArg_match__1(lean_object*);
 lean_object* l_Lean_Elab_Term_hasElabWithoutExpectedType___boxed(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLValsAux_loop_match__4___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabExplicitUniv(lean_object*);
@@ -241,6 +242,7 @@ lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLValsAux_loop___
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppAux___spec__1(lean_object*, lean_object*, size_t, size_t, 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___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_fTypeHasOptAutoParams(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_2191____closed__3;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_resolveLValAux___closed__7;
 extern lean_object* l_Lean_Parser_Term_byTactic___elambda__1___closed__2;
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppAux___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -300,7 +302,6 @@ uint8_t l_Lean_Elab_Term_ElabAppArgs_State_ellipsis___default;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_anyNamedArgDependsOnCurrent___lambda__2___closed__1;
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_finalize___spec__1(lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_ElabAppArgs_main_match__1___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_anyNamedArgDependsOnCurrent_match__2(lean_object*);
 lean_object* l_Lean_Elab_logException___at___private_Lean_Elab_Term_0__Lean_Elab_Term_exceptionToSorry___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___spec__1___closed__6;
@@ -340,6 +341,7 @@ lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_processInst
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___spec__2___lambda__4___boxed(lean_object**);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_Lean_Elab_Term_throwInvalidNamedArg_match__1(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 lean_object* l_List_foldlM___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFnId___spec__3___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*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFn___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -349,7 +351,6 @@ lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Te
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppFnId___boxed(lean_object**);
 lean_object* l_Lean_Elab_Term_expandApp_match__3___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_resolveLValAux___lambda__1___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__3;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppArgs___closed__4;
 lean_object* l___private_Lean_Meta_LevelDefEq_0__Lean_Meta_getResetPostponed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg(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*);
@@ -419,7 +420,6 @@ lean_object* lean_expr_dbg_to_string(lean_object*);
 lean_object* l_Lean_Elab_Term_elabApp(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_finalize___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*);
 extern lean_object* l_Lean_instInhabitedExpr;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_Lean_getPathToBaseStructure_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeAppInstMVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MetavarContext_localDeclDependsOn(lean_object*, lean_object*, lean_object*);
@@ -473,11 +473,9 @@ lean_object* l___regBuiltin_Lean_Elab_Term_elabProj___closed__1;
 lean_object* l_Lean_Elab_Term_LVal_getRef(lean_object*);
 uint8_t l_Lean_Expr_isAutoParam(lean_object*);
 extern lean_object* l_Lean_Parser_Term_arrayRef___elambda__1___closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l_Lean_Elab_Term_elabNamedPattern(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppAux___spec__1___closed__1;
-extern lean_object* l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__3;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLVals(lean_object*, lean_object*, 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* l___private_Lean_Elab_App_0__Lean_Elab_Term_toMessageList(lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_hasOptAutoParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -508,9 +506,7 @@ lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___lambda__2(
 lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_hasOptAutoParams___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg_match__4(lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___spec__2___lambda__1___boxed(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_6978____closed__2;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_hasOptAutoParams___lambda__1___boxed(lean_object*, lean_object*, 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_2117____closed__1;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_App_0__Lean_Elab_Term_throwLValError___spec__1(lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_synthesizePendingAndNormalizeFunType___closed__2;
 lean_object* l_Lean_Syntax_getPos_x3f(lean_object*, uint8_t);
@@ -530,6 +526,7 @@ lean_object* l_List_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_El
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_consumeImplicits_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_expandApp_match__3(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Lean_Elab_Term_ElabAppArgs_main_match__2(lean_object*);
 lean_object* l_List_find_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___spec__1___closed__3;
@@ -569,13 +566,13 @@ lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore(lean_object*, lean_object*,
 lean_object* l_List_foldr___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_anyNamedArgDependsOnCurrent___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_processExplictArg___spec__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_App_0__Lean_Elab_Term_resolveLValAux_match__4___rarg(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 extern lean_object* l_Lean_Parser_Term_ellipsis___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_throwInvalidNamedArg___rarg___closed__5;
 lean_object* l_Lean_Elab_Term_addTermInfo(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___regBuiltin_Lean_Elab_Term_elabExplicit___closed__1;
 lean_object* l_Lean_Elab_Term_elabBinRel_match__2___rarg(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
 lean_object* l_Lean_Elab_Term_elabTerm___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_App_0__Lean_Elab_Term_ElabAppArgs_addImplicitArg___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_Lean_Elab_Term_ElabAppArgs_State_etaArgs___default;
@@ -621,7 +618,9 @@ lean_object* l_Lean_Elab_Term_withSynthesize___rarg(lean_object*, uint8_t, lean_
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLValsAux_loop_match__2(lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___lambda__1___closed__4;
 lean_object* l_Lean_Meta_mkArrow(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_7052____closed__2;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabBinRel(lean_object*);
+extern lean_object* l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__3;
 extern lean_object* l_Lean_Meta_throwLetTypeMismatchMessage___rarg___closed__7;
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_finalize___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*, lean_object*, lean_object*);
@@ -719,6 +718,7 @@ lean_object* l_List_lengthAux___rarg(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_findMethod_x3f___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Term_ElabAppArgs_main_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isTypeFormer(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ElabAppArgs_getForallBody_match__2(lean_object*);
 lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_ensureArgType(lean_object*, 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_throwInvalidNamedArg___spec__1(lean_object*);
@@ -8727,7 +8727,7 @@ x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
 lean_dec(x_1);
 x_3 = l_Lean_Syntax_getKind(x_2);
-x_4 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_4 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_5 = lean_name_eq(x_3, x_4);
 if (x_5 == 0)
 {
@@ -9034,7 +9034,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1080____closed__1;
-x_2 = l_myMacro____x40_Init_Notation___hyg_2117____closed__3;
+x_2 = l_myMacro____x40_Init_Notation___hyg_2191____closed__3;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -12284,7 +12284,7 @@ lean_ctor_set(x_75, 1, x_74);
 x_76 = l_Array_empty___closed__1;
 x_77 = lean_array_push(x_76, x_75);
 x_78 = lean_array_push(x_76, x_66);
-x_79 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__3;
+x_79 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__3;
 x_80 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_80, 0, x_79);
 lean_ctor_set(x_80, 1, x_78);
@@ -12940,7 +12940,7 @@ else
 {
 lean_object* x_42; uint8_t x_43; 
 lean_dec(x_26);
-x_42 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_42 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_43 = lean_string_dec_eq(x_22, x_42);
 if (x_43 == 0)
 {
@@ -12955,7 +12955,7 @@ else
 {
 lean_object* x_45; uint8_t x_46; 
 lean_dec(x_22);
-x_45 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_45 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_46 = lean_string_dec_eq(x_18, x_45);
 if (x_46 == 0)
 {
@@ -13010,7 +13010,7 @@ else
 {
 lean_object* x_57; uint8_t x_58; 
 lean_dec(x_26);
-x_57 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_57 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_58 = lean_string_dec_eq(x_22, x_57);
 if (x_58 == 0)
 {
@@ -13028,7 +13028,7 @@ else
 {
 lean_object* x_61; uint8_t x_62; 
 lean_dec(x_22);
-x_61 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_61 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_62 = lean_string_dec_eq(x_18, x_61);
 if (x_62 == 0)
 {
@@ -13129,7 +13129,7 @@ else
 {
 lean_object* x_81; uint8_t x_82; 
 lean_dec(x_26);
-x_81 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_81 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_82 = lean_string_dec_eq(x_22, x_81);
 if (x_82 == 0)
 {
@@ -13155,7 +13155,7 @@ else
 {
 lean_object* x_86; uint8_t x_87; 
 lean_dec(x_22);
-x_86 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_86 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_87 = lean_string_dec_eq(x_18, x_86);
 if (x_87 == 0)
 {
@@ -13283,7 +13283,7 @@ else
 {
 lean_object* x_111; uint8_t x_112; 
 lean_dec(x_96);
-x_111 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_111 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_112 = lean_string_dec_eq(x_22, x_111);
 if (x_112 == 0)
 {
@@ -13316,7 +13316,7 @@ else
 {
 lean_object* x_117; uint8_t x_118; 
 lean_dec(x_22);
-x_117 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_117 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_118 = lean_string_dec_eq(x_18, x_117);
 if (x_118 == 0)
 {
@@ -13470,7 +13470,7 @@ else
 {
 lean_object* x_147; uint8_t x_148; 
 lean_dec(x_130);
-x_147 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_147 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_148 = lean_string_dec_eq(x_128, x_147);
 if (x_148 == 0)
 {
@@ -13511,7 +13511,7 @@ else
 {
 lean_object* x_154; uint8_t x_155; 
 lean_dec(x_128);
-x_154 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_154 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_155 = lean_string_dec_eq(x_18, x_154);
 if (x_155 == 0)
 {
@@ -13691,7 +13691,7 @@ else
 {
 lean_object* x_189; uint8_t x_190; 
 lean_dec(x_171);
-x_189 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_189 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_190 = lean_string_dec_eq(x_168, x_189);
 if (x_190 == 0)
 {
@@ -13740,7 +13740,7 @@ else
 {
 lean_object* x_197; uint8_t x_198; 
 lean_dec(x_168);
-x_197 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_197 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_198 = lean_string_dec_eq(x_166, x_197);
 if (x_198 == 0)
 {
@@ -13945,7 +13945,7 @@ else
 {
 lean_object* x_236; uint8_t x_237; 
 lean_dec(x_217);
-x_236 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_236 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_237 = lean_string_dec_eq(x_214, x_236);
 if (x_237 == 0)
 {
@@ -14001,7 +14001,7 @@ else
 {
 lean_object* x_245; uint8_t x_246; 
 lean_dec(x_214);
-x_245 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_245 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_246 = lean_string_dec_eq(x_211, x_245);
 if (x_246 == 0)
 {
@@ -14333,7 +14333,7 @@ else
 {
 lean_object* x_300; uint8_t x_301; 
 lean_dec(x_280);
-x_300 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_300 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_301 = lean_string_dec_eq(x_277, x_300);
 if (x_301 == 0)
 {
@@ -14394,7 +14394,7 @@ else
 {
 lean_object* x_310; uint8_t x_311; 
 lean_dec(x_277);
-x_310 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_310 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_311 = lean_string_dec_eq(x_274, x_310);
 if (x_311 == 0)
 {
@@ -14696,7 +14696,7 @@ return x_11;
 else
 {
 lean_object* x_43; uint8_t x_44; 
-x_43 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_43 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_44 = lean_string_dec_eq(x_32, x_43);
 lean_dec(x_32);
 if (x_44 == 0)
@@ -14711,7 +14711,7 @@ return x_11;
 else
 {
 lean_object* x_47; uint8_t x_48; 
-x_47 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_47 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_48 = lean_string_dec_eq(x_31, x_47);
 lean_dec(x_31);
 if (x_48 == 0)
@@ -14789,7 +14789,7 @@ return x_67;
 else
 {
 lean_object* x_68; uint8_t x_69; 
-x_68 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_68 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_69 = lean_string_dec_eq(x_55, x_68);
 lean_dec(x_55);
 if (x_69 == 0)
@@ -14806,7 +14806,7 @@ return x_72;
 else
 {
 lean_object* x_73; uint8_t x_74; 
-x_73 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_73 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 x_74 = lean_string_dec_eq(x_54, x_73);
 lean_dec(x_54);
 if (x_74 == 0)
@@ -25355,7 +25355,7 @@ x_33 = l_Lean_Syntax_isOfKind(x_1, x_32);
 if (x_33 == 0)
 {
 lean_object* x_34; uint8_t x_35; 
-x_34 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_34 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 lean_inc(x_1);
 x_35 = l_Lean_Syntax_isOfKind(x_1, x_34);
 if (x_35 == 0)
@@ -32352,7 +32352,7 @@ static lean_object* _init_l___private_Lean_Elab_App_0__Lean_Elab_Term_toMessageD
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_1 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 x_2 = l_Lean_stringToMessageData(x_1);
 return x_2;
 }
@@ -34747,7 +34747,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Term_termElabAttribute;
-x_3 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_3 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_4 = l___regBuiltin_Lean_Elab_Term_elabApp___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
@@ -34910,7 +34910,7 @@ if (x_18 == 0)
 {
 lean_object* x_19; uint8_t x_20; 
 lean_dec(x_1);
-x_19 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_19 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 lean_inc(x_14);
 x_20 = l_Lean_Syntax_isOfKind(x_14, x_19);
 if (x_20 == 0)
@@ -36620,7 +36620,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Term_termElabAttribute;
-x_3 = l_myMacro____x40_Init_Notation___hyg_6978____closed__2;
+x_3 = l_myMacro____x40_Init_Notation___hyg_7052____closed__2;
 x_4 = l___regBuiltin_Lean_Elab_Term_elabBinRel___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;

stage0/stdlib/Lean/Elab/Command.c

@@ -27,7 +27,6 @@ lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Command_0__Lean_E
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_getVarDecls___boxed(lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KVMap_setBool(lean_object*, lean_object*, uint8_t);
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabSection(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabInitQuot_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_addNamespace(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -54,6 +53,7 @@ lean_object* l_ReaderT_read___at_Lean_Elab_Command_instMonadLogCommandElabM___sp
 lean_object* l_List_head_x21___at_Lean_Elab_Command_instMonadOptionsCommandElabM___spec__1(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabExport___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_List_foldl___at_Lean_Elab_addMacroStack___spec__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_logTrace___at_Lean_Elab_Command_elabCommand___spec__10___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_elabCommandUsing_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadInfoTreeCommandElabM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -118,6 +118,7 @@ extern lean_object* l_Lean_identKind___closed__2;
 lean_object* l_Lean_addDocString___at_Lean_Elab_Command_expandDeclId___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_initFn____x40_Lean_Util_PPExt___hyg_3____closed__3;
 lean_object* l_Lean_Elab_Command_elabCommand___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabExport___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Command_elabVariable___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe_match__2(lean_object*);
@@ -367,6 +368,7 @@ lean_object* l_Lean_Elab_Command_elabCheck___closed__2;
 lean_object* l_Lean_Elab_Command_mkCommandElabAttributeUnsafe___closed__9;
 extern lean_object* l_Lean_Parser_Command_set__option___elambda__1___closed__2;
 lean_object* l_Lean_Syntax_isStrLit_x3f(lean_object*);
+lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___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_logException___at_Lean_Elab_Command_withLogging___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -702,7 +704,6 @@ lean_object* l_Lean_KVMap_insertCore(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadRecDepthCommandElabM___closed__3;
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___closed__4;
 lean_object* l_Lean_Syntax_getOptionalIdent_x3f(lean_object*);
-lean_object* l_Lean_evalConst___at_Lean_Elab_Term_evalExpr___spec__14___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_setEnv___at_Lean_Elab_Command_elabInitQuot___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_runTermElabM_match__1(lean_object*);
 lean_object* l_Lean_Elab_Command_elbChoice___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -720,7 +721,6 @@ lean_object* l_Lean_Elab_Command_withNamespace___rarg(lean_object*, lean_object*
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Std_Data_PersistentArray_0__Std_PersistentArray_foldlMAux___at___private_Lean_Elab_Command_0__Lean_Elab_Command_addTraceAsMessages___spec__10(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_List_head_x21___rarg___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
 lean_object* l_Lean_Elab_Command_failIfSucceeds___closed__4;
 lean_object* l___private_Lean_Elab_Command_0__Lean_Elab_Command_popScopes_match__1___rarg(lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabCommand___spec__12___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -754,7 +754,6 @@ lean_object* l___regBuiltin_Lean_Elab_Command_elabNamespace(lean_object*);
 extern lean_object* l_Lean_Parser_Command_universes___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabEnd___closed__3;
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__4___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_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabVariable___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* l_Lean_Elab_Command_instMonadInfoTreeCommandElabM;
 lean_object* l_List_foldl___at_Lean_Elab_Command_elabExport___spec__3(lean_object*, lean_object*);
@@ -766,10 +765,10 @@ lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___lambda__3___boxed(le
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadMacroAdapterCommandElabM___closed__3;
 lean_object* l_Lean_resolveNamespace___at_Lean_Elab_Command_elabExport___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_evalConst___at_Lean_Elab_Term_evalExpr___spec__13___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_elabInitQuot___closed__1;
 extern lean_object* l_Lean_Parser_Command_openOnly___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_instMonadRecDepthCommandElabM___closed__5;
-lean_object* l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getMainModule___boxed(lean_object*);
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEvalUnsafe___lambda__4___closed__1;
@@ -906,6 +905,7 @@ lean_object* l_Lean_ScopedEnvExtension_activateScoped___rarg(lean_object*, lean_
 extern lean_object* l_Lean_Parser_Command_openHiding___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_instMonadLogCommandElabM___closed__5;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 lean_object* l_Lean_Elab_Command_elabEnd___lambda__1___closed__3;
 lean_object* l_Lean_Elab_Command_liftTermElabM___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_PersistentArray_mapMAux___at_Lean_Elab_Command_liftTermElabM___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -24155,7 +24155,7 @@ x_39 = lean_ctor_get(x_38, 2);
 lean_inc(x_39);
 lean_dec(x_38);
 lean_inc(x_1);
-x_40 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_40 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_40, 0, x_1);
 x_41 = 8192;
 x_42 = l_Lean_Expr_FindImpl_initCache;
@@ -24227,7 +24227,7 @@ x_15 = lean_ctor_get(x_12, 1);
 lean_inc(x_15);
 lean_dec(x_12);
 lean_inc(x_1);
-x_16 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_16 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_16, 0, x_1);
 x_17 = 8192;
 x_18 = l_Lean_Expr_FindImpl_initCache;
@@ -24329,7 +24329,7 @@ x_14 = lean_ctor_get(x_12, 1);
 lean_inc(x_14);
 lean_dec(x_12);
 lean_inc(x_1);
-x_15 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_15 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_15, 0, x_1);
 x_16 = 8192;
 x_17 = l_Lean_Expr_FindImpl_initCache;
@@ -24427,7 +24427,7 @@ lean_dec(x_3);
 x_23 = lean_ctor_get(x_12, 1);
 lean_inc(x_23);
 lean_inc(x_1);
-x_24 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_24 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_24, 0, x_1);
 x_25 = 8192;
 x_26 = l_Lean_Expr_FindImpl_initCache;
@@ -24570,7 +24570,7 @@ lean_dec(x_11);
 x_13 = lean_ctor_get(x_12, 2);
 lean_inc(x_13);
 lean_dec(x_12);
-x_14 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_14 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_14, 0, x_1);
 x_15 = 8192;
 x_16 = l_Lean_Expr_FindImpl_initCache;
@@ -24642,7 +24642,7 @@ x_53 = lean_ctor_get(x_32, 2);
 lean_inc(x_53);
 lean_dec(x_32);
 lean_inc(x_1);
-x_54 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_54 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_54, 0, x_1);
 x_55 = 8192;
 x_56 = l_Lean_Expr_FindImpl_initCache;
@@ -24709,7 +24709,7 @@ goto block_52;
 block_52:
 {
 lean_object* x_35; size_t x_36; lean_object* x_37; lean_object* x_38; lean_object* x_39; 
-x_35 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_35 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_35, 0, x_1);
 x_36 = 8192;
 x_37 = l_Lean_Expr_FindImpl_initCache;
@@ -24782,7 +24782,7 @@ x_93 = lean_ctor_get(x_72, 2);
 lean_inc(x_93);
 lean_dec(x_72);
 lean_inc(x_1);
-x_94 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_94 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_94, 0, x_1);
 x_95 = 8192;
 x_96 = l_Lean_Expr_FindImpl_initCache;
@@ -24849,7 +24849,7 @@ goto block_92;
 block_92:
 {
 lean_object* x_75; size_t x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; 
-x_75 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_75 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_75, 0, x_1);
 x_76 = 8192;
 x_77 = l_Lean_Expr_FindImpl_initCache;
@@ -24922,7 +24922,7 @@ x_133 = lean_ctor_get(x_112, 2);
 lean_inc(x_133);
 lean_dec(x_112);
 lean_inc(x_1);
-x_134 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_134 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_134, 0, x_1);
 x_135 = 8192;
 x_136 = l_Lean_Expr_FindImpl_initCache;
@@ -24989,7 +24989,7 @@ goto block_132;
 block_132:
 {
 lean_object* x_115; size_t x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; 
-x_115 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__11___lambda__1___boxed), 2, 1);
+x_115 = lean_alloc_closure((void*)(l_List_foldlM___at_Lean_Elab_Term_evalExpr___spec__10___lambda__1___boxed), 2, 1);
 lean_closure_set(x_115, 0, x_1);
 x_116 = 8192;
 x_117 = l_Lean_Expr_FindImpl_initCache;
@@ -25255,7 +25255,7 @@ x_25 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_25, 0, x_24);
 x_26 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_26, 0, x_25);
-x_27 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_22);
+x_27 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_22);
 return x_27;
 }
 else
@@ -25440,7 +25440,7 @@ x_40 = lean_ctor_get(x_39, 1);
 lean_inc(x_40);
 lean_dec(x_39);
 lean_inc(x_5);
-x_41 = l_Lean_evalConst___at_Lean_Elab_Term_evalExpr___spec__14___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_40);
+x_41 = l_Lean_evalConst___at_Lean_Elab_Term_evalExpr___spec__13___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_40);
 lean_dec(x_3);
 if (lean_obj_tag(x_41) == 0)
 {
@@ -25450,7 +25450,7 @@ lean_inc(x_42);
 x_43 = lean_ctor_get(x_41, 1);
 lean_inc(x_43);
 lean_dec(x_41);
-x_44 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_43);
+x_44 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_43);
 x_45 = lean_ctor_get(x_44, 1);
 lean_inc(x_45);
 lean_dec(x_44);
@@ -25470,7 +25470,7 @@ lean_inc(x_47);
 x_48 = lean_ctor_get(x_41, 1);
 lean_inc(x_48);
 lean_dec(x_41);
-x_49 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_48);
+x_49 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_48);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -25509,7 +25509,7 @@ lean_inc(x_54);
 x_55 = lean_ctor_get(x_39, 1);
 lean_inc(x_55);
 lean_dec(x_39);
-x_56 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_55);
+x_56 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_55);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -25549,7 +25549,7 @@ lean_inc(x_61);
 x_62 = lean_ctor_get(x_37, 1);
 lean_inc(x_62);
 lean_dec(x_37);
-x_63 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_62);
+x_63 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_62);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -25589,7 +25589,7 @@ lean_inc(x_68);
 x_69 = lean_ctor_get(x_28, 1);
 lean_inc(x_69);
 lean_dec(x_28);
-x_70 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_69);
+x_70 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_27, x_5, x_6, x_7, x_8, x_9, x_10, x_69);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -26041,7 +26041,7 @@ x_27 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_27, 0, x_26);
 x_28 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_28, 0, x_27);
-x_29 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_28, x_5, x_6, x_7, x_8, x_9, x_10, x_24);
+x_29 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_28, x_5, x_6, x_7, x_8, x_9, x_10, x_24);
 return x_29;
 }
 else
@@ -26053,7 +26053,7 @@ lean_dec(x_23);
 x_31 = lean_ctor_get(x_19, 0);
 lean_inc(x_31);
 lean_dec(x_19);
-x_32 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_31, x_5, x_6, x_7, x_8, x_9, x_10, x_30);
+x_32 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_31, x_5, x_6, x_7, x_8, x_9, x_10, x_30);
 lean_dec(x_5);
 x_33 = !lean_is_exclusive(x_32);
 if (x_33 == 0)
@@ -26259,7 +26259,7 @@ x_42 = lean_ctor_get(x_41, 1);
 lean_inc(x_42);
 lean_dec(x_41);
 lean_inc(x_5);
-x_43 = l_Lean_evalConst___at_Lean_Elab_Term_evalExpr___spec__14___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_42);
+x_43 = l_Lean_evalConst___at_Lean_Elab_Term_evalExpr___spec__13___rarg(x_3, x_5, x_6, x_7, x_8, x_9, x_10, x_42);
 lean_dec(x_3);
 if (lean_obj_tag(x_43) == 0)
 {
@@ -26270,7 +26270,7 @@ x_45 = lean_ctor_get(x_43, 1);
 lean_inc(x_45);
 lean_dec(x_43);
 lean_inc(x_29);
-x_46 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_45);
+x_46 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_45);
 x_47 = lean_ctor_get(x_46, 1);
 lean_inc(x_47);
 lean_dec(x_46);
@@ -26291,7 +26291,7 @@ lean_inc(x_49);
 x_50 = lean_ctor_get(x_43, 1);
 lean_inc(x_50);
 lean_dec(x_43);
-x_51 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_50);
+x_51 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_50);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -26331,7 +26331,7 @@ lean_inc(x_56);
 x_57 = lean_ctor_get(x_41, 1);
 lean_inc(x_57);
 lean_dec(x_41);
-x_58 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_57);
+x_58 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_57);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -26372,7 +26372,7 @@ lean_inc(x_63);
 x_64 = lean_ctor_get(x_39, 1);
 lean_inc(x_64);
 lean_dec(x_39);
-x_65 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_64);
+x_65 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_64);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -26413,7 +26413,7 @@ lean_inc(x_70);
 x_71 = lean_ctor_get(x_31, 1);
 lean_inc(x_71);
 lean_dec(x_31);
-x_72 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_71);
+x_72 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_29, x_5, x_6, x_7, x_8, x_9, x_10, x_71);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_8);
@@ -28920,7 +28920,7 @@ lean_ctor_set(x_12, 0, x_10);
 lean_ctor_set(x_12, 1, x_11);
 x_13 = l_Array_empty___closed__1;
 x_14 = lean_array_push(x_13, x_12);
-x_15 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_15 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_16 = lean_array_push(x_14, x_15);
 x_17 = l_Lean_Parser_Command_section___elambda__1___closed__2;
 x_18 = lean_alloc_ctor(1, 2, 0);
@@ -28962,7 +28962,7 @@ lean_ctor_set(x_34, 0, x_31);
 lean_ctor_set(x_34, 1, x_33);
 x_35 = l_Array_empty___closed__1;
 x_36 = lean_array_push(x_35, x_34);
-x_37 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_37 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_38 = lean_array_push(x_36, x_37);
 x_39 = l_Lean_Parser_Command_section___elambda__1___closed__2;
 x_40 = lean_alloc_ctor(1, 2, 0);

stage0/stdlib/Lean/Elab/Declaration.c

@@ -28,7 +28,6 @@ lean_object* l_Lean_Elab_expandOptDeclSig(lean_object*);
 extern lean_object* l_Lean_Parser_Command_abbrev___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_expandMutualElement_match__2(lean_object*);
 extern lean_object* l_Lean_Elab_checkNotAlreadyDeclared___rarg___lambda__3___closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l___regBuiltin_Lean_Elab_Command_expandMutualPreamble___closed__1;
 lean_object* l_Lean_Elab_getOptDerivingClasses___at_Lean_Elab_Command_elabStructure___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMutualNamespace_match__4(lean_object*);
@@ -70,6 +69,7 @@ lean_object* l_Lean_Elab_Command_elabAxiom_match__1___rarg(lean_object*, lean_ob
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Lean_Elab_Declaration_0__Lean_Elab_Command_isMutualPreambleCommand___closed__2;
 lean_object* l___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView_match__3___rarg(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l_Lean_Elab_Command_elabAxiom_match__3(lean_object*);
 lean_object* l_Lean_Elab_Command_elabDeclaration_match__1___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_section___elambda__1___closed__2;
@@ -81,7 +81,6 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Declaration_0__Lean_Elab_Command_isMutualPreambleCommand___closed__1;
 lean_object* lean_private_to_user_name(lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___at_Lean_Elab_Command_elabMutualDef___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 extern lean_object* l_Lean_declRangeExt;
 lean_object* l_Lean_Elab_Term_ensureNoUnassignedMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkIdentFrom(lean_object*, lean_object*);
@@ -128,8 +127,10 @@ lean_object* l___regBuiltin_Lean_Elab_Command_expandMutualNamespace(lean_object*
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__11;
 extern lean_object* l_Lean_Parser_Command_check___elambda__1___closed__2;
+lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Declaration_0__Lean_Elab_Command_classInductiveSyntaxToView(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Lean_setEnv___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_classInductive___elambda__1___closed__2;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -137,6 +138,7 @@ lean_object* l_Lean_Elab_Command_expandDeclIdNamespace_x3f_match__1(lean_object*
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_expandMutualNamespace___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandBuiltinInitialize___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_addDeclarationRanges___at_Lean_Elab_Command_elabAxiom___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 lean_object* l_Lean_Elab_Command_expandDeclIdNamespace_x3f_match__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getDeclarationRange___at_Lean_Elab_Command_elabAxiom___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_runTermElabM___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -154,7 +156,6 @@ lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at___private_Lean_Elab_Declar
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_initialize___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabAxiom___lambda__3___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*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabAxiom(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_set__option___elambda__1___closed__2;
 extern lean_object* l_myMacro____x40_Init_System_IO___hyg_2797____closed__19;
@@ -199,7 +200,6 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_expandMutualNamespa
 extern lean_object* l_myMacro____x40_Init_System_IO___hyg_2797____closed__16;
 lean_object* l_Lean_Elab_addDeclarationRanges___at_Lean_Elab_Command_elabAxiom___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_docStringExt;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_Lean_Elab_Command_expandInitCmd___closed__2;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__30;
 lean_object* l_Lean_Elab_Command_expandMutualElement___closed__1;
@@ -214,7 +214,6 @@ lean_object* l_Lean_Elab_Command_expandDeclNamespace_x3f(lean_object*);
 extern lean_object* l_Lean_Parser_Command_open___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_sortDeclLevelParams(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l___private_Lean_Elab_Declaration_0__Lean_Elab_Command_isMutualInductive___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_elabMutual___closed__2;
 lean_object* l_Lean_Elab_Command_elabAxiom_match__2___rarg(lean_object*, lean_object*);
@@ -241,6 +240,7 @@ lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabAxiom___spec__4___bo
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__18;
 extern lean_object* l_Lean_nullKind___closed__2;
 extern lean_object* l_Lean_initFn____x40_Lean_Compiler_InitAttr___hyg_535____closed__2;
+lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMutualElement(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Command_expandMutualElement(lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__8;
@@ -252,6 +252,7 @@ lean_object* l_Lean_Elab_addAuxDeclarationRanges___at___private_Lean_Elab_Declar
 lean_object* l_Lean_Elab_Command_expandInitCmd(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_expandMutualNamespace___spec__1___closed__1;
 lean_object* l_Lean_Elab_Command_expandInitCmd___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Lean_Elab_Command_expandInitCmd___closed__11;
 extern lean_object* l_Lean_CollectLevelParams_instInhabitedState___closed__1;
 extern lean_object* l_Lean_Elab_macroAttribute;
@@ -277,16 +278,15 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Declaration_0__Lean
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__8___closed__3;
 extern lean_object* l_Lean_Elab_Command_elabStructure___closed__1;
 lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__3___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabAttr_match__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMutualNamespace_match__2(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_expandMutualElement___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__25;
 lean_object* l_Lean_Elab_Command_getMainModule___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabStructure(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView_match__1(lean_object*);
 lean_object* l_Lean_Elab_Command_expandInitCmd___closed__13;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
 lean_object* l_Lean_Elab_Command_elabMutual___closed__3;
 lean_object* l_Array_ofSubarray___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_expandMutualNamespace_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -303,6 +303,7 @@ extern lean_object* l_Lean_Parser_Command_inductive___elambda__1___closed__2;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__5;
 uint8_t l_Lean_Syntax_isNone(lean_object*);
 extern lean_object* l_Lean_Parser_Command_universes___elambda__1___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_Lean_Elab_Modifiers_addAttribute(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__1___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -339,7 +340,6 @@ lean_object* l_Lean_Elab_Command_elabAxiom___lambda__2(lean_object*, lean_object
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__1___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_FileMap_leanPosToLspPos(lean_object*, lean_object*);
 extern lean_object* l_Lean_expandExplicitBindersAux_loop___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabInductive(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addDocString_x27___at___private_Lean_Elab_Declaration_0__Lean_Elab_Command_inductiveSyntaxToView___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -365,6 +365,7 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Command_elabAttr___spec__1_
 extern lean_object* l_Lean_Elab_Command_checkValidCtorModifier___rarg___lambda__2___closed__3;
 lean_object* l___regBuiltin_Lean_Elab_Command_elabMutual___closed__1;
 extern lean_object* l_Lean_Parser_myMacro____x40_Lean_Parser_Extra___hyg_276____closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 lean_object* l_Lean_Elab_Command_elabAxiom_match__1(lean_object*);
 lean_object* l_Lean_Elab_Command_expandInitCmd___closed__1;
 extern lean_object* l_Lean_Parser_Command_constant___elambda__1___closed__2;
@@ -378,7 +379,6 @@ 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_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_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabAxiom___lambda__3(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*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_expandMutualNamespace_match__2___rarg(lean_object*, lean_object*);
@@ -2187,7 +2187,7 @@ lean_inc(x_56);
 lean_dec(x_55);
 lean_inc(x_13);
 lean_inc(x_9);
-x_57 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(x_54, x_9, x_10, x_11, x_12, x_13, x_14, x_56);
+x_57 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(x_54, x_9, x_10, x_11, x_12, x_13, x_14, x_56);
 if (lean_obj_tag(x_57) == 0)
 {
 lean_object* x_58; uint8_t x_59; lean_object* x_60; 
@@ -2234,7 +2234,7 @@ else
 lean_object* x_69; 
 lean_inc(x_13);
 lean_inc(x_9);
-x_69 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__8(x_54, x_9, x_10, x_11, x_12, x_13, x_14, x_64);
+x_69 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(x_54, x_9, x_10, x_11, x_12, x_13, x_14, x_64);
 if (lean_obj_tag(x_69) == 0)
 {
 lean_object* x_70; uint8_t x_71; lean_object* x_72; 
@@ -7099,7 +7099,7 @@ lean_inc(x_12);
 x_13 = lean_ctor_get(x_11, 1);
 lean_inc(x_13);
 lean_dec(x_11);
-x_14 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_2, x_3);
+x_14 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_2, x_3);
 x_15 = lean_ctor_get(x_14, 0);
 lean_inc(x_15);
 x_16 = lean_ctor_get(x_14, 1);
@@ -7111,7 +7111,7 @@ lean_ctor_set(x_18, 0, x_15);
 lean_ctor_set(x_18, 1, x_17);
 x_19 = l_Array_empty___closed__1;
 x_20 = lean_array_push(x_19, x_18);
-x_21 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_21 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_22 = lean_array_push(x_20, x_21);
 x_23 = l_Lean_Parser_Command_section___elambda__1___closed__2;
 x_24 = lean_alloc_ctor(1, 2, 0);
@@ -7122,7 +7122,7 @@ x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_13);
 x_27 = l_Lean_Syntax_setArg(x_1, x_4, x_26);
-x_28 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_2, x_16);
+x_28 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_2, x_16);
 x_29 = !lean_is_exclusive(x_28);
 if (x_29 == 0)
 {
@@ -7614,7 +7614,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__8;
-x_2 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_2 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -7624,7 +7624,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Command_expandInitCmd___closed__1;
-x_2 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_2 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -7634,7 +7634,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Command_expandInitCmd___closed__2;
-x_2 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_2 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -7644,7 +7644,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Command_expandInitCmd___closed__3;
-x_2 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_2 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -7654,7 +7654,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Command_expandInitCmd___closed__4;
-x_2 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_2 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_3 = lean_array_push(x_1, x_2);
 return x_3;
 }
@@ -7835,7 +7835,7 @@ lean_ctor_set(x_29, 1, x_28);
 lean_ctor_set(x_29, 2, x_26);
 lean_ctor_set(x_29, 3, x_27);
 x_30 = lean_array_push(x_23, x_29);
-x_31 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_31 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 lean_inc(x_30);
 x_32 = lean_array_push(x_30, x_31);
 x_33 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__23;
@@ -7843,7 +7843,7 @@ x_34 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_34, 0, x_33);
 lean_ctor_set(x_34, 1, x_32);
 x_35 = lean_array_push(x_24, x_34);
-x_36 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_36 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_18);
 x_37 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_37, 0, x_18);
@@ -7867,7 +7867,7 @@ x_47 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_47, 0, x_46);
 lean_ctor_set(x_47, 1, x_45);
 x_48 = lean_array_push(x_44, x_47);
-x_49 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_49 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_50 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_50, 0, x_49);
 lean_ctor_set(x_50, 1, x_48);
@@ -7888,7 +7888,7 @@ x_59 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_59, 0, x_58);
 lean_ctor_set(x_59, 1, x_57);
 x_60 = lean_array_push(x_35, x_59);
-x_61 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_61 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_18);
 x_62 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_62, 0, x_18);
@@ -8038,7 +8038,7 @@ lean_ctor_set(x_141, 1, x_140);
 lean_ctor_set(x_141, 2, x_138);
 lean_ctor_set(x_141, 3, x_139);
 x_142 = lean_array_push(x_135, x_141);
-x_143 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_143 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 lean_inc(x_142);
 x_144 = lean_array_push(x_142, x_143);
 x_145 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__23;
@@ -8046,7 +8046,7 @@ x_146 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_146, 0, x_145);
 lean_ctor_set(x_146, 1, x_144);
 x_147 = lean_array_push(x_136, x_146);
-x_148 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_148 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_129);
 x_149 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_149, 0, x_129);
@@ -8070,7 +8070,7 @@ x_159 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_159, 0, x_158);
 lean_ctor_set(x_159, 1, x_157);
 x_160 = lean_array_push(x_156, x_159);
-x_161 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_161 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_162 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_162, 0, x_161);
 lean_ctor_set(x_162, 1, x_160);
@@ -8091,7 +8091,7 @@ x_171 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_171, 0, x_170);
 lean_ctor_set(x_171, 1, x_169);
 x_172 = lean_array_push(x_147, x_171);
-x_173 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_173 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_129);
 x_174 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_174, 0, x_129);
@@ -8234,7 +8234,7 @@ lean_ctor_set(x_248, 1, x_247);
 x_249 = l_Array_empty___closed__1;
 x_250 = lean_array_push(x_249, x_248);
 x_251 = lean_array_push(x_249, x_11);
-x_252 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_252 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_253 = lean_array_push(x_251, x_252);
 x_254 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__15;
 x_255 = lean_alloc_ctor(1, 2, 0);
@@ -8266,7 +8266,7 @@ x_269 = lean_array_push(x_249, x_268);
 x_270 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_270, 0, x_261);
 lean_ctor_set(x_270, 1, x_269);
-x_271 = l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
+x_271 = l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 x_272 = lean_array_push(x_271, x_270);
 x_273 = lean_array_push(x_272, x_252);
 x_274 = lean_array_push(x_273, x_252);
@@ -8302,7 +8302,7 @@ x_291 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_291, 0, x_290);
 lean_ctor_set(x_291, 1, x_289);
 x_292 = lean_array_push(x_282, x_291);
-x_293 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_293 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_244);
 x_294 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_294, 0, x_244);
@@ -8336,7 +8336,7 @@ x_308 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_308, 0, x_261);
 lean_ctor_set(x_308, 1, x_307);
 x_309 = lean_array_push(x_301, x_308);
-x_310 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_310 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_311 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_311, 0, x_310);
 lean_ctor_set(x_311, 1, x_309);
@@ -8355,7 +8355,7 @@ x_319 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_319, 0, x_318);
 lean_ctor_set(x_319, 1, x_317);
 x_320 = lean_array_push(x_292, x_319);
-x_321 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_321 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_244);
 x_322 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_322, 0, x_244);
@@ -8411,7 +8411,7 @@ lean_ctor_set(x_345, 1, x_344);
 x_346 = l_Array_empty___closed__1;
 x_347 = lean_array_push(x_346, x_345);
 x_348 = lean_array_push(x_346, x_11);
-x_349 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_349 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_350 = lean_array_push(x_348, x_349);
 x_351 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__15;
 x_352 = lean_alloc_ctor(1, 2, 0);
@@ -8443,7 +8443,7 @@ x_366 = lean_array_push(x_346, x_365);
 x_367 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_367, 0, x_358);
 lean_ctor_set(x_367, 1, x_366);
-x_368 = l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
+x_368 = l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 x_369 = lean_array_push(x_368, x_367);
 x_370 = lean_array_push(x_369, x_349);
 x_371 = lean_array_push(x_370, x_349);
@@ -8479,7 +8479,7 @@ x_388 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_388, 0, x_387);
 lean_ctor_set(x_388, 1, x_386);
 x_389 = lean_array_push(x_379, x_388);
-x_390 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_390 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_340);
 x_391 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_391, 0, x_340);
@@ -8513,7 +8513,7 @@ x_405 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_405, 0, x_358);
 lean_ctor_set(x_405, 1, x_404);
 x_406 = lean_array_push(x_398, x_405);
-x_407 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_407 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_408 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_408, 0, x_407);
 lean_ctor_set(x_408, 1, x_406);
@@ -8532,7 +8532,7 @@ x_416 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_416, 0, x_415);
 lean_ctor_set(x_416, 1, x_414);
 x_417 = lean_array_push(x_389, x_416);
-x_418 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_418 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_340);
 x_419 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_419, 0, x_340);

stage0/stdlib/Lean/Elab/DefView.c

@@ -27,7 +27,6 @@ lean_object* l_Lean_Elab_expandOptNamedPrio(lean_object*, lean_object*, lean_obj
 lean_object* l_Lean_Elab_DefKind_isExample_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_toAttributeKind___at_Lean_Elab_Command_mkDefViewOfInstance___spec__1___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Command_mkDefViewOfInstance___spec__4___boxed(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_kindReplacements___closed__4;
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabExport___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_DefKind_isDefOrAbbrevOrOpaque(uint8_t);
@@ -35,7 +34,6 @@ lean_object* l___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_k
 lean_object* l_Lean_Elab_Command_mkDefViewOfConstant_match__2(lean_object*);
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getOptional_x3f(lean_object*);
-extern lean_object* l_Lean_initFn____x40_Lean_ReducibilityAttrs___hyg_11____closed__4;
 lean_object* lean_array_uget(lean_object*, size_t);
 uint8_t l_Lean_Name_quickLt(lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_throwUnsupportedSyntax___rarg___closed__1;
@@ -49,6 +47,7 @@ extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____close
 extern lean_object* l_Lean_Parser_Term_forall___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Term_type___elambda__1___closed__2;
 extern lean_object* l_Array_empty___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l_Lean_Elab_mkUnusedBaseName___at_Lean_Elab_Command_MkInstanceName_main___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedParserDescr___closed__1;
@@ -222,6 +221,7 @@ lean_object* l_Lean_Elab_Command_getScope___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_kindReplacements___closed__5;
 lean_object* l_Lean_Elab_mkUnusedBaseName___at_Lean_Elab_Command_MkInstanceName_main___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_kindReplacements___closed__3;
+extern lean_object* l_Lean_initFn____x40_Lean_ReducibilityAttrs___hyg_87____closed__4;
 lean_object* l___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_kindReplacements___closed__15;
 lean_object* l_Lean_Elab_Command_MkInstanceName_mkFreshInstanceName___boxed(lean_object*);
 lean_object* l_Std_RBNode_ins___at___private_Lean_Elab_DefView_0__Lean_Elab_Command_MkInstanceName_kindReplacements___spec__3(lean_object*, lean_object*, lean_object*);
@@ -570,7 +570,7 @@ _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = 0;
-x_2 = l_Lean_initFn____x40_Lean_ReducibilityAttrs___hyg_11____closed__4;
+x_2 = l_Lean_initFn____x40_Lean_ReducibilityAttrs___hyg_87____closed__4;
 x_3 = lean_box(0);
 x_4 = lean_alloc_ctor(0, 2, 1);
 lean_ctor_set(x_4, 0, x_2);
@@ -4806,7 +4806,7 @@ lean_ctor_set(x_27, 0, x_15);
 lean_ctor_set(x_27, 1, x_25);
 lean_ctor_set(x_27, 2, x_24);
 lean_ctor_set(x_27, 3, x_26);
-x_28 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_28 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_29 = l_Lean_mkAtomFrom(x_2, x_28);
 x_30 = l_Lean_Syntax_mkApp___closed__1;
 x_31 = lean_array_push(x_30, x_29);

stage0/stdlib/Lean/Elab/Deriving/BEq.c

@@ -15,35 +15,36 @@ extern "C" {
 #endif
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__6___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*, lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_mkConst___spec__1(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_12938____closed__8;
 lean_object* l_Array_mapMUnsafe_map___at_myMacro____x40_Init_NotationExtra___hyg_2903____spec__3(size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkElseAlt___closed__4;
 uint8_t l_Lean_Expr_hasAnyFVar_visit___at_Lean_Expr_containsFVar___spec__1(lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__21;
+extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l___private_Lean_Elab_Deriving_BEq_0__Lean_Elab_Deriving_BEq_mkBEqInstanceCmds(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_liftTermElabM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 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);
-extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkElseAlt___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkBEqHeader___rarg(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_Deriving_BEq_mkMatch_mkAlts___spec__6___lambda__1___closed__3;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkElseAlt___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__23;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkElseAlt(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__3(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_Deriving_BEq_mkMatch_mkElseAlt___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 extern lean_object* l_instReprBool___closed__1;
 lean_object* l_Lean_Elab_Deriving_BEq_mkAuxFunction___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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__7;
 extern lean_object* l_Lean_Parser_Command_mutual___elambda__1___closed__2;
 uint8_t l_Lean_Expr_isAppOf(lean_object*, lean_object*);
@@ -54,7 +55,6 @@ lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts__
 lean_object* l_Lean_MessageData_ofList(lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkAlts_match__3(lean_object*);
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__35;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_6227____closed__5;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkAlts_match__2___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_mutual___elambda__1___closed__1;
 lean_object* lean_string_utf8_byte_size(lean_object*);
@@ -65,12 +65,15 @@ lean_object* l_Lean_Elab_Deriving_mkLocalInstanceLetDecls(lean_object*, lean_obj
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Deriving_BEq_mkBEqInstanceHandler___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch___rarg(lean_object*, lean_object*, 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_12938____closed__14;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkAlts_match__4___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_mkDiscrs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_BEq_0__Lean_Elab_Deriving_BEq_mkBEqInstanceCmds___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfoCtor___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_instQuoteBool___closed__5;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 lean_object* l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkAlts_match__3___rarg(lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
@@ -88,12 +91,12 @@ extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____close
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__4(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*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_mkLet(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkAlts_match__1(lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch(lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkAuxFunction___lambda__1___closed__1;
 extern lean_object* l_instReprBool___closed__3;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkAlts_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__6___lambda__1___closed__1;
 extern lean_object* l_Lean_Core_betaReduce___closed__2;
@@ -107,7 +110,7 @@ lean_object* l_Lean_Elab_Deriving_BEq_mkAuxFunction___lambda__1___boxed(lean_obj
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_6301____closed__6;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__4___boxed(lean_object**);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__4___closed__1;
 extern lean_object* l_Lean_KernelException_toMessageData___closed__15;
@@ -115,22 +118,16 @@ lean_object* l_Lean_throwError___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec
 lean_object* l_Lean_mkSepArray(lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__4___closed__2;
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMatch_mkAlts_match__2(lean_object*);
 lean_object* l_Lean_Core_transform___at_Lean_Core_betaReduce___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
 lean_object* l_Lean_Elab_Deriving_mkHeader___rarg(lean_object*, lean_object*, 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_12864____closed__6;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__20;
 lean_object* l_Lean_Elab_Deriving_mkContext(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkBEqHeader(lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__4;
 extern lean_object* l_Lean_KernelException_toMessageData___closed__3;
 size_t lean_usize_of_nat(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, 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_12262____closed__13;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__5(lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
@@ -141,6 +138,7 @@ lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMutualBlock___
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_2903____closed__6;
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_set__option___elambda__1___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 extern lean_object* l_Array_foldlMUnsafe_fold___at_Lean_withNestedTraces___spec__5___closed__1;
 extern lean_object* l_Lean_instQuoteBool___closed__2;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__33;
@@ -148,12 +146,12 @@ extern lean_object* l_Lean_Parser_Command_end___elambda__1___closed__1;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_private___elambda__1___closed__1;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__4___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__9;
 lean_object* l_Array_appendCore___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_Core_betaReduce___closed__1;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__25;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__6(lean_object*, 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_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___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_Lean_Elab_Deriving_BEq_mkMatch___boxed(lean_object*);
@@ -162,6 +160,7 @@ extern lean_object* l_Lean_getConstInfoCtor___rarg___lambda__1___closed__2;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__5;
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_registerBuiltinDerivingHandler(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__2;
 lean_object* l_Lean_getConstInfoCtor___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -169,7 +168,6 @@ lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___boxed(lean_object*, lean_o
 extern lean_object* l_term___x3d_x3d_____closed__2;
 extern lean_object* l_IO_Prim_fopenFlags___closed__4;
 lean_object* l_Lean_Elab_Deriving_BEq_initFn____x40_Lean_Elab_Deriving_BEq___hyg_2397____closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_6227____closed__6;
 lean_object* l_Lean_Elab_Deriving_BEq_mkAuxFunction___lambda__1___closed__3;
 lean_object* l_Lean_Elab_Deriving_BEq_mkAuxFunction___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_syntax_ident(lean_object*);
@@ -184,11 +182,12 @@ lean_object* l_Lean_isInductive___at_Lean_Elab_Deriving_BEq_mkBEqInstanceHandler
 lean_object* l_Lean_isInductive___at_Lean_Elab_Deriving_BEq_mkBEqInstanceHandler___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_BEq_mkMatch_mkElseAlt___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*);
 extern lean_object* l_Lean_Parser_Command_partial___elambda__1___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_6301____closed__5;
 extern lean_object* l_Lean_Elab_Deriving_mkContext___closed__3;
 lean_object* l_Lean_throwError___at_Lean_Elab_Deriving_BEq_mkMatch_mkAlts___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_expandExplicitBindersAux_loop___closed__4;
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__6;
 lean_object* l_Lean_Elab_Deriving_BEq_mkBEqInstanceHandler(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkAuxFunction(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -196,6 +195,7 @@ lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Deriving_BEq_mkBEqInstance
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l_List_map___at___private_Lean_Elab_Deriving_BEq_0__Lean_Elab_Deriving_BEq_mkBEqInstanceCmds___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__5;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 lean_object* l_Lean_Elab_Deriving_BEq_mkAuxFunction___lambda__1___closed__4;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__34;
 extern lean_object* l_Lean_setOptionFromString___closed__3;
@@ -208,7 +208,7 @@ lean_object* l_Lean_Elab_Deriving_BEq_mkBEqHeader___rarg(lean_object* x_1, lean_
 _start:
 {
 lean_object* x_9; lean_object* x_10; lean_object* x_11; 
-x_9 = l_myMacro____x40_Init_Notation___hyg_6227____closed__5;
+x_9 = l_myMacro____x40_Init_Notation___hyg_6301____closed__5;
 x_10 = lean_unsigned_to_nat(2u);
 x_11 = l_Lean_Elab_Deriving_mkHeader___rarg(x_9, x_10, x_1, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 return x_11;
@@ -356,13 +356,13 @@ x_24 = l_Lean_Elab_Term_getMainModule___rarg(x_11, x_23);
 x_25 = lean_ctor_get(x_24, 1);
 lean_inc(x_25);
 lean_dec(x_24);
-x_26 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_26 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_27 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_27, 0, x_20);
 lean_ctor_set(x_27, 1, x_26);
 lean_inc(x_1);
 x_28 = lean_array_push(x_1, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_29 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -484,12 +484,12 @@ x_22 = l_Lean_Elab_Term_getMainModule___rarg(x_7, x_21);
 x_23 = lean_ctor_get(x_22, 1);
 lean_inc(x_23);
 lean_dec(x_22);
-x_24 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_24 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_25 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_25, 0, x_18);
 lean_ctor_set(x_25, 1, x_24);
 x_26 = lean_array_push(x_13, x_25);
-x_27 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_27 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_28 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_28, 0, x_27);
 lean_ctor_set(x_28, 1, x_26);
@@ -560,7 +560,7 @@ if (x_61 == 0)
 lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; size_t x_67; size_t x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; lean_object* x_82; lean_object* x_83; 
 x_62 = lean_ctor_get(x_60, 0);
 lean_dec(x_62);
-x_63 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_63 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_56);
 x_64 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_64, 0, x_56);
@@ -583,13 +583,13 @@ x_76 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_76, 0, x_75);
 lean_ctor_set(x_76, 1, x_74);
 x_77 = lean_array_push(x_65, x_76);
-x_78 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_78 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_79 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_79, 0, x_56);
 lean_ctor_set(x_79, 1, x_78);
 x_80 = lean_array_push(x_77, x_79);
 x_81 = lean_array_push(x_80, x_54);
-x_82 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_82 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_83 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_83, 0, x_82);
 lean_ctor_set(x_83, 1, x_81);
@@ -602,7 +602,7 @@ lean_object* x_84; lean_object* x_85; lean_object* x_86; lean_object* x_87; lean
 x_84 = lean_ctor_get(x_60, 1);
 lean_inc(x_84);
 lean_dec(x_60);
-x_85 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_85 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_56);
 x_86 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_86, 0, x_56);
@@ -625,13 +625,13 @@ x_98 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_98, 0, x_97);
 lean_ctor_set(x_98, 1, x_96);
 x_99 = lean_array_push(x_87, x_98);
-x_100 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_100 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_101 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_101, 0, x_56);
 lean_ctor_set(x_101, 1, x_100);
 x_102 = lean_array_push(x_99, x_101);
 x_103 = lean_array_push(x_102, x_54);
-x_104 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_104 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_105 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_105, 0, x_104);
 lean_ctor_set(x_105, 1, x_103);
@@ -849,13 +849,13 @@ x_27 = l_Lean_Elab_Term_getMainModule___rarg(x_11, x_26);
 x_28 = lean_ctor_get(x_27, 1);
 lean_inc(x_28);
 lean_dec(x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_29 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_30 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_30, 0, x_23);
 lean_ctor_set(x_30, 1, x_29);
 lean_inc(x_1);
 x_31 = lean_array_push(x_1, x_30);
-x_32 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_32 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_33 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
@@ -915,13 +915,13 @@ x_56 = l_Lean_Elab_Term_getMainModule___rarg(x_11, x_55);
 x_57 = lean_ctor_get(x_56, 1);
 lean_inc(x_57);
 lean_dec(x_56);
-x_58 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_58 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_59 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_59, 0, x_52);
 lean_ctor_set(x_59, 1, x_58);
 lean_inc(x_1);
 x_60 = lean_array_push(x_1, x_59);
-x_61 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_61 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_62 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_62, 0, x_61);
 lean_ctor_set(x_62, 1, x_60);
@@ -1052,7 +1052,7 @@ lean_dec(x_40);
 if (x_41 == 0)
 {
 lean_object* x_42; lean_object* 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; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; 
-x_42 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_42 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 x_43 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_42, x_15, x_16, x_17);
 x_44 = lean_ctor_get(x_43, 0);
 lean_inc(x_44);
@@ -1176,7 +1176,7 @@ x_98 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_98, 0, x_97);
 lean_ctor_set(x_98, 1, x_96);
 x_99 = lean_array_push(x_94, x_98);
-x_100 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_100 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_101 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_101, 0, x_100);
 lean_ctor_set(x_101, 1, x_99);
@@ -1251,13 +1251,13 @@ x_115 = l_Lean_Elab_Term_getMainModule___rarg(x_16, x_114);
 x_116 = lean_ctor_get(x_115, 1);
 lean_inc(x_116);
 lean_dec(x_115);
-x_117 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_117 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_118 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_118, 0, x_111);
 lean_ctor_set(x_118, 1, x_117);
 lean_inc(x_3);
 x_119 = lean_array_push(x_3, x_118);
-x_120 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_120 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_121 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_121, 0, x_120);
 lean_ctor_set(x_121, 1, x_119);
@@ -1313,7 +1313,7 @@ lean_dec(x_141);
 if (x_142 == 0)
 {
 lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; 
-x_143 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_143 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 x_144 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_143, x_15, x_16, x_17);
 x_145 = lean_ctor_get(x_144, 0);
 lean_inc(x_145);
@@ -1439,7 +1439,7 @@ x_200 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_200, 0, x_199);
 lean_ctor_set(x_200, 1, x_198);
 x_201 = lean_array_push(x_196, x_200);
-x_202 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_202 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_203 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_203, 0, x_202);
 lean_ctor_set(x_203, 1, x_201);
@@ -1517,13 +1517,13 @@ x_218 = l_Lean_Elab_Term_getMainModule___rarg(x_16, x_217);
 x_219 = lean_ctor_get(x_218, 1);
 lean_inc(x_219);
 lean_dec(x_218);
-x_220 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_220 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_221 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_221, 0, x_214);
 lean_ctor_set(x_221, 1, x_220);
 lean_inc(x_3);
 x_222 = lean_array_push(x_3, x_221);
-x_223 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_223 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_224 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_224, 0, x_223);
 lean_ctor_set(x_224, 1, x_222);
@@ -1594,7 +1594,7 @@ lean_dec(x_247);
 if (x_248 == 0)
 {
 lean_object* x_249; lean_object* x_250; lean_object* x_251; lean_object* x_252; lean_object* x_253; lean_object* x_254; lean_object* x_255; lean_object* x_256; lean_object* x_257; lean_object* x_258; lean_object* x_259; lean_object* x_260; lean_object* x_261; 
-x_249 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_249 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 x_250 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_249, x_15, x_16, x_17);
 x_251 = lean_ctor_get(x_250, 0);
 lean_inc(x_251);
@@ -1725,7 +1725,7 @@ x_307 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_307, 0, x_306);
 lean_ctor_set(x_307, 1, x_305);
 x_308 = lean_array_push(x_303, x_307);
-x_309 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_309 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_310 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_310, 0, x_309);
 lean_ctor_set(x_310, 1, x_308);
@@ -1808,13 +1808,13 @@ x_326 = l_Lean_Elab_Term_getMainModule___rarg(x_16, x_325);
 x_327 = lean_ctor_get(x_326, 1);
 lean_inc(x_327);
 lean_dec(x_326);
-x_328 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_328 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_329 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_329, 0, x_322);
 lean_ctor_set(x_329, 1, x_328);
 lean_inc(x_3);
 x_330 = lean_array_push(x_3, x_329);
-x_331 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_331 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_332 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_332, 0, x_331);
 lean_ctor_set(x_332, 1, x_330);
@@ -2185,7 +2185,7 @@ x_77 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_77, 0, x_76);
 lean_ctor_set(x_77, 1, x_75);
 x_78 = lean_array_push(x_74, x_77);
-x_79 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_79 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_80 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_80, 0, x_79);
 lean_ctor_set(x_80, 1, x_78);
@@ -2247,7 +2247,7 @@ if (x_105 == 0)
 lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; size_t x_111; size_t x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; 
 x_106 = lean_ctor_get(x_104, 0);
 lean_dec(x_106);
-x_107 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_107 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_100);
 x_108 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_108, 0, x_100);
@@ -2270,13 +2270,13 @@ x_119 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_119, 0, x_76);
 lean_ctor_set(x_119, 1, x_118);
 x_120 = lean_array_push(x_109, x_119);
-x_121 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_121 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_122 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_122, 0, x_100);
 lean_ctor_set(x_122, 1, x_121);
 x_123 = lean_array_push(x_120, x_122);
 x_124 = lean_array_push(x_123, x_59);
-x_125 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_125 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_126 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_126, 0, x_125);
 lean_ctor_set(x_126, 1, x_124);
@@ -2289,7 +2289,7 @@ lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130;
 x_127 = lean_ctor_get(x_104, 1);
 lean_inc(x_127);
 lean_dec(x_104);
-x_128 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_128 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_100);
 x_129 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_129, 0, x_100);
@@ -2312,13 +2312,13 @@ x_140 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_140, 0, x_76);
 lean_ctor_set(x_140, 1, x_139);
 x_141 = lean_array_push(x_130, x_140);
-x_142 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_142 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_143 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_143, 0, x_100);
 lean_ctor_set(x_143, 1, x_142);
 x_144 = lean_array_push(x_141, x_143);
 x_145 = lean_array_push(x_144, x_59);
-x_146 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_146 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_147 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_147, 0, x_146);
 lean_ctor_set(x_147, 1, x_145);
@@ -2445,7 +2445,7 @@ x_183 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_183, 0, x_182);
 lean_ctor_set(x_183, 1, x_181);
 x_184 = lean_array_push(x_180, x_183);
-x_185 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_185 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_186 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_186, 0, x_185);
 lean_ctor_set(x_186, 1, x_184);
@@ -2511,7 +2511,7 @@ if (lean_is_exclusive(x_210)) {
  lean_dec_ref(x_210);
  x_212 = lean_box(0);
 }
-x_213 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_213 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_206);
 x_214 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_214, 0, x_206);
@@ -2534,13 +2534,13 @@ x_225 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_225, 0, x_182);
 lean_ctor_set(x_225, 1, x_224);
 x_226 = lean_array_push(x_215, x_225);
-x_227 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_227 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_228 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_228, 0, x_206);
 lean_ctor_set(x_228, 1, x_227);
 x_229 = lean_array_push(x_226, x_228);
 x_230 = lean_array_push(x_229, x_165);
-x_231 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_231 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_232 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_232, 0, x_231);
 lean_ctor_set(x_232, 1, x_230);
@@ -2991,7 +2991,7 @@ if (x_23 == 0)
 lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; size_t x_30; size_t x_31; 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; lean_object* x_42; lean_object* 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; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_dec(x_24);
-x_25 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_25 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 lean_inc(x_18);
 x_26 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_26, 0, x_18);
@@ -3015,9 +3015,9 @@ x_39 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_39, 0, x_38);
 lean_ctor_set(x_39, 1, x_37);
 x_40 = lean_array_push(x_28, x_39);
-x_41 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_41 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_42 = lean_array_push(x_40, x_41);
-x_43 = l_myMacro____x40_Init_Notation___hyg_12864____closed__6;
+x_43 = l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 x_44 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_44, 0, x_18);
 lean_ctor_set(x_44, 1, x_43);
@@ -3028,12 +3028,12 @@ x_47 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_47, 0, x_38);
 lean_ctor_set(x_47, 1, x_46);
 x_48 = lean_array_push(x_27, x_47);
-x_49 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_49 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 x_50 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_50, 0, x_49);
 lean_ctor_set(x_50, 1, x_48);
 x_51 = lean_array_push(x_45, x_50);
-x_52 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_52 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 x_53 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_53, 0, x_52);
 lean_ctor_set(x_53, 1, x_51);
@@ -3046,7 +3046,7 @@ lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean
 x_54 = lean_ctor_get(x_22, 1);
 lean_inc(x_54);
 lean_dec(x_22);
-x_55 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_55 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 lean_inc(x_18);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_18);
@@ -3070,9 +3070,9 @@ x_69 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_69, 0, x_68);
 lean_ctor_set(x_69, 1, x_67);
 x_70 = lean_array_push(x_58, x_69);
-x_71 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_71 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_72 = lean_array_push(x_70, x_71);
-x_73 = l_myMacro____x40_Init_Notation___hyg_12864____closed__6;
+x_73 = l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 x_74 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_74, 0, x_18);
 lean_ctor_set(x_74, 1, x_73);
@@ -3083,12 +3083,12 @@ x_77 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_77, 0, x_68);
 lean_ctor_set(x_77, 1, x_76);
 x_78 = lean_array_push(x_57, x_77);
-x_79 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_79 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 x_80 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_80, 0, x_79);
 lean_ctor_set(x_80, 1, x_78);
 x_81 = lean_array_push(x_75, x_80);
-x_82 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_82 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 x_83 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_83, 0, x_82);
 lean_ctor_set(x_83, 1, x_81);
@@ -3269,7 +3269,7 @@ lean_ctor_set(x_32, 0, x_31);
 lean_ctor_set(x_32, 1, x_30);
 x_33 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_34 = lean_array_push(x_33, x_32);
-x_35 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_35 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_36 = lean_array_push(x_34, x_35);
 x_37 = lean_array_push(x_36, x_35);
 x_38 = lean_array_push(x_37, x_35);
@@ -3297,7 +3297,7 @@ x_52 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_52, 0, x_31);
 lean_ctor_set(x_52, 1, x_51);
 x_53 = lean_array_push(x_26, x_52);
-x_54 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_54 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_16);
 x_55 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_55, 0, x_16);
@@ -3328,7 +3328,7 @@ x_69 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_69, 0, x_68);
 lean_ctor_set(x_69, 1, x_67);
 x_70 = lean_array_push(x_50, x_69);
-x_71 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_71 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_72 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_72, 0, x_16);
 lean_ctor_set(x_72, 1, x_71);
@@ -3378,7 +3378,7 @@ lean_ctor_set(x_94, 0, x_93);
 lean_ctor_set(x_94, 1, x_92);
 x_95 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_96 = lean_array_push(x_95, x_94);
-x_97 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_97 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_98 = lean_array_push(x_96, x_97);
 x_99 = lean_array_push(x_98, x_97);
 x_100 = lean_array_push(x_99, x_97);
@@ -3406,7 +3406,7 @@ x_114 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_114, 0, x_93);
 lean_ctor_set(x_114, 1, x_113);
 x_115 = lean_array_push(x_88, x_114);
-x_116 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_116 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_16);
 x_117 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_117, 0, x_16);
@@ -3437,7 +3437,7 @@ x_131 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_131, 0, x_130);
 lean_ctor_set(x_131, 1, x_129);
 x_132 = lean_array_push(x_112, x_131);
-x_133 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_133 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_134 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_134, 0, x_16);
 lean_ctor_set(x_134, 1, x_133);
@@ -3504,7 +3504,7 @@ lean_ctor_set(x_165, 0, x_164);
 lean_ctor_set(x_165, 1, x_163);
 x_166 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_167 = lean_array_push(x_166, x_165);
-x_168 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_168 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_169 = lean_array_push(x_167, x_168);
 x_170 = lean_array_push(x_169, x_168);
 x_171 = l_Lean_Parser_Command_partial___elambda__1___closed__1;
@@ -3546,7 +3546,7 @@ x_192 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_192, 0, x_164);
 lean_ctor_set(x_192, 1, x_191);
 x_193 = lean_array_push(x_159, x_192);
-x_194 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_194 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_149);
 x_195 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_195, 0, x_149);
@@ -3577,7 +3577,7 @@ x_209 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_209, 0, x_208);
 lean_ctor_set(x_209, 1, x_207);
 x_210 = lean_array_push(x_190, x_209);
-x_211 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_211 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_212 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_212, 0, x_149);
 lean_ctor_set(x_212, 1, x_211);
@@ -3627,7 +3627,7 @@ lean_ctor_set(x_234, 0, x_233);
 lean_ctor_set(x_234, 1, x_232);
 x_235 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_236 = lean_array_push(x_235, x_234);
-x_237 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_237 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_238 = lean_array_push(x_236, x_237);
 x_239 = lean_array_push(x_238, x_237);
 x_240 = l_Lean_Parser_Command_partial___elambda__1___closed__1;
@@ -3669,7 +3669,7 @@ x_261 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_261, 0, x_233);
 lean_ctor_set(x_261, 1, x_260);
 x_262 = lean_array_push(x_228, x_261);
-x_263 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_263 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_149);
 x_264 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_264, 0, x_149);
@@ -3700,7 +3700,7 @@ x_278 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_278, 0, x_277);
 lean_ctor_set(x_278, 1, x_276);
 x_279 = lean_array_push(x_259, x_278);
-x_280 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_280 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_281 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_281, 0, x_149);
 lean_ctor_set(x_281, 1, x_280);
@@ -3797,7 +3797,7 @@ lean_inc(x_26);
 lean_dec(x_19);
 x_27 = lean_ctor_get(x_17, 1);
 lean_inc(x_27);
-x_28 = l_myMacro____x40_Init_Notation___hyg_6227____closed__5;
+x_28 = l_myMacro____x40_Init_Notation___hyg_6301____closed__5;
 lean_inc(x_8);
 lean_inc(x_7);
 lean_inc(x_6);
@@ -4099,7 +4099,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_2 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -4138,7 +4138,7 @@ static lean_object* _init_l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__8() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_1 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 x_2 = l_Lean_Elab_Deriving_BEq_mkMutualBlock___closed__7;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -4429,7 +4429,7 @@ lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_
 x_9 = l_Lean_instInhabitedName;
 x_10 = lean_unsigned_to_nat(0u);
 x_11 = lean_array_get(x_9, x_1, x_10);
-x_12 = l_myMacro____x40_Init_Notation___hyg_6227____closed__6;
+x_12 = l_myMacro____x40_Init_Notation___hyg_6301____closed__6;
 lean_inc(x_2);
 x_13 = l_Lean_Elab_Deriving_mkContext(x_12, x_11, x_2, x_3, x_4, x_5, x_6, x_7, x_8);
 if (lean_obj_tag(x_13) == 0)
@@ -4455,7 +4455,7 @@ lean_inc(x_17);
 x_18 = lean_ctor_get(x_16, 1);
 lean_inc(x_18);
 lean_dec(x_16);
-x_19 = l_myMacro____x40_Init_Notation___hyg_6227____closed__5;
+x_19 = l_myMacro____x40_Init_Notation___hyg_6301____closed__5;
 x_20 = 1;
 lean_inc(x_7);
 lean_inc(x_6);
@@ -5311,7 +5311,7 @@ lean_object* l_Lean_Elab_Deriving_BEq_initFn____x40_Lean_Elab_Deriving_BEq___hyg
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_2 = l_myMacro____x40_Init_Notation___hyg_6227____closed__5;
+x_2 = l_myMacro____x40_Init_Notation___hyg_6301____closed__5;
 x_3 = l_Lean_Elab_Deriving_BEq_initFn____x40_Lean_Elab_Deriving_BEq___hyg_2397____closed__1;
 x_4 = l_Lean_Elab_registerBuiltinDerivingHandler(x_2, x_3, x_1);
 if (lean_obj_tag(x_4) == 0)

stage0/stdlib/Lean/Elab/Deriving/FromToJson.c

@@ -20,7 +20,6 @@ size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler_match__1(lean_object*);
 extern lean_object* l_Lean_Parser_Term_doIdDecl___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__13;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___closed__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__11;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__7;
@@ -39,11 +38,11 @@ extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____close
 extern lean_object* l_Lean_Parser_Term_tupleTail___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__4;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___boxed__const__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__14;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__8;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__5;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__17;
@@ -63,53 +62,54 @@ lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__10;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__3;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_SepArray_ofElems(lean_object*, lean_object*);
 lean_object* l_Array_zip___rarg(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___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_object*, size_t, size_t, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__15;
 extern lean_object* l_term___x3c_x7c_____closed__3;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__3;
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__2;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__6;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__5;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkJsonField___lambda__1___boxed(lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__3;
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
 extern lean_object* l_term___x3c_x7c_____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__3;
 lean_object* l_Lean_Elab_Deriving_mkInstanceCmds(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__15;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___rarg(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__3;
 lean_object* l_Lean_getStructureFieldsFlattened(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_myMacro____x40_Lean_Parser_Extra___hyg_276____closed__6;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__7;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler_match__1___rarg(lean_object*, lean_object*);
 extern lean_object* l___private_Init_Meta_0__Lean_quoteOption___rarg___closed__2;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__7;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__3;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__16;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__5;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_initFn____x40_Lean_Elab_Deriving_FromToJson___hyg_1578_(lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__7;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__3;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_doLetArrow___elambda__1___closed__1;
 lean_object* l_Lean_Syntax_mkStrLit(lean_object*, lean_object*);
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__5;
 uint8_t l_Lean_Elab_Deriving_FromToJson_mkJsonField___lambda__1(uint32_t);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__15;
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__22;
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__14;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l_Lean_Elab_Deriving_mkHeader___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__20;
@@ -123,13 +123,12 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonI
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler_match__1(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__8;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
 extern lean_object* l_Lean_Parser_myMacro____x40_Lean_Parser_Extra___hyg_276____closed__7;
 uint8_t l_UInt32_decEq(uint32_t, uint32_t);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__16;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_10131____closed__5;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler_match__2___rarg(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__7;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__11;
 lean_object* l_Lean_Elab_Deriving_FromToJson_initFn____x40_Lean_Elab_Deriving_FromToJson___hyg_1578____closed__2;
@@ -142,6 +141,7 @@ extern lean_object* l_Lean_Parser_Term_explicitBinder___elambda__1___closed__1;
 lean_object* l_Lean_Name_append(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__10;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkJsonField(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___spec__2___closed__4;
 lean_object* l_Array_appendCore___rarg(lean_object*, lean_object*);
@@ -152,13 +152,14 @@ lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda_
 extern lean_object* l_Lean_instInhabitedName;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___boxed(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_myMacro____x40_Init_NotationExtra___hyg_1128____closed__5;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__7;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___spec__2___closed__3;
 lean_object* l_Lean_Elab_registerBuiltinDerivingHandler(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__9;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__9;
 extern lean_object* l_prec_x28___x29___closed__7;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 extern lean_object* l_Lean_Parser_myMacro____x40_Lean_Parser_Extra___hyg_276____closed__4;
 extern lean_object* l_prec_x28___x29___closed__3;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___spec__2___closed__2;
@@ -170,12 +171,11 @@ extern lean_object* l_Lean_mkOptionalNode___closed__2;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___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*, lean_object*, lean_object*);
 extern lean_object* l_Lean_expandExplicitBindersAux_loop___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkJsonField___closed__1;
 lean_object* l_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___lambda__1___closed__8;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_10205____closed__5;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___spec__2___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
 extern lean_object* l_term_x5b___x5d___closed__2;
 extern lean_object* l_Lean_Parser_Tactic_rwRule___closed__3;
 extern lean_object* l_Lean_Parser_myMacro____x40_Lean_Parser_Extra___hyg_276____closed__2;
@@ -434,9 +434,9 @@ x_47 = lean_array_push(x_46, x_45);
 x_48 = l_Lean_Parser_Syntax_addPrec___closed__3;
 lean_inc(x_1);
 x_49 = lean_name_mk_string(x_1, x_48);
-x_50 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_50 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_51 = lean_name_mk_string(x_49, x_50);
-x_52 = l_myMacro____x40_Init_Notation___hyg_12262____closed__7;
+x_52 = l_myMacro____x40_Init_Notation___hyg_12336____closed__7;
 lean_inc(x_51);
 x_53 = lean_name_mk_string(x_51, x_52);
 x_54 = l_prec_x28___x29___closed__3;
@@ -449,13 +449,13 @@ x_57 = lean_array_push(x_46, x_33);
 x_58 = l_Lean_Parser_Term_tupleTail___elambda__1___closed__1;
 lean_inc(x_51);
 x_59 = lean_name_mk_string(x_51, x_58);
-x_60 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_60 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_36);
 x_61 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_61, 0, x_36);
 lean_ctor_set(x_61, 1, x_60);
 x_62 = lean_array_push(x_46, x_61);
-x_63 = l_myMacro____x40_Init_Notation___hyg_2117____closed__3;
+x_63 = l_myMacro____x40_Init_Notation___hyg_2191____closed__3;
 x_64 = lean_name_mk_string(x_51, x_63);
 x_65 = l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__4;
 x_66 = l_Lean_addMacroScope(x_42, x_65, x_39);
@@ -569,9 +569,9 @@ x_118 = lean_array_push(x_117, x_116);
 x_119 = l_Lean_Parser_Syntax_addPrec___closed__3;
 lean_inc(x_1);
 x_120 = lean_name_mk_string(x_1, x_119);
-x_121 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_121 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_122 = lean_name_mk_string(x_120, x_121);
-x_123 = l_myMacro____x40_Init_Notation___hyg_12262____closed__7;
+x_123 = l_myMacro____x40_Init_Notation___hyg_12336____closed__7;
 lean_inc(x_122);
 x_124 = lean_name_mk_string(x_122, x_123);
 x_125 = l_prec_x28___x29___closed__3;
@@ -584,13 +584,13 @@ x_128 = lean_array_push(x_117, x_105);
 x_129 = l_Lean_Parser_Term_tupleTail___elambda__1___closed__1;
 lean_inc(x_122);
 x_130 = lean_name_mk_string(x_122, x_129);
-x_131 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_131 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_107);
 x_132 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_132, 0, x_107);
 lean_ctor_set(x_132, 1, x_131);
 x_133 = lean_array_push(x_117, x_132);
-x_134 = l_myMacro____x40_Init_Notation___hyg_2117____closed__3;
+x_134 = l_myMacro____x40_Init_Notation___hyg_2191____closed__3;
 x_135 = lean_name_mk_string(x_122, x_134);
 x_136 = l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__4;
 x_137 = l_Lean_addMacroScope(x_113, x_136, x_110);
@@ -703,9 +703,9 @@ lean_dec(x_186);
 x_189 = l_Lean_Parser_Syntax_addPrec___closed__3;
 lean_inc(x_1);
 x_190 = lean_name_mk_string(x_1, x_189);
-x_191 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_191 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_192 = lean_name_mk_string(x_190, x_191);
-x_193 = l_myMacro____x40_Init_Notation___hyg_2117____closed__3;
+x_193 = l_myMacro____x40_Init_Notation___hyg_2191____closed__3;
 x_194 = lean_name_mk_string(x_192, x_193);
 x_195 = l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__8;
 x_196 = l_Lean_addMacroScope(x_187, x_195, x_184);
@@ -775,9 +775,9 @@ lean_dec(x_225);
 x_228 = l_Lean_Parser_Syntax_addPrec___closed__3;
 lean_inc(x_1);
 x_229 = lean_name_mk_string(x_1, x_228);
-x_230 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_230 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_231 = lean_name_mk_string(x_229, x_230);
-x_232 = l_myMacro____x40_Init_Notation___hyg_2117____closed__3;
+x_232 = l_myMacro____x40_Init_Notation___hyg_2191____closed__3;
 x_233 = lean_name_mk_string(x_231, x_232);
 x_234 = l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___spec__1___closed__8;
 x_235 = l_Lean_addMacroScope(x_226, x_234, x_223);
@@ -1045,7 +1045,7 @@ static lean_object* _init_l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandle
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l_myMacro____x40_Init_Notation___hyg_10131____closed__5;
+x_1 = l_myMacro____x40_Init_Notation___hyg_10205____closed__5;
 x_2 = l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__14;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
@@ -1186,7 +1186,7 @@ lean_ctor_set(x_53, 0, x_52);
 lean_ctor_set(x_53, 1, x_51);
 x_54 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_55 = lean_array_push(x_54, x_53);
-x_56 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_56 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_57 = lean_array_push(x_55, x_56);
 x_58 = lean_array_push(x_57, x_56);
 x_59 = lean_array_push(x_58, x_56);
@@ -1227,7 +1227,7 @@ x_81 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_81, 0, x_80);
 lean_ctor_set(x_81, 1, x_79);
 x_82 = lean_array_push(x_74, x_81);
-x_83 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_83 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_37);
 x_84 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_84, 0, x_37);
@@ -1269,7 +1269,7 @@ x_102 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_102, 0, x_37);
 lean_ctor_set(x_102, 1, x_101);
 x_103 = lean_array_push(x_47, x_102);
-x_104 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_104 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 x_105 = l_Lean_Syntax_SepArray_ofElems(x_104, x_34);
 lean_dec(x_34);
 x_106 = l_Array_appendCore___rarg(x_47, x_105);
@@ -1292,7 +1292,7 @@ x_115 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_115, 0, x_52);
 lean_ctor_set(x_115, 1, x_114);
 x_116 = lean_array_push(x_100, x_115);
-x_117 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_117 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_118 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_118, 0, x_117);
 lean_ctor_set(x_118, 1, x_116);
@@ -2157,7 +2157,7 @@ x_28 = lean_name_mk_string(x_7, x_27);
 x_29 = l_Lean_Parser_Term_doLetArrow___elambda__1___closed__1;
 lean_inc(x_7);
 x_30 = lean_name_mk_string(x_7, x_29);
-x_31 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_31 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_1);
 x_32 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_32, 0, x_1);
@@ -2205,10 +2205,10 @@ lean_ctor_set(x_50, 2, x_45);
 lean_ctor_set(x_50, 3, x_48);
 lean_inc(x_4);
 x_51 = lean_array_push(x_4, x_50);
-x_52 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_52 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 lean_inc(x_7);
 x_53 = lean_name_mk_string(x_7, x_52);
-x_54 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_54 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_inc(x_1);
 x_55 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_55, 0, x_1);
@@ -2270,7 +2270,7 @@ x_78 = lean_name_mk_string(x_7, x_77);
 x_79 = l_Lean_Parser_Term_doLetArrow___elambda__1___closed__1;
 lean_inc(x_7);
 x_80 = lean_name_mk_string(x_7, x_79);
-x_81 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_81 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_1);
 x_82 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_82, 0, x_1);
@@ -2319,10 +2319,10 @@ lean_ctor_set(x_101, 2, x_95);
 lean_ctor_set(x_101, 3, x_99);
 lean_inc(x_4);
 x_102 = lean_array_push(x_4, x_101);
-x_103 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_103 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 lean_inc(x_7);
 x_104 = lean_name_mk_string(x_7, x_103);
-x_105 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_105 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_inc(x_1);
 x_106 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_106, 0, x_1);
@@ -2608,7 +2608,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__15;
-x_2 = l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
+x_2 = l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
@@ -2704,7 +2704,7 @@ lean_ctor_set(x_53, 0, x_52);
 lean_ctor_set(x_53, 1, x_51);
 x_54 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_55 = lean_array_push(x_54, x_53);
-x_56 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_56 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_57 = lean_array_push(x_55, x_56);
 x_58 = lean_array_push(x_57, x_56);
 x_59 = lean_array_push(x_58, x_56);
@@ -2759,7 +2759,7 @@ x_86 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_86, 0, x_52);
 lean_ctor_set(x_86, 1, x_85);
 x_87 = lean_array_push(x_79, x_86);
-x_88 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_88 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_37);
 x_89 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_89, 0, x_37);
@@ -2817,7 +2817,7 @@ x_115 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_115, 0, x_52);
 lean_ctor_set(x_115, 1, x_114);
 x_116 = lean_array_push(x_113, x_115);
-x_117 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_117 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_118 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_118, 0, x_117);
 lean_ctor_set(x_118, 1, x_116);
@@ -2836,7 +2836,7 @@ x_126 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_126, 0, x_125);
 lean_ctor_set(x_126, 1, x_124);
 x_127 = lean_array_push(x_74, x_126);
-x_128 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_128 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_37);
 x_129 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_129, 0, x_37);
@@ -2855,7 +2855,7 @@ x_135 = lean_array_get_size(x_134);
 x_136 = lean_usize_of_nat(x_135);
 lean_dec(x_135);
 x_137 = x_134;
-x_138 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_138 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_139 = l_Lean_Elab_Deriving_FromToJson_mkToJsonInstanceHandler___lambda__1___closed__7;
 lean_inc(x_37);
 x_140 = l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_FromToJson_mkFromJsonInstanceHandler___spec__2(x_37, x_40, x_43, x_47, x_52, x_56, x_138, x_82, x_85, x_139, x_82, x_117, x_136, x_26, x_137);

stage0/stdlib/Lean/Elab/Deriving/Inhabited.c

@@ -19,11 +19,11 @@ lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedIn
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___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_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_mkInhabitedInstanceHandler___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 size_t l_USize_add(size_t, size_t);
 lean_object* l_List_map___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__4(lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* l_Lean_stringToMessageData(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstance___spec__6___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_instReprSigma___rarg___closed__2;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith_match__2(lean_object*);
@@ -36,7 +36,6 @@ lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_USize_decEq(size_t, size_t);
 lean_object* lean_array_uget(lean_object*, size_t);
-extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
 extern lean_object* l_Lean_getConstInfoInduct___rarg___lambda__1___closed__2;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Term_quoteAutoTactic___spec__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkAppM(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -47,11 +46,11 @@ extern lean_object* l___private_Lean_Elab_Binders_0__Lean_Elab_Term_expandOptIde
 extern lean_object* l_Lean_Parser_Term_anonymousCtor___elambda__1___closed__2;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f_match__2(lean_object*);
 extern lean_object* l_Lean_Parser_Term_funImplicitBinder___elambda__1___closed__5;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__1___closed__7;
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
@@ -68,6 +67,7 @@ lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedIn
 lean_object* l_Lean_getConstInfoInduct___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_utf8_byte_size(lean_object*);
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__27;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 lean_object* l_Lean_Elab_Term_getMainModule___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__6___closed__4;
@@ -77,8 +77,10 @@ lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstance___spec__4(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__8___closed__1;
 extern lean_object* l_Lean_throwUnknownConstant___rarg___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__1___closed__4;
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__7___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*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstance_match__3(lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___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*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -95,7 +97,6 @@ lean_object* lean_st_ref_take(lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_implicitBinder___elambda__1___closed__1;
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__6___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___lambda__1___closed__3;
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_forallTelescopeReducingImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_implicitBinderF;
@@ -105,6 +106,7 @@ lean_object* l_List_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Le
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux_match__1(lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__8___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*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstance_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__8___closed__2;
@@ -125,6 +127,7 @@ lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Deriving_Inhabited___hyg_1959__
 lean_object* l_Std_RBNode_revFold___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__3(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_instBinder___elambda__1___closed__1;
 lean_object* l_Std_RBTree_toList___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__2(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_object* l_Lean_addMessageContextPartial___at_Lean_Elab_Command_instAddMessageContextCommandElabM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__1___closed__1;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___closed__1;
@@ -135,7 +138,6 @@ lean_object* l_Lean_getConstInfoCtor___at___private_Lean_Elab_Deriving_Inhabited
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___boxed(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_instInhabitedExpr;
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_mkInhabitedInstanceHandler___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__30;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith_match__1___rarg(lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__28;
@@ -147,7 +149,6 @@ extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____clos
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__1___closed__5;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstance_match__3___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_KernelException_toMessageData___closed__3;
 size_t lean_usize_of_nat(lean_object*);
@@ -165,7 +166,6 @@ lean_object* l_Lean_getConstInfo___at___private_Lean_Elab_Deriving_Inhabited_0__
 extern lean_object* l_Std_RBNode_forIn_visit___at___private_Lean_Elab_SyntheticMVars_0__Lean_Elab_Term_synthesizeUsingDefault___spec__2___lambda__1___closed__1;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___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*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkInhabitedInstanceHandler(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
 lean_object* l_Std_HashMapImp_insert___at_Lean_Expr_forEach___spec__4(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__8(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_isInductive___at_Lean_Elab_mkInhabitedInstanceHandler___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -174,6 +174,7 @@ lean_object* l_Lean_throwError___at___private_Lean_Elab_Deriving_Inhabited_0__Le
 lean_object* l_Lean_Meta_trySynthInstance(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts_match__2(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_Std_RBNode_revFold___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__3___boxed(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f___spec__1___closed__9;
@@ -191,7 +192,6 @@ lean_object* l_Lean_getConstInfoInduct___at___private_Lean_Elab_Deriving_Inhabit
 lean_object* l_Lean_getConstInfoInduct___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, 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_Lean_ForEachExpr_visit___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
 lean_object* l_Array_appendCore___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts_match__1(lean_object*);
 extern lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Deriving_Basic___hyg_577____closed__2;
@@ -210,6 +210,7 @@ lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__5;
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_registerBuiltinDerivingHandler(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_Std_RBNode_insert___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmd_x3f_match__1(lean_object*);
 extern lean_object* l_Lean_Meta_mkArbitrary___closed__2;
@@ -232,7 +233,6 @@ extern lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__6___closed__1;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__32;
 extern lean_object* l_Lean_expandExplicitBindersAux_loop___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_addLocalInstancesForParamsAux___rarg___lambda__1___closed__3;
 extern lean_object* l_Lean_Meta_substCore___lambda__1___closed__3;
 lean_object* l___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_collectUsedLocalsInsts___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -4817,7 +4817,7 @@ if (x_27 == 0)
 lean_object* x_28; lean_object* x_29; lean_object* 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; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* 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; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; 
 x_28 = lean_ctor_get(x_6, 0);
 x_29 = lean_ctor_get(x_6, 1);
-x_30 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_30 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 x_31 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_30, x_11, x_12, x_13);
 x_32 = lean_ctor_get(x_31, 0);
 lean_inc(x_32);
@@ -4929,7 +4929,7 @@ lean_ctor_set(x_77, 3, x_76);
 lean_inc(x_2);
 x_78 = lean_array_push(x_2, x_77);
 x_79 = lean_array_push(x_78, x_48);
-x_80 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_80 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_81 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_81, 0, x_80);
 lean_ctor_set(x_81, 1, x_79);
@@ -4961,7 +4961,7 @@ x_91 = lean_ctor_get(x_6, 1);
 lean_inc(x_91);
 lean_inc(x_90);
 lean_dec(x_6);
-x_92 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_92 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 x_93 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_92, x_11, x_12, x_13);
 x_94 = lean_ctor_get(x_93, 0);
 lean_inc(x_94);
@@ -5074,7 +5074,7 @@ lean_ctor_set(x_140, 3, x_139);
 lean_inc(x_2);
 x_141 = lean_array_push(x_2, x_140);
 x_142 = lean_array_push(x_141, x_110);
-x_143 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_143 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_144 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_144, 0, x_143);
 lean_ctor_set(x_144, 1, x_142);
@@ -5171,10 +5171,10 @@ x_25 = l_Lean_Elab_Term_getMainModule___rarg(x_12, x_24);
 x_26 = lean_ctor_get(x_25, 1);
 lean_inc(x_26);
 lean_dec(x_25);
-x_27 = l_myMacro____x40_Init_Notation___hyg_12864____closed__12;
+x_27 = l_myMacro____x40_Init_Notation___hyg_12938____closed__12;
 lean_inc(x_2);
 x_28 = lean_name_mk_string(x_2, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_29 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_30 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_30, 0, x_21);
 lean_ctor_set(x_30, 1, x_29);
@@ -5442,12 +5442,12 @@ x_59 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_59, 0, x_58);
 lean_ctor_set(x_59, 1, x_57);
 x_60 = lean_array_push(x_56, x_59);
-x_61 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_61 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_62 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_62, 0, x_61);
 lean_ctor_set(x_62, 1, x_60);
 x_63 = lean_array_push(x_23, x_62);
-x_64 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_64 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_65 = lean_array_push(x_63, x_64);
 x_66 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_66, 0, x_58);
@@ -5458,7 +5458,7 @@ x_69 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_69, 0, x_31);
 lean_ctor_set(x_69, 1, x_68);
 x_70 = lean_array_push(x_67, x_69);
-x_71 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_71 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_72 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_72, 0, x_71);
 lean_ctor_set(x_72, 1, x_70);
@@ -5477,7 +5477,7 @@ x_78 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_78, 0, x_20);
 lean_ctor_set(x_78, 1, x_77);
 lean_ctor_set(x_78, 2, x_21);
-x_79 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_79 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_80 = l_Std_Range_forIn_loop___at___private_Lean_Elab_Deriving_Inhabited_0__Lean_Elab_mkInhabitedInstanceUsing_mkInstanceCmdWith___spec__7(x_23, x_79, x_78, x_77, x_20, x_23, x_4, x_5, x_6, x_7, x_8, x_9, x_38);
 lean_dec(x_78);
 x_81 = lean_ctor_get(x_80, 0);
@@ -5587,7 +5587,7 @@ x_131 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_131, 0, x_58);
 lean_ctor_set(x_131, 1, x_130);
 x_132 = lean_array_push(x_23, x_131);
-x_133 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_133 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_117);
 x_134 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_134, 0, x_117);
@@ -5604,7 +5604,7 @@ x_141 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_141, 0, x_140);
 lean_ctor_set(x_141, 1, x_139);
 x_142 = lean_array_push(x_129, x_141);
-x_143 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_143 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_144 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_144, 0, x_117);
 lean_ctor_set(x_144, 1, x_143);
@@ -5650,7 +5650,7 @@ x_165 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_165, 0, x_58);
 lean_ctor_set(x_165, 1, x_164);
 x_166 = lean_array_push(x_23, x_165);
-x_167 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_167 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_117);
 x_168 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_168, 0, x_117);
@@ -5667,7 +5667,7 @@ x_175 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_175, 0, x_174);
 lean_ctor_set(x_175, 1, x_173);
 x_176 = lean_array_push(x_163, x_175);
-x_177 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_177 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_178 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_178, 0, x_117);
 lean_ctor_set(x_178, 1, x_177);

stage0/stdlib/Lean/Elab/Deriving/Repr.c

@@ -14,17 +14,18 @@
 extern "C" {
 #endif
 lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_mkConst___spec__1(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_12938____closed__8;
 lean_object* l___private_Lean_Elab_Deriving_Repr_0__Lean_Elab_Deriving_Repr_mkReprInstanceCmds___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_myMacro____x40_Init_NotationExtra___hyg_2903____spec__3(size_t, size_t, lean_object*);
 extern lean_object* l_Lean_Name_toString___closed__1;
 lean_object* l___private_Lean_Elab_Deriving_Repr_0__Lean_Elab_Deriving_Repr_mkReprInstanceCmds___closed__1;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__21;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___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*);
+extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprInstanceHandler(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_stringToMessageData(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__2___closed__7;
 extern lean_object* l_Lean_Elab_Deriving_mkContext___closed__2;
 lean_object* l_Lean_Elab_Command_liftTermElabM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -35,26 +36,26 @@ lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts(lean_object*, lean
 lean_object* l_Lean_throwError___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprHeader___rarg___closed__5;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__17;
-extern lean_object* l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
 lean_object* l_Array_append___rarg(lean_object*, lean_object*);
 extern lean_object* l_term___x3e_x3d_____closed__2;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__1___closed__3;
 lean_object* l_List_head_x21___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct_match__2___rarg(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__23;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__1___closed__5;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__8;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__13;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__2;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__9;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__2___closed__3;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__27;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 extern lean_object* l_Lean_Parser_Command_mutual___elambda__1___closed__2;
 uint8_t l_Lean_Expr_isAppOf(lean_object*, lean_object*);
 lean_object* lean_array_push(lean_object*, lean_object*);
@@ -73,6 +74,7 @@ extern lean_object* l_Lean_Parser_Command_mutual___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__1___closed__4;
 lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_Lean_isInductive___at_Lean_Elab_Deriving_Repr_mkReprInstanceHandler___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBody___rarg(lean_object*, 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_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__13;
 lean_object* l_Lean_Elab_Term_getMainModule___rarg(lean_object*, lean_object*);
@@ -81,15 +83,18 @@ lean_object* l_Lean_Elab_Deriving_mkLocalInstanceLetDecls(lean_object*, lean_obj
 lean_object* lean_nat_add(lean_object*, lean_object*);
 extern lean_object* l_termMaxPrec_x21___closed__2;
 lean_object* l_Lean_Elab_Deriving_Repr_mkMutualBlock(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_12938____closed__14;
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForInduct(lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__2___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__7;
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprHeader___rarg___closed__8;
 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_Lean_Elab_Deriving_mkDiscrs(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForInduct___boxed(lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprHeader___rarg___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__26;
 lean_object* l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts_match__2(lean_object*);
@@ -115,8 +120,8 @@ lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkMutualBlock__
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__14;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, 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_12864____closed__11;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct_match__1___rarg(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 extern lean_object* l_Lean_strLitKind___closed__2;
 extern lean_object* l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__5;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__19;
@@ -135,7 +140,6 @@ lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Deriving_Repr_mkReprInstanceHandler___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__2___closed__9;
 extern lean_object* l_Lean_instInhabitedExpr;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__2___closed__1;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___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*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__4___closed__2;
@@ -149,12 +153,8 @@ lean_object* l_Lean_mkSepArray(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_isProof(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__4___lambda__1___closed__6;
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
 lean_object* l_Lean_throwError___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__3(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_1324____closed__8;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
 lean_object* l_Lean_Elab_Deriving_mkHeader___rarg(lean_object*, lean_object*, 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_12864____closed__6;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__20;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__6;
 lean_object* l_Lean_Elab_Deriving_mkContext(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -162,13 +162,10 @@ lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAl
 extern lean_object* l_Lean_KernelException_toMessageData___closed__3;
 size_t lean_usize_of_nat(lean_object*);
 extern lean_object* l_term___x2b_x2b_____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, 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_12262____closed__13;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Deriving_Repr_mkReprInstanceHandler___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts_match__1___rarg(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__4;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__2___boxed(lean_object**);
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__4___lambda__1___closed__3;
@@ -180,6 +177,7 @@ lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAl
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__20;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_2903____closed__6;
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(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_2191____closed__4;
 extern lean_object* l_Array_foldlMUnsafe_fold___at_Lean_withNestedTraces___spec__5___closed__1;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__33;
 extern lean_object* l_Lean_Parser_Command_end___elambda__1___closed__1;
@@ -189,10 +187,8 @@ extern lean_object* l_Lean_Parser_Term_explicitBinder___elambda__1___closed__1;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Deriving_Repr_mkReprInstanceHandler___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts_match__1(lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
 lean_object* l_Lean_getConstInfoCtor___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfoCtor___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__2(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_12262____closed__8;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__4___closed__3;
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprHeader___rarg___closed__6;
 lean_object* l_Array_appendCore___rarg(lean_object*, lean_object*);
@@ -203,6 +199,7 @@ extern lean_object* l_List_head_x21___rarg___closed__3;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkMutualBlock___spec__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*);
 extern lean_object* l_Lean_Syntax_expandInterpolatedStr___lambda__1___closed__1;
 lean_object* l_List_map___at___private_Lean_Elab_Deriving_Repr_0__Lean_Elab_Deriving_Repr_mkReprInstanceCmds___spec__1(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprHeader___boxed(lean_object*);
 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_Deriving_Repr_mkBodyForStruct___rarg___lambda__1___closed__2;
@@ -210,6 +207,7 @@ extern lean_object* l_Lean_instInhabitedName;
 lean_object* l___private_Lean_Elab_Deriving_Repr_0__Lean_Elab_Deriving_Repr_mkReprInstanceCmds(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__3___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_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4___lambda__1___closed__21;
+extern lean_object* l_Lean_myMacro____x40_Init_Notation___hyg_14642____closed__4;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__4___lambda__1___closed__2;
 extern lean_object* l_Lean_getConstInfoCtor___rarg___lambda__1___closed__2;
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__5;
@@ -217,6 +215,7 @@ lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAl
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_registerBuiltinDerivingHandler(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___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*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 extern lean_object* l_Lean_Parser_Term_notFollowedByRedefinedTermToken___elambda__1___closed__45;
 lean_object* l_Lean_Elab_Deriving_Repr_mkMutualBlock___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_termIfThenElse___closed__2;
@@ -250,15 +249,15 @@ extern lean_object* l_Lean_expandExplicitBindersAux_loop___closed__4;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__4___lambda__1___closed__4;
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_termMaxPrec_x21___closed__3;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__4;
 lean_object* l_Lean_Elab_Deriving_Repr_mkAuxFunction___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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 extern lean_object* l_Lean_Parser_Tactic_letrec___closed__3;
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Deriving_Repr_mkReprInstanceHandler___spec__3(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprHeader___rarg___closed__3;
 uint8_t l_Lean_isStructureLike(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___lambda__2___closed__2;
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__3(lean_object*);
-extern lean_object* l_Lean_myMacro____x40_Init_Notation___hyg_14568____closed__4;
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts_match__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_Repr_mkBodyForStruct___rarg___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*);
@@ -266,6 +265,7 @@ lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAl
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForInduct_mkAlts___spec__4(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_Deriving_Repr_mkBodyForStruct___rarg___lambda__2___closed__1;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_Repr_mkBodyForStruct___spec__4___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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__34;
 lean_object* l_Lean_Elab_Deriving_Repr_mkReprHeader___rarg___closed__7;
 lean_object* l_Lean_Meta_isType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -453,7 +453,7 @@ x_40 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_40, 0, x_39);
 lean_ctor_set(x_40, 1, x_38);
 x_41 = lean_array_push(x_32, x_40);
-x_42 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_42 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_21);
 x_43 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_43, 0, x_21);
@@ -474,7 +474,7 @@ x_51 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_51, 0, x_39);
 lean_ctor_set(x_51, 1, x_50);
 x_52 = lean_array_push(x_41, x_51);
-x_53 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_53 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_54 = lean_array_push(x_52, x_53);
 x_55 = l_prec_x28___x29___closed__7;
 x_56 = lean_alloc_ctor(2, 2, 0);
@@ -547,7 +547,7 @@ x_81 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_81, 0, x_80);
 lean_ctor_set(x_81, 1, x_79);
 x_82 = lean_array_push(x_73, x_81);
-x_83 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_83 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_21);
 x_84 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_84, 0, x_21);
@@ -568,7 +568,7 @@ x_92 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_92, 0, x_80);
 lean_ctor_set(x_92, 1, x_91);
 x_93 = lean_array_push(x_82, x_92);
-x_94 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_94 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_95 = lean_array_push(x_93, x_94);
 x_96 = l_prec_x28___x29___closed__7;
 x_97 = lean_alloc_ctor(2, 2, 0);
@@ -1134,7 +1134,7 @@ x_64 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_64, 0, x_63);
 lean_ctor_set(x_64, 1, x_62);
 x_65 = lean_array_push(x_28, x_64);
-x_66 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_66 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_67 = lean_array_push(x_65, x_66);
 x_68 = l_Lean_nullKind___closed__2;
 x_69 = lean_alloc_ctor(1, 2, 0);
@@ -1146,7 +1146,7 @@ x_72 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_72, 0, x_20);
 lean_ctor_set(x_72, 1, x_71);
 x_73 = lean_array_push(x_70, x_72);
-x_74 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_74 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_75 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_75, 0, x_74);
 lean_ctor_set(x_75, 1, x_73);
@@ -1155,7 +1155,7 @@ x_77 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_77, 0, x_68);
 lean_ctor_set(x_77, 1, x_76);
 x_78 = lean_array_push(x_53, x_77);
-x_79 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_79 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_80 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_80, 0, x_79);
 lean_ctor_set(x_80, 1, x_78);
@@ -1249,7 +1249,7 @@ x_124 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_124, 0, x_123);
 lean_ctor_set(x_124, 1, x_122);
 x_125 = lean_array_push(x_88, x_124);
-x_126 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_126 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_127 = lean_array_push(x_125, x_126);
 x_128 = l_Lean_nullKind___closed__2;
 x_129 = lean_alloc_ctor(1, 2, 0);
@@ -1261,7 +1261,7 @@ x_132 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_132, 0, x_20);
 lean_ctor_set(x_132, 1, x_131);
 x_133 = lean_array_push(x_130, x_132);
-x_134 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_134 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_135 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_135, 0, x_134);
 lean_ctor_set(x_135, 1, x_133);
@@ -1270,7 +1270,7 @@ x_137 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_137, 0, x_128);
 lean_ctor_set(x_137, 1, x_136);
 x_138 = lean_array_push(x_113, x_137);
-x_139 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_139 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_140 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_140, 0, x_139);
 lean_ctor_set(x_140, 1, x_138);
@@ -1534,7 +1534,7 @@ lean_ctor_set(x_50, 0, x_39);
 lean_ctor_set(x_50, 1, x_49);
 lean_inc(x_50);
 x_51 = lean_array_push(x_48, x_50);
-x_52 = l_myMacro____x40_Init_Notation___hyg_1324____closed__4;
+x_52 = l_myMacro____x40_Init_Notation___hyg_1398____closed__4;
 lean_inc(x_39);
 x_53 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_53, 0, x_39);
@@ -1999,7 +1999,7 @@ x_60 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_60, 0, x_59);
 lean_ctor_set(x_60, 1, x_58);
 x_61 = lean_array_push(x_46, x_60);
-x_62 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_62 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_63 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_63, 0, x_62);
 lean_ctor_set(x_63, 1, x_61);
@@ -2060,7 +2060,7 @@ x_89 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_89, 0, x_88);
 lean_ctor_set(x_89, 1, x_87);
 x_90 = lean_array_push(x_75, x_89);
-x_91 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_91 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_92 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_92, 0, x_91);
 lean_ctor_set(x_92, 1, x_90);
@@ -2137,7 +2137,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__4;
-x_2 = l_Lean_myMacro____x40_Init_Notation___hyg_14568____closed__4;
+x_2 = l_Lean_myMacro____x40_Init_Notation___hyg_14642____closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2147,7 +2147,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Std_myMacro____x40_Init_Data_Format_Macro___hyg_26____closed__5;
-x_2 = l_Lean_myMacro____x40_Init_Notation___hyg_14568____closed__4;
+x_2 = l_Lean_myMacro____x40_Init_Notation___hyg_14642____closed__4;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2586,13 +2586,13 @@ x_24 = l_Lean_Elab_Term_getMainModule___rarg(x_11, x_23);
 x_25 = lean_ctor_get(x_24, 1);
 lean_inc(x_25);
 lean_dec(x_24);
-x_26 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_26 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_27 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_27, 0, x_20);
 lean_ctor_set(x_27, 1, x_26);
 lean_inc(x_1);
 x_28 = lean_array_push(x_1, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_29 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -2699,7 +2699,7 @@ x_39 = lean_nat_add(x_11, x_14);
 x_40 = l_Lean_instInhabitedExpr;
 x_41 = lean_array_get(x_40, x_4, x_39);
 lean_dec(x_39);
-x_42 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_42 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 x_43 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_42, x_20, x_21, x_22);
 x_44 = lean_ctor_get(x_43, 0);
 lean_inc(x_44);
@@ -2979,7 +2979,7 @@ x_141 = lean_nat_add(x_11, x_14);
 x_142 = l_Lean_instInhabitedExpr;
 x_143 = lean_array_get(x_142, x_4, x_141);
 lean_dec(x_141);
-x_144 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_914____closed__4;
+x_144 = l_Array_myMacro____x40_Init_Data_Array_Subarray___hyg_915____closed__4;
 x_145 = l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(x_144, x_20, x_21, x_22);
 x_146 = lean_ctor_get(x_145, 0);
 lean_inc(x_146);
@@ -3790,7 +3790,7 @@ x_47 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_47, 0, x_46);
 lean_ctor_set(x_47, 1, x_45);
 x_48 = lean_array_push(x_44, x_47);
-x_49 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_49 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_50 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_50, 0, x_49);
 lean_ctor_set(x_50, 1, x_48);
@@ -3904,7 +3904,7 @@ if (x_92 == 0)
 {
 lean_object* x_93; lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; size_t x_98; size_t x_99; lean_object* x_100; lean_object* x_101; lean_object* x_102; lean_object* x_103; lean_object* x_104; lean_object* x_105; lean_object* x_106; lean_object* x_107; lean_object* x_108; lean_object* x_109; lean_object* x_110; lean_object* x_111; lean_object* x_112; lean_object* x_113; lean_object* x_114; lean_object* x_115; lean_object* x_116; lean_object* x_117; lean_object* x_118; lean_object* x_119; lean_object* x_120; lean_object* x_121; lean_object* x_122; lean_object* x_123; lean_object* x_124; lean_object* x_125; lean_object* x_126; lean_object* x_127; lean_object* x_128; lean_object* x_129; lean_object* x_130; lean_object* x_131; lean_object* x_132; lean_object* x_133; lean_object* x_134; lean_object* x_135; lean_object* x_136; lean_object* x_137; lean_object* x_138; lean_object* x_139; lean_object* x_140; lean_object* x_141; lean_object* x_142; lean_object* x_143; lean_object* x_144; lean_object* x_145; lean_object* x_146; lean_object* x_147; lean_object* x_148; lean_object* x_149; lean_object* x_150; lean_object* x_151; lean_object* x_152; lean_object* x_153; lean_object* x_154; lean_object* x_155; lean_object* x_156; lean_object* x_157; lean_object* x_158; lean_object* x_159; lean_object* x_160; lean_object* x_161; lean_object* x_162; lean_object* x_163; lean_object* x_164; lean_object* x_165; lean_object* x_166; lean_object* x_167; lean_object* x_168; lean_object* x_169; lean_object* x_170; lean_object* x_171; lean_object* x_172; lean_object* x_173; lean_object* x_174; lean_object* x_175; lean_object* x_176; lean_object* x_177; lean_object* x_178; lean_object* x_179; lean_object* x_180; lean_object* x_181; lean_object* x_182; lean_object* x_183; lean_object* x_184; lean_object* x_185; lean_object* x_186; lean_object* x_187; lean_object* x_188; lean_object* x_189; lean_object* x_190; lean_object* x_191; lean_object* x_192; lean_object* x_193; lean_object* x_194; lean_object* x_195; lean_object* x_196; lean_object* x_197; lean_object* x_198; lean_object* x_199; lean_object* x_200; lean_object* x_201; lean_object* x_202; lean_object* x_203; lean_object* x_204; lean_object* x_205; lean_object* x_206; lean_object* x_207; lean_object* x_208; lean_object* x_209; lean_object* x_210; lean_object* x_211; lean_object* x_212; lean_object* x_213; lean_object* x_214; lean_object* x_215; 
 x_93 = lean_ctor_get(x_91, 0);
-x_94 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_94 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_86);
 x_95 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_95, 0, x_86);
@@ -3928,7 +3928,7 @@ x_106 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_106, 0, x_46);
 lean_ctor_set(x_106, 1, x_105);
 x_107 = lean_array_push(x_96, x_106);
-x_108 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_108 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 lean_inc(x_86);
 x_109 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_109, 0, x_86);
@@ -4083,7 +4083,7 @@ lean_ctor_set(x_177, 0, x_86);
 lean_ctor_set(x_177, 1, x_176);
 lean_inc(x_177);
 x_178 = lean_array_push(x_175, x_177);
-x_179 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_179 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_180 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_180, 0, x_179);
 lean_ctor_set(x_180, 1, x_178);
@@ -4155,7 +4155,7 @@ x_212 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_212, 0, x_49);
 lean_ctor_set(x_212, 1, x_211);
 x_213 = lean_array_push(x_110, x_212);
-x_214 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_214 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_215 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_215, 0, x_214);
 lean_ctor_set(x_215, 1, x_213);
@@ -4170,7 +4170,7 @@ x_217 = lean_ctor_get(x_91, 1);
 lean_inc(x_217);
 lean_inc(x_216);
 lean_dec(x_91);
-x_218 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_218 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_86);
 x_219 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_219, 0, x_86);
@@ -4194,7 +4194,7 @@ x_230 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_230, 0, x_46);
 lean_ctor_set(x_230, 1, x_229);
 x_231 = lean_array_push(x_220, x_230);
-x_232 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_232 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 lean_inc(x_86);
 x_233 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_233, 0, x_86);
@@ -4349,7 +4349,7 @@ lean_ctor_set(x_301, 0, x_86);
 lean_ctor_set(x_301, 1, x_300);
 lean_inc(x_301);
 x_302 = lean_array_push(x_299, x_301);
-x_303 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_303 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_304 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_304, 0, x_303);
 lean_ctor_set(x_304, 1, x_302);
@@ -4421,7 +4421,7 @@ x_336 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_336, 0, x_49);
 lean_ctor_set(x_336, 1, x_335);
 x_337 = lean_array_push(x_234, x_336);
-x_338 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_338 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_339 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_339, 0, x_338);
 lean_ctor_set(x_339, 1, x_337);
@@ -4782,7 +4782,7 @@ if (x_23 == 0)
 lean_object* x_24; lean_object* x_25; lean_object* x_26; lean_object* x_27; lean_object* x_28; lean_object* x_29; size_t x_30; size_t x_31; 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; lean_object* x_42; lean_object* 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; lean_object* x_51; lean_object* x_52; lean_object* x_53; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_dec(x_24);
-x_25 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_25 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 lean_inc(x_18);
 x_26 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_26, 0, x_18);
@@ -4806,9 +4806,9 @@ x_39 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_39, 0, x_38);
 lean_ctor_set(x_39, 1, x_37);
 x_40 = lean_array_push(x_28, x_39);
-x_41 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_41 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_42 = lean_array_push(x_40, x_41);
-x_43 = l_myMacro____x40_Init_Notation___hyg_12864____closed__6;
+x_43 = l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 x_44 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_44, 0, x_18);
 lean_ctor_set(x_44, 1, x_43);
@@ -4819,12 +4819,12 @@ x_47 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_47, 0, x_38);
 lean_ctor_set(x_47, 1, x_46);
 x_48 = lean_array_push(x_27, x_47);
-x_49 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_49 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 x_50 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_50, 0, x_49);
 lean_ctor_set(x_50, 1, x_48);
 x_51 = lean_array_push(x_45, x_50);
-x_52 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_52 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 x_53 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_53, 0, x_52);
 lean_ctor_set(x_53, 1, x_51);
@@ -4837,7 +4837,7 @@ lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean
 x_54 = lean_ctor_get(x_22, 1);
 lean_inc(x_54);
 lean_dec(x_22);
-x_55 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_55 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 lean_inc(x_18);
 x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_18);
@@ -4861,9 +4861,9 @@ x_69 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_69, 0, x_68);
 lean_ctor_set(x_69, 1, x_67);
 x_70 = lean_array_push(x_58, x_69);
-x_71 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_71 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_72 = lean_array_push(x_70, x_71);
-x_73 = l_myMacro____x40_Init_Notation___hyg_12864____closed__6;
+x_73 = l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 x_74 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_74, 0, x_18);
 lean_ctor_set(x_74, 1, x_73);
@@ -4874,12 +4874,12 @@ x_77 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_77, 0, x_68);
 lean_ctor_set(x_77, 1, x_76);
 x_78 = lean_array_push(x_57, x_77);
-x_79 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_79 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 x_80 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_80, 0, x_79);
 lean_ctor_set(x_80, 1, x_78);
 x_81 = lean_array_push(x_75, x_80);
-x_82 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_82 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 x_83 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_83, 0, x_82);
 lean_ctor_set(x_83, 1, x_81);
@@ -5065,7 +5065,7 @@ lean_ctor_set(x_32, 0, x_31);
 lean_ctor_set(x_32, 1, x_30);
 x_33 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_34 = lean_array_push(x_33, x_32);
-x_35 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_35 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_36 = lean_array_push(x_34, x_35);
 x_37 = lean_array_push(x_36, x_35);
 x_38 = lean_array_push(x_37, x_35);
@@ -5093,7 +5093,7 @@ x_52 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_52, 0, x_31);
 lean_ctor_set(x_52, 1, x_51);
 x_53 = lean_array_push(x_26, x_52);
-x_54 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_54 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_16);
 x_55 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_55, 0, x_16);
@@ -5124,7 +5124,7 @@ x_69 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_69, 0, x_68);
 lean_ctor_set(x_69, 1, x_67);
 x_70 = lean_array_push(x_50, x_69);
-x_71 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_71 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_72 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_72, 0, x_16);
 lean_ctor_set(x_72, 1, x_71);
@@ -5174,7 +5174,7 @@ lean_ctor_set(x_94, 0, x_93);
 lean_ctor_set(x_94, 1, x_92);
 x_95 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_96 = lean_array_push(x_95, x_94);
-x_97 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_97 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_98 = lean_array_push(x_96, x_97);
 x_99 = lean_array_push(x_98, x_97);
 x_100 = lean_array_push(x_99, x_97);
@@ -5202,7 +5202,7 @@ x_114 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_114, 0, x_93);
 lean_ctor_set(x_114, 1, x_113);
 x_115 = lean_array_push(x_88, x_114);
-x_116 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_116 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_16);
 x_117 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_117, 0, x_16);
@@ -5233,7 +5233,7 @@ x_131 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_131, 0, x_130);
 lean_ctor_set(x_131, 1, x_129);
 x_132 = lean_array_push(x_112, x_131);
-x_133 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_133 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_134 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_134, 0, x_16);
 lean_ctor_set(x_134, 1, x_133);
@@ -5300,7 +5300,7 @@ lean_ctor_set(x_165, 0, x_164);
 lean_ctor_set(x_165, 1, x_163);
 x_166 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_167 = lean_array_push(x_166, x_165);
-x_168 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_168 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_169 = lean_array_push(x_167, x_168);
 x_170 = lean_array_push(x_169, x_168);
 x_171 = l_Lean_Parser_Command_partial___elambda__1___closed__1;
@@ -5342,7 +5342,7 @@ x_192 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_192, 0, x_164);
 lean_ctor_set(x_192, 1, x_191);
 x_193 = lean_array_push(x_159, x_192);
-x_194 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_194 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_149);
 x_195 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_195, 0, x_149);
@@ -5373,7 +5373,7 @@ x_209 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_209, 0, x_208);
 lean_ctor_set(x_209, 1, x_207);
 x_210 = lean_array_push(x_190, x_209);
-x_211 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_211 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_212 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_212, 0, x_149);
 lean_ctor_set(x_212, 1, x_211);
@@ -5423,7 +5423,7 @@ lean_ctor_set(x_234, 0, x_233);
 lean_ctor_set(x_234, 1, x_232);
 x_235 = l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__10;
 x_236 = lean_array_push(x_235, x_234);
-x_237 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_237 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_238 = lean_array_push(x_236, x_237);
 x_239 = lean_array_push(x_238, x_237);
 x_240 = l_Lean_Parser_Command_partial___elambda__1___closed__1;
@@ -5465,7 +5465,7 @@ x_261 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_261, 0, x_233);
 lean_ctor_set(x_261, 1, x_260);
 x_262 = lean_array_push(x_228, x_261);
-x_263 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_263 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_149);
 x_264 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_264, 0, x_149);
@@ -5496,7 +5496,7 @@ x_278 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_278, 0, x_277);
 lean_ctor_set(x_278, 1, x_276);
 x_279 = lean_array_push(x_259, x_278);
-x_280 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_280 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_281 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_281, 0, x_149);
 lean_ctor_set(x_281, 1, x_280);

stage0/stdlib/Lean/Elab/Deriving/Util.c

@@ -17,10 +17,10 @@ lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_mkConst___spec__1(lean_obje
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___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_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_add(size_t, size_t);
 extern lean_object* l_Lean_Parser_Syntax_addPrec___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_object* lean_erase_macro_scopes(lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstanceCmds___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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 extern lean_object* l_instReprSigma___rarg___closed__2;
 lean_object* l_Lean_Elab_Deriving_mkInstImplicitBinders___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_Lean_LocalDecl_userName(lean_object*);
@@ -42,18 +42,18 @@ lean_object* l_Lean_Meta_mkAppM(lean_object*, lean_object*, lean_object*, lean_o
 lean_object* l_Lean_Elab_Deriving_mkContext___closed__1;
 lean_object* l_Lean_Elab_Deriving_mkInductiveApp___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 lean_object* l_Lean_Elab_Deriving_mkInductArgNames___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_anonymousCtor___elambda__1___closed__2;
 size_t l_USize_sub(size_t, size_t);
 extern lean_object* l_Array_empty___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Deriving_mkInductArgNames___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_mkContext_match__1(lean_object*);
 extern lean_object* l_Lean_Parser_Term_funImplicitBinder___elambda__1___closed__5;
 lean_object* l_Lean_Elab_Deriving_implicitBinderF;
 lean_object* l_Lean_Elab_Deriving_mkLocalInstanceLetDecls___boxed(lean_object*, lean_object*, 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_14350____closed__12;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Lean_Elab_Deriving_mkHeader___boxed(lean_object*);
 lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Elab_Deriving_mkInductArgNames___spec__2(lean_object*);
 lean_object* l_Array_toSubarray___rarg(lean_object*, lean_object*, lean_object*);
@@ -63,7 +63,6 @@ lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallTelescope___at___private_Lean_Elab_Term_0__Lean_Elab_Term_tryPureCoe_x3f___spec__1___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* l_Lean_MessageData_ofList(lean_object*);
 lean_object* l_Lean_Meta_isTypeCorrect(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
 lean_object* l_Lean_throwError___at_Lean_Elab_Deriving_mkContext___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__35;
 lean_object* l_Lean_throwError___at_Lean_Elab_Deriving_mkContext___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -76,19 +75,20 @@ lean_object* l_Lean_Elab_Deriving_mkDiscr___boxed(lean_object*, lean_object*, le
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_instBinderF;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_mkContext___spec__4___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 lean_object* l_Lean_Elab_Deriving_mkInductArgNames(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_mkHeader___rarg___boxed__const__1;
 lean_object* l_Lean_Elab_Deriving_mkDiscrs(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_Deriving_mkContext___spec__4___closed__1;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_mkContext___spec__4___boxed(lean_object*, lean_object*, 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_12938____closed__5;
 lean_object* l_Lean_Elab_Deriving_mkInstImplicitBinders___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*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_mkInductiveApp___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_mkDiscrs___boxed__const__1;
 lean_object* l___private_Lean_CoreM_0__Lean_Core_mkFreshNameImp(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Deriving_mkDiscr(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_eq(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
 lean_object* l_Lean_Elab_Deriving_mkInstanceCmds(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_implicitBinder___elambda__1___closed__1;
@@ -105,27 +105,28 @@ lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_mkContext___spec__4(lean_
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__32;
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_mkDiscrs___spec__2(size_t, size_t, 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_14350____closed__4;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_mkHeader___spec__2(lean_object*, size_t, size_t, 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_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_object* l_Lean_Elab_addMacroStack___at_Lean_Elab_Term_instAddErrorMessageContextTermElabM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_instBinder___elambda__1___closed__1;
 uint8_t l_Array_contains___at_Lean_findField_x3f___spec__1(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Deriving_mkInductArgNames___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_Deriving_explicitBinderF___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_object* l_Lean_Elab_Term_getCurrMacroScope(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_to_list(lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstanceCmds___spec__1___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*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Deriving_mkInstImplicitBinders___spec__3___rarg(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_instInhabitedExpr;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_6301____closed__6;
 extern lean_object* l_Lean_KernelException_toMessageData___closed__15;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstanceCmds___spec__1(lean_object*, lean_object*, 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*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Term_explicitBinder(uint8_t);
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__22;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Deriving_mkInductiveApp___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l_Lean_Elab_Deriving_mkHeader___rarg(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_Deriving_mkContext(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_KernelException_toMessageData___closed__3;
@@ -137,14 +138,14 @@ extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Lean_Elab_Deriving_mkInstanceCmds___boxed(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_myMacro____x40_Init_NotationExtra___hyg_3363____closed__31;
 lean_object* l_Lean_Elab_Deriving_mkHeader(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
 lean_object* l_Lean_Elab_Deriving_mkContext_match__1___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__6;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Deriving_mkInductiveApp___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkLocalInstanceLetDecls___spec__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*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_mkHeader___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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(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_2191____closed__4;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Deriving_mkDiscrs___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_foldlMUnsafe_fold___at_Lean_withNestedTraces___spec__5___closed__1;
 lean_object* l_Lean_Meta_getLocalDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -164,9 +165,9 @@ lean_object* l_Lean_Elab_Deriving_mkImplicitBinders(lean_object*, lean_object*,
 extern lean_object* l_Lean_instInhabitedName;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstImplicitBinders___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*, lean_object*, lean_object*);
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_mkContext___spec__3(lean_object*, 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_1398____closed__8;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkHeader___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_Meta_forallTelescopeReducing___at_Lean_Elab_Deriving_mkInductArgNames___spec__2___rarg(lean_object*, 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_6227____closed__6;
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Deriving_mkInductiveApp___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_prec_x28___x29___closed__7;
 extern lean_object* l_prec_x28___x29___closed__3;
@@ -179,7 +180,6 @@ extern lean_object* l_Lean_expandExplicitBindersAux_loop___closed__4;
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkLocalInstanceLetDecls___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*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkLocalInstanceLetDecls___spec__1___closed__1;
 lean_object* l_Lean_Elab_Deriving_mkInductArgNames___lambda__1___boxed(lean_object*, 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_12864____closed__5;
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1080____closed__1;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Deriving_mkContext___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -583,7 +583,7 @@ x_37 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_37, 0, x_36);
 lean_ctor_set(x_37, 1, x_35);
 x_38 = lean_array_push(x_34, x_37);
-x_39 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_39 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_40 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_40, 0, x_39);
 lean_ctor_set(x_40, 1, x_38);
@@ -615,7 +615,7 @@ x_52 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_52, 0, x_51);
 lean_ctor_set(x_52, 1, x_50);
 x_53 = lean_array_push(x_49, x_52);
-x_54 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_54 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_55 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_55, 0, x_54);
 lean_ctor_set(x_55, 1, x_53);
@@ -723,7 +723,7 @@ x_32 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_32, 0, x_31);
 lean_ctor_set(x_32, 1, x_30);
 x_33 = lean_array_push(x_28, x_32);
-x_34 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_34 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_35 = lean_array_push(x_33, x_34);
 x_36 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__22;
 x_37 = lean_alloc_ctor(2, 2, 0);
@@ -913,7 +913,7 @@ x_61 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_61, 0, x_54);
 lean_ctor_set(x_61, 1, x_60);
 x_62 = lean_array_push(x_58, x_61);
-x_63 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_63 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_64 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_64, 0, x_63);
 lean_ctor_set(x_64, 1, x_62);
@@ -1553,7 +1553,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_Deriving_mkContext___closed__2;
-x_2 = l_myMacro____x40_Init_Notation___hyg_6227____closed__6;
+x_2 = l_myMacro____x40_Init_Notation___hyg_6301____closed__6;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2014,7 +2014,7 @@ x_54 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_54, 0, x_53);
 lean_ctor_set(x_54, 1, x_52);
 x_55 = lean_array_push(x_51, x_54);
-x_56 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_56 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_57 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_57, 0, x_56);
 lean_ctor_set(x_57, 1, x_55);
@@ -2086,7 +2086,7 @@ x_91 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_91, 0, x_53);
 lean_ctor_set(x_91, 1, x_90);
 x_92 = lean_array_push(x_89, x_91);
-x_93 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_93 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_82);
 x_94 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_94, 0, x_82);
@@ -2104,19 +2104,19 @@ x_100 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_100, 0, x_53);
 lean_ctor_set(x_100, 1, x_99);
 x_101 = lean_array_push(x_92, x_100);
-x_102 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_102 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_103 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_103, 0, x_82);
 lean_ctor_set(x_103, 1, x_102);
 x_104 = lean_array_push(x_101, x_103);
 x_105 = lean_array_push(x_104, x_76);
-x_106 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_106 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_107 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_107, 0, x_106);
 lean_ctor_set(x_107, 1, x_105);
 lean_inc(x_4);
 x_108 = lean_array_push(x_4, x_107);
-x_109 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_109 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_110 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_110, 0, x_109);
 lean_ctor_set(x_110, 1, x_108);
@@ -2354,7 +2354,7 @@ x_21 = l_Lean_Elab_Term_getMainModule___rarg(x_10, x_20);
 x_22 = lean_ctor_get(x_21, 1);
 lean_inc(x_22);
 lean_dec(x_21);
-x_23 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_23 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_17);
 x_24 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_24, 0, x_17);
@@ -2362,7 +2362,7 @@ lean_ctor_set(x_24, 1, x_23);
 x_25 = l_Array_empty___closed__1;
 x_26 = lean_array_push(x_25, x_24);
 x_27 = lean_array_push(x_26, x_15);
-x_28 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_28 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_17);
 lean_ctor_set(x_29, 1, x_28);
@@ -2373,7 +2373,7 @@ lean_ctor_set(x_32, 0, x_31);
 lean_ctor_set(x_32, 1, x_30);
 x_33 = lean_array_push(x_27, x_32);
 x_34 = lean_array_push(x_33, x_4);
-x_35 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_35 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_36 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_36, 0, x_35);
 lean_ctor_set(x_36, 1, x_34);
@@ -2542,7 +2542,7 @@ lean_inc(x_3);
 x_53 = lean_array_push(x_3, x_52);
 x_54 = l_Lean_expandExplicitBindersAux_loop___closed__3;
 x_55 = lean_name_mk_string(x_4, x_54);
-x_56 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_56 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_17);
 x_57 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_57, 0, x_17);
@@ -2560,7 +2560,7 @@ lean_ctor_set(x_62, 1, x_61);
 x_63 = lean_array_push(x_48, x_62);
 x_64 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__32;
 x_65 = lean_name_mk_string(x_25, x_64);
-x_66 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_66 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_67 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_67, 0, x_17);
 lean_ctor_set(x_67, 1, x_66);
@@ -2803,7 +2803,7 @@ x_63 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_63, 0, x_62);
 lean_ctor_set(x_63, 1, x_61);
 x_64 = lean_array_push(x_60, x_63);
-x_65 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_65 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_66 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_66, 0, x_65);
 lean_ctor_set(x_66, 1, x_64);
@@ -2812,7 +2812,7 @@ if (x_4 == 0)
 lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; 
 x_67 = lean_mk_syntax_ident(x_39);
 x_68 = l_Lean_Parser_Syntax_addPrec___closed__4;
-x_69 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_69 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_inc(x_5);
 x_70 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstanceCmds___spec__1___lambda__1(x_68, x_62, x_5, x_69, x_49, x_66, x_10, x_67, x_11, x_12, x_13, x_14, x_15, x_16, x_58);
 lean_dec(x_49);
@@ -2866,7 +2866,7 @@ x_91 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_91, 0, x_90);
 lean_ctor_set(x_91, 1, x_89);
 x_92 = l_Lean_Parser_Syntax_addPrec___closed__4;
-x_93 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_93 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_inc(x_5);
 x_94 = l_Std_Range_forIn_loop___at_Lean_Elab_Deriving_mkInstanceCmds___spec__1___lambda__1(x_92, x_62, x_5, x_93, x_49, x_66, x_10, x_91, x_11, x_12, x_13, x_14, x_15, x_16, x_79);
 lean_dec(x_49);
@@ -3186,9 +3186,9 @@ lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean
 x_15 = lean_ctor_get(x_13, 0);
 lean_dec(x_15);
 x_16 = lean_mk_syntax_ident(x_1);
-x_17 = l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
+x_17 = l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 x_18 = lean_array_push(x_17, x_16);
-x_19 = l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
+x_19 = l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 x_20 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_20, 0, x_19);
 lean_ctor_set(x_20, 1, x_18);
@@ -3202,9 +3202,9 @@ x_21 = lean_ctor_get(x_13, 1);
 lean_inc(x_21);
 lean_dec(x_13);
 x_22 = lean_mk_syntax_ident(x_1);
-x_23 = l_myMacro____x40_Init_Notation___hyg_12864____closed__5;
+x_23 = l_myMacro____x40_Init_Notation___hyg_12938____closed__5;
 x_24 = lean_array_push(x_23, x_22);
-x_25 = l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
+x_25 = l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_24);
@@ -3336,7 +3336,7 @@ x_33 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
 x_34 = lean_array_push(x_29, x_33);
-x_35 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_35 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_20);
 x_36 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_36, 0, x_20);
@@ -3348,7 +3348,7 @@ x_39 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_39, 0, x_32);
 lean_ctor_set(x_39, 1, x_38);
 x_40 = lean_array_push(x_34, x_39);
-x_41 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_41 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_42 = lean_array_push(x_40, x_41);
 x_43 = l_prec_x28___x29___closed__7;
 x_44 = lean_alloc_ctor(2, 2, 0);

stage0/stdlib/Lean/Elab/Inductive.c

@@ -20,7 +20,6 @@ lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkParamsAnd
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_elabCtors(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_Inductive_0__Lean_Elab_Command_elabHeaderAux___lambda__2___closed__1;
 lean_object* lean_expr_update_forall(lean_object*, uint8_t, lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_collectUniversesFromCtorTypeAux___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*, lean_object*, lean_object*);
 lean_object* lean_mk_brec_on(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -38,7 +37,6 @@ lean_object* l_Lean_Meta_forallTelescopeReducing___at___private_Lean_Elab_Induct
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_withUsed___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_applyDerivingHandlers___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_stringToMessageData(lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___rarg___closed__1;
 lean_object* l_Lean_Elab_Command_checkResultingUniverse(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -101,6 +99,7 @@ lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Command_accLevelAtCtor___spec
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Term_quoteAutoTactic___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l_List_mapM___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_levelMVarToParamAux___spec__1(lean_object*, 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_6045____closed__4;
 lean_object* l_List_map___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_applyInferMod___spec__2(lean_object*, lean_object*, lean_object*);
 uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___rarg___lambda__3___closed__1;
@@ -163,6 +162,7 @@ lean_object* l_Lean_Elab_Term_elabTypeWithAutoBoundImplicit___rarg(lean_object*,
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkLevelNames(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___rarg___closed__3;
 lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Inductive___hyg_2751____closed__1;
+lean_object* l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkResultingUniverse___closed__1;
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_getResultingUniverse___closed__5;
@@ -170,6 +170,7 @@ lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkUnsafe_ma
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_withInductiveLocalDecls___rarg___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*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_levelMVarToParam(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_6561____closed__4;
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkCtor2InferMod(lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkUnsafe___spec__1(uint8_t, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateParams(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -180,6 +181,7 @@ lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkParamsAnd
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkTypeFor___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_Command_checkResultingUniverse___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___rarg(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2450____closed__4;
 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___private_Lean_Elab_Inductive_0__Lean_Elab_Command_elabCtors_match__1___boxed(lean_object*, lean_object*);
 lean_object* l_List_map___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_applyInferMod___spec__1(lean_object*, lean_object*, lean_object*);
@@ -211,6 +213,7 @@ lean_object* l_List_foldl___at___private_Lean_Elab_Inductive_0__Lean_Elab_Comman
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkParamsAndResultType___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* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkInductiveDecl___lambda__3___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*, lean_object*, lean_object*);
 lean_object* l_List_mapM___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateParams___spec__1___boxed(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_evalExpr___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_withUsed_match__1(lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_forallTelescopeReducingImp___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_KVMap_getBool(lean_object*, lean_object*, uint8_t);
@@ -281,7 +284,6 @@ lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_collectUsed(le
 lean_object* l_Lean_Elab_Command_initFn____x40_Lean_Elab_Inductive___hyg_2751____closed__5;
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkParamsAndResultType___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_CollectLevelParams_main(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_6487____closed__4;
 lean_object* l_List_map___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateResultingUniverse___spec__2(lean_object*, lean_object*);
 lean_object* l_List_mapM___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_replaceIndFVarsWithConsts___spec__2___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*);
 lean_object* lean_mk_no_confusion(lean_object*, lean_object*);
@@ -343,6 +345,7 @@ lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateResultin
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateResultingUniverse(lean_object*, 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_Inductive_0__Lean_Elab_Command_checkNumParams___spec__1___closed__2;
 lean_object* l_Lean_Elab_Command_accLevelAtCtor___closed__2;
+lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkIBelow___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkAuxConstructions___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_DerivingClassView_applyHandlers(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_accLevelAtCtor___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -423,7 +426,6 @@ lean_object* l_Lean_Meta_forallTelescopeReducing___at_Lean_Meta_getParamNames___
 lean_object* l_List_foldlM___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_collectUniverses___spec__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*);
 lean_object* l_Lean_Level_normalize(lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr___closed__1;
-lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidInductiveModifier___rarg___lambda__2___closed__2;
 lean_object* l_Lean_Elab_Command_elabInductiveViews___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*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkAuxConstructions___spec__6___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*);
@@ -534,7 +536,6 @@ lean_object* l_Lean_Expr_ReplaceImpl_replaceUnsafeM_visit___at___private_Lean_El
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateResultingUniverse___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*);
 uint8_t l_Array_contains___at_Lean_Elab_Command_accLevelAtCtor___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_indentExpr(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2376____closed__4;
 lean_object* l_Lean_Elab_Command_shouldInferResultUniverse_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_withInductiveLocalDecls_loop___rarg___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*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_getResultingType___closed__1;
@@ -573,7 +574,6 @@ lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateResultin
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_updateResultingUniverse___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_Inductive_0__Lean_Elab_Command_updateResultingUniverse___closed__1;
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Inductive_0__Lean_Elab_Command_checkLevelNames___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*);
 lean_object* l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkInductiveDecl___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, 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___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkAuxConstructions_match__2___boxed(lean_object*, lean_object*);
@@ -13073,7 +13073,7 @@ lean_object* x_14; lean_object* x_15;
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
 lean_dec(x_13);
-x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
+x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
 return x_15;
 }
 else
@@ -13180,7 +13180,7 @@ lean_object* x_14; lean_object* x_15;
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
 lean_dec(x_13);
-x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
+x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
 return x_15;
 }
 else
@@ -13287,7 +13287,7 @@ lean_object* x_14; lean_object* x_15;
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
 lean_dec(x_13);
-x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
+x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
 return x_15;
 }
 else
@@ -13394,7 +13394,7 @@ lean_object* x_14; lean_object* x_15;
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
 lean_dec(x_13);
-x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
+x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
 return x_15;
 }
 else
@@ -13501,7 +13501,7 @@ lean_object* x_14; lean_object* x_15;
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
 lean_dec(x_13);
-x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
+x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
 return x_15;
 }
 else
@@ -14030,7 +14030,7 @@ lean_object* x_14; lean_object* x_15;
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
 lean_dec(x_13);
-x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
+x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
 return x_15;
 }
 else
@@ -14137,7 +14137,7 @@ lean_object* x_14; lean_object* x_15;
 x_14 = lean_ctor_get(x_13, 0);
 lean_inc(x_14);
 lean_dec(x_13);
-x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
+x_15 = l_Lean_throwKernelException___at_Lean_Elab_Term_evalExpr___spec__4(x_14, x_2, x_3, x_4, x_5, x_6, x_7, x_11);
 return x_15;
 }
 else
@@ -14563,16 +14563,16 @@ lean_dec(x_9);
 x_12 = lean_ctor_get(x_10, 0);
 lean_inc(x_12);
 lean_dec(x_10);
-x_13 = l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
+x_13 = l_myMacro____x40_Init_Notation___hyg_6045____closed__4;
 lean_inc(x_12);
 x_14 = l_Lean_Environment_contains(x_12, x_13);
-x_15 = l_myMacro____x40_Init_Notation___hyg_6487____closed__4;
+x_15 = l_myMacro____x40_Init_Notation___hyg_6561____closed__4;
 lean_inc(x_12);
 x_16 = l_Lean_Environment_contains(x_12, x_15);
 x_17 = l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkAuxConstructions___closed__2;
 lean_inc(x_12);
 x_18 = l_Lean_Environment_contains(x_12, x_17);
-x_19 = l_myMacro____x40_Init_Notation___hyg_2376____closed__4;
+x_19 = l_myMacro____x40_Init_Notation___hyg_2450____closed__4;
 x_20 = l_Lean_Environment_contains(x_12, x_19);
 x_21 = lean_array_get_size(x_1);
 x_22 = lean_usize_of_nat(x_21);
@@ -15200,7 +15200,7 @@ x_20 = lean_alloc_ctor(2, 1, 0);
 lean_ctor_set(x_20, 0, x_19);
 x_21 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_21, 0, x_20);
-x_22 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_21, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
+x_22 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_21, x_10, x_11, x_12, x_13, x_14, x_15, x_16);
 lean_dec(x_15);
 lean_dec(x_14);
 lean_dec(x_13);
@@ -15253,7 +15253,7 @@ lean_inc(x_30);
 lean_dec(x_29);
 lean_inc(x_14);
 lean_inc(x_10);
-x_31 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(x_28, x_10, x_11, x_12, x_13, x_14, x_15, x_30);
+x_31 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(x_28, x_10, x_11, x_12, x_13, x_14, x_15, x_30);
 lean_dec(x_28);
 if (lean_obj_tag(x_31) == 0)
 {

stage0/stdlib/Lean/Elab/LetRec.c

@@ -17,7 +17,6 @@ lean_object* l_Lean_addDocString_x27___at___private_Lean_Elab_LetRec_0__Lean_Ela
 lean_object* l_Array_mapIdxM_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_registerLetRecsToLift___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__19___lambda__1___closed__1;
 lean_object* l_Lean_Elab_Term_elabLetRec(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_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__19___lambda__3___closed__3;
 size_t l_USize_add(size_t, size_t);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__18___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -45,6 +44,7 @@ lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__19___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addDeclarationRanges___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_letPatDecl___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__10___rarg(lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_st_ref_get(lean_object*, lean_object*);
@@ -63,7 +63,6 @@ lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at___private_Lean_Elab_LetRec
 lean_object* l___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_applyAttributesAt(lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_utf8_extract(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
 lean_object* l_Lean_addDocString___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__6___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__14___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_string_utf8_byte_size(lean_object*);
@@ -98,6 +97,7 @@ lean_object* lean_st_ref_take(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabDeclAttrs___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_registerCustomErrorIfMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__19___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_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_toAttributeKind___at___private_Lean_Elab_LetRec_0__Lean_Elab_Term_mkLetRecDeclView___spec__16(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_LetRec_0__Lean_Elab_Term_withAuxLocalDecls___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -509,7 +509,7 @@ x_21 = l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___rarg___closed__3;
 x_22 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_22, 0, x_20);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_22, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_23 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_22, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_23;
 }
 }
@@ -2025,7 +2025,7 @@ x_16 = l_Lean_Syntax_isOfKind(x_14, x_15);
 if (x_16 == 0)
 {
 lean_object* x_17; uint8_t x_18; lean_object* x_19; 
-x_17 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_17 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 lean_inc(x_14);
 x_18 = l_Lean_Syntax_isOfKind(x_14, x_17);
 if (x_18 == 0)

stage0/stdlib/Lean/Elab/Match.c

@@ -17,6 +17,7 @@ lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls__
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_processImplicitArg___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_Meta_Basic_0__Lean_Meta_withExistingLocalDeclsImp___rarg(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__2___rarg(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType_match__3(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_myMacro____x40_Init_NotationExtra___hyg_2903____spec__3(size_t, size_t, lean_object*);
@@ -31,6 +32,7 @@ lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Term_elabForall__
 size_t l_USize_add(size_t, size_t);
 extern lean_object* l_Lean_Name_getString_x21___closed__3;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_pushNewArg___lambda__1___boxed(lean_object*, lean_object*, 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_14424____closed__12;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_withDepElimPatterns___spec__3(lean_object*, size_t, size_t, lean_object*);
 extern lean_object* l_Lean_Parser_Term_namedPattern___elambda__1___closed__2;
 lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
@@ -52,7 +54,6 @@ lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS___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_mk_empty_array_with_capacity(lean_object*);
 extern lean_object* l_Lean_Elab_throwIllFormedSyntax___rarg___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__1;
 lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -95,6 +96,7 @@ 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*);
 lean_object* l_Lean_Syntax_mkSep(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__9;
 extern lean_object* l_Lean_Elab_throwUnsupportedSyntax___rarg___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType___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_withPatternVars_loop___rarg___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_object*);
@@ -119,6 +121,7 @@ extern lean_object* l_Lean_initFn____x40_Lean_Util_PPExt___hyg_3____closed__3;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__2___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withDepElimPatterns(lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_Elab_Term_CollectPatternVars_collect___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 lean_object* l_Array_extract___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_processExplicitArg___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars_loop___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*);
@@ -127,13 +130,14 @@ lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_6023____closed
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___spec__1(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*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 lean_object* lean_local_ctx_erase(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_anonymousCtor___elambda__1___closed__2;
 lean_object* l_Lean_mkMVar(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___rarg___closed__2;
 lean_object* lean_environment_find(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 uint8_t l_Lean_checkTraceOption(lean_object*, lean_object*);
 extern lean_object* l___private_Lean_Meta_ExprDefEq_0__Lean_Meta_checkTypesAndAssign___closed__7;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern___closed__8;
@@ -155,8 +159,6 @@ lean_object* l_Lean_annotation_x3f(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getPatternsVars_match__1___boxed(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;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 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_waitExpectedType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getPatternsVars_match__1(lean_object*, lean_object*);
@@ -194,8 +196,6 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedType_matc
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___lambda__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MessageData_ofList(lean_object*);
 lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___closed__3;
 lean_object* l_List_map___at_Lean_Elab_Term_elabMatchAltView___spec__2(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processId_match__1(lean_object*);
@@ -219,6 +219,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_na
 lean_object* l_Lean_Expr_getRevArg_x21(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorApp(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_Match_mkMatcher(lean_object*, 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_12336____closed__8;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls___spec__1___closed__4;
@@ -243,6 +244,7 @@ lean_object* l_Lean_Elab_Term_ToDepElimPattern_main_match__1(lean_object*);
 lean_object* l_Lean_Elab_Term_getPatternsVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_throwUnknownConstant___rarg___closed__2;
 extern lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_object* l_Lean_Elab_Term_instToStringPatternVar_match__1(lean_object*);
 lean_object* l_Lean_Name_toStringWithSep(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_CtorApp_Context_newArgs___default;
@@ -256,6 +258,7 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_
 lean_object* l_Lean_Elab_Term_finalizePatternDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getPatternsVars_match__1___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatch_elabMatchDefault___lambda__1___boxed(lean_object*, lean_object*, 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_13855____closed__9;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_main___spec__3___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_CollectPatternVars_CtorApp_processCtorApp___lambda__2(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* l_Lean_mkAppN(lean_object*, lean_object*);
@@ -268,6 +271,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscr
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg___closed__3;
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabPatterns___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_initFn____x40_Lean_Elab_Match___hyg_6023____closed__5;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 lean_object* l_Lean_Elab_Term_finalizePatternDecls___boxed(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_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*);
@@ -314,9 +318,7 @@ lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_Match_0__Lean_Ela
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_collectPatternVars___closed__1;
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at_Lean_Elab_Term_CollectPatternVars_main___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_withDepElimPatterns___spec__2___boxed(lean_object*, lean_object*, 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_14350____closed__2;
 uint8_t l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_isDone(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isPatternVar_match__3___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorApp___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -326,6 +328,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_Ct
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorAppAux_match__1___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorApp___spec__3(size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_numLitKind;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_nomatch___elambda__1___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___lambda__1___boxed(lean_object*, lean_object*);
@@ -368,12 +371,12 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs
 lean_object* l_Lean_Expr_fvarId_x21(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_quotedNameToPattern(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_mkUserNameFor_match__1(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isPatternVar_isAtomicIdent___boxed(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_throwInvalidPattern___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_instInhabited___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope___at_Lean_Elab_Term_elabLetDeclAux___spec__1___rarg(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_nameToPattern___closed__12;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 lean_object* l_Lean_Meta_instantiateLocalDeclMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkMatcher(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_processCtorAppAux_match__3___rarg(lean_object*, lean_object*);
@@ -397,6 +400,7 @@ lean_object* l_Lean_Elab_Term_expandMacrosInPatterns(lean_object*, lean_object*,
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__2(lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___closed__4;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_object* l_Lean_Elab_Term_inaccessible_x3f___boxed(lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchOptType(lean_object*);
@@ -408,11 +412,13 @@ extern lean_object* l_Lean_choiceKind;
 extern lean_object* l_Lean_charLitKind;
 lean_object* l_Lean_Elab_Term_withDepElimPatterns_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_mkFreshId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__1___rarg(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType_match__2(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___closed__1;
 extern lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_finalizePatternDecls_match__2(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorAppAux_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__9(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__4;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -436,7 +442,6 @@ uint8_t l_Lean_Expr_isAppOfArity(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_alreadyVisited(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_resolveId_x3f(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_tryPostponeIfDiscrTypeIsMVar___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_2117____closed__4;
 lean_object* l_Lean_Elab_Term_expandApp(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Term_elabInaccessible(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabDiscrsWitMatchType_match__1(lean_object*);
@@ -462,15 +467,12 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processVar___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* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withPatternVars_loop___rarg___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*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_pushNewArg___lambda__1(lean_object*, lean_object*, 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_12864____closed__2;
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_elabMatch_elabMatchDefault___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_expandMacrosInPatterns___spec__2(size_t, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandNonAtomicDiscrs_x3f_loop___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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_mkUserNameFor_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_inaccessible_x3f(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern___rarg(lean_object*, 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_12864____closed__1;
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_instMonadLogTermElabM___spec__2___rarg(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_CtorApp_processCtorApp_match__3(lean_object*);
 lean_object* l_Lean_Elab_Term_initFn____x40_Lean_Elab_Match___hyg_1485____closed__2;
@@ -496,7 +498,6 @@ lean_object* l_Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorApp_match__1
 extern lean_object* l_Lean_NameSet_empty;
 lean_object* l_Lean_mkFreshId___at___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_mkLocalDeclFor___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabAtomicDiscr___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l___private_Init_Meta_0__Lean_quoteName___closed__1;
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -530,7 +531,6 @@ lean_object* l_Lean_LocalDecl_type(lean_object*);
 lean_object* l_Std_Range_forIn_loop___at___private_Lean_Elab_App_0__Lean_Elab_Term_addLValArg___spec__2___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Term_finalizePatternDecls___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
 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*);
@@ -542,6 +542,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_na
 lean_object* l_Lean_Elab_Term_instToStringPatternVar_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_CtorApp_finalize(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Syntax_mkApp___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__5___lambda__1___closed__2;
 extern lean_object* l_term_x5b___x5d___closed__5;
 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*);
@@ -553,12 +554,12 @@ lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_expandMacrosInPatterns__
 lean_object* l_Lean_Elab_Term_mkFreshBinderName(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_mkUserNameFor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getSepArgs(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(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_processVar___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_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs___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_Init_Meta_0__Array_mapSepElemsMAux___at_Lean_Elab_Term_CollectPatternVars_collect___spec__3(lean_object*, 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_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_expandSimpleMatchWithType(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___private_Lean_Elab_Match_0__Lean_Elab_Term_ToDepElimPattern_throwInvalidPattern(lean_object*);
 lean_object* l_Lean_Elab_Term_elabMatchAltView_match__1___rarg(lean_object*, lean_object*);
@@ -613,9 +614,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_Ct
 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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Term_reportMatcherResultErrors___spec__1___closed__4;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_processId_match__3(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_State_vars___default;
 lean_object* l_Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorApp_match__2(lean_object*);
@@ -624,7 +623,6 @@ uint8_t l_Lean_LocalDecl_hasExprMVar(lean_object*);
 uint8_t l_Lean_TagAttribute_hasTag(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_getConstInfo___at_Lean_Elab_Term_CollectPatternVars_CtorApp_processCtorApp___spec__1(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___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux___spec__5___lambda__1___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__9;
 extern lean_object* l___private_Lean_Hygiene_0__Lean_mkInaccessibleUserNameAux___closed__2;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_waitExpectedType_match__1(lean_object*);
 lean_object* l_Lean_LocalContext_addDecl(lean_object*, lean_object*);
@@ -680,6 +678,7 @@ lean_object* lean_name_mk_numeral(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_isAuxDiscrName___boxed(lean_object*);
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 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;
@@ -773,8 +772,8 @@ 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_CtorApp_processExplicitArg_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_CollectPatternVars_nameToPattern(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_12938____closed__13;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_mkMVarSyntax(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Term_withDepElimPatterns___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Term_getPatternsVars___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_Lean_Elab_Term_ToDepElimPattern_main___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*);
@@ -836,6 +835,7 @@ lean_object* l_Lean_Elab_Term_ToDepElimPattern_main___lambda__1___boxed(lean_obj
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_withElaboratedLHS___rarg___boxed__const__1;
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchAux_match__3(lean_object*);
 lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_elabMatchTypeAndDiscrs_loop_match__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 lean_object* l___regBuiltin_Lean_Elab_Term_elabMVarWithIdKind(lean_object*);
 lean_object* l_Lean_Elab_Term_CollectPatternVars_collect___closed__5;
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__34;
@@ -906,7 +906,7 @@ x_18 = l_Lean_Elab_Term_getMainModule___rarg(x_11, x_17);
 x_19 = lean_ctor_get(x_18, 1);
 lean_inc(x_19);
 lean_dec(x_18);
-x_20 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_20 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_14);
 x_21 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_21, 0, x_14);
@@ -914,27 +914,27 @@ lean_ctor_set(x_21, 1, x_20);
 x_22 = l_Array_empty___closed__1;
 x_23 = lean_array_push(x_22, x_21);
 x_24 = lean_array_push(x_22, x_3);
-x_25 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_25 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_26 = lean_array_push(x_24, x_25);
 x_27 = lean_array_push(x_26, x_25);
-x_28 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_28 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_14);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_14);
 lean_ctor_set(x_29, 1, x_28);
 x_30 = lean_array_push(x_27, x_29);
 x_31 = lean_array_push(x_30, x_2);
-x_32 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_32 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_33 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_33, 0, x_32);
 lean_ctor_set(x_33, 1, x_31);
 x_34 = lean_array_push(x_22, x_33);
-x_35 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_35 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_36 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_36, 0, x_35);
 lean_ctor_set(x_36, 1, x_34);
 x_37 = lean_array_push(x_23, x_36);
-x_38 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_38 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_39 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_39, 0, x_14);
 lean_ctor_set(x_39, 1, x_38);
@@ -945,7 +945,7 @@ lean_ctor_set(x_42, 0, x_41);
 lean_ctor_set(x_42, 1, x_40);
 x_43 = lean_array_push(x_37, x_42);
 x_44 = lean_array_push(x_43, x_4);
-x_45 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_45 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_46 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_46, 0, x_45);
 lean_ctor_set(x_46, 1, x_44);
@@ -977,7 +977,7 @@ x_19 = l_Lean_Elab_Term_getMainModule___rarg(x_12, x_18);
 x_20 = lean_ctor_get(x_19, 1);
 lean_inc(x_20);
 lean_dec(x_19);
-x_21 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_21 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_15);
 x_22 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_22, 0, x_15);
@@ -985,9 +985,9 @@ lean_ctor_set(x_22, 1, x_21);
 x_23 = l_Array_empty___closed__1;
 x_24 = lean_array_push(x_23, x_22);
 x_25 = lean_array_push(x_23, x_3);
-x_26 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_26 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_27 = lean_array_push(x_25, x_26);
-x_28 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_28 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_15);
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_15);
@@ -1004,24 +1004,24 @@ x_36 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_36, 0, x_35);
 lean_ctor_set(x_36, 1, x_34);
 x_37 = lean_array_push(x_27, x_36);
-x_38 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_38 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_15);
 x_39 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_39, 0, x_15);
 lean_ctor_set(x_39, 1, x_38);
 x_40 = lean_array_push(x_37, x_39);
 x_41 = lean_array_push(x_40, x_2);
-x_42 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_42 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_43 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_43, 0, x_42);
 lean_ctor_set(x_43, 1, x_41);
 x_44 = lean_array_push(x_23, x_43);
-x_45 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_45 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_46 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_46, 0, x_45);
 lean_ctor_set(x_46, 1, x_44);
 x_47 = lean_array_push(x_24, x_46);
-x_48 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_48 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_49 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_49, 0, x_15);
 lean_ctor_set(x_49, 1, x_48);
@@ -1031,7 +1031,7 @@ lean_ctor_set(x_51, 0, x_35);
 lean_ctor_set(x_51, 1, x_50);
 x_52 = lean_array_push(x_47, x_51);
 x_53 = lean_array_push(x_52, x_5);
-x_54 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_54 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_55 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_55, 0, x_54);
 lean_ctor_set(x_55, 1, x_53);
@@ -1172,7 +1172,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1080____closed__1;
-x_2 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_2 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -3581,7 +3581,7 @@ x_7 = lean_array_uget(x_4, x_3);
 x_8 = lean_unsigned_to_nat(0u);
 x_9 = lean_array_uset(x_4, x_3, x_8);
 x_10 = x_7;
-x_11 = l_myMacro____x40_Init_Notation___hyg_12864____closed__9;
+x_11 = l_myMacro____x40_Init_Notation___hyg_12938____closed__9;
 lean_inc(x_1);
 x_12 = lean_name_mk_string(x_1, x_11);
 lean_inc(x_10);
@@ -3643,7 +3643,7 @@ lean_object* l___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts(lean_obj
 _start:
 {
 lean_object* x_2; uint8_t x_3; 
-x_2 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_2 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 lean_inc(x_1);
 x_3 = l_Lean_Syntax_isOfKind(x_1, x_2);
 if (x_3 == 0)
@@ -3748,7 +3748,7 @@ lean_dec(x_9);
 x_11 = lean_unsigned_to_nat(4u);
 x_12 = l_Lean_Syntax_getArg(x_1, x_11);
 lean_dec(x_1);
-x_13 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_13 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 lean_inc(x_12);
 x_14 = l_Lean_Syntax_isOfKind(x_12, x_13);
 if (x_14 == 0)
@@ -3773,7 +3773,7 @@ x_22 = lean_usize_of_nat(x_21);
 lean_dec(x_21);
 x_23 = 0;
 x_24 = x_20;
-x_25 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_25 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_26 = l_Array_mapMUnsafe_map___at___private_Lean_Elab_Match_0__Lean_Elab_Term_getMatchAlts___spec__1(x_25, x_22, x_23, x_24);
 x_27 = x_26;
 return x_27;
@@ -5601,13 +5601,13 @@ x_34 = l_Lean_Elab_Term_getMainModule___rarg(x_10, x_33);
 x_35 = lean_ctor_get(x_34, 1);
 lean_inc(x_35);
 lean_dec(x_34);
-x_36 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_36 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_37 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_37, 0, x_30);
 lean_ctor_set(x_37, 1, x_36);
 x_38 = l_Array_empty___closed__1;
 x_39 = lean_array_push(x_38, x_37);
-x_40 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_40 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_41 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_41, 0, x_40);
 lean_ctor_set(x_41, 1, x_39);
@@ -5733,13 +5733,13 @@ x_18 = l_Lean_Elab_Term_getMainModule___rarg(x_10, x_17);
 x_19 = lean_ctor_get(x_18, 1);
 lean_inc(x_19);
 lean_dec(x_18);
-x_20 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_20 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_21 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_21, 0, x_14);
 lean_ctor_set(x_21, 1, x_20);
 x_22 = l_Array_empty___closed__1;
 x_23 = lean_array_push(x_22, x_21);
-x_24 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_24 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_25 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_25, 0, x_24);
 lean_ctor_set(x_25, 1, x_23);
@@ -8474,12 +8474,12 @@ x_53 = lean_box(2);
 x_54 = l_Lean_Syntax_mkStrLit(x_32, x_53);
 lean_dec(x_32);
 x_55 = lean_array_push(x_52, x_54);
-x_56 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_56 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_57 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_57, 0, x_37);
 lean_ctor_set(x_57, 1, x_56);
 x_58 = lean_array_push(x_50, x_57);
-x_59 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_59 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_60 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_60, 0, x_59);
 lean_ctor_set(x_60, 1, x_58);
@@ -8489,7 +8489,7 @@ x_63 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_63, 0, x_62);
 lean_ctor_set(x_63, 1, x_61);
 x_64 = lean_array_push(x_51, x_63);
-x_65 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_65 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_66 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_66, 0, x_65);
 lean_ctor_set(x_66, 1, x_64);
@@ -8521,12 +8521,12 @@ x_77 = lean_box(2);
 x_78 = l_Lean_Syntax_mkStrLit(x_32, x_77);
 lean_dec(x_32);
 x_79 = lean_array_push(x_76, x_78);
-x_80 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_80 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_81 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_81, 0, x_37);
 lean_ctor_set(x_81, 1, x_80);
 x_82 = lean_array_push(x_74, x_81);
-x_83 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_83 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_84 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_84, 0, x_83);
 lean_ctor_set(x_84, 1, x_82);
@@ -8536,7 +8536,7 @@ x_87 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_87, 0, x_86);
 lean_ctor_set(x_87, 1, x_85);
 x_88 = lean_array_push(x_75, x_87);
-x_89 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_89 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_90 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_90, 0, x_89);
 lean_ctor_set(x_90, 1, x_88);
@@ -8596,12 +8596,12 @@ x_115 = l_Lean_numLitKind;
 x_116 = lean_box(2);
 x_117 = l_Lean_Syntax_mkLit(x_115, x_114, x_116);
 x_118 = lean_array_push(x_113, x_117);
-x_119 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_119 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_120 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_120, 0, x_98);
 lean_ctor_set(x_120, 1, x_119);
 x_121 = lean_array_push(x_111, x_120);
-x_122 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_122 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_123 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_123, 0, x_122);
 lean_ctor_set(x_123, 1, x_121);
@@ -8611,7 +8611,7 @@ x_126 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_126, 0, x_125);
 lean_ctor_set(x_126, 1, x_124);
 x_127 = lean_array_push(x_112, x_126);
-x_128 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_128 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_129 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_129, 0, x_128);
 lean_ctor_set(x_129, 1, x_127);
@@ -8644,12 +8644,12 @@ x_141 = l_Lean_numLitKind;
 x_142 = lean_box(2);
 x_143 = l_Lean_Syntax_mkLit(x_141, x_140, x_142);
 x_144 = lean_array_push(x_139, x_143);
-x_145 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_145 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_146 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_146, 0, x_98);
 lean_ctor_set(x_146, 1, x_145);
 x_147 = lean_array_push(x_137, x_146);
-x_148 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_148 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_149 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_149, 0, x_148);
 lean_ctor_set(x_149, 1, x_147);
@@ -8659,7 +8659,7 @@ x_152 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_152, 0, x_151);
 lean_ctor_set(x_152, 1, x_150);
 x_153 = lean_array_push(x_138, x_152);
-x_154 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_154 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_155 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_155, 0, x_154);
 lean_ctor_set(x_155, 1, x_153);
@@ -9310,7 +9310,7 @@ x_10 = lean_ctor_get(x_1, 0);
 lean_inc(x_10);
 x_11 = lean_ctor_get(x_1, 1);
 lean_inc(x_11);
-x_12 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_12 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_13 = lean_name_eq(x_10, x_12);
 if (x_13 == 0)
 {
@@ -9379,12 +9379,12 @@ x_34 = lean_name_eq(x_10, x_33);
 if (x_34 == 0)
 {
 lean_object* x_35; uint8_t x_36; 
-x_35 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_35 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_36 = lean_name_eq(x_10, x_35);
 if (x_36 == 0)
 {
 lean_object* x_37; uint8_t x_38; 
-x_37 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_37 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_38 = lean_name_eq(x_10, x_37);
 if (x_38 == 0)
 {
@@ -9888,7 +9888,7 @@ lean_object* x_162; lean_object* x_163; lean_object* x_164; uint8_t x_165;
 x_162 = l_Lean_Syntax_getArg(x_160, x_158);
 lean_inc(x_162);
 x_163 = l_Lean_Syntax_getKind(x_162);
-x_164 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_164 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_165 = lean_name_eq(x_163, x_164);
 lean_dec(x_163);
 if (x_165 == 0)
@@ -10170,7 +10170,7 @@ lean_object* x_231; lean_object* x_232; lean_object* x_233; uint8_t x_234;
 x_231 = l_Lean_Syntax_getArg(x_229, x_227);
 lean_inc(x_231);
 x_232 = l_Lean_Syntax_getKind(x_231);
-x_233 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_233 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_234 = lean_name_eq(x_232, x_233);
 lean_dec(x_232);
 if (x_234 == 0)
@@ -10811,12 +10811,12 @@ x_381 = lean_name_eq(x_10, x_380);
 if (x_381 == 0)
 {
 lean_object* x_382; uint8_t x_383; 
-x_382 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_382 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_383 = lean_name_eq(x_10, x_382);
 if (x_383 == 0)
 {
 lean_object* x_384; uint8_t x_385; 
-x_384 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_384 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_385 = lean_name_eq(x_10, x_384);
 if (x_385 == 0)
 {
@@ -11195,7 +11195,7 @@ lean_object* x_462; lean_object* x_463; lean_object* x_464; uint8_t x_465;
 x_462 = l_Lean_Syntax_getArg(x_460, x_458);
 lean_inc(x_462);
 x_463 = l_Lean_Syntax_getKind(x_462);
-x_464 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_464 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_465 = lean_name_eq(x_463, x_464);
 lean_dec(x_463);
 if (x_465 == 0)
@@ -11776,12 +11776,12 @@ x_583 = lean_name_eq(x_10, x_582);
 if (x_583 == 0)
 {
 lean_object* x_584; uint8_t x_585; 
-x_584 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_584 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_585 = lean_name_eq(x_10, x_584);
 if (x_585 == 0)
 {
 lean_object* x_586; uint8_t x_587; 
-x_586 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_586 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_587 = lean_name_eq(x_10, x_586);
 if (x_587 == 0)
 {
@@ -12171,7 +12171,7 @@ lean_object* x_669; lean_object* x_670; lean_object* x_671; uint8_t x_672;
 x_669 = l_Lean_Syntax_getArg(x_667, x_665);
 lean_inc(x_669);
 x_670 = l_Lean_Syntax_getKind(x_669);
-x_671 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_671 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_672 = lean_name_eq(x_670, x_671);
 lean_dec(x_670);
 if (x_672 == 0)
@@ -12775,12 +12775,12 @@ x_800 = lean_name_eq(x_10, x_799);
 if (x_800 == 0)
 {
 lean_object* x_801; uint8_t x_802; 
-x_801 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_801 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_802 = lean_name_eq(x_10, x_801);
 if (x_802 == 0)
 {
 lean_object* x_803; uint8_t x_804; 
-x_803 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_803 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_804 = lean_name_eq(x_10, x_803);
 if (x_804 == 0)
 {
@@ -13194,7 +13194,7 @@ lean_object* x_886; lean_object* x_887; lean_object* x_888; uint8_t x_889;
 x_886 = l_Lean_Syntax_getArg(x_884, x_882);
 lean_inc(x_886);
 x_887 = l_Lean_Syntax_getKind(x_886);
-x_888 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_888 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_889 = lean_name_eq(x_887, x_888);
 lean_dec(x_887);
 if (x_889 == 0)
@@ -13853,12 +13853,12 @@ x_1031 = lean_name_eq(x_10, x_1030);
 if (x_1031 == 0)
 {
 lean_object* x_1032; uint8_t x_1033; 
-x_1032 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_1032 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_1033 = lean_name_eq(x_10, x_1032);
 if (x_1033 == 0)
 {
 lean_object* x_1034; uint8_t x_1035; 
-x_1034 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_1034 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_1035 = lean_name_eq(x_10, x_1034);
 if (x_1035 == 0)
 {
@@ -14272,7 +14272,7 @@ lean_object* x_1117; lean_object* x_1118; lean_object* x_1119; uint8_t x_1120;
 x_1117 = l_Lean_Syntax_getArg(x_1115, x_1113);
 lean_inc(x_1117);
 x_1118 = l_Lean_Syntax_getKind(x_1117);
-x_1119 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_1119 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_1120 = lean_name_eq(x_1118, x_1119);
 lean_dec(x_1118);
 if (x_1120 == 0)
@@ -22391,7 +22391,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_2 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -25602,7 +25602,7 @@ if (x_31 == 0)
 {
 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; lean_object* x_42; lean_object* 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; lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; 
 x_32 = lean_ctor_get(x_30, 0);
-x_33 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_33 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_25);
 x_34 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_34, 0, x_25);
@@ -25617,27 +25617,27 @@ lean_ctor_set(x_38, 1, x_7);
 lean_ctor_set(x_38, 2, x_37);
 lean_ctor_set(x_38, 3, x_8);
 x_39 = lean_array_push(x_35, x_38);
-x_40 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_40 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_41 = lean_array_push(x_39, x_40);
 x_42 = lean_array_push(x_41, x_40);
-x_43 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_43 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_25);
 x_44 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_44, 0, x_25);
 lean_ctor_set(x_44, 1, x_43);
 x_45 = lean_array_push(x_42, x_44);
 x_46 = lean_array_push(x_45, x_9);
-x_47 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_47 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
 x_49 = lean_array_push(x_35, x_48);
-x_50 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_50 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_51 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_51, 0, x_50);
 lean_ctor_set(x_51, 1, x_49);
 x_52 = lean_array_push(x_36, x_51);
-x_53 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_53 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_54 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_54, 0, x_25);
 lean_ctor_set(x_54, 1, x_53);
@@ -25648,7 +25648,7 @@ lean_ctor_set(x_57, 0, x_56);
 lean_ctor_set(x_57, 1, x_55);
 x_58 = lean_array_push(x_52, x_57);
 x_59 = lean_array_push(x_58, x_22);
-x_60 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_60 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_61 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_61, 0, x_60);
 lean_ctor_set(x_61, 1, x_59);
@@ -25663,7 +25663,7 @@ x_63 = lean_ctor_get(x_30, 1);
 lean_inc(x_63);
 lean_inc(x_62);
 lean_dec(x_30);
-x_64 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_64 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_25);
 x_65 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_65, 0, x_25);
@@ -25678,27 +25678,27 @@ lean_ctor_set(x_69, 1, x_7);
 lean_ctor_set(x_69, 2, x_68);
 lean_ctor_set(x_69, 3, x_8);
 x_70 = lean_array_push(x_66, x_69);
-x_71 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_71 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_72 = lean_array_push(x_70, x_71);
 x_73 = lean_array_push(x_72, x_71);
-x_74 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_74 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_25);
 x_75 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_75, 0, x_25);
 lean_ctor_set(x_75, 1, x_74);
 x_76 = lean_array_push(x_73, x_75);
 x_77 = lean_array_push(x_76, x_9);
-x_78 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_78 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_79 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_79, 0, x_78);
 lean_ctor_set(x_79, 1, x_77);
 x_80 = lean_array_push(x_66, x_79);
-x_81 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_81 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_82 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_82, 0, x_81);
 lean_ctor_set(x_82, 1, x_80);
 x_83 = lean_array_push(x_67, x_82);
-x_84 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_84 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_85 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_85, 0, x_25);
 lean_ctor_set(x_85, 1, x_84);
@@ -25709,7 +25709,7 @@ lean_ctor_set(x_88, 0, x_87);
 lean_ctor_set(x_88, 1, x_86);
 x_89 = lean_array_push(x_83, x_88);
 x_90 = lean_array_push(x_89, x_22);
-x_91 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_91 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_92 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_92, 0, x_91);
 lean_ctor_set(x_92, 1, x_90);
@@ -27999,7 +27999,7 @@ lean_object* l_Lean_Elab_Term_elabMatch(lean_object* x_1, lean_object* x_2, lean
 _start:
 {
 lean_object* x_10; uint8_t x_11; 
-x_10 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_10 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 lean_inc(x_1);
 x_11 = l_Lean_Syntax_isOfKind(x_1, x_10);
 if (x_11 == 0)
@@ -28044,7 +28044,7 @@ lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25;
 x_22 = lean_unsigned_to_nat(0u);
 x_23 = l_Lean_Syntax_getArg(x_14, x_22);
 lean_dec(x_14);
-x_24 = l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
+x_24 = l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 lean_inc(x_23);
 x_25 = l_Lean_Syntax_isOfKind(x_23, x_24);
 if (x_25 == 0)
@@ -28121,7 +28121,7 @@ lean_object* x_96; lean_object* x_97; lean_object* x_98; uint8_t x_99;
 lean_dec(x_36);
 x_96 = lean_unsigned_to_nat(4u);
 x_97 = l_Lean_Syntax_getArg(x_1, x_96);
-x_98 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_98 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 lean_inc(x_97);
 x_99 = l_Lean_Syntax_isOfKind(x_97, x_98);
 if (x_99 == 0)
@@ -28168,7 +28168,7 @@ else
 lean_object* x_108; lean_object* x_109; uint8_t x_110; 
 x_108 = l_Lean_Syntax_getArg(x_101, x_22);
 lean_dec(x_101);
-x_109 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_109 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 lean_inc(x_108);
 x_110 = l_Lean_Syntax_isOfKind(x_108, x_109);
 if (x_110 == 0)
@@ -28363,7 +28363,7 @@ x_48 = l_Lean_Syntax_getArg(x_44, x_13);
 lean_dec(x_44);
 x_49 = lean_unsigned_to_nat(4u);
 x_50 = l_Lean_Syntax_getArg(x_1, x_49);
-x_51 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_51 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 lean_inc(x_50);
 x_52 = l_Lean_Syntax_isOfKind(x_50, x_51);
 if (x_52 == 0)
@@ -28413,7 +28413,7 @@ else
 lean_object* x_61; lean_object* x_62; uint8_t x_63; 
 x_61 = l_Lean_Syntax_getArg(x_54, x_22);
 lean_dec(x_54);
-x_62 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_62 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 lean_inc(x_61);
 x_63 = l_Lean_Syntax_isOfKind(x_61, x_62);
 if (x_63 == 0)
@@ -28584,7 +28584,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Term_termElabAttribute;
-x_3 = l_myMacro____x40_Init_Notation___hyg_12864____closed__2;
+x_3 = l_myMacro____x40_Init_Notation___hyg_12938____closed__2;
 x_4 = l___regBuiltin_Lean_Elab_Term_elabMatch___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
@@ -28698,7 +28698,7 @@ lean_inc(x_17);
 lean_dec(x_15);
 x_18 = l_Lean_Elab_Term_elabNoMatch___closed__1;
 x_19 = lean_array_push(x_18, x_14);
-x_20 = l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
+x_20 = l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 x_21 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_21, 0, x_20);
 lean_ctor_set(x_21, 1, x_19);

stage0/stdlib/Lean/Elab/MutualDef.c

@@ -19,7 +19,6 @@ lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabFunType_match
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__10___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_expr_update_forall(lean_object*, uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabCommand___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___spec__1___lambda__2(size_t, lean_object*, lean_object*, lean_object*, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_extractMacroScopes(lean_object*);
@@ -39,12 +38,12 @@ lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check(lean_object
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 extern lean_object* l_Lean_Elab_checkNotAlreadyDeclared___rarg___lambda__3___closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_Std_RBNode_insert___at_Lean_NameSet_insert___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabMutualDef___spec__7___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabExport___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_forallBoundedTelescope___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabFunValues___spec__1(lean_object*);
+lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_elabAttr___rarg___lambda__8___closed__2;
 lean_object* l_Lean_Elab_Term_getLetRecsToLift___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__14___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*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -91,6 +90,7 @@ lean_object* l_Lean_addDocString_x27___at___private_Lean_Elab_MutualDef_0__Lean_
 lean_object* l_Lean_CollectFVars_main(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabMutualDef___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_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 uint8_t l_Lean_Elab_Term_MutualClosure_FixPoint_State_modified___default;
 lean_object* l_List_forM___at_Lean_Elab_Term_MutualClosure_main___spec__3___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_identKind___closed__2;
@@ -107,7 +107,9 @@ uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_MutualDef_0__Lean_Elab_T
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkModifiers___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* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_FixPoint_updateUsedVarsOf___lambda__1(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders_match__1___rarg(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkLetRecClosures___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabMutualDef___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkLetRecClosureFor___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*, lean_object*, lean_object*);
@@ -125,7 +127,6 @@ lean_object* lean_private_to_user_name(lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___at_Lean_Elab_Command_elabMutualDef___spec__3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check___lambda__7___closed__2;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check___lambda__2___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 extern lean_object* l_Lean_declRangeExt;
 lean_object* l_List_forIn_loop___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkInitialUsedFVarsMap___spec__4(lean_object*, lean_object*, size_t, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__4___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -210,10 +211,12 @@ lean_object* l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_isTheorem___boxed(lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_FixPoint_getUsedFVarsMap___rarg(lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureFor___boxed(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_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_MutualClosure_main___spec__8(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___spec__1___lambda__1___closed__3;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_withFunLocalDecls(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_getFunName___closed__2;
 extern lean_object* l___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___lambda__5___closed__2;
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
@@ -227,7 +230,6 @@ lean_object* l_Lean_Elab_expandDeclId___at___private_Lean_Elab_MutualDef_0__Lean
 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_Lean_Elab_toAttributeKind___at_Lean_Elab_Command_mkDefViewOfInstance___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__11;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___closed__2;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_getFunName___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_MutualDef_0__Lean_Elab_Term_withFunLocalDecls_loop(lean_object*);
@@ -278,6 +280,7 @@ lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean
 lean_object* l_Lean_Elab_Term_elabMutualDef(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_withFunLocalDecls_loop___rarg(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_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkInitialUsedFVarsMap___spec__3___lambda__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___spec__1___lambda__1___closed__4;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkModifiers___lambda__2___closed__1;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_getFunName___lambda__1(lean_object*, lean_object*);
@@ -355,6 +358,7 @@ lean_object* l_Array_indexOfAux___at_Lean_LocalContext_erase___spec__3(lean_obje
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_pushLocalDecl(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_collectUsed___spec__2(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check___lambda__5___closed__2;
 lean_object* l_Lean_addMessageContextPartial___at_Lean_Elab_Command_instAddMessageContextCommandElabM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___spec__1(lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
@@ -375,11 +379,9 @@ extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____clos
 extern lean_object* l_Lean_docStringExt;
 extern lean_object* l_Lean_instInhabitedExpr;
 lean_object* l_Lean_Elab_addDeclarationRanges___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__11___boxed(lean_object*, 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_14350____closed__3;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst_match__3(lean_object*);
 lean_object* l_Lean_Elab_checkNotAlreadyDeclared___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__4___lambda__2___boxed(lean_object*, lean_object*, 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_1190____closed__7;
 lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_elabModifiers___rarg___lambda__3___closed__3;
 lean_object* l___private_Init_Util_0__mkPanicMessageWithDecl(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -396,9 +398,7 @@ extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____clos
 uint8_t l_Array_anyMUnsafe_any___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_isTheorem___spec__1(lean_object*, size_t, size_t);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_FixPoint_resetModified(lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureFor_match__1(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check___lambda__2___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l_Std_RBNode_find___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_FixPoint_updateUsedVarsOf___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLCtx___at_Lean_Elab_Term_elabSyntheticHole___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkLetRecClosureFor___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -412,7 +412,6 @@ lean_object* l_Lean_Elab_Term_collectUsedFVars(lean_object*, lean_object*, lean_
 lean_object* lean_expr_update_let(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkModifiers___lambda__1___closed__3;
 lean_object* l_Lean_Elab_Term_MutualClosure_FixPoint_State_usedFVarsMap___default;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__5;
 lean_object* l_List_forM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkLetRecsToLiftTypes___spec__2___closed__4;
 lean_object* l_Lean_mkFVar(lean_object*);
 uint8_t l_Lean_Expr_Data_binderInfo(uint64_t);
@@ -435,7 +434,6 @@ lean_object* l_Array_anyMUnsafe_any___at___private_Lean_Elab_MutualDef_0__Lean_E
 lean_object* l_Lean_addDeclarationRanges___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders___spec__13(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_MutualClosure_Replacement_apply_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttr___at_Lean_Elab_Command_elabMutualDef___spec__4___lambda__1(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
 lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkInitialUsedFVarsMap___spec__1(lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_isAutoImplicit___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabMutualDef___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -459,7 +457,6 @@ lean_object* l_Array_forInUnsafe_loop___at___private_Lean_Elab_MutualDef_0__Lean
 lean_object* l_Lean_Elab_Term_MutualClosure_ClosureState_localDecls___default;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_FixPoint_getUsedFVarsMap(lean_object*);
 uint8_t l_Array_anyMUnsafe_any___at_Lean_Elab_Term_MutualClosure_getKindForLetRecs___spec__1(lean_object*, size_t, size_t);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
 lean_object* l_List_forM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkLetRecsToLiftTypes___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* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___spec__2___lambda__4(size_t, lean_object*, lean_object*, lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Command_elabMutualDef___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -484,6 +481,7 @@ lean_object* l_Std_PersistentArray_push___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_getMVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_withUsed_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureFor(lean_object*, 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_14424____closed__5;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_check___lambda__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_MutualClosure_main___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_index(lean_object*);
@@ -491,6 +489,7 @@ lean_object* l_Lean_Syntax_getSepArgs(lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_removeUnusedVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_isAttribute(lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_collectUsed___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*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__7;
 lean_object* l_List_forM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_collectUsed___spec__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_MutualDef_0__Lean_Elab_Term_MutualClosure_pickMaxFVar_x3f___boxed(lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Meta_revert___spec__1(size_t, size_t, lean_object*);
@@ -510,6 +509,7 @@ lean_object* l_Array_anyMUnsafe_any___at_Lean_Elab_Term_MutualClosure_getModifie
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_withFunLocalDecls_loop___rarg___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*, lean_object*);
 lean_object* l_List_foldl___at_Lean_Elab_Term_MutualClosure_insertReplacementForLetRecs___spec__1(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__3;
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_isExample___boxed(lean_object*);
 lean_object* l_Lean_mkPrivateName(lean_object*, lean_object*);
@@ -528,7 +528,6 @@ lean_object* l_Lean_Syntax_getKind(lean_object*);
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___spec__1___lambda__1___closed__2;
 lean_object* l_Array_erase___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___spec__1(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__7;
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_instantiateForallAux(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*);
@@ -567,11 +566,13 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_E
 lean_object* l_Nat_foldM_loop___at_Lean_Elab_Term_MutualClosure_pushMain___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*, lean_object*);
 lean_object* l_Lean_Elab_Command_getRef(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_RBNode_fold___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkFreeVarMap___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__11;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_registerFailedToInferDefTypeInfo___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_MutualClosure_ClosureState_newLetDecls___default;
 lean_object* l_Lean_Elab_Term_elabType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
 uint8_t l_Array_anyMUnsafe_any___at_Lean_Elab_Term_isAutoImplicit___spec__4(lean_object*, lean_object*, size_t, size_t);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__7;
 lean_object* l_Lean_Elab_Term_MutualClosure_getModifiersForLetRecs___boxed(lean_object*);
 lean_object* l_List_forM___at_Lean_Elab_Term_MutualClosure_main___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addMessageContextFull___at_Lean_Meta_instAddMessageContextMetaM___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -583,12 +584,11 @@ extern lean_object* l_Lean_Meta_Match_Pattern_toMessageData___closed__6;
 lean_object* l_List_toArrayAux___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_FixPoint_isModified___rarg(lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__7;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___spec__2(lean_object*, lean_object*, size_t, size_t, lean_object*);
 lean_object* l_Lean_Elab_Term_MutualClosure_Replacement_apply_match__2(lean_object*);
 lean_object* l_List_forM___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkLetRecsToLiftTypes___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(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_1398____closed__8;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabFunValues___spec__2___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_erase___at___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkClosureForAux___spec__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_elabAttrs___at_Lean_Elab_Command_elabMutualDef___spec__3___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -624,6 +624,7 @@ lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_Fix
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_instantiateMVarsAtLetRecToLift(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_instantiateMVarsAtPreDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_elabHeaders_match__1(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_pushNewVars(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_FindImpl_findM_x3f_visit(lean_object*, size_t, lean_object*, lean_object*);
 extern lean_object* l_Lean_CollectMVars_instInhabitedState___closed__1;
@@ -727,7 +728,6 @@ lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_MutualClosure_mkL
 extern lean_object* l_Lean_Expr_ReplaceImpl_initCache;
 lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
 extern lean_object* l_Lean_expandExplicitBindersAux_loop___closed__3;
-lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_MutualClosure_Replacement_apply(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst_match__3___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_findLocalDecl_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -842,7 +842,7 @@ if (x_13 == 0)
 {
 lean_object* x_14; lean_object* x_15; 
 x_14 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkModifiers___lambda__1___closed__3;
-x_15 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_14, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_15 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_15;
 }
 else
@@ -1175,7 +1175,7 @@ if (x_13 == 0)
 {
 lean_object* x_14; lean_object* x_15; 
 x_14 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_checkKinds___lambda__1___closed__3;
-x_15 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_14, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_15 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_15;
 }
 else
@@ -3041,7 +3041,7 @@ x_21 = l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___rarg___closed__3;
 x_22 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_22, 0, x_20);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_22, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_23 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_22, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_23;
 }
 }
@@ -3282,7 +3282,7 @@ lean_dec(x_22);
 x_25 = l_Lean_protectedExt;
 lean_inc(x_2);
 x_26 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_25, x_24, x_2);
-x_27 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_23);
+x_27 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_23);
 lean_dec(x_3);
 x_28 = !lean_is_exclusive(x_27);
 if (x_28 == 0)
@@ -5833,7 +5833,7 @@ else
 lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; uint8_t x_57; 
 x_53 = lean_unsigned_to_nat(2u);
 x_54 = l_Lean_Syntax_getArg(x_1, x_53);
-x_55 = l_myMacro____x40_Init_Notation___hyg_14350____closed__3;
+x_55 = l_myMacro____x40_Init_Notation___hyg_14424____closed__3;
 lean_inc(x_2);
 x_56 = lean_name_mk_string(x_2, x_55);
 lean_inc(x_54);
@@ -5878,7 +5878,7 @@ lean_dec(x_69);
 if (x_70 == 0)
 {
 lean_object* x_71; lean_object* x_72; uint8_t x_73; 
-x_71 = l_myMacro____x40_Init_Notation___hyg_14350____closed__5;
+x_71 = l_myMacro____x40_Init_Notation___hyg_14424____closed__5;
 x_72 = lean_name_mk_string(x_2, x_71);
 lean_inc(x_64);
 x_73 = l_Lean_Syntax_isOfKind(x_64, x_72);
@@ -5961,7 +5961,7 @@ else
 lean_object* x_94; lean_object* x_95; lean_object* x_96; lean_object* x_97; uint8_t x_98; 
 x_94 = lean_unsigned_to_nat(2u);
 x_95 = l_Lean_Syntax_getArg(x_1, x_94);
-x_96 = l_myMacro____x40_Init_Notation___hyg_14350____closed__3;
+x_96 = l_myMacro____x40_Init_Notation___hyg_14424____closed__3;
 x_97 = lean_name_mk_string(x_2, x_96);
 x_98 = l_Lean_Syntax_isOfKind(x_95, x_97);
 lean_dec(x_97);
@@ -6062,13 +6062,13 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_E
 _start:
 {
 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_17; lean_object* x_18; lean_object* x_19; size_t 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; lean_object* x_29; lean_object* x_30; lean_object* x_31; lean_object* x_32; lean_object* x_33; lean_object* x_34; lean_object* x_35; uint8_t x_36; 
-x_9 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_7, x_8);
+x_9 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_7, x_8);
 x_10 = lean_ctor_get(x_9, 0);
 lean_inc(x_10);
 x_11 = lean_ctor_get(x_9, 1);
 lean_inc(x_11);
 lean_dec(x_9);
-x_12 = l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
+x_12 = l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_inc(x_1);
 x_13 = lean_name_mk_string(x_1, x_12);
 lean_inc(x_10);
@@ -6077,7 +6077,7 @@ lean_ctor_set(x_14, 0, x_10);
 lean_ctor_set(x_14, 1, x_12);
 x_15 = l_Array_empty___closed__1;
 x_16 = lean_array_push(x_15, x_14);
-x_17 = l_myMacro____x40_Init_Notation___hyg_12262____closed__11;
+x_17 = l_myMacro____x40_Init_Notation___hyg_12336____closed__11;
 lean_inc(x_1);
 x_18 = lean_name_mk_string(x_1, x_17);
 x_19 = lean_array_get_size(x_2);
@@ -6093,7 +6093,7 @@ x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_24);
 x_27 = lean_array_push(x_15, x_26);
-x_28 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_28 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_29 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_29, 0, x_10);
 lean_ctor_set(x_29, 1, x_28);
@@ -6106,7 +6106,7 @@ x_33 = lean_array_push(x_16, x_32);
 x_34 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_34, 0, x_13);
 lean_ctor_set(x_34, 1, x_33);
-x_35 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_7, x_11);
+x_35 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_7, x_11);
 x_36 = !lean_is_exclusive(x_35);
 if (x_36 == 0)
 {
@@ -6118,13 +6118,13 @@ x_39 = lean_name_mk_string(x_1, x_38);
 x_40 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__5;
 x_41 = lean_name_mk_string(x_1, x_40);
 x_42 = lean_array_push(x_15, x_4);
-x_43 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_43 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_44 = lean_array_push(x_42, x_43);
 x_45 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_45, 0, x_41);
 lean_ctor_set(x_45, 1, x_44);
 x_46 = lean_array_push(x_15, x_45);
-x_47 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_47 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_48 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_48, 0, x_37);
 lean_ctor_set(x_48, 1, x_47);
@@ -6150,13 +6150,13 @@ x_55 = lean_name_mk_string(x_1, x_54);
 x_56 = l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____closed__5;
 x_57 = lean_name_mk_string(x_1, x_56);
 x_58 = lean_array_push(x_15, x_4);
-x_59 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_59 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_60 = lean_array_push(x_58, x_59);
 x_61 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_61, 0, x_57);
 lean_ctor_set(x_61, 1, x_60);
 x_62 = lean_array_push(x_15, x_61);
-x_63 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_63 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 x_64 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_64, 0, x_52);
 lean_ctor_set(x_64, 1, x_63);
@@ -6200,13 +6200,13 @@ lean_object* x_17; lean_object* x_18; lean_object* x_19; lean_object* x_20; lean
 x_17 = lean_ctor_get(x_7, 0);
 lean_inc(x_17);
 lean_dec(x_7);
-x_18 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_8, x_9);
+x_18 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_8, x_9);
 x_19 = lean_ctor_get(x_18, 0);
 lean_inc(x_19);
 x_20 = lean_ctor_get(x_18, 1);
 lean_inc(x_20);
 lean_dec(x_18);
-x_21 = l_myMacro____x40_Init_Notation___hyg_12262____closed__7;
+x_21 = l_myMacro____x40_Init_Notation___hyg_12336____closed__7;
 lean_inc(x_2);
 x_22 = lean_name_mk_string(x_2, x_21);
 x_23 = l_prec_x28___x29___closed__3;
@@ -6217,10 +6217,10 @@ lean_ctor_set(x_24, 1, x_23);
 x_25 = l_Array_empty___closed__1;
 x_26 = lean_array_push(x_25, x_24);
 x_27 = lean_array_push(x_25, x_11);
-x_28 = l_myMacro____x40_Init_Notation___hyg_13781____closed__7;
+x_28 = l_myMacro____x40_Init_Notation___hyg_13855____closed__7;
 lean_inc(x_2);
 x_29 = lean_name_mk_string(x_2, x_28);
-x_30 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_30 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_19);
 x_31 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_31, 0, x_19);
@@ -6293,13 +6293,13 @@ lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean
 x_57 = lean_ctor_get(x_7, 0);
 lean_inc(x_57);
 lean_dec(x_7);
-x_58 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_54, x_9);
+x_58 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_54, x_9);
 x_59 = lean_ctor_get(x_58, 0);
 lean_inc(x_59);
 x_60 = lean_ctor_get(x_58, 1);
 lean_inc(x_60);
 lean_dec(x_58);
-x_61 = l_myMacro____x40_Init_Notation___hyg_12262____closed__7;
+x_61 = l_myMacro____x40_Init_Notation___hyg_12336____closed__7;
 lean_inc(x_2);
 x_62 = lean_name_mk_string(x_2, x_61);
 x_63 = l_prec_x28___x29___closed__3;
@@ -6310,10 +6310,10 @@ lean_ctor_set(x_64, 1, x_63);
 x_65 = l_Array_empty___closed__1;
 x_66 = lean_array_push(x_65, x_64);
 x_67 = lean_array_push(x_65, x_11);
-x_68 = l_myMacro____x40_Init_Notation___hyg_13781____closed__7;
+x_68 = l_myMacro____x40_Init_Notation___hyg_13855____closed__7;
 lean_inc(x_2);
 x_69 = lean_name_mk_string(x_2, x_68);
-x_70 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_70 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_59);
 x_71 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_71, 0, x_59);
@@ -6366,7 +6366,7 @@ lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_MutualDef_0__Lean_E
 _start:
 {
 lean_object* x_7; lean_object* x_8; uint8_t x_9; 
-x_7 = l_myMacro____x40_Init_Notation___hyg_14350____closed__5;
+x_7 = l_myMacro____x40_Init_Notation___hyg_14424____closed__5;
 lean_inc(x_2);
 x_8 = lean_name_mk_string(x_2, x_7);
 lean_inc(x_1);
@@ -6760,7 +6760,7 @@ x_11 = lean_array_uset(x_6, x_5, x_10);
 x_12 = x_9;
 lean_inc(x_2);
 x_13 = lean_array_push(x_2, x_12);
-x_14 = l_myMacro____x40_Init_Notation___hyg_1190____closed__7;
+x_14 = l_myMacro____x40_Init_Notation___hyg_1264____closed__7;
 lean_inc(x_1);
 x_15 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_15, 0, x_1);
@@ -6856,7 +6856,7 @@ x_21 = lean_usize_of_nat(x_20);
 lean_dec(x_20);
 x_22 = 0;
 x_23 = x_19;
-x_24 = l_myMacro____x40_Init_Notation___hyg_2117____closed__2;
+x_24 = l_myMacro____x40_Init_Notation___hyg_2191____closed__2;
 x_25 = l_instMonadEST___closed__1;
 x_26 = lean_box_usize(x_21);
 x_27 = l___private_Lean_Elab_MutualDef_0__Lean_Elab_Term_expandWhereDeclsAsStructInst___boxed__const__1;
@@ -6916,7 +6916,7 @@ lean_ctor_set(x_48, 0, x_46);
 lean_ctor_set(x_48, 1, x_47);
 x_49 = l_Array_empty___closed__1;
 x_50 = lean_array_push(x_49, x_48);
-x_51 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_51 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_52 = lean_array_push(x_50, x_51);
 x_53 = lean_array_get_size(x_42);
 x_54 = lean_usize_of_nat(x_53);
@@ -6962,7 +6962,7 @@ lean_ctor_set(x_73, 0, x_70);
 lean_ctor_set(x_73, 1, x_72);
 x_74 = l_Array_empty___closed__1;
 x_75 = lean_array_push(x_74, x_73);
-x_76 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_76 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_77 = lean_array_push(x_75, x_76);
 x_78 = lean_array_get_size(x_42);
 x_79 = lean_usize_of_nat(x_78);

stage0/stdlib/Lean/Elab/PreDefinition/Basic.c

@@ -65,7 +65,6 @@ lean_object* lean_state_sharecommon(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_levelMVarToParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_levelMVarToParamPreDecls(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addDecl___at_Lean_Elab_addAsAxiom___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__8(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_instInhabitedPreDefinition___closed__1;
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_PreDefinition_Basic_0__Lean_Elab_shareCommon___spec__2(size_t, size_t, lean_object*, lean_object*);
 lean_object* l_Lean_KernelException_toMessageData(lean_object*, lean_object*);
@@ -103,6 +102,7 @@ lean_object* l_Lean_Elab_addAndCompilePartialRec(lean_object*, lean_object*, lea
 lean_object* l_Lean_setEnv___at_Lean_Meta_setInlineAttribute___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_expr_update_proj(lean_object*, lean_object*);
 lean_object* l_Lean_Expr_ReplaceImpl_replaceUnsafeM_visit___at_Lean_Elab_fixLevelParams___spec__2(lean_object*, lean_object*, size_t, lean_object*, lean_object*);
+lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 size_t l_USize_mod(size_t, size_t);
 lean_object* l___private_Lean_Elab_PreDefinition_Basic_0__Lean_Elab_addNonRecAux_match__1___rarg(uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_PreDefinition_Basic_0__Lean_Elab_addNonRecAux___closed__3;
@@ -120,10 +120,10 @@ extern lean_object* l_Lean_Elab_instInhabitedModifiers___closed__1;
 lean_object* l_Lean_Elab_addAndCompileUnsafe___boxed(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*);
 extern lean_object* l_Lean_instInhabitedExpr___closed__1;
-lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_applyAttributesOf___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Expr_ReplaceImpl_replaceUnsafeM_visit___at_Lean_Elab_addAndCompilePartialRec___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_PreDefinition_Basic_0__Lean_Elab_getLevelParamsPreDecls___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_applyAttributesOf_match__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_fixLevelParams_match__1(lean_object*);
 lean_object* lean_st_ref_set(lean_object*, lean_object*, lean_object*);
@@ -4135,7 +4135,7 @@ block_52:
 lean_object* x_23; 
 lean_inc(x_7);
 lean_inc(x_3);
-x_23 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(x_22, x_3, x_4, x_5, x_6, x_7, x_8, x_19);
+x_23 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(x_22, x_3, x_4, x_5, x_6, x_7, x_8, x_19);
 if (lean_obj_tag(x_23) == 0)
 {
 lean_object* x_24; lean_object* x_25; lean_object* x_26; uint8_t x_27; lean_object* x_28; 
@@ -4191,7 +4191,7 @@ else
 lean_object* x_36; 
 lean_inc(x_7);
 lean_inc(x_3);
-x_36 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__8(x_22, x_3, x_4, x_5, x_6, x_7, x_8, x_32);
+x_36 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(x_22, x_3, x_4, x_5, x_6, x_7, x_8, x_32);
 if (lean_obj_tag(x_36) == 0)
 {
 lean_object* x_37; uint8_t x_38; lean_object* x_39; 
@@ -4560,7 +4560,7 @@ block_158:
 lean_object* x_129; 
 lean_inc(x_119);
 lean_inc(x_3);
-x_129 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(x_128, x_3, x_4, x_5, x_6, x_119, x_8, x_125);
+x_129 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(x_128, x_3, x_4, x_5, x_6, x_119, x_8, x_125);
 if (lean_obj_tag(x_129) == 0)
 {
 lean_object* x_130; lean_object* x_131; lean_object* x_132; uint8_t x_133; lean_object* x_134; 
@@ -4616,7 +4616,7 @@ else
 lean_object* x_142; 
 lean_inc(x_119);
 lean_inc(x_3);
-x_142 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__8(x_128, x_3, x_4, x_5, x_6, x_119, x_8, x_138);
+x_142 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(x_128, x_3, x_4, x_5, x_6, x_119, x_8, x_138);
 if (lean_obj_tag(x_142) == 0)
 {
 lean_object* x_143; uint8_t x_144; lean_object* x_145; 
@@ -4925,7 +4925,7 @@ lean_dec(x_13);
 lean_ctor_set(x_7, 3, x_19);
 lean_inc(x_7);
 lean_inc(x_3);
-x_20 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_20 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 if (lean_obj_tag(x_20) == 0)
 {
 lean_object* x_21; uint8_t x_22; lean_object* x_23; 
@@ -4945,7 +4945,7 @@ lean_inc(x_24);
 lean_dec(x_23);
 lean_inc(x_7);
 lean_inc(x_3);
-x_25 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__8(x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_24);
+x_25 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(x_16, x_3, x_4, x_5, x_6, x_7, x_8, x_24);
 if (lean_obj_tag(x_25) == 0)
 {
 lean_object* x_26; uint8_t x_27; lean_object* x_28; 
@@ -5121,7 +5121,7 @@ lean_ctor_set(x_60, 6, x_57);
 lean_ctor_set(x_60, 7, x_58);
 lean_inc(x_60);
 lean_inc(x_3);
-x_61 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(x_16, x_3, x_4, x_5, x_6, x_60, x_8, x_9);
+x_61 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(x_16, x_3, x_4, x_5, x_6, x_60, x_8, x_9);
 if (lean_obj_tag(x_61) == 0)
 {
 lean_object* x_62; uint8_t x_63; lean_object* x_64; 
@@ -5141,7 +5141,7 @@ lean_inc(x_65);
 lean_dec(x_64);
 lean_inc(x_60);
 lean_inc(x_3);
-x_66 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__8(x_16, x_3, x_4, x_5, x_6, x_60, x_8, x_65);
+x_66 = l_Lean_compileDecl___at_Lean_Elab_Term_evalExpr___spec__7(x_16, x_3, x_4, x_5, x_6, x_60, x_8, x_65);
 if (lean_obj_tag(x_66) == 0)
 {
 lean_object* x_67; uint8_t x_68; lean_object* x_69; 

stage0/stdlib/Lean/Elab/PreDefinition/MkInhabitant.c

@@ -26,7 +26,7 @@ lean_object* l_Lean_Elab_mkInhabitantFor_match__2___rarg(lean_object*, lean_obje
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l___private_Lean_Elab_PreDefinition_MkInhabitant_0__Lean_Elab_mkFnInhabitant_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_throwError___at_Lean_Meta_initFn____x40_Lean_Meta_Basic___hyg_1001____spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_throwError___at_Lean_Meta_initFn____x40_Lean_Meta_Basic___hyg_1002____spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkInhabitantFor___closed__1;
 lean_object* l_Lean_Elab_mkInhabitantFor_match__1___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t l_USize_decLt(size_t, size_t);
@@ -929,7 +929,7 @@ x_21 = l_Lean_Elab_mkInhabitantFor___closed__4;
 x_22 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_22, 0, x_20);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_throwError___at_Lean_Meta_initFn____x40_Lean_Meta_Basic___hyg_1001____spec__1(x_22, x_4, x_5, x_6, x_7, x_17);
+x_23 = l_Lean_throwError___at_Lean_Meta_initFn____x40_Lean_Meta_Basic___hyg_1002____spec__1(x_22, x_4, x_5, x_6, x_7, x_17);
 lean_dec(x_7);
 lean_dec(x_6);
 lean_dec(x_5);

stage0/stdlib/Lean/Elab/Quotation/Util.c

@@ -44,7 +44,6 @@ lean_object* l_Lean_Elab_Term_Quotation_getAntiquotationIds(lean_object*, lean_o
 extern lean_object* l_Lean_KernelException_toMessageData___closed__15;
 size_t lean_usize_of_nat(lean_object*);
 uint8_t l_Lean_Syntax_isAntiquot(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l_Lean_Elab_Term_Quotation_getAntiquotationIds_go___closed__3;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_Quotation_getAntiquotationIds___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -61,6 +60,7 @@ uint8_t l_Lean_Syntax_isEscapedAntiquot(lean_object*);
 lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_Quotation_getAntiquotationIds_go___spec__2___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_12938____closed__13;
 lean_object* l_Lean_throwErrorAt___at_Lean_Elab_Term_Quotation_getAntiquotationIds_go___spec__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_getBetterRef(lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
@@ -546,7 +546,7 @@ x_9 = l_Lean_Syntax_isQuot(x_1);
 if (x_9 == 0)
 {
 lean_object* x_10; uint8_t x_11; 
-x_10 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_10 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 lean_inc(x_1);
 x_11 = l_Lean_Syntax_isOfKind(x_1, x_10);
 if (x_11 == 0)

stage0/stdlib/Lean/Elab/StructInst.c

@@ -27,6 +27,7 @@ size_t l_USize_add(size_t, size_t);
 extern lean_object* l_Lean_Name_getString_x21___closed__3;
 extern lean_object* l_Lean_fieldIdxKind;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_mkDefaultValueAux_x3f_match__2___rarg(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_object* l_Lean_Expr_mvarId_x21(lean_object*);
 lean_object* l_List_head_x21___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandStruct___spec__3(lean_object*);
 lean_object* l_List_tail_x21___rarg(lean_object*);
@@ -41,7 +42,6 @@ lean_object* l_Lean_Elab_Term_StructInst_Struct_modifyFieldsM(lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabStruct_match__4___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
 lean_object* l_Std_fmt___at_Lean_Position_instToFormatPosition___spec__1(lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_StructInst_DefaultFields_reduce___spec__1(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -84,6 +84,7 @@ lean_object* l_List_forIn_loop___at_Lean_Elab_Term_StructInst_DefaultFields_step
 lean_object* l_Lean_throwError___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_isModifyOp_x3f___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName_throwUnknownExpectedType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkProjStx(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_structInstArrayRef___elambda__1___closed__2;
 lean_object* l___regBuiltin_Lean_Elab_Term_StructInst_elabStructInst___closed__1;
@@ -92,6 +93,7 @@ lean_object* l_List_forIn_loop___at_Lean_Elab_Term_StructInst_DefaultFields_step
 extern lean_object* l_Lean_Meta_SynthInstance_getInstances___lambda__1___closed__7;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandNumLitFields___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_StructInst_elabStructInst_match__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_groupFields___lambda__3___closed__1;
 lean_object* l_List_foldlM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkFieldMap___spec__12___closed__4;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduce___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -107,8 +109,9 @@ lean_object* l_Lean_Elab_Term_StructInst_Struct_allDefault_match__1(lean_object*
 lean_object* l_Lean_Elab_Term_StructInst_markDefaultMissing(lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__10;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_object* l_Lean_Elab_Term_StructInst_initFn____x40_Lean_Elab_StructInst___hyg_6674_(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_mkDefaultValueAux_x3f___boxed(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_StructInst_0__Lean_Elab_Term_StructInst_expandNumLitFields___spec__3___closed__7;
 lean_object* l___private_Init_Meta_0__Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
@@ -138,8 +141,6 @@ uint8_t l_Lean_Expr_isApp(lean_object*);
 lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkCtorHeader___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_mkId___closed__2;
 lean_object* l___regBuiltin_Lean_Elab_Term_StructInst_elabStructInst(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
 lean_object* l_Std_HashMapImp_expand___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkFieldMap___spec__5(lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandStruct___spec__11___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*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkStructView___spec__1(size_t, size_t, lean_object*);
@@ -165,10 +166,8 @@ extern lean_object* l_Std_Range_myMacro____x40_Init_Data_Range___hyg_265____clos
 lean_object* l_Std_HashMap_toList___rarg(lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabModifyOp___closed__18;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_groupFields___lambda__1(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkFieldMap___spec__9___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Nat_max(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
 extern lean_object* l_Lean_Elab_MacroExpansionInfo_format___closed__3;
 extern lean_object* l_Lean_Expr_getAppArgs___closed__1;
 lean_object* l_Lean_Elab_Term_StructInst_formatField(lean_object*, lean_object*);
@@ -190,6 +189,7 @@ lean_object* lean_string_utf8_byte_size(lean_object*);
 lean_object* l_List_head_x21___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_tryToSynthesizeDefault___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___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkCtorHeaderAux_match__3___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName_throwUnexpectedExpectedType___closed__4;
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Term_StructInst_Field_toSyntax___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -229,12 +229,14 @@ lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabM
 lean_object* l_Lean_Elab_Term_StructInst_Struct_ref_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_isSimpleField_x3f(lean_object*);
 extern lean_object* l_Lean_Json_render___closed__8;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_object* l_Lean_Elab_Term_StructInst_FieldLHS_toSyntax___boxed(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructSource(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkAppN(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkStructView(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_Source_isNone___boxed(lean_object*);
 extern lean_object* l___private_Lean_Elab_App_0__Lean_Elab_Term_elabAppLValsAux_loop___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 lean_object* l_Lean_Elab_Term_StructInst_Struct_structName(lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_propagateLoop___closed__1;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -250,7 +252,6 @@ lean_object* l_Lean_Elab_Term_StructInst_Struct_modifyFieldsM___at___private_Lea
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_StructInst_throwFailedToElabField___spec__1(lean_object*);
 lean_object* l_Lean_Meta_project_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_propagateLoop___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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__12;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName___rarg___closed__2;
 lean_object* l___private_Lean_Expr_0__Lean_Expr_getAppArgsAux(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_mapM___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -275,11 +276,10 @@ lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkFie
 lean_object* l_Lean_Elab_Term_StructInst_formatStruct___closed__3;
 lean_object* l_Lean_Elab_Term_StructInst_FieldVal_toSyntax___boxed(lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabModifyOp___closed__9;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName_throwUnexpectedExpectedType___closed__3;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabModifyOp___closed__8;
 lean_object* lean_st_ref_take(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabStruct_match__7(lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkFieldMap_match__1(lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_mkDefaultValueAux_x3f_match__1___rarg(lean_object*, lean_object*, lean_object*);
@@ -323,7 +323,6 @@ lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_toFie
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_getFieldName___closed__1;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 lean_object* l_Std_mkHashMapImp___rarg(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName_match__2(lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_propagateExpectedType(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_StructInst_0__Lean_Elab_Term_StructInst_mkStructView___spec__2(lean_object*);
@@ -355,6 +354,7 @@ lean_object* l_List_findSome_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduceProjOf_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_st_mk_ref(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_trySynthStructInstance_x3f(lean_object*, 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_14424____closed__1;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandNumLitFields_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduceProjOf_x3f_match__2(lean_object*);
 lean_object* l_Lean_Syntax_getId(lean_object*);
@@ -370,6 +370,7 @@ lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getSt
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_reduce_match__1(lean_object*);
 uint8_t l_Array_contains___at_Lean_findField_x3f___spec__1(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructSource_match__1(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getFieldIdx___lambda__1___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_getStructureFields(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_CtorHeaderResult_instMVars___default;
@@ -395,7 +396,6 @@ lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_S
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_tryToSynthesizeDefault_loop___closed__2;
 lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandNumLitFields___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_defaultMissing_x3f(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
 lean_object* l_Lean_getPathToBaseStructure_x3f(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandCompositeFields___closed__1;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_groupFields_match__2(lean_object*);
@@ -431,8 +431,6 @@ lean_object* l_List_head_x21___at___private_Lean_Elab_StructInst_0__Lean_Elab_Te
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_tryToSynthesizeDefault_loop___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*, lean_object*);
 lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandNumLitFields___spec__3___closed__3;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkFieldMap___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabStructInstAux_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_toFieldLHS_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkCtorHeaderAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -460,7 +458,6 @@ lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getFi
 uint8_t l_Lean_Expr_isLambda(lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_mkDefaultValueAux_x3f_match__1(lean_object*);
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, 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_12262____closed__13;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getStructName___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_Struct_structName___boxed(lean_object*);
@@ -524,6 +521,7 @@ lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_propa
 lean_object* l_Lean_Expr_getAppNumArgsAux(lean_object*, lean_object*);
 lean_object* l___private_Lean_Util_Trace_0__Lean_checkTraceOptionM___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_formatField___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 lean_object* l_List_find_x3f___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_mkHole(lean_object*);
 extern lean_object* l_Lean_Elab_macroAttribute;
@@ -547,6 +545,7 @@ uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabStructInstAux(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 lean_object* l_List_map___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandParentFields___spec__1___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__10;
 lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkSubstructSource_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_Struct_source___boxed(lean_object*);
 lean_object* l_Lean_Expr_betaRev(lean_object*, lean_object*);
@@ -563,7 +562,6 @@ lean_object* l___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expan
 lean_object* l_Lean_Elab_Term_StructInst_formatStruct_match__1(lean_object*);
 lean_object* lean_panic_fn(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_findDefaultMissing_x3f_match__2___rarg(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
 lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandNumLitFields___spec__3___boxed(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_StructInst_0__Lean_Elab_Term_StructInst_expandNumLitFields___spec__3___closed__1;
 lean_object* l_List_head_x21___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandStruct___spec__5___boxed(lean_object*);
@@ -622,6 +620,7 @@ lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_S
 lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_mkStructView___spec__2___closed__1;
 lean_object* l_Lean_Meta_isExprDefEq(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Meta_Basic_0__Lean_Meta_mkFreshExprMVarImpl(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_getHierarchyDepth_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_DefaultFields_step_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_isModifyOp_x3f___spec__3___closed__1;
@@ -690,6 +689,7 @@ lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_S
 lean_object* l_Array_findIdx_x3f_loop___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_CheckAssignment_checkFVar___closed__2;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_getFieldIdx___spec__1(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_12336____closed__12;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_elabStruct___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_StructInst_formatStruct___closed__1;
 lean_object* l_List_mapM___at___private_Lean_Elab_StructInst_0__Lean_Elab_Term_StructInst_expandParentFields___spec__2___closed__3;
@@ -815,14 +815,14 @@ lean_ctor_set(x_15, 1, x_14);
 x_16 = l_Array_empty___closed__1;
 x_17 = lean_array_push(x_16, x_15);
 x_18 = lean_array_push(x_16, x_10);
-x_19 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_19 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_13);
 x_20 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_20, 0, x_13);
 lean_ctor_set(x_20, 1, x_19);
 x_21 = lean_array_push(x_16, x_20);
 x_22 = lean_array_push(x_21, x_8);
-x_23 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_23 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_24 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_24, 0, x_23);
 lean_ctor_set(x_24, 1, x_22);
@@ -841,7 +841,7 @@ x_32 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_32, 0, x_13);
 lean_ctor_set(x_32, 1, x_31);
 x_33 = lean_array_push(x_30, x_32);
-x_34 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_34 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_35 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_35, 0, x_34);
 lean_ctor_set(x_35, 1, x_33);
@@ -864,14 +864,14 @@ lean_ctor_set(x_39, 1, x_38);
 x_40 = l_Array_empty___closed__1;
 x_41 = lean_array_push(x_40, x_39);
 x_42 = lean_array_push(x_40, x_10);
-x_43 = l_myMacro____x40_Init_Notation___hyg_13781____closed__9;
+x_43 = l_myMacro____x40_Init_Notation___hyg_13855____closed__9;
 lean_inc(x_36);
 x_44 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_44, 0, x_36);
 lean_ctor_set(x_44, 1, x_43);
 x_45 = lean_array_push(x_40, x_44);
 x_46 = lean_array_push(x_45, x_8);
-x_47 = l_myMacro____x40_Init_Notation___hyg_13781____closed__8;
+x_47 = l_myMacro____x40_Init_Notation___hyg_13855____closed__8;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -890,7 +890,7 @@ x_56 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_56, 0, x_36);
 lean_ctor_set(x_56, 1, x_55);
 x_57 = lean_array_push(x_54, x_56);
-x_58 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_58 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_59 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_59, 0, x_58);
 lean_ctor_set(x_59, 1, x_57);
@@ -1135,7 +1135,7 @@ if (x_50 == 0)
 {
 lean_object* x_51; lean_object* x_52; lean_object* x_53; lean_object* x_54; lean_object* x_55; lean_object* x_56; lean_object* x_57; lean_object* x_58; lean_object* x_59; lean_object* x_60; lean_object* x_61; lean_object* x_62; lean_object* x_63; lean_object* x_64; lean_object* x_65; lean_object* x_66; lean_object* x_67; lean_object* x_68; lean_object* x_69; lean_object* x_70; lean_object* x_71; lean_object* x_72; lean_object* x_73; lean_object* x_74; lean_object* x_75; lean_object* x_76; lean_object* x_77; lean_object* x_78; lean_object* x_79; lean_object* x_80; lean_object* x_81; 
 x_51 = lean_ctor_get(x_49, 0);
-x_52 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_52 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_44);
 x_53 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_53, 0, x_44);
@@ -1150,27 +1150,27 @@ lean_ctor_set(x_57, 1, x_39);
 lean_ctor_set(x_57, 2, x_56);
 lean_ctor_set(x_57, 3, x_38);
 x_58 = lean_array_push(x_54, x_57);
-x_59 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_59 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_60 = lean_array_push(x_58, x_59);
 x_61 = lean_array_push(x_60, x_59);
-x_62 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_62 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_44);
 x_63 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_63, 0, x_44);
 lean_ctor_set(x_63, 1, x_62);
 x_64 = lean_array_push(x_61, x_63);
 x_65 = lean_array_push(x_64, x_23);
-x_66 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_66 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_67 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_67, 0, x_66);
 lean_ctor_set(x_67, 1, x_65);
 x_68 = lean_array_push(x_54, x_67);
-x_69 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_69 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_70 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_70, 0, x_69);
 lean_ctor_set(x_70, 1, x_68);
 x_71 = lean_array_push(x_55, x_70);
-x_72 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_72 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_73 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_73, 0, x_44);
 lean_ctor_set(x_73, 1, x_72);
@@ -1181,7 +1181,7 @@ lean_ctor_set(x_76, 0, x_75);
 lean_ctor_set(x_76, 1, x_74);
 x_77 = lean_array_push(x_71, x_76);
 x_78 = lean_array_push(x_77, x_42);
-x_79 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_79 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_80 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_80, 0, x_79);
 lean_ctor_set(x_80, 1, x_78);
@@ -1198,7 +1198,7 @@ x_83 = lean_ctor_get(x_49, 1);
 lean_inc(x_83);
 lean_inc(x_82);
 lean_dec(x_49);
-x_84 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_84 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_44);
 x_85 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_85, 0, x_44);
@@ -1213,27 +1213,27 @@ lean_ctor_set(x_89, 1, x_39);
 lean_ctor_set(x_89, 2, x_88);
 lean_ctor_set(x_89, 3, x_38);
 x_90 = lean_array_push(x_86, x_89);
-x_91 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_91 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_92 = lean_array_push(x_90, x_91);
 x_93 = lean_array_push(x_92, x_91);
-x_94 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_94 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_44);
 x_95 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_95, 0, x_44);
 lean_ctor_set(x_95, 1, x_94);
 x_96 = lean_array_push(x_93, x_95);
 x_97 = lean_array_push(x_96, x_23);
-x_98 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_98 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_99 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_99, 0, x_98);
 lean_ctor_set(x_99, 1, x_97);
 x_100 = lean_array_push(x_86, x_99);
-x_101 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_101 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_102 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_102, 0, x_101);
 lean_ctor_set(x_102, 1, x_100);
 x_103 = lean_array_push(x_87, x_102);
-x_104 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_104 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_105 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_105, 0, x_44);
 lean_ctor_set(x_105, 1, x_104);
@@ -1244,7 +1244,7 @@ lean_ctor_set(x_108, 0, x_107);
 lean_ctor_set(x_108, 1, x_106);
 x_109 = lean_array_push(x_103, x_108);
 x_110 = lean_array_push(x_109, x_42);
-x_111 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_111 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_112 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_112, 0, x_111);
 lean_ctor_set(x_112, 1, x_110);
@@ -1391,7 +1391,7 @@ if (lean_is_exclusive(x_159)) {
  lean_dec_ref(x_159);
  x_162 = lean_box(0);
 }
-x_163 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_163 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_154);
 x_164 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_164, 0, x_154);
@@ -1406,27 +1406,27 @@ lean_ctor_set(x_168, 1, x_149);
 lean_ctor_set(x_168, 2, x_167);
 lean_ctor_set(x_168, 3, x_148);
 x_169 = lean_array_push(x_165, x_168);
-x_170 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_170 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_171 = lean_array_push(x_169, x_170);
 x_172 = lean_array_push(x_171, x_170);
-x_173 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_173 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_154);
 x_174 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_174, 0, x_154);
 lean_ctor_set(x_174, 1, x_173);
 x_175 = lean_array_push(x_172, x_174);
 x_176 = lean_array_push(x_175, x_133);
-x_177 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_177 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_178 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_178, 0, x_177);
 lean_ctor_set(x_178, 1, x_176);
 x_179 = lean_array_push(x_165, x_178);
-x_180 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_180 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_181 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_181, 0, x_180);
 lean_ctor_set(x_181, 1, x_179);
 x_182 = lean_array_push(x_166, x_181);
-x_183 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_183 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_184 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_184, 0, x_154);
 lean_ctor_set(x_184, 1, x_183);
@@ -1437,7 +1437,7 @@ lean_ctor_set(x_187, 0, x_186);
 lean_ctor_set(x_187, 1, x_185);
 x_188 = lean_array_push(x_182, x_187);
 x_189 = lean_array_push(x_188, x_152);
-x_190 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_190 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_191 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_191, 0, x_190);
 lean_ctor_set(x_191, 1, x_189);
@@ -1656,7 +1656,7 @@ if (lean_is_exclusive(x_251)) {
  lean_dec_ref(x_251);
  x_254 = lean_box(0);
 }
-x_255 = l_myMacro____x40_Init_Notation___hyg_14350____closed__1;
+x_255 = l_myMacro____x40_Init_Notation___hyg_14424____closed__1;
 lean_inc(x_246);
 x_256 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_256, 0, x_246);
@@ -1671,27 +1671,27 @@ lean_ctor_set(x_260, 1, x_241);
 lean_ctor_set(x_260, 2, x_259);
 lean_ctor_set(x_260, 3, x_240);
 x_261 = lean_array_push(x_257, x_260);
-x_262 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_262 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_263 = lean_array_push(x_261, x_262);
 x_264 = lean_array_push(x_263, x_262);
-x_265 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_265 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_246);
 x_266 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_266, 0, x_246);
 lean_ctor_set(x_266, 1, x_265);
 x_267 = lean_array_push(x_264, x_266);
 x_268 = lean_array_push(x_267, x_225);
-x_269 = l_myMacro____x40_Init_Notation___hyg_14350____closed__6;
+x_269 = l_myMacro____x40_Init_Notation___hyg_14424____closed__6;
 x_270 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_270, 0, x_269);
 lean_ctor_set(x_270, 1, x_268);
 x_271 = lean_array_push(x_257, x_270);
-x_272 = l_myMacro____x40_Init_Notation___hyg_14350____closed__4;
+x_272 = l_myMacro____x40_Init_Notation___hyg_14424____closed__4;
 x_273 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_273, 0, x_272);
 lean_ctor_set(x_273, 1, x_271);
 x_274 = lean_array_push(x_258, x_273);
-x_275 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_275 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_276 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_276, 0, x_246);
 lean_ctor_set(x_276, 1, x_275);
@@ -1702,7 +1702,7 @@ lean_ctor_set(x_279, 0, x_278);
 lean_ctor_set(x_279, 1, x_277);
 x_280 = lean_array_push(x_274, x_279);
 x_281 = lean_array_push(x_280, x_244);
-x_282 = l_myMacro____x40_Init_Notation___hyg_14350____closed__2;
+x_282 = l_myMacro____x40_Init_Notation___hyg_14424____closed__2;
 x_283 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_283, 0, x_282);
 lean_ctor_set(x_283, 1, x_281);
@@ -3408,7 +3408,7 @@ lean_ctor_set(x_93, 2, x_91);
 lean_ctor_set(x_93, 3, x_29);
 lean_inc(x_89);
 x_94 = lean_array_push(x_89, x_93);
-x_95 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_95 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_66);
 x_96 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_96, 0, x_66);
@@ -3427,7 +3427,7 @@ x_103 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_103, 0, x_102);
 lean_ctor_set(x_103, 1, x_101);
 x_104 = lean_array_push(x_74, x_103);
-x_105 = l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
+x_105 = l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_inc(x_66);
 x_106 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_106, 0, x_66);
@@ -3446,30 +3446,30 @@ x_112 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_112, 0, x_111);
 lean_ctor_set(x_112, 1, x_110);
 x_113 = lean_array_push(x_74, x_112);
-x_114 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_114 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_115 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_115, 0, x_66);
 lean_ctor_set(x_115, 1, x_114);
 x_116 = lean_array_push(x_113, x_115);
 x_117 = lean_array_push(x_116, x_60);
-x_118 = l_myMacro____x40_Init_Notation___hyg_12262____closed__12;
+x_118 = l_myMacro____x40_Init_Notation___hyg_12336____closed__12;
 x_119 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_119, 0, x_118);
 lean_ctor_set(x_119, 1, x_117);
 x_120 = lean_array_push(x_107, x_119);
-x_121 = l_myMacro____x40_Init_Notation___hyg_12262____closed__10;
+x_121 = l_myMacro____x40_Init_Notation___hyg_12336____closed__10;
 x_122 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_122, 0, x_121);
 lean_ctor_set(x_122, 1, x_120);
 x_123 = lean_array_push(x_74, x_122);
-x_124 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_124 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_125 = lean_array_push(x_123, x_124);
 x_126 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_126, 0, x_111);
 lean_ctor_set(x_126, 1, x_125);
 x_127 = lean_array_push(x_89, x_126);
 x_128 = lean_array_push(x_127, x_100);
-x_129 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_129 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_130 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_130, 0, x_129);
 lean_ctor_set(x_130, 1, x_128);
@@ -3478,7 +3478,7 @@ x_132 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_132, 0, x_111);
 lean_ctor_set(x_132, 1, x_131);
 x_133 = lean_array_push(x_86, x_132);
-x_134 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_134 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_135 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_135, 0, x_134);
 lean_ctor_set(x_135, 1, x_133);
@@ -3691,7 +3691,7 @@ lean_ctor_set(x_238, 2, x_236);
 lean_ctor_set(x_238, 3, x_225);
 lean_inc(x_234);
 x_239 = lean_array_push(x_234, x_238);
-x_240 = l_myMacro____x40_Init_Notation___hyg_14350____closed__11;
+x_240 = l_myMacro____x40_Init_Notation___hyg_14424____closed__11;
 lean_inc(x_210);
 x_241 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_241, 0, x_210);
@@ -3710,7 +3710,7 @@ x_248 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_248, 0, x_247);
 lean_ctor_set(x_248, 1, x_246);
 x_249 = lean_array_push(x_218, x_248);
-x_250 = l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
+x_250 = l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_inc(x_210);
 x_251 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_251, 0, x_210);
@@ -3731,30 +3731,30 @@ x_259 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_259, 0, x_258);
 lean_ctor_set(x_259, 1, x_257);
 x_260 = lean_array_push(x_218, x_259);
-x_261 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_261 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_262 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_262, 0, x_210);
 lean_ctor_set(x_262, 1, x_261);
 x_263 = lean_array_push(x_260, x_262);
 x_264 = lean_array_push(x_263, x_205);
-x_265 = l_myMacro____x40_Init_Notation___hyg_12262____closed__12;
+x_265 = l_myMacro____x40_Init_Notation___hyg_12336____closed__12;
 x_266 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_266, 0, x_265);
 lean_ctor_set(x_266, 1, x_264);
 x_267 = lean_array_push(x_252, x_266);
-x_268 = l_myMacro____x40_Init_Notation___hyg_12262____closed__10;
+x_268 = l_myMacro____x40_Init_Notation___hyg_12336____closed__10;
 x_269 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_269, 0, x_268);
 lean_ctor_set(x_269, 1, x_267);
 x_270 = lean_array_push(x_218, x_269);
-x_271 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_271 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_272 = lean_array_push(x_270, x_271);
 x_273 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_273, 0, x_258);
 lean_ctor_set(x_273, 1, x_272);
 x_274 = lean_array_push(x_234, x_273);
 x_275 = lean_array_push(x_274, x_245);
-x_276 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_276 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_277 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_277, 0, x_276);
 lean_ctor_set(x_277, 1, x_275);
@@ -3763,7 +3763,7 @@ x_279 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_279, 0, x_258);
 lean_ctor_set(x_279, 1, x_278);
 x_280 = lean_array_push(x_231, x_279);
-x_281 = l_myMacro____x40_Init_Notation___hyg_2117____closed__4;
+x_281 = l_myMacro____x40_Init_Notation___hyg_2191____closed__4;
 x_282 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_282, 0, x_281);
 lean_ctor_set(x_282, 1, x_280);

stage0/stdlib/Lean/Elab/Structure.c

@@ -24,7 +24,6 @@ lean_object* l_Lean_addDeclarationRanges___at___private_Lean_Elab_Structure_0__L
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__3___lambda__3___closed__2;
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__1___boxed(lean_object**);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__4___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*);
-lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_removeUnused(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_getResultUniverse___closed__1;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_levelMVarToParam(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -55,6 +54,7 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_removeUnused__
 lean_object* l_Lean_Elab_getOptDerivingClasses___at_Lean_Elab_Command_elabStructure___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_mkForallFVars(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_throwError___at_Lean_Elab_Command_elabExport___spec__5(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Elab_elabAttr___rarg___lambda__8___closed__2;
 lean_object* l_List_map___at_Lean_Meta_addInstance___spec__1(lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidCtorModifier___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__12(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -91,6 +91,7 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___r
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___closed__3;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields_match__5___rarg(uint8_t, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_collectUniversesFromFields___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*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___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_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields_match__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -101,7 +102,7 @@ extern lean_object* l_Lean_Elab_instInhabitedAttribute;
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields_match__5(lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__4(lean_object*, lean_object*, lean_object*, size_t, size_t, 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_12262____closed__10;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__5___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___closed__3;
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__10___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -112,6 +113,7 @@ lean_object* lean_st_ref_get(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_myMacro____x40_Init_NotationExtra___hyg_3363____closed__17;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withParents___rarg___lambda__3___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*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_6045____closed__4;
 lean_object* l_Lean_Elab_Command_elabStructure_match__1(lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__3___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*, lean_object*, lean_object*);
@@ -191,6 +193,7 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addProjections
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults_match__1___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_Meta_withLocalDecl___at_Lean_Elab_Term_elabLetDeclAux___spec__2___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_Lean_Elab_Command_checkValidFieldModifier___lambda__3___boxed(lean_object*, 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_12938____closed__14;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView_match__1___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_checkParentIsStructure(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___rarg___closed__4;
@@ -203,6 +206,7 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_levelMVarToPar
 lean_object* l_Lean_throwError___at_Lean_Elab_Term_throwErrorIfErrors___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_validStructType___boxed(lean_object*);
 lean_object* l_Lean_Elab_Command_StructFieldInfo_isFromParent___boxed(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_6561____closed__4;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_updateResultingUniverse_match__1(lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__10___lambda__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -219,7 +223,6 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_processSubfiel
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addCtorFields(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_elabModifiers___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___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*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_removeUnused_match__1___rarg(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__12;
 lean_object* l_Lean_Elab_elabAttrs___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__3(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_Structure_0__Lean_Elab_Command_expandCtor___spec__7(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalDecl_value(lean_object*);
@@ -270,6 +273,7 @@ lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lea
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__3___closed__1;
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__4___boxed(lean_object**);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_collectUsed___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*);
+lean_object* l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_mkAuxConstructions___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*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_defaultCtorName;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withUsed_match__1(lean_object*);
@@ -346,7 +350,6 @@ extern lean_object* l_Lean_protectedExt;
 lean_object* l_Lean_Elab_Command_elabStructure___lambda__5(lean_object*, lean_object*, lean_object*, uint8_t, lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_CollectLevelParams_main(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_6487____closed__4;
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__3___lambda__4___closed__2;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___boxed(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_Command_checkValidFieldModifier___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -375,7 +378,6 @@ lean_object* l_Lean_Meta_getLocalInstances(lean_object*, lean_object*, lean_obje
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___rarg___closed__5;
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__3___lambda__3___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_expandDeclId___at_Lean_Elab_Command_elabStructure___spec__4___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*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
 lean_object* l_Lean_Elab_sortDeclLevelParams(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_structSimpleBinder___elambda__1___closed__2;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___spec__1(lean_object*);
@@ -397,7 +399,6 @@ size_t lean_usize_of_nat(lean_object*);
 lean_object* l_Lean_Elab_expandDeclIdCore(lean_object*);
 lean_object* l_Lean_addTrace___at___private_Lean_Elab_Term_0__Lean_Elab_Term_postponeElabTerm___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_LocalContext_updateBinderInfo(lean_object*, lean_object*, uint8_t);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_collectLevelParamsInStructure___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_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__3___lambda__2___closed__1;
@@ -415,6 +416,7 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_addCtorFields_
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields___spec__3___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*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_getDeclarationRange___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__18(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields(lean_object*);
+lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Command_elabStructure___spec__9(lean_object*, size_t, size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_DerivingClassView_applyHandlers(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___rarg___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*, lean_object*, lean_object*, lean_object*);
@@ -466,6 +468,7 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_collectLevelPa
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields_match__4(lean_object*);
 lean_object* l_Lean_Elab_Command_getCurrMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_mkPrivateName(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__10;
 lean_object* l_Lean_addDeclarationRanges___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__19(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at___private_Lean_Elab_Term_0__Lean_Elab_Term_elabTermAux___spec__4___rarg(lean_object*);
 extern lean_object* l_Lean_Elab_instInhabitedModifiers___closed__1;
@@ -497,7 +500,6 @@ extern lean_object* l_Lean_Elab_sortDeclLevelParams___closed__1;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___rarg___lambda__3___boxed(lean_object**);
 lean_object* l_Array_appendCore___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_instInhabitedExpr___closed__1;
-lean_object* l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_withDeclName___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_checkValidFieldModifier___lambda__3___closed__3;
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields___spec__4(lean_object*);
@@ -540,7 +542,6 @@ lean_object* l_Lean_Level_getLevelOffset(lean_object*);
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_expandMacros(lean_object*, lean_object*, lean_object*);
 uint8_t l_Lean_Elab_Command_StructFieldInfo_isFromParent(lean_object*);
-lean_object* l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Modifiers_addAttribute(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_collectUniversesFromFields___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_set_reducibility_status(lean_object*, lean_object*, uint8_t);
@@ -604,6 +605,7 @@ lean_object* l_Lean_throwError___at___private_Lean_Elab_Structure_0__Lean_Elab_C
 lean_object* l_Lean_Expr_getAppFn(lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandFields_match__2(lean_object*);
 lean_object* l_Lean_FileMap_leanPosToLspPos(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__12;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_levelMVarToParamFVar___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_Structure_0__Lean_Elab_Command_expandCtor___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*);
 lean_object* l_Lean_throwErrorAt___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_expandCtor___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -620,7 +622,6 @@ lean_object* l_Lean_Elab_Command_getScope___rarg(lean_object*, lean_object*);
 lean_object* l_Array_foldlMUnsafe_fold___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabStructureView___spec__9(lean_object*, size_t, size_t, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withUsed_match__1___rarg(lean_object*, lean_object*);
 uint8_t l_Lean_Elab_isFreshInstanceName(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_levelMVarToParamFVars___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_setReducibilityStatus___at___private_Lean_Elab_Structure_0__Lean_Elab_Command_addDefaults___spec__1(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_structImplicitBinder___elambda__1___closed__2;
@@ -679,7 +680,6 @@ lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_levelMVarToPar
 lean_object* l_Lean_Elab_getBetterRef(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_withFields_match__4___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_lt(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_elabFieldTypeValue(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_resolveGlobalConstNoOverload___at_Lean_Elab_elabDeriving___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Structure_0__Lean_Elab_Command_collectUsed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2305,7 +2305,7 @@ if (x_13 == 0)
 {
 lean_object* x_14; lean_object* x_15; 
 x_14 = l_Lean_Elab_Command_checkValidCtorModifier___rarg___lambda__1___closed__3;
-x_15 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_14, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_15 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_14, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_15;
 }
 else
@@ -2481,7 +2481,7 @@ x_21 = l_Lean_Elab_throwAlreadyDeclaredUniverseLevel___rarg___closed__3;
 x_22 = lean_alloc_ctor(10, 2, 0);
 lean_ctor_set(x_22, 0, x_20);
 lean_ctor_set(x_22, 1, x_21);
-x_23 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_22, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
+x_23 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_22, x_4, x_5, x_6, x_7, x_8, x_9, x_10);
 return x_23;
 }
 }
@@ -2722,7 +2722,7 @@ lean_dec(x_22);
 x_25 = l_Lean_protectedExt;
 lean_inc(x_2);
 x_26 = l_Lean_PersistentEnvExtension_addEntry___rarg(x_25, x_24, x_2);
-x_27 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__7(x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_23);
+x_27 = l_Lean_setEnv___at_Lean_Elab_Term_evalExpr___spec__6(x_26, x_3, x_4, x_5, x_6, x_7, x_8, x_23);
 lean_dec(x_3);
 x_28 = !lean_is_exclusive(x_27);
 if (x_28 == 0)
@@ -4422,7 +4422,7 @@ else
 {
 lean_object* x_13; lean_object* x_14; 
 x_13 = l_Lean_Elab_Command_checkValidFieldModifier___lambda__1___closed__3;
-x_14 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__6(x_13, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
+x_14 = l_Lean_throwError___at_Lean_Elab_Term_evalExpr___spec__5(x_13, x_3, x_4, x_5, x_6, x_7, x_8, x_9);
 return x_14;
 }
 }
@@ -9888,7 +9888,7 @@ x_88 = l_Lean_Elab_Term_getMainModule___rarg(x_10, x_87);
 x_89 = lean_ctor_get(x_88, 1);
 lean_inc(x_89);
 lean_dec(x_88);
-x_90 = l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
+x_90 = l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_inc(x_84);
 x_91 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_91, 0, x_84);
@@ -9902,18 +9902,18 @@ x_96 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_96, 0, x_95);
 lean_ctor_set(x_96, 1, x_94);
 x_97 = lean_array_push(x_92, x_96);
-x_98 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_98 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_99 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_99, 0, x_84);
 lean_ctor_set(x_99, 1, x_98);
 x_100 = lean_array_push(x_97, x_99);
 x_101 = lean_array_push(x_100, x_75);
-x_102 = l_myMacro____x40_Init_Notation___hyg_12262____closed__12;
+x_102 = l_myMacro____x40_Init_Notation___hyg_12336____closed__12;
 x_103 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_103, 0, x_102);
 lean_ctor_set(x_103, 1, x_101);
 x_104 = lean_array_push(x_93, x_103);
-x_105 = l_myMacro____x40_Init_Notation___hyg_12262____closed__10;
+x_105 = l_myMacro____x40_Init_Notation___hyg_12336____closed__10;
 x_106 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_106, 0, x_105);
 lean_ctor_set(x_106, 1, x_104);
@@ -10319,7 +10319,7 @@ x_196 = l_Lean_Elab_Term_getMainModule___rarg(x_10, x_195);
 x_197 = lean_ctor_get(x_196, 1);
 lean_inc(x_197);
 lean_dec(x_196);
-x_198 = l_myMacro____x40_Init_Notation___hyg_12262____closed__9;
+x_198 = l_myMacro____x40_Init_Notation___hyg_12336____closed__9;
 lean_inc(x_192);
 x_199 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_199, 0, x_192);
@@ -10333,18 +10333,18 @@ x_204 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_204, 0, x_203);
 lean_ctor_set(x_204, 1, x_202);
 x_205 = lean_array_push(x_200, x_204);
-x_206 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_206 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 x_207 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_207, 0, x_192);
 lean_ctor_set(x_207, 1, x_206);
 x_208 = lean_array_push(x_205, x_207);
 x_209 = lean_array_push(x_208, x_183);
-x_210 = l_myMacro____x40_Init_Notation___hyg_12262____closed__12;
+x_210 = l_myMacro____x40_Init_Notation___hyg_12336____closed__12;
 x_211 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_211, 0, x_210);
 lean_ctor_set(x_211, 1, x_209);
 x_212 = lean_array_push(x_201, x_211);
-x_213 = l_myMacro____x40_Init_Notation___hyg_12262____closed__10;
+x_213 = l_myMacro____x40_Init_Notation___hyg_12336____closed__10;
 x_214 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_214, 0, x_213);
 lean_ctor_set(x_214, 1, x_212);
@@ -13238,7 +13238,7 @@ default:
 {
 lean_object* x_36; lean_object* x_37; lean_object* x_38; uint8_t x_39; lean_object* x_40; lean_object* x_41; 
 x_36 = l_Lean_LocalDecl_userName(x_19);
-x_37 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_37 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_38 = l_Lean_Name_appendBefore(x_36, x_37);
 x_39 = l_Lean_LocalDecl_binderInfo(x_19);
 x_40 = l_Lean_LocalDecl_type(x_19);
@@ -13947,10 +13947,10 @@ lean_dec(x_10);
 x_13 = l___private_Lean_Elab_Inductive_0__Lean_Elab_Command_mkAuxConstructions___closed__2;
 lean_inc(x_12);
 x_14 = l_Lean_Environment_contains(x_12, x_13);
-x_15 = l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
+x_15 = l_myMacro____x40_Init_Notation___hyg_6045____closed__4;
 lean_inc(x_12);
 x_16 = l_Lean_Environment_contains(x_12, x_15);
-x_17 = l_myMacro____x40_Init_Notation___hyg_6487____closed__4;
+x_17 = l_myMacro____x40_Init_Notation___hyg_6561____closed__4;
 x_18 = l_Lean_Environment_contains(x_12, x_17);
 lean_inc(x_6);
 lean_inc(x_2);
@@ -15613,7 +15613,7 @@ lean_inc(x_67);
 lean_dec(x_66);
 lean_inc(x_13);
 lean_inc(x_9);
-x_68 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__4(x_65, x_9, x_10, x_11, x_12, x_13, x_14, x_67);
+x_68 = l_Lean_addDecl___at_Lean_Elab_Term_evalExpr___spec__3(x_65, x_9, x_10, x_11, x_12, x_13, x_14, x_67);
 lean_dec(x_65);
 if (lean_obj_tag(x_68) == 0)
 {
@@ -19103,7 +19103,7 @@ lean_ctor_set(x_43, 0, x_36);
 lean_ctor_set(x_43, 1, x_42);
 x_44 = l_Array_empty___closed__1;
 x_45 = lean_array_push(x_44, x_43);
-x_46 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_46 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_47 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_47, 0, x_36);
 lean_ctor_set(x_47, 1, x_46);

stage0/stdlib/Lean/Elab/Tactic/Basic.c

@@ -14,6 +14,7 @@
 extern "C" {
 #endif
 lean_object* l_List_reverse___rarg(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Tactic_evalTacticAux___spec__2___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Tactic_tacticSeqBracketed___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Tactic_getMainTag___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -22,6 +23,7 @@ size_t l_USize_add(size_t, size_t);
 lean_object* l_Lean_Elab_Tactic_forEachVar_match__2(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_expandTacticMacroFns_loop___spec__3___rarg(lean_object*);
 lean_object* l_Std_PersistentHashMap_findAtAux___at_Lean_Elab_Tactic_evalTacticAux___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 extern lean_object* l_Lean_Parser_Tactic_revert___closed__2;
 lean_object* l_Std_HashMapImp_find_x3f___at_Lean_Elab_Tactic_evalTacticAux___spec__5(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_liftMetaTacticAux___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -78,6 +80,7 @@ extern lean_object* l_Lean_Parser_Tactic_intro___closed__4;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_Elab_Tactic_appendGoals___boxed(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_Tactic_pruneSolvedGoals___boxed(lean_object*, 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_12336____closed__13;
 lean_object* l_Lean_Elab_Tactic_focus(lean_object*);
 lean_object* l_Array_qpartition_loop___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds___spec__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_identKind___closed__2;
@@ -89,13 +92,13 @@ lean_object* l_Lean_Elab_withMacroExpansionInfo___at_Lean_Elab_Tactic_adaptExpan
 lean_object* l_Lean_Elab_Tactic_mkTacticAttribute___closed__6;
 lean_object* l_List_findM_x3f___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_findTag_x3f___spec__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_Lean_Elab_Tactic_evalIntros_match__2(lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 lean_object* l_Lean_Elab_Tactic_liftMetaM___rarg(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_Tactic_evalCase___closed__1;
 lean_object* l_Lean_Elab_Tactic_evalTacticAux(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_Tactic_done(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_goalsToMessageData___spec__1(lean_object*);
 lean_object* l_Lean_mkMVar(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
 lean_object* l_Lean_Elab_Tactic_evalTacticSeq1Indented___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Array_empty___closed__1;
 lean_object* l___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_findTag_x3f(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -122,7 +125,6 @@ uint8_t lean_name_eq(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalTactic(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_goalsToMessageData___closed__1;
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalCase___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
 lean_object* l_List_forIn_loop___at_Lean_Elab_Tactic_tagUntaggedGoals___spec__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*);
 lean_object* l_Lean_Elab_Tactic_saveAllState(lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Tactic_evalTacticAux___spec__8___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -189,6 +191,7 @@ extern lean_object* l_Lean_Parser_Tactic_clear___closed__1;
 lean_object* l_Lean_Elab_Term_ensureHasType(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_Tactic_instMonadExceptExceptionTacticM___closed__2;
 extern lean_object* l_Lean_Parser_Tactic_clear___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_object* l_Lean_Elab_Tactic_getMainGoal___closed__2;
 lean_object* l_Lean_Elab_throwUnsupportedSyntax___at_Lean_Elab_Tactic_evalFirst___spec__1(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_throwErrorIfErrors___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -215,6 +218,7 @@ lean_object* l_Lean_Elab_Tactic_forEachVar_match__2___rarg(lean_object*);
 lean_object* l_Lean_Elab_Tactic_TacticM_run_x27(lean_object*);
 lean_object* l_Lean_Elab_Tactic_focus_match__1(lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDone___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSkip___closed__1;
 lean_object* l_Lean_Elab_Tactic_evalCase(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalClear___closed__1;
@@ -270,7 +274,6 @@ lean_object* l_Array_qsort_sort___at___private_Lean_Elab_Tactic_Basic_0__Lean_El
 lean_object* l_Lean_replaceRef(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalDone___rarg___boxed(lean_object*, 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_12864____closed__11;
 lean_object* l_Lean_Elab_Tactic_evalRevert_match__2(lean_object*);
 lean_object* l___private_Lean_Elab_Util_0__Lean_Elab_expandMacro_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalTacticAux___lambda__1___closed__1;
@@ -286,6 +289,7 @@ lean_object* l_Lean_Elab_Tactic_saveAllState___rarg___boxed(lean_object*, lean_o
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalDone(lean_object*);
 lean_object* l_Lean_Name_appendIndexAfter(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_getUnsolvedGoals(lean_object*, 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_12938____closed__10;
 lean_object* l_Lean_Elab_Tactic_evalTacticAux___lambda__1___closed__2;
 lean_object* l_Lean_Elab_Tactic_evalIntros___lambda__2(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_Tactic_evalFirst(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -356,9 +360,7 @@ lean_object* l_Lean_Elab_Tactic_evalAllGoals___boxed(lean_object*, lean_object*,
 extern lean_object* l_Lean_Parser_Tactic_allGoals___closed__2;
 uint8_t l_Lean_MessageData_hasSyntheticSorry(lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalFailIfSuccess___closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
 lean_object* l_Lean_Elab_Term_reportUnsolvedGoals___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__6;
 extern lean_object* l_Lean_Parser_Tactic_paren___closed__1;
 extern lean_object* l_Lean_Parser_Tactic_done___closed__2;
 lean_object* l___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds___lambda__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -369,12 +371,9 @@ lean_object* l_Lean_Elab_Tactic_liftMetaM(lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalFirst(lean_object*);
 lean_object* l_Lean_InternalExceptionId_getName(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_tacticElabAttribute;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Tactic_evalTacticAux___spec__10(lean_object*, size_t, size_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_Elab_Tactic_reportUnsolvedGoals___boxed(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_Tactic_saveAllState___boxed(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
-extern lean_object* l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__3;
 lean_object* l_Lean_addMacroScope(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_expandTacticMacroFns_loop_match__1(lean_object*);
 lean_object* l_Lean_Elab_Tactic_try___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -401,6 +400,7 @@ lean_object* l_Lean_Elab_Tactic_saveBacktrackableState(lean_object*);
 lean_object* l_Lean_Syntax_getPos_x3f(lean_object*, uint8_t);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSubst___closed__1;
 lean_object* l_Lean_Meta_assignExprMVar(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 lean_object* l_Lean_Elab_withMacroExpansionInfo___at_Lean_Elab_Tactic_withMacroExpansion___spec__1(lean_object*);
 lean_object* l_Lean_Elab_log___at_Lean_Elab_Tactic_evalTraceState___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_goalsToMessageData(lean_object*);
@@ -417,8 +417,6 @@ lean_object* l_Lean_LocalDecl_index(lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalSeq1(lean_object*);
 lean_object* l_Lean_Syntax_getSepArgs(lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalFailIfSuccess___closed__1;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
-extern lean_object* l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__2;
 lean_object* l_Std_PersistentHashMap_find_x3f___at_Lean_Elab_Tactic_evalTacticAux___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_liftMetaTacticAux_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_sortFVarIds_match__1(lean_object*);
@@ -438,7 +436,6 @@ lean_object* l_Lean_Elab_Tactic_evalClear_match__2___rarg(lean_object*);
 lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Tactic_evalTactic___spec__1(lean_object*, lean_object*, lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_ensureHasNoMVars___closed__2;
-extern lean_object* l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__5;
 lean_object* l_Lean_Elab_Tactic_liftMetaTactic___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*);
 lean_object* l_Lean_Elab_Tactic_evalTacticSeqBracketed___closed__1;
 lean_object* l_Lean_Elab_Tactic_evalIntro___closed__4;
@@ -458,7 +455,6 @@ lean_object* l_Lean_Elab_Tactic_evalAssumption(lean_object*);
 lean_object* l_Lean_Elab_Tactic_saveBacktrackableState___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalIntro_introStep___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*);
 lean_object* l_Lean_Elab_Tactic_evalCase___closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
 extern lean_object* l_Lean_Elab_Term_instInhabitedSavedState___closed__1;
 lean_object* l_Array_forInUnsafe_loop___at_Lean_Elab_Tactic_evalClear___spec__2___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* l_Lean_Elab_Tactic_setGoals(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -466,6 +462,7 @@ lean_object* l_Lean_Elab_Tactic_saveAllState___rarg(lean_object*, lean_object*,
 lean_object* l_Lean_Elab_Tactic_withMainMVarContext_match__1___rarg(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_evalTacticUsing_loop___closed__2;
 lean_object* l_Array_appendCore___rarg(lean_object*, lean_object*);
+extern lean_object* l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__2;
 lean_object* l_Lean_Meta_withMVarContext___at_Lean_Elab_Tactic_withMainMVarContext___spec__1___rarg(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_Tactic_tagUntaggedGoals(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_Lean_Elab_Tactic_evalIntro___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*);
@@ -476,11 +473,11 @@ lean_object* l_List_filterAuxM___at_Lean_Elab_Tactic_pruneSolvedGoals___spec__1_
 lean_object* l_Lean_Elab_Tactic_evalFailIfSuccess(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_Tactic_evalIntros_match__1(lean_object*);
 lean_object* l_Lean_Meta_isExprMVarAssigned(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
 lean_object* l_Lean_Elab_Tactic_TacticM_run___rarg(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_Parser_Tactic_case___closed__2;
 lean_object* l_Lean_Elab_Tactic_evalChoiceAux(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_Tactic_evalFocus___boxed(lean_object*, lean_object*, 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_12938____closed__11;
 lean_object* l_Lean_Elab_logException___at_Lean_Elab_Tactic_closeUsingOrAdmit___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_findM_x3f___at___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_findTag_x3f___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* l_Lean_Elab_Tactic_withMacroExpansion___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*);
@@ -495,6 +492,7 @@ extern lean_object* l_Lean_instInhabitedName;
 lean_object* l_Lean_Elab_Tactic_ensureHasNoMVars(lean_object*, 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_Tactic_evalTacticAux___spec__11___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_getFVarIds___spec__1(size_t, size_t, 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_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__3;
 lean_object* l_Lean_Elab_Tactic_evalIntro_introStep(lean_object*, 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_Tactic_tagUntaggedGoals___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*);
 lean_object* l_Lean_Meta_inferType(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -528,6 +526,7 @@ lean_object* l_Lean_PersistentEnvExtension_getState___rarg(lean_object*, lean_ob
 lean_object* l_Lean_Elab_Tactic_evalTraceState___boxed(lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalDone(lean_object*);
 lean_object* l_Lean_setEnv___at_Lean_Elab_Tactic_BacktrackableState_restore___spec__1___boxed(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_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__5;
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalIntro(lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_evalTacticUsing_loop_match__2___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getTailPos_x3f(lean_object*, uint8_t);
@@ -572,7 +571,7 @@ lean_object* l_List_erase___at_Lean_Elab_Tactic_evalCase___spec__1___boxed(lean_
 lean_object* lean_local_ctx_find(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalIntro_introStep_match__1(lean_object*);
 extern lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1080____closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 lean_object* l___private_Lean_Elab_Tactic_Basic_0__Lean_Elab_Tactic_evalTacticUsing_loop_match__3(lean_object*);
 lean_object* lean_usize_to_nat(size_t);
 lean_object* l_Array_foldlMUnsafe_fold___at_Lean_Elab_Tactic_evalTacticSeq1Indented___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*, lean_object*);
@@ -607,6 +606,7 @@ extern lean_object* l_Array_forInUnsafe_loop___at_Lean_mkSepArray___spec__1___cl
 lean_object* l_Lean_Elab_Term_reportUnsolvedGoals___closed__2;
 lean_object* l___private_Lean_Elab_InfoTree_0__Lean_Elab_getResetInfoTrees___at_Lean_Elab_Tactic_evalTactic___spec__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_mkTacticInfo(lean_object*, 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_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 lean_object* l_Lean_Elab_Tactic_TacticM_run_x27___rarg(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_Tactic_liftMetaTacticAux___rarg___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_Lean_Elab_Tactic_expandTacticMacro(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -10707,7 +10707,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Tactic_tacticElabAttribute;
-x_3 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__2;
+x_3 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__2;
 x_4 = l___regBuiltin_Lean_Elab_Tactic_evalSeq1___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
@@ -10938,7 +10938,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Tactic_tacticElabAttribute;
-x_3 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__5;
+x_3 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__5;
 x_4 = l___regBuiltin_Lean_Elab_Tactic_evalTacticSeq1Indented___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
@@ -11522,7 +11522,7 @@ _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
 x_2 = l_Lean_Elab_Tactic_tacticElabAttribute;
-x_3 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__3;
+x_3 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__3;
 x_4 = l___regBuiltin_Lean_Elab_Tactic_evalTacticSeq___closed__1;
 x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_2, x_3, x_4, x_1);
 return x_5;
@@ -13551,7 +13551,7 @@ x_43 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_43, 0, x_11);
 lean_ctor_set(x_43, 1, x_42);
 x_44 = lean_array_push(x_37, x_43);
-x_45 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_45 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 x_46 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_46, 0, x_29);
 lean_ctor_set(x_46, 1, x_45);
@@ -13570,7 +13570,7 @@ x_53 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_53, 0, x_40);
 lean_ctor_set(x_53, 1, x_52);
 x_54 = lean_array_push(x_37, x_53);
-x_55 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__2;
+x_55 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__2;
 x_56 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_56, 0, x_55);
 lean_ctor_set(x_56, 1, x_54);
@@ -13619,7 +13619,7 @@ x_70 = l_Lean_Syntax_isOfKind(x_68, x_69);
 if (x_70 == 0)
 {
 lean_object* x_71; uint8_t x_72; 
-x_71 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_71 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 lean_inc(x_68);
 x_72 = l_Lean_Syntax_isOfKind(x_68, x_71);
 if (x_72 == 0)
@@ -13671,14 +13671,14 @@ x_94 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_94, 0, x_11);
 lean_ctor_set(x_94, 1, x_93);
 x_95 = lean_array_push(x_84, x_94);
-x_96 = l_myMacro____x40_Init_Notation___hyg_14350____closed__12;
+x_96 = l_myMacro____x40_Init_Notation___hyg_14424____closed__12;
 lean_inc(x_74);
 x_97 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_97, 0, x_74);
 lean_ctor_set(x_97, 1, x_96);
 lean_inc(x_97);
 x_98 = lean_array_push(x_95, x_97);
-x_99 = l_myMacro____x40_Init_Notation___hyg_12864____closed__1;
+x_99 = l_myMacro____x40_Init_Notation___hyg_12938____closed__1;
 lean_inc(x_74);
 x_100 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_100, 0, x_74);
@@ -13686,7 +13686,7 @@ lean_ctor_set(x_100, 1, x_99);
 x_101 = lean_array_push(x_84, x_100);
 x_102 = l_Lean_myMacro____x40_Init_NotationExtra___hyg_1128____closed__8;
 x_103 = lean_array_push(x_102, x_90);
-x_104 = l_myMacro____x40_Init_Notation___hyg_12864____closed__4;
+x_104 = l_myMacro____x40_Init_Notation___hyg_12938____closed__4;
 x_105 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_105, 0, x_104);
 lean_ctor_set(x_105, 1, x_103);
@@ -13695,15 +13695,15 @@ x_107 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_107, 0, x_60);
 lean_ctor_set(x_107, 1, x_106);
 x_108 = lean_array_push(x_101, x_107);
-x_109 = l_myMacro____x40_Init_Notation___hyg_13781____closed__10;
+x_109 = l_myMacro____x40_Init_Notation___hyg_13855____closed__10;
 x_110 = lean_array_push(x_108, x_109);
-x_111 = l_myMacro____x40_Init_Notation___hyg_12864____closed__6;
+x_111 = l_myMacro____x40_Init_Notation___hyg_12938____closed__6;
 lean_inc(x_74);
 x_112 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_112, 0, x_74);
 lean_ctor_set(x_112, 1, x_111);
 x_113 = lean_array_push(x_110, x_112);
-x_114 = l_myMacro____x40_Init_Notation___hyg_12864____closed__11;
+x_114 = l_myMacro____x40_Init_Notation___hyg_12938____closed__11;
 lean_inc(x_74);
 x_115 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_115, 0, x_74);
@@ -13714,13 +13714,13 @@ x_118 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_118, 0, x_60);
 lean_ctor_set(x_118, 1, x_117);
 x_119 = lean_array_push(x_116, x_118);
-x_120 = l_myMacro____x40_Init_Notation___hyg_12262____closed__13;
+x_120 = l_myMacro____x40_Init_Notation___hyg_12336____closed__13;
 lean_inc(x_74);
 x_121 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_121, 0, x_74);
 lean_ctor_set(x_121, 1, x_120);
 x_122 = lean_array_push(x_119, x_121);
-x_123 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_123 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_inc(x_74);
 x_124 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_124, 0, x_74);
@@ -13730,7 +13730,7 @@ x_126 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_126, 0, x_71);
 lean_ctor_set(x_126, 1, x_125);
 x_127 = lean_array_push(x_122, x_126);
-x_128 = l_myMacro____x40_Init_Notation___hyg_12864____closed__10;
+x_128 = l_myMacro____x40_Init_Notation___hyg_12938____closed__10;
 x_129 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_129, 0, x_128);
 lean_ctor_set(x_129, 1, x_127);
@@ -13739,7 +13739,7 @@ x_131 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_131, 0, x_60);
 lean_ctor_set(x_131, 1, x_130);
 x_132 = lean_array_push(x_84, x_131);
-x_133 = l_myMacro____x40_Init_Notation___hyg_12864____closed__8;
+x_133 = l_myMacro____x40_Init_Notation___hyg_12938____closed__8;
 x_134 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_134, 0, x_133);
 lean_ctor_set(x_134, 1, x_132);
@@ -13765,7 +13765,7 @@ x_147 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_147, 0, x_60);
 lean_ctor_set(x_147, 1, x_146);
 x_148 = lean_array_push(x_84, x_147);
-x_149 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__2;
+x_149 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__2;
 x_150 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_150, 0, x_149);
 lean_ctor_set(x_150, 1, x_148);
@@ -17540,7 +17540,7 @@ x_15 = l_Lean_Syntax_getArg(x_1, x_14);
 x_16 = lean_unsigned_to_nat(3u);
 x_17 = l_Lean_Syntax_getArg(x_1, x_16);
 lean_dec(x_1);
-x_18 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15515____closed__3;
+x_18 = l_Lean_Parser_Tactic_myMacro____x40_Init_Notation___hyg_15589____closed__3;
 lean_inc(x_17);
 x_19 = l_Lean_Syntax_isOfKind(x_17, x_18);
 if (x_19 == 0)

stage0/stdlib/Lean/Elab/Tactic/Binders.c

@@ -30,8 +30,11 @@ lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_expandLetTactic(lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Binders_0__Lean_Elab_Tactic_liftTermBinderSyntax___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Binders_0__Lean_Elab_Tactic_liftTermBinderSyntax___closed__1;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_myMacro____x40_Init_Notation___hyg_109____spec__1(lean_object*, lean_object*);
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
+lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_expandLetBangTactic___closed__1;
 lean_object* l_Lean_Elab_Tactic_expandLetBangTactic(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_syntheticHole___elambda__1___closed__1;
@@ -45,15 +48,12 @@ lean_object* l_Lean_Elab_Tactic_expandSufficesTactic___boxed(lean_object*, lean_
 extern lean_object* l_Lean_Parser_Error_toString___closed__2;
 lean_object* l_Lean_Elab_Tactic_expandHaveTactic___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_expandShowTactic(lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
 extern lean_object* l_Lean_Parser_Tactic_suffices___closed__2;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l___regBuiltin_Lean_Elab_Tactic_expandLetRecTactic(lean_object*);
 lean_object* l_Lean_Elab_Tactic_expandSufficesTactic(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Binders_0__Lean_Elab_Tactic_liftTermBinderSyntax_match__1(lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l_Lean_mkAtomFrom(lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
 lean_object* l_Lean_Elab_Tactic_expandLetBangTactic___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Syntax_mkApp___closed__1;
 extern lean_object* l_Lean_Parser_Tactic_refine___closed__1;
@@ -65,8 +65,9 @@ lean_object* l___regBuiltin_Lean_Elab_Tactic_expandShowTactic___closed__1;
 extern lean_object* l_Lean_Parser_Tactic_letrec___closed__2;
 lean_object* l_Lean_Syntax_getArgs(lean_object*);
 lean_object* l_Lean_Syntax_getKind(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 extern lean_object* l_Lean_Parser_Tactic_show___closed__2;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 extern lean_object* l_Lean_Parser_Tactic_show___closed__1;
 extern lean_object* l_prec_x28___x29___closed__7;
 lean_object* l___regBuiltin_Lean_Elab_Tactic_expandShowTactic(lean_object*);
@@ -76,12 +77,11 @@ lean_object* l_Lean_Syntax_getArg(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkOptionalNode___closed__2;
 extern lean_object* l_Lean_Parser_Tactic_intro___closed__1;
 lean_object* l___regBuiltin_Lean_Elab_Tactic_expandSufficesTactic(lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+extern lean_object* l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 lean_object* l_Lean_Elab_Tactic_expandLetRecTactic___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_expandLetBangTactic(lean_object*);
 lean_object* l_Lean_Elab_Tactic_expandShowTactic___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_expandShowTactic___closed__1;
-lean_object* l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(lean_object*, lean_object*);
 uint8_t lean_string_dec_eq(lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Binders_0__Lean_Elab_Tactic_liftTermBinderSyntax_match__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
@@ -164,7 +164,7 @@ lean_object* l___private_Lean_Elab_Tactic_Binders_0__Lean_Elab_Tactic_liftTermBi
 _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; lean_object* x_15; lean_object* x_16; lean_object* x_17; lean_object* x_18; lean_object* x_19; 
-x_4 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14568__expandListLit___spec__1(x_2, x_3);
+x_4 = l_Lean_MonadRef_mkInfoFromRefPos___at_Lean_myMacro____x40_Init_Notation___hyg_14642__expandListLit___spec__1(x_2, x_3);
 x_5 = lean_ctor_get(x_4, 0);
 lean_inc(x_5);
 x_6 = lean_ctor_get(x_4, 1);
@@ -177,12 +177,12 @@ lean_ctor_set(x_8, 0, x_5);
 lean_ctor_set(x_8, 1, x_7);
 x_9 = l_Array_empty___closed__1;
 x_10 = lean_array_push(x_9, x_8);
-x_11 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_11 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 x_12 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_12, 0, x_5);
 lean_ctor_set(x_12, 1, x_11);
 x_13 = lean_array_push(x_9, x_12);
-x_14 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_14 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_15 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_15, 0, x_14);
 lean_ctor_set(x_15, 1, x_13);
@@ -226,7 +226,7 @@ return x_27;
 else
 {
 lean_object* x_28; lean_object* x_29; lean_object* 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; lean_object* x_37; lean_object* x_38; lean_object* x_39; lean_object* x_40; lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
-x_28 = l_myMacro____x40_Init_Notation___hyg_2117____closed__1;
+x_28 = l_myMacro____x40_Init_Notation___hyg_2191____closed__1;
 x_29 = lean_name_mk_string(x_22, x_28);
 x_30 = lean_name_mk_string(x_29, x_21);
 x_31 = l_Lean_Syntax_getArgs(x_1);
@@ -556,13 +556,13 @@ x_24 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_24, 0, x_8);
 lean_ctor_set(x_24, 1, x_23);
 x_25 = lean_array_push(x_11, x_24);
-x_26 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_26 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_inc(x_8);
 x_27 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_27, 0, x_8);
 lean_ctor_set(x_27, 1, x_26);
 x_28 = lean_array_push(x_11, x_27);
-x_29 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_29 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_30 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_30, 0, x_29);
 lean_ctor_set(x_30, 1, x_28);
@@ -582,7 +582,7 @@ x_39 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_39, 0, x_38);
 lean_ctor_set(x_39, 1, x_37);
 x_40 = lean_array_push(x_11, x_39);
-x_41 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_41 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_42 = lean_array_push(x_40, x_41);
 x_43 = l_Lean_nullKind___closed__2;
 x_44 = lean_alloc_ctor(1, 2, 0);
@@ -594,7 +594,7 @@ x_47 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_47, 0, x_8);
 lean_ctor_set(x_47, 1, x_46);
 x_48 = lean_array_push(x_45, x_47);
-x_49 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_49 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_50 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_50, 0, x_49);
 lean_ctor_set(x_50, 1, x_48);
@@ -646,13 +646,13 @@ x_71 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_71, 0, x_54);
 lean_ctor_set(x_71, 1, x_70);
 x_72 = lean_array_push(x_58, x_71);
-x_73 = l_myMacro____x40_Init_Notation___hyg_12864____closed__14;
+x_73 = l_myMacro____x40_Init_Notation___hyg_12938____closed__14;
 lean_inc(x_54);
 x_74 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_74, 0, x_54);
 lean_ctor_set(x_74, 1, x_73);
 x_75 = lean_array_push(x_58, x_74);
-x_76 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_76 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_77 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_77, 0, x_76);
 lean_ctor_set(x_77, 1, x_75);
@@ -672,7 +672,7 @@ x_86 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_86, 0, x_85);
 lean_ctor_set(x_86, 1, x_84);
 x_87 = lean_array_push(x_58, x_86);
-x_88 = l_myMacro____x40_Init_Notation___hyg_1324____closed__8;
+x_88 = l_myMacro____x40_Init_Notation___hyg_1398____closed__8;
 x_89 = lean_array_push(x_87, x_88);
 x_90 = l_Lean_nullKind___closed__2;
 x_91 = lean_alloc_ctor(1, 2, 0);
@@ -684,7 +684,7 @@ x_94 = lean_alloc_ctor(2, 2, 0);
 lean_ctor_set(x_94, 0, x_54);
 lean_ctor_set(x_94, 1, x_93);
 x_95 = lean_array_push(x_92, x_94);
-x_96 = l_myMacro____x40_Init_Notation___hyg_12262____closed__8;
+x_96 = l_myMacro____x40_Init_Notation___hyg_12336____closed__8;
 x_97 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_97, 0, x_96);
 lean_ctor_set(x_97, 1, x_95);

stage0/stdlib/Lean/Elab/Tactic/Generalize.c

@@ -26,6 +26,7 @@ lean_object* l___private_Lean_Elab_Tactic_Generalize_0__Lean_Elab_Tactic_evalGen
 lean_object* l_Lean_Elab_Tactic_evalGeneralizeAux___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*, lean_object*);
 lean_object* l_Lean_Meta_getMVarTag(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_BacktrackableState_restore(lean_object*, lean_object*, 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_6045____closed__4;
 lean_object* lean_expr_lift_loose_bvars(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Generalize_0__Lean_Elab_Tactic_getVarName___boxed(lean_object*);
@@ -78,7 +79,6 @@ lean_object* l___private_Lean_Elab_Tactic_Generalize_0__Lean_Elab_Tactic_evalGen
 lean_object* l_Lean_mkApp3(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Generalize_0__Lean_Elab_Tactic_getVarName(lean_object*);
 lean_object* l_Lean_throwError___at___private_Lean_Elab_Tactic_Generalize_0__Lean_Elab_Tactic_evalGeneralizeWithEq___spec__1(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
 lean_object* l___private_Lean_Elab_Tactic_Generalize_0__Lean_Elab_Tactic_getAuxHypothesisName(lean_object* x_1) {
 _start:
 {
@@ -590,7 +590,7 @@ x_49 = lean_box(0);
 x_50 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_50, 0, x_47);
 lean_ctor_set(x_50, 1, x_49);
-x_51 = l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
+x_51 = l_myMacro____x40_Init_Notation___hyg_6045____closed__4;
 x_52 = l_Lean_mkConst(x_51, x_50);
 x_53 = l_Lean_Meta_assertExt___lambda__1___closed__1;
 lean_inc(x_2);
@@ -991,7 +991,7 @@ x_23 = lean_box(0);
 x_24 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_24, 0, x_18);
 lean_ctor_set(x_24, 1, x_23);
-x_25 = l_myMacro____x40_Init_Notation___hyg_5971____closed__4;
+x_25 = l_myMacro____x40_Init_Notation___hyg_6045____closed__4;
 x_26 = l_Lean_mkConst(x_25, x_24);
 x_27 = l_Lean_Meta_assertExt___lambda__1___closed__1;
 lean_inc(x_1);

stage0/stdlib/Lean/Elab/Tactic/Induction.c

@@ -366,7 +366,6 @@ lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_getGener
 size_t lean_usize_of_nat(lean_object*);
 lean_object* l_Lean_Elab_Tactic_evalCases___lambda__2___closed__1;
 extern lean_object* l_Lean_Elab_Tactic_tacticElabAttribute;
-extern lean_object* l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
 lean_object* l_Lean_Elab_Tactic_ElimApp_evalAlts_match__6(lean_object*);
 lean_object* l_Array_mapMUnsafe_map___at_Lean_Elab_Tactic_evalCasesUsing___spec__1(lean_object*, size_t, size_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_throwErrorAt___at___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_checkAltNames___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*);
@@ -567,6 +566,7 @@ extern lean_object* l_Lean_Elab_initFn____x40_Lean_Elab_Util___hyg_1080____close
 uint8_t l_List_isEmpty___rarg(lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_getRecInfoDefault___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*, lean_object*, lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_ElimApp_getAltNumFields___lambda__1___boxed(lean_object*, 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_12938____closed__13;
 lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_getRecInfo(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_Tactic_Induction_0__Lean_Elab_Tactic_getRecInfo_match__3(lean_object*);
 lean_object* l___private_Lean_Elab_Tactic_Induction_0__Lean_Elab_Tactic_getRecInfo___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*);
@@ -705,7 +705,7 @@ x_3 = l_Lean_Syntax_isOfKind(x_1, x_2);
 if (x_3 == 0)
 {
 lean_object* x_4; uint8_t x_5; 
-x_4 = l_myMacro____x40_Init_Notation___hyg_12864____closed__13;
+x_4 = l_myMacro____x40_Init_Notation___hyg_12938____closed__13;
 x_5 = l_Lean_Syntax_isOfKind(x_1, x_4);
 return x_5;
 }