chore: update stage0

stage0/src/Init/Lean/Elab/Command.lean

@@ -133,10 +133,6 @@ unsafe def mkCommandElabAttribute : IO (KeyedDeclsAttribute CommandElab) :=
 mkElabAttribute CommandElab `Lean.Elab.Command.commandElabAttribute `builtinCommandElab `commandElab `Lean.Parser.Command `Lean.Elab.Command.CommandElab "command"
 @[init mkCommandElabAttribute] constant commandElabAttribute : KeyedDeclsAttribute CommandElab := arbitrary _
 
--- TODO: remove after bootstrap
-def addBuiltinCommandElab (k : SyntaxNodeKind) (declName : Name) (elab : CommandElab) : IO Unit := do
-KeyedDeclsAttribute.addBuiltin commandElabAttribute k elab
-
 @[inline] def withIncRecDepth {α} (ref : Syntax) (x : CommandElabM α) : CommandElabM α := do
 ctx ← read; s ← get;
 when (ctx.currRecDepth == s.maxRecDepth) $ throwError ref maxRecDepthErrorMessage;

stage0/src/Init/Lean/Elab/Tactic/Basic.lean

@@ -123,10 +123,6 @@ unsafe def mkTacticAttribute : IO (KeyedDeclsAttribute Tactic) :=
 mkElabAttribute Tactic `Lean.Elab.Tactic.tacticElabAttribute `builtinTactic `tactic `Lean.Parser.Tactic `Lean.Elab.Tactic.Tactic "tactic"
 @[init mkTacticAttribute] constant tacticElabAttribute : KeyedDeclsAttribute Tactic := arbitrary _
 
--- TODO: remove after bootstrap
-def addBuiltinTactic (k : SyntaxNodeKind) (declName : Name) (elab : Tactic) : IO Unit := do
-KeyedDeclsAttribute.addBuiltin tacticElabAttribute k elab
-
 def logTrace (cls : Name) (ref : Syntax) (msg : MessageData) : TacticM Unit := liftTermElabM $ Term.logTrace cls ref msg
 @[inline] def trace (cls : Name) (ref : Syntax) (msg : Unit → MessageData) : TacticM Unit := liftTermElabM $ Term.trace cls ref msg
 @[inline] def traceAtCmdPos (cls : Name) (msg : Unit → MessageData) : TacticM Unit := liftTermElabM $ Term.traceAtCmdPos cls msg

stage0/src/Init/Lean/Elab/Term.lean

@@ -166,10 +166,6 @@ unsafe def mkTermElabAttribute : IO (KeyedDeclsAttribute TermElab) :=
 mkElabAttribute TermElab `Lean.Elab.Term.termElabAttribute `builtinTermElab `termElab `Lean.Parser.Term `Lean.Elab.Term.TermElab "term"
 @[init mkTermElabAttribute] constant termElabAttribute : KeyedDeclsAttribute TermElab := arbitrary _
 
--- TODO: remove after bootstrap
-def addBuiltinTermElab (k : SyntaxNodeKind) (declName : Name) (elab : TermElab) : IO Unit := do
-KeyedDeclsAttribute.addBuiltin termElabAttribute k elab
-
 /--
   Auxiliary datatatype for presenting a Lean lvalue modifier.
   We represent a unelaborated lvalue as a `Syntax` (or `Expr`) and `List LVal`.

stage0/src/Init/Lean/Elab/Util.lean

@@ -93,10 +93,6 @@ unsafe def mkMacroAttribute : IO (KeyedDeclsAttribute Macro) :=
 mkElabAttribute Macro `Lean.Elab.macroAttribute `builtinMacro `macro Name.anonymous `Lean.Macro "macro"
 @[init mkMacroAttribute] constant macroAttribute : KeyedDeclsAttribute Macro := arbitrary _
 
--- TODO: remove after bootstrap
-def addBuiltinMacro (k : SyntaxNodeKind) (elab : Macro) : IO Unit := do
-KeyedDeclsAttribute.addBuiltin macroAttribute k elab
-
 private def expandMacroFns (stx : Syntax) : List Macro → MacroM Syntax
 | []    => throw Macro.Exception.unsupportedSyntax
 | m::ms => m stx <|> expandMacroFns ms

stage0/src/Init/Lean/KeyedDeclsAttribute.lean

@@ -21,17 +21,19 @@ Used to register elaborators, macros, tactics, and delaborators.
 namespace Lean
 namespace KeyedDeclsAttribute
 
--- could be variable as well, but right now it's all names
+-- could be a parameter as well, but right now it's all names
 abbrev Key := Name
 
-variable (Value : Type)
+/--
+`KeyedDeclsAttribute` definition.
 
-structure Def (Value : Type) :=
-(builtinName   : Name)
-(name          : Name)
-(descr         : String)
--- `Value` should be a constant of name `valueTypeName`
+ Important: `mkConst valueTypeName` and `γ` must be definitionally equal. -/
+structure Def (γ : Type) :=
+(builtinName   : Name)    -- Builtin attribute name (e.g., `builtinTermElab)
+(name          : Name)    -- Attribute name (e.g., `termElab)
+(descr         : String)  -- Attribute description
 (valueTypeName : Name)
+-- Convert `Syntax` into a `Key`, the default implementation expects an identifier.
 (evalKey       : Environment → Syntax → Except String Key :=
   fun env arg => match attrParamSyntaxToIdentifier arg with
     | some id => Except.ok id
@@ -39,64 +41,64 @@ structure Def (Value : Type) :=
 
 structure OLeanEntry :=
 (key  : Key)
-(decl : Name)
+(decl : Name) -- Name of a declaration stored in the environment which has type `mkConst Def.valueTypeName`.
 
-structure AttributeEntry extends OLeanEntry :=
-(value : Value)
+structure AttributeEntry (γ : Type) extends OLeanEntry :=
+/- Recall that we cannot store `γ` into .olean files because it is a closure.
+   Given `OLeanEntry.decl`, we convert it into a `γ` by using the unsafe function `evalConstCheck`. -/
+(value : γ)
 
-abbrev Table := SMap Key (List Value)
+abbrev Table (γ : Type) := SMap Key (List γ)
 
-structure ExtensionState :=
+structure ExtensionState (γ : Type) :=
 (newEntries : List OLeanEntry := [])
-(table      : Table Value := {})
+(table      : Table γ := {})
 
-abbrev Extension := PersistentEnvExtension OLeanEntry (AttributeEntry Value) (ExtensionState Value)
+abbrev Extension (γ : Type) := PersistentEnvExtension OLeanEntry (AttributeEntry γ) (ExtensionState γ)
 
-structure KeyedDeclsAttribute :=
-(builtinTableRef : IO.Ref (Table Value))
-(ext             : Extension Value)
+structure KeyedDeclsAttribute (γ : Type) :=
+(builtinTableRef : IO.Ref (Table γ))
+(ext             : Extension γ)
 
-variable {Value}
-variable (df : Def Value)
-
-def Table.insert (table : Table Value) (k : Key) (v : Value) : Table Value :=
+def Table.insert {γ : Type} (table : Table γ) (k : Key) (v : γ) : Table γ :=
 match table.find? k with
 | some vs => table.insert k (v::vs)
 | none    => table.insert k [v]
 
-instance ExtensionState.inhabited : Inhabited (ExtensionState Value) :=
+instance ExtensionState.inhabited {γ} : Inhabited (ExtensionState γ) :=
 ⟨{}⟩
 
-instance inhabited : Inhabited (KeyedDeclsAttribute Value) := ⟨{ builtinTableRef := arbitrary _, ext := arbitrary _ }⟩
+instance KeyedDeclsAttribute.inhabited {γ} : Inhabited (KeyedDeclsAttribute γ) :=
+⟨{ builtinTableRef := arbitrary _, ext := arbitrary _ }⟩
 
-private def mkInitial (builtinTableRef : IO.Ref (Table Value)) : IO (ExtensionState Value) := do
+private def mkInitial {γ} (builtinTableRef : IO.Ref (Table γ)) : IO (ExtensionState γ) := do
 table ← builtinTableRef.get;
 pure { table := table }
 
-private unsafe def addImported (builtinTableRef : IO.Ref (Table Value)) (env : Environment) (es : Array (Array OLeanEntry)) : IO (ExtensionState Value) := do
+private unsafe def addImported {γ} (df : Def γ) (builtinTableRef : IO.Ref (Table γ)) (env : Environment) (es : Array (Array OLeanEntry)) : IO (ExtensionState γ) := do
 table ← builtinTableRef.get;
 table ← es.foldlM
   (fun table entries =>
     entries.foldlM
-      (fun (table : Table Value) entry =>
-        match env.evalConstCheck Value df.valueTypeName entry.decl with
+      (fun (table : Table γ) entry =>
+        match env.evalConstCheck γ df.valueTypeName entry.decl with
         | Except.ok f     => pure $ table.insert entry.key f
         | Except.error ex => throw (IO.userError ex))
       table)
   table;
 pure { table := table }
 
-private def addExtensionEntry (s : ExtensionState Value) (e : AttributeEntry Value) : ExtensionState Value :=
+private def addExtensionEntry {γ} (s : ExtensionState γ) (e : AttributeEntry γ) : ExtensionState γ :=
 { table := s.table.insert e.key e.value, newEntries := e.toOLeanEntry :: s.newEntries }
 
-def addBuiltin (attr : KeyedDeclsAttribute Value) (key : Key) (val : Value) : IO Unit :=
+def addBuiltin {γ} (attr : KeyedDeclsAttribute γ) (key : Key) (val : γ) : IO Unit :=
 attr.builtinTableRef.modify $ fun m => m.insert key val
 
 /--
 def _regBuiltin$(declName) : IO Unit :=
 addBuiltin $(mkConst valueTypeName) $(mkConst attrDeclName) $(key) $(mkConst declName)
 -/
-def declareBuiltin (attrDeclName : Name) (env : Environment) (key : Key) (declName : Name) : IO Environment :=
+def declareBuiltin {γ} (df : Def γ) (attrDeclName : Name) (env : Environment) (key : Key) (declName : Name) : IO Environment :=
 let name := `_regBuiltin ++ declName;
 let type := mkApp (mkConst `IO) (mkConst `Unit);
 let val  := mkAppN (mkConst `Lean.KeyedDeclsAttribute.addBuiltin) #[mkConst df.valueTypeName, mkConst attrDeclName, toExpr key, mkConst declName];
@@ -107,9 +109,9 @@ match env.addAndCompile {} decl with
 | Except.ok env  => IO.ofExcept (setInitAttr env name)
 
 /- TODO: add support for scoped attributes -/
-protected unsafe def init (attrDeclName : Name) : IO (KeyedDeclsAttribute Value) := do
-builtinTableRef : IO.Ref (Table Value) ← IO.mkRef {};
-ext : Extension Value ← registerPersistentEnvExtension {
+protected unsafe def init {γ} (df : Def γ) (attrDeclName : Name) : IO (KeyedDeclsAttribute γ) := do
+builtinTableRef : IO.Ref (Table γ) ← IO.mkRef {};
+ext : Extension γ ← registerPersistentEnvExtension {
   name            := df.name,
   mkInitial       := mkInitial builtinTableRef,
   addImportedFn   := addImported df builtinTableRef,
@@ -118,27 +120,27 @@ ext : Extension Value ← registerPersistentEnvExtension {
   statsFn         := fun s => format "number of local entries: " ++ format s.newEntries.length
 };
 registerBuiltinAttribute {
- name  := df.builtinName,
- descr := "Builtin macro",
- add   := fun env declName arg persistent => do {
-   unless persistent $ throw (IO.userError ("invalid attribute '" ++ toString df.builtinName ++ "', must be persistent"));
-   key ← IO.ofExcept $ df.evalKey env arg;
-   match env.find? declName with
-   | none  => throw $ IO.userError "unknown declaration"
-   | some decl =>
-     match decl.type with
-     | Expr.const c _ _ =>
-       if c != df.valueTypeName then throw (IO.userError ("unexpected type at '" ++ toString declName ++ "', `" ++ toString df.valueTypeName ++ "` expected"))
-       else declareBuiltin df attrDeclName env key declName
-     | _ => throw (IO.userError ("unexpected type at '" ++ toString declName ++ "', `" ++ toString df.valueTypeName ++ "` expected"))
- },
- applicationTime := AttributeApplicationTime.afterCompilation
+  name  := df.builtinName,
+  descr := "(builtin) " ++ df.descr,
+  add   := fun env declName arg persistent => do {
+    unless persistent $ throw (IO.userError ("invalid attribute '" ++ toString df.builtinName ++ "', must be persistent"));
+    key ← IO.ofExcept $ df.evalKey env arg;
+    match env.find? declName with
+    | none  => throw $ IO.userError "unknown declaration"
+    | some decl =>
+      match decl.type with
+      | Expr.const c _ _ =>
+        if c != df.valueTypeName then throw (IO.userError ("unexpected type at '" ++ toString declName ++ "', `" ++ toString df.valueTypeName ++ "` expected"))
+        else declareBuiltin df attrDeclName env key declName
+      | _ => throw (IO.userError ("unexpected type at '" ++ toString declName ++ "', `" ++ toString df.valueTypeName ++ "` expected"))
+  },
+  applicationTime := AttributeApplicationTime.afterCompilation
 };
 registerBuiltinAttribute {
   name            := df.name,
   descr           := df.descr,
   add             := fun env constName arg persistent =>
-    match env.evalConstCheck Value df.valueTypeName constName with
+    match env.evalConstCheck γ df.valueTypeName constName with
     | Except.error ex => throw (IO.userError ex)
     | Except.ok v     => do
       key ← IO.ofExcept $ df.evalKey env arg;

stage0/stdlib/Init/Lean/Elab/Command.c

@@ -148,7 +148,6 @@ lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_Command_elabCommand___main___s
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabEnd___closed__9;
 lean_object* l_Lean_Elab_Command_throwUnsupportedSyntax___rarg(lean_object*);
-lean_object* l_Lean_Elab_Command_addBuiltinCommandElab(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_elabCheckFailure(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttribute___closed__9;
 lean_object* l_Lean_Elab_Command_State_inhabited___closed__3;
@@ -246,7 +245,6 @@ lean_object* l_Lean_Elab_Command_mkState(lean_object*, lean_object*, lean_object
 lean_object* l_Lean_Elab_Command_dbgTrace___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_qsortAux___main___at_Lean_Elab_Command_sortDeclLevelParams___spec__3___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Command_namespace___elambda__1___closed__2;
-lean_object* l_Lean_Elab_Command_addBuiltinCommandElab___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_mkCommandElabAttribute___closed__6;
 lean_object* l_Lean_Elab_Command_CommandElabCoreM_monadState;
 lean_object* l___regBuiltin_Lean_Elab_Command_elabSetOption(lean_object*);
@@ -3249,24 +3247,6 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Command_addBuiltinCommandElab(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; lean_object* x_6; 
-x_5 = l_Lean_Elab_Command_commandElabAttribute;
-x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_5, x_1, x_3, x_4);
-return x_6;
-}
-}
-lean_object* l_Lean_Elab_Command_addBuiltinCommandElab___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_Elab_Command_addBuiltinCommandElab(x_1, x_2, x_3, x_4);
-lean_dec(x_2);
-return x_5;
-}
-}
 lean_object* l_Lean_Elab_Command_withIncRecDepth___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {

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

@@ -326,7 +326,6 @@ lean_object* l_Lean_Elab_Tactic_evalCase___closed__2;
 lean_object* l_Lean_Elab_Tactic_monadLog___closed__2;
 lean_object* l_Lean_Elab_Tactic_evalChoiceAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_setGoals(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Tactic_addBuiltinTactic(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_modifyMCtx(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_tagUntaggedGoals(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Tactic_orelse___elambda__1___closed__1;
@@ -343,7 +342,6 @@ lean_object* l_Lean_Elab_Tactic_withFreshMacroScope___rarg(lean_object*, lean_ob
 lean_object* l_Lean_Elab_Tactic_throwError(lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Tactic_evalTactic___main___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Syntax_getPos(lean_object*);
-lean_object* l_Lean_Elab_Tactic_addBuiltinTactic___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalParen___closed__1;
 lean_object* l_Lean_Elab_Tactic_assignExprMVar(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltin_Lean_Elab_Tactic_evalRevert(lean_object*);
@@ -3080,24 +3078,6 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Tactic_addBuiltinTactic(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; lean_object* x_6; 
-x_5 = l_Lean_Elab_Tactic_tacticElabAttribute;
-x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_5, x_1, x_3, x_4);
-return x_6;
-}
-}
-lean_object* l_Lean_Elab_Tactic_addBuiltinTactic___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_Elab_Tactic_addBuiltinTactic(x_1, x_2, x_3, x_4);
-lean_dec(x_2);
-return x_5;
-}
-}
 lean_object* l_Lean_Elab_Tactic_logTrace(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
 {

stage0/stdlib/Init/Lean/Elab/Term.c

@@ -478,7 +478,6 @@ lean_object* l_mkHashMapImp___rarg(lean_object*);
 lean_object* l_Lean_Elab_Term_whnfCore___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getCurrNamespace___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Level_elabLevel___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_addBuiltinTermElab___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_getLocalInsts(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkFreshInstanceName___rarg(lean_object*);
 lean_object* l_Lean_Meta_whnf(lean_object*, lean_object*, lean_object*);
@@ -685,7 +684,6 @@ lean_object* l_Lean_Elab_Term_monadLog___closed__11;
 lean_object* l_Lean_Elab_Term_mkTacticMVar___closed__2;
 lean_object* l___private_Init_Lean_Elab_Term_10__elabTermUsing___main___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_Term_addBuiltinTermElab(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabTermAux___main___closed__7;
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__1;
 lean_object* l_Lean_Elab_Term_elabImplicitLambda___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -2964,24 +2962,6 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_Term_addBuiltinTermElab(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; lean_object* x_6; 
-x_5 = l_Lean_Elab_Term_termElabAttribute;
-x_6 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_5, x_1, x_3, x_4);
-return x_6;
-}
-}
-lean_object* l_Lean_Elab_Term_addBuiltinTermElab___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
-_start:
-{
-lean_object* x_5; 
-x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_1, x_2, x_3, x_4);
-lean_dec(x_2);
-return x_5;
-}
-}
 lean_object* l_Lean_Elab_Term_LVal_hasToString(lean_object* x_1) {
 _start:
 {

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

@@ -47,14 +47,12 @@ lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_adaptMacro___rarg___lambda__2(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkMacroAttribute___closed__3;
 size_t l_USize_shiftRight(size_t, size_t);
-lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_getMacros___spec__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_LocalContext_Inhabited___closed__1;
 lean_object* l_Lean_Syntax_truncateTrailing(lean_object*);
 lean_object* l_Lean_Elab_macroAttribute___closed__3;
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKindAtNamespaces___main(lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_Elab_addBuiltinMacro(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_foldl___main___at_Lean_Elab_addMacroStack___spec__1___closed__1;
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__1;
 extern lean_object* l_Lean_mkAttributeImplOfConstant___closed__1;
@@ -1106,15 +1104,6 @@ lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_Elab_addBuiltinMacro(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
-_start:
-{
-lean_object* x_4; lean_object* x_5; 
-x_4 = l_Lean_Elab_macroAttribute;
-x_5 = l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(x_4, x_1, x_2, x_3);
-return x_5;
-}
-}
 lean_object* l___private_Init_Lean_Elab_Util_3__expandMacroFns___main(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {

stage0/stdlib/Init/Lean/KeyedDeclsAttribute.c

@@ -22,6 +22,7 @@ size_t l_USize_add(size_t, size_t);
 lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___spec__2___rarg(lean_object*);
 lean_object* l_AssocList_replace___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__19___rarg(lean_object*, lean_object*, lean_object*);
 uint8_t l_AssocList_contains___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__15___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__2;
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__3;
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin(lean_object*);
 lean_object* l_AssocList_foldlM___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__18___rarg(lean_object*, lean_object*);
@@ -30,12 +31,13 @@ extern lean_object* l___private_Init_Lean_Environment_8__persistentEnvExtensions
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_AssocList_find_x3f___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__6___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_HashMapImp_expand___at_Lean_KeyedDeclsAttribute_Table_insert___spec__16(lean_object*);
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_5__addImported___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__1;
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___closed__4;
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__9;
 lean_object* l_AssocList_contains___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__15(lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__11(lean_object*);
 lean_object* lean_array_uget(lean_object*, size_t);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_KeyedDeclsAttribute_init___spec__4___rarg(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__3(lean_object*);
 lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_init___spec__8(lean_object*);
@@ -51,8 +53,7 @@ lean_object* l_Array_iterateMAux___main___at_Lean_KeyedDeclsAttribute_Table_inse
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___closed__1;
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__4___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__1;
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_5__addImported___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_2__addImported___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_find_x3f___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__8___rarg(lean_object*, lean_object*);
 extern lean_object* l_PersistentHashMap_mkCollisionNode___rarg___closed__1;
 size_t l_USize_sub(size_t, size_t);
@@ -60,10 +61,9 @@ lean_object* l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_init___spec
 extern lean_object* l_Array_empty___closed__1;
 lean_object* lean_environment_find(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_init___spec__1___closed__1;
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial___rarg(lean_object*, lean_object*);
 lean_object* lean_io_mk_ref(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__3___rarg___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_inhabited___spec__2(lean_object*);
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* lean_io_ref_get(lean_object*, lean_object*);
 lean_object* l_HashMapImp_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__25___rarg(lean_object*, lean_object*, lean_object*);
@@ -74,13 +74,11 @@ lean_object* l_HashMapImp_expand___at_Lean_KeyedDeclsAttribute_Table_insert___sp
 lean_object* lean_string_append(lean_object*, lean_object*);
 lean_object* l_Lean_MessageData_formatAux___main(lean_object*, lean_object*);
 lean_object* l_AssocList_contains___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__15___rarg___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_5__addImported(lean_object*);
 lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__12___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init(lean_object*);
-lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_inhabited___spec__2___rarg(lean_object*);
+lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__2;
 lean_object* l_Lean_SMap_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__9___rarg(lean_object*, lean_object*, lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
-lean_object* l_Lean_KeyedDeclsAttribute_inhabited___closed__6;
 extern lean_object* l___private_Init_Lean_Environment_14__throwUnexpectedType___rarg___closed__3;
 lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__14;
@@ -92,26 +90,31 @@ lean_object* l_Lean_KeyedDeclsAttribute_addBuiltin(lean_object*);
 lean_object* lean_nat_add(lean_object*, lean_object*);
 lean_object* l_IO_ofExcept___at_Lean_registerClassAttr___spec__1(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__13(lean_object*);
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial(lean_object*);
+lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__2(lean_object*);
 lean_object* l_HashMapImp_expand___at_Lean_KeyedDeclsAttribute_Table_insert___spec__16___rarg(lean_object*, lean_object*);
 lean_object* l_HashMapImp_moveEntries___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__17___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial(lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__2;
 lean_object* l_PersistentHashMap_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__10(lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__1;
 uint8_t l_Array_anyRangeMAux___main___at_Lean_KeyedDeclsAttribute_init___spec__5___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_HashMapImp_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__14___rarg(lean_object*, lean_object*, lean_object*);
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_2__addImported(lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__5___rarg___boxed(lean_object*, lean_object*);
+lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1(lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited(lean_object*);
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_2__addImported___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_IO_ofExcept___at_Lean_KeyedDeclsAttribute_init___spec__10(lean_object*, lean_object*);
 lean_object* lean_array_fget(lean_object*, lean_object*);
 lean_object* l_AssocList_find_x3f___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__8___rarg___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__22___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_Table_insert(lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_KeyedDeclsAttribute_init___spec__6___rarg___closed__2;
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_3__addExtensionEntry___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_EnvExtension_Inhabited___rarg___closed__1;
 lean_object* l_EStateM_bind___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_foldlM___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__29(lean_object*);
+lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__3;
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__22___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__6;
 lean_object* l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__1;
@@ -119,7 +122,7 @@ lean_object* l_Lean_Name_append___main(lean_object*, lean_object*);
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__2;
 lean_object* l_Lean_KernelException_toMessageData(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___closed__3;
-lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1(lean_object*);
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited(lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_KeyedDeclsAttribute_init___spec__6___rarg___closed__1;
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__4;
 lean_object* l_AssocList_find_x3f___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__6(lean_object*);
@@ -151,14 +154,12 @@ lean_object* l_AssocList_contains___main___at_Lean_KeyedDeclsAttribute_Table_ins
 extern lean_object* l_Lean_Options_empty;
 lean_object* l_Lean_SMap_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__1___rarg___boxed(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___spec__1___closed__3;
-lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__3;
 size_t lean_usize_modn(size_t, lean_object*);
 extern lean_object* l___private_Init_Lean_Environment_5__envExtensionsRef;
 lean_object* l_Lean_registerBuiltinAttribute(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__4(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, uint8_t, lean_object*);
 lean_object* l_HashMapImp_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__25(lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_KeyedDeclsAttribute_init___spec__6___rarg___closed__3;
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1(lean_object*);
 size_t l_USize_mul(size_t, size_t);
 lean_object* l_Lean_SMap_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__20___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_List_redLength___main___rarg(lean_object*);
@@ -172,65 +173,63 @@ lean_object* l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_ExtensionSt
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__3;
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___closed__2;
 lean_object* l_Lean_ConstantInfo_type(lean_object*);
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__3;
 lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__23(lean_object*);
 lean_object* l_AssocList_replace___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__19(lean_object*);
 lean_object* l_Lean_PersistentEnvExtension_addEntry___rarg(lean_object*, lean_object*, lean_object*);
 size_t l_USize_land(size_t, size_t);
 lean_object* l_Lean_Environment_evalConstCheck___rarg(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_registerTagAttribute___lambda__4___closed__2;
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__5;
 lean_object* l_Lean_ParametricAttribute_setParam___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__21___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_HashMapImp_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__14(lean_object*);
 lean_object* l_Lean_SMap_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__9(lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__7;
 lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___spec__1___closed__1;
-lean_object* l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__3(lean_object*);
-lean_object* l_Lean_KeyedDeclsAttribute_inhabited___closed__3;
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__3;
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__2___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_insert___at_Lean_KeyedDeclsAttribute_Table_insert___spec__20(lean_object*);
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__1;
 lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_init___spec__7___closed__3;
-lean_object* l_Lean_KeyedDeclsAttribute_inhabited___closed__5;
 lean_object* l_IO_ofExcept___at_Lean_KeyedDeclsAttribute_init___spec__10___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__2___rarg___boxed(lean_object*, lean_object*);
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_6__addExtensionEntry(lean_object*);
 extern lean_object* l_Lean_registerSimplePersistentEnvExtension___rarg___lambda__4___closed__2;
 extern lean_object* l_Lean_mkInitAttr___lambda__1___closed__1;
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_3__addExtensionEntry(lean_object*);
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 uint8_t l_USize_decLe(size_t, size_t);
 lean_object* l_Lean_mkApp(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__1(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_nameToExprAux___main(lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Environment_addAndCompile(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__22(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__24___rarg(size_t, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2(lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_init___spec__7___closed__2;
 extern lean_object* l___private_Init_Lean_Environment_14__throwUnexpectedType___rarg___closed__1;
 extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed__4;
 lean_object* l_HashMapImp_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__5___rarg(lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__3(lean_object*);
 lean_object* l_HashMapImp_moveEntries___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__28(lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__11;
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__4;
 lean_object* lean_io_ref_reset(lean_object*, lean_object*);
 extern lean_object* l_Lean_registerEnvExtensionUnsafe___rarg___closed__2;
 lean_object* lean_nat_mul(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_init___spec__7___closed__1;
 lean_object* l_HashMapImp_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__7___rarg___boxed(lean_object*, lean_object*);
-lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__2;
 lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_init___spec__1___closed__3;
 lean_object* l_Lean_KeyedDeclsAttribute_init___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* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__3___closed__1;
 lean_object* l_HashMapImp_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__5(lean_object*);
+lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__1;
 lean_object* lean_io_ref_set(lean_object*, lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_AssocList_contains___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__26___rarg(lean_object*, lean_object*);
 lean_object* l_Array_anyRangeMAux___main___at_Lean_KeyedDeclsAttribute_init___spec__5___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Lean_KeyedDeclsAttribute_inhabited___closed__2;
 lean_object* lean_mk_array(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__12;
 extern lean_object* l_Lean_registerEnvExtensionUnsafe___rarg___closed__3;
@@ -246,20 +245,21 @@ lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_KeyedDeclsAttribute_ini
 lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___spec__2(lean_object*);
 lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__12(lean_object*);
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__4(lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2(lean_object*);
 lean_object* l_Lean_registerEnvExtensionUnsafe___at_Lean_KeyedDeclsAttribute_init___spec__6(lean_object*);
 lean_object* l_List_toArrayAux___main___rarg(lean_object*, lean_object*);
-lean_object* l_Lean_KeyedDeclsAttribute_inhabited___closed__1;
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_mkAppN___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SMap_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__1___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__6;
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
 lean_object* l_AssocList_foldlM___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__29___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_foldlM___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__18(lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1(lean_object*);
 lean_object* lean_usize_to_nat(size_t);
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__2;
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_6__addExtensionEntry___rarg(lean_object*, lean_object*);
 lean_object* l_HashMapImp_expand___at_Lean_KeyedDeclsAttribute_Table_insert___spec__27___rarg(lean_object*, lean_object*);
 extern lean_object* l_Lean_mkAppStx___closed__2;
 lean_object* l_Lean_mkConst(lean_object*, lean_object*);
@@ -267,13 +267,13 @@ extern lean_object* l_Lean_registerTagAttribute___lambda__4___closed__1;
 extern lean_object* l_Lean_PersistentEnvExtension_inhabited___rarg___closed__4;
 extern lean_object* l_Lean_initAttr;
 lean_object* l_HashMapImp_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__7(lean_object*);
+lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__2___rarg(lean_object*);
 lean_object* l_PersistentHashMap_mkCollisionNode___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_init___rarg___lambda__2(lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_KeyedDeclsAttribute_Table_insert___spec__7___rarg(lean_object*, lean_object*);
 lean_object* l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__13;
-lean_object* l_Lean_KeyedDeclsAttribute_inhabited(lean_object*);
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1___rarg___boxed(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_KeyedDeclsAttribute_inhabited___closed__4;
 extern lean_object* l___private_Init_Lean_Environment_14__throwUnexpectedType___rarg___closed__2;
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_KeyedDeclsAttribute_Table_insert___spec__4___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
 _start:
@@ -2765,7 +2765,7 @@ x_2 = l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__2;
 return x_2;
 }
 }
-lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_inhabited___spec__2___rarg(lean_object* x_1) {
+lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__2___rarg(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -2773,15 +2773,15 @@ x_2 = l_mkHashMapImp___rarg(x_1);
 return x_2;
 }
 }
-lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_inhabited___spec__2(lean_object* x_1) {
+lean_object* l_mkHashMap___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_mkHashMap___at_Lean_KeyedDeclsAttribute_inhabited___spec__2___rarg), 1, 0);
+x_2 = lean_alloc_closure((void*)(l_mkHashMap___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__2___rarg), 1, 0);
 return x_2;
 }
 }
-lean_object* l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__3(lean_object* x_1) {
+lean_object* l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__3(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
@@ -2789,7 +2789,7 @@ x_2 = l_Lean_LocalContext_Inhabited___closed__1;
 return x_2;
 }
 }
-lean_object* _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__1() {
+lean_object* _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; 
@@ -2798,21 +2798,21 @@ x_2 = l_mkHashMapImp___rarg(x_1);
 return x_2;
 }
 }
-lean_object* _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__2() {
+lean_object* _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__2() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__3(lean_box(0));
+x_1 = l_PersistentHashMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__3(lean_box(0));
 return x_1;
 }
 }
-lean_object* _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__3() {
+lean_object* _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__3() {
 _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = 1;
-x_2 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__1;
-x_3 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__2;
+x_2 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__1;
+x_3 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__2;
 x_4 = lean_alloc_ctor(0, 2, 1);
 lean_ctor_set(x_4, 0, x_2);
 lean_ctor_set(x_4, 1, x_3);
@@ -2820,53 +2820,53 @@ lean_ctor_set_uint8(x_4, sizeof(void*)*2, x_1);
 return x_4;
 }
 }
-lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1(lean_object* x_1) {
+lean_object* l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__3;
+x_2 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__3;
 return x_2;
 }
 }
-lean_object* _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__1() {
+lean_object* _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__1() {
 _start:
 {
 lean_object* x_1; 
-x_1 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1(lean_box(0));
+x_1 = l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1(lean_box(0));
 return x_1;
 }
 }
-lean_object* _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__2() {
+lean_object* _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_KeyedDeclsAttribute_inhabited___closed__1;
+x_2 = l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__1;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__3() {
+lean_object* _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_empty___closed__1;
-x_2 = l_Lean_KeyedDeclsAttribute_inhabited___closed__2;
+x_2 = l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__2;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__4() {
+lean_object* _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__4() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
 x_1 = lean_unsigned_to_nat(0u);
 x_2 = l_Lean_EnvExtension_Inhabited___rarg___closed__1;
-x_3 = l_Lean_KeyedDeclsAttribute_inhabited___closed__3;
+x_3 = l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__3;
 x_4 = lean_alloc_ctor(0, 3, 0);
 lean_ctor_set(x_4, 0, x_1);
 lean_ctor_set(x_4, 1, x_2);
@@ -2874,11 +2874,11 @@ lean_ctor_set(x_4, 2, x_3);
 return x_4;
 }
 }
-lean_object* _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__5() {
+lean_object* _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__5() {
 _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; lean_object* x_7; 
-x_1 = l_Lean_KeyedDeclsAttribute_inhabited___closed__4;
+x_1 = l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__4;
 x_2 = lean_box(0);
 x_3 = l_Lean_PersistentEnvExtension_inhabited___rarg___closed__1;
 x_4 = l_Lean_PersistentEnvExtension_inhabited___rarg___closed__2;
@@ -2894,27 +2894,27 @@ lean_ctor_set(x_7, 5, x_6);
 return x_7;
 }
 }
-lean_object* _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__6() {
+lean_object* _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__6() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = lean_box(0);
-x_2 = l_Lean_KeyedDeclsAttribute_inhabited___closed__5;
+x_2 = l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__5;
 x_3 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
 lean_ctor_set(x_3, 1, x_2);
 return x_3;
 }
 }
-lean_object* l_Lean_KeyedDeclsAttribute_inhabited(lean_object* x_1) {
+lean_object* l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = l_Lean_KeyedDeclsAttribute_inhabited___closed__6;
+x_2 = l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__6;
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
@@ -2976,24 +2976,24 @@ return x_16;
 }
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial(lean_object* x_1) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial___rarg___boxed), 2, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial___rarg___boxed), 2, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial___rarg___boxed(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial___rarg___boxed(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; 
-x_3 = l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial___rarg(x_1, x_2);
+x_3 = l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial___rarg(x_1, x_2);
 lean_dec(x_1);
 return x_3;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
@@ -3059,15 +3059,15 @@ goto _start;
 }
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1(lean_object* x_1) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1___rarg___boxed), 7, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1___rarg___boxed), 7, 0);
 return x_2;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; uint8_t x_9; 
@@ -3095,7 +3095,7 @@ lean_dec(x_5);
 x_14 = lean_unsigned_to_nat(0u);
 lean_inc(x_2);
 lean_inc(x_1);
-x_15 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1___rarg(x_1, x_2, x_11, x_11, x_14, x_6, x_7);
+x_15 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1___rarg(x_1, x_2, x_11, x_11, x_14, x_6, x_7);
 lean_dec(x_11);
 if (lean_obj_tag(x_15) == 0)
 {
@@ -3138,15 +3138,15 @@ return x_22;
 }
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2(lean_object* x_1) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2___rarg___boxed), 7, 0);
+x_2 = lean_alloc_closure((void*)(l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2___rarg___boxed), 7, 0);
 return x_2;
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_5__addImported___rarg(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_2__addImported___rarg(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; 
@@ -3160,7 +3160,7 @@ x_8 = lean_ctor_get(x_6, 1);
 lean_inc(x_8);
 lean_dec(x_6);
 x_9 = lean_unsigned_to_nat(0u);
-x_10 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2___rarg(x_1, x_3, x_4, x_4, x_9, x_7, x_8);
+x_10 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2___rarg(x_1, x_3, x_4, x_4, x_9, x_7, x_8);
 if (lean_obj_tag(x_10) == 0)
 {
 uint8_t x_11; 
@@ -3243,45 +3243,45 @@ return x_27;
 }
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_5__addImported(lean_object* x_1) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_2__addImported(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_5__addImported___rarg___boxed), 5, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_2__addImported___rarg___boxed), 5, 0);
 return x_2;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__1___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_4);
 lean_dec(x_3);
 return x_8;
 }
 }
-lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
+lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5, lean_object* x_6, lean_object* x_7) {
 _start:
 {
 lean_object* x_8; 
-x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_5__addImported___spec__2___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
+x_8 = l_Array_iterateMAux___main___at___private_Init_Lean_KeyedDeclsAttribute_2__addImported___spec__2___rarg(x_1, x_2, x_3, x_4, x_5, x_6, x_7);
 lean_dec(x_4);
 lean_dec(x_3);
 return x_8;
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_5__addImported___rarg___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4, lean_object* x_5) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_2__addImported___rarg___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___private_Init_Lean_KeyedDeclsAttribute_5__addImported___rarg(x_1, x_2, x_3, x_4, x_5);
+x_6 = l___private_Init_Lean_KeyedDeclsAttribute_2__addImported___rarg(x_1, x_2, x_3, x_4, x_5);
 lean_dec(x_4);
 lean_dec(x_2);
 return x_6;
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_6__addExtensionEntry___rarg(lean_object* x_1, lean_object* x_2) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_3__addExtensionEntry___rarg(lean_object* x_1, lean_object* x_2) {
 _start:
 {
 lean_object* x_3; lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; 
@@ -3309,11 +3309,11 @@ lean_ctor_set(x_10, 1, x_9);
 return x_10;
 }
 }
-lean_object* l___private_Init_Lean_KeyedDeclsAttribute_6__addExtensionEntry(lean_object* x_1) {
+lean_object* l___private_Init_Lean_KeyedDeclsAttribute_3__addExtensionEntry(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; 
-x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_6__addExtensionEntry___rarg), 2, 0);
+x_2 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_3__addExtensionEntry___rarg), 2, 0);
 return x_2;
 }
 }
@@ -4936,7 +4936,7 @@ lean_object* _init_l_Lean_KeyedDeclsAttribute_init___rarg___closed__2() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_6__addExtensionEntry___rarg), 2, 0);
+x_1 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_3__addExtensionEntry___rarg), 2, 0);
 return x_1;
 }
 }
@@ -4960,7 +4960,7 @@ lean_object* _init_l_Lean_KeyedDeclsAttribute_init___rarg___closed__5() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("Builtin macro");
+x_1 = lean_mk_string("(builtin) ");
 return x_1;
 }
 }
@@ -4989,11 +4989,11 @@ lean_inc(x_11);
 x_12 = lean_ctor_get(x_1, 4);
 lean_inc(x_12);
 lean_inc(x_6);
-x_13 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_4__mkInitial___rarg___boxed), 2, 1);
+x_13 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_1__mkInitial___rarg___boxed), 2, 1);
 lean_closure_set(x_13, 0, x_6);
 lean_inc(x_6);
 lean_inc(x_1);
-x_14 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_5__addImported___rarg___boxed), 5, 2);
+x_14 = lean_alloc_closure((void*)(l___private_Init_Lean_KeyedDeclsAttribute_2__addImported___rarg___boxed), 5, 2);
 lean_closure_set(x_14, 0, x_1);
 lean_closure_set(x_14, 1, x_6);
 x_15 = l_Lean_KeyedDeclsAttribute_init___rarg___closed__2;
@@ -5010,133 +5010,134 @@ lean_ctor_set(x_18, 5, x_17);
 x_19 = l_Lean_registerPersistentEnvExtensionUnsafe___at_Lean_KeyedDeclsAttribute_init___spec__4___rarg(x_18, x_7);
 if (lean_obj_tag(x_19) == 0)
 {
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; uint8_t x_24; lean_object* x_25; lean_object* x_26; 
+lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; uint8_t x_25; lean_object* x_26; lean_object* x_27; 
 x_20 = lean_ctor_get(x_19, 0);
 lean_inc(x_20);
 x_21 = lean_ctor_get(x_19, 1);
 lean_inc(x_21);
 lean_dec(x_19);
+x_22 = l_Lean_KeyedDeclsAttribute_init___rarg___closed__5;
+x_23 = lean_string_append(x_22, x_10);
 lean_inc(x_11);
 lean_inc(x_12);
 lean_inc(x_8);
-x_22 = lean_alloc_closure((void*)(l_Lean_KeyedDeclsAttribute_init___rarg___lambda__3___boxed), 10, 5);
-lean_closure_set(x_22, 0, x_8);
-lean_closure_set(x_22, 1, x_12);
-lean_closure_set(x_22, 2, x_11);
-lean_closure_set(x_22, 3, x_1);
-lean_closure_set(x_22, 4, x_2);
-x_23 = l_Lean_KeyedDeclsAttribute_init___rarg___closed__5;
-x_24 = 1;
-x_25 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_25, 0, x_8);
-lean_ctor_set(x_25, 1, x_23);
-lean_ctor_set(x_25, 2, x_22);
-lean_ctor_set_uint8(x_25, sizeof(void*)*3, x_24);
-x_26 = l_Lean_registerBuiltinAttribute(x_25, x_21);
-if (lean_obj_tag(x_26) == 0)
+x_24 = lean_alloc_closure((void*)(l_Lean_KeyedDeclsAttribute_init___rarg___lambda__3___boxed), 10, 5);
+lean_closure_set(x_24, 0, x_8);
+lean_closure_set(x_24, 1, x_12);
+lean_closure_set(x_24, 2, x_11);
+lean_closure_set(x_24, 3, x_1);
+lean_closure_set(x_24, 4, x_2);
+x_25 = 1;
+x_26 = lean_alloc_ctor(0, 3, 1);
+lean_ctor_set(x_26, 0, x_8);
+lean_ctor_set(x_26, 1, x_23);
+lean_ctor_set(x_26, 2, x_24);
+lean_ctor_set_uint8(x_26, sizeof(void*)*3, x_25);
+x_27 = l_Lean_registerBuiltinAttribute(x_26, x_21);
+if (lean_obj_tag(x_27) == 0)
 {
-lean_object* x_27; lean_object* x_28; lean_object* x_29; lean_object* x_30; 
-x_27 = lean_ctor_get(x_26, 1);
-lean_inc(x_27);
-lean_dec(x_26);
+lean_object* x_28; lean_object* x_29; lean_object* x_30; lean_object* x_31; 
+x_28 = lean_ctor_get(x_27, 1);
+lean_inc(x_28);
+lean_dec(x_27);
 lean_inc(x_20);
-x_28 = lean_alloc_closure((void*)(l_Lean_KeyedDeclsAttribute_init___rarg___lambda__4___boxed), 8, 3);
-lean_closure_set(x_28, 0, x_11);
-lean_closure_set(x_28, 1, x_12);
-lean_closure_set(x_28, 2, x_20);
-x_29 = lean_alloc_ctor(0, 3, 1);
-lean_ctor_set(x_29, 0, x_9);
-lean_ctor_set(x_29, 1, x_10);
-lean_ctor_set(x_29, 2, x_28);
-lean_ctor_set_uint8(x_29, sizeof(void*)*3, x_24);
-x_30 = l_Lean_registerBuiltinAttribute(x_29, x_27);
-if (lean_obj_tag(x_30) == 0)
+x_29 = lean_alloc_closure((void*)(l_Lean_KeyedDeclsAttribute_init___rarg___lambda__4___boxed), 8, 3);
+lean_closure_set(x_29, 0, x_11);
+lean_closure_set(x_29, 1, x_12);
+lean_closure_set(x_29, 2, x_20);
+x_30 = lean_alloc_ctor(0, 3, 1);
+lean_ctor_set(x_30, 0, x_9);
+lean_ctor_set(x_30, 1, x_10);
+lean_ctor_set(x_30, 2, x_29);
+lean_ctor_set_uint8(x_30, sizeof(void*)*3, x_25);
+x_31 = l_Lean_registerBuiltinAttribute(x_30, x_28);
+if (lean_obj_tag(x_31) == 0)
 {
-uint8_t x_31; 
-x_31 = !lean_is_exclusive(x_30);
-if (x_31 == 0)
+uint8_t x_32; 
+x_32 = !lean_is_exclusive(x_31);
+if (x_32 == 0)
 {
-lean_object* x_32; lean_object* x_33; 
-x_32 = lean_ctor_get(x_30, 0);
-lean_dec(x_32);
-x_33 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_33, 0, x_6);
-lean_ctor_set(x_33, 1, x_20);
-lean_ctor_set(x_30, 0, x_33);
-return x_30;
+lean_object* x_33; lean_object* x_34; 
+x_33 = lean_ctor_get(x_31, 0);
+lean_dec(x_33);
+x_34 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_34, 0, x_6);
+lean_ctor_set(x_34, 1, x_20);
+lean_ctor_set(x_31, 0, x_34);
+return x_31;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_34 = lean_ctor_get(x_30, 1);
-lean_inc(x_34);
-lean_dec(x_30);
-x_35 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_35, 0, x_6);
-lean_ctor_set(x_35, 1, x_20);
+lean_object* x_35; lean_object* x_36; lean_object* x_37; 
+x_35 = lean_ctor_get(x_31, 1);
+lean_inc(x_35);
+lean_dec(x_31);
 x_36 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_36, 0, x_35);
-lean_ctor_set(x_36, 1, x_34);
-return x_36;
+lean_ctor_set(x_36, 0, x_6);
+lean_ctor_set(x_36, 1, x_20);
+x_37 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_37, 0, x_36);
+lean_ctor_set(x_37, 1, x_35);
+return x_37;
 }
 }
 else
 {
-uint8_t x_37; 
+uint8_t x_38; 
 lean_dec(x_20);
 lean_dec(x_6);
-x_37 = !lean_is_exclusive(x_30);
-if (x_37 == 0)
+x_38 = !lean_is_exclusive(x_31);
+if (x_38 == 0)
 {
-return x_30;
+return x_31;
 }
 else
 {
-lean_object* x_38; lean_object* x_39; lean_object* x_40; 
-x_38 = lean_ctor_get(x_30, 0);
-x_39 = lean_ctor_get(x_30, 1);
+lean_object* x_39; lean_object* x_40; lean_object* x_41; 
+x_39 = lean_ctor_get(x_31, 0);
+x_40 = lean_ctor_get(x_31, 1);
+lean_inc(x_40);
 lean_inc(x_39);
-lean_inc(x_38);
-lean_dec(x_30);
-x_40 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_40, 0, x_38);
-lean_ctor_set(x_40, 1, x_39);
-return x_40;
+lean_dec(x_31);
+x_41 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_41, 0, x_39);
+lean_ctor_set(x_41, 1, x_40);
+return x_41;
 }
 }
 }
 else
 {
-uint8_t x_41; 
+uint8_t x_42; 
 lean_dec(x_20);
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
 lean_dec(x_9);
 lean_dec(x_6);
-x_41 = !lean_is_exclusive(x_26);
-if (x_41 == 0)
+x_42 = !lean_is_exclusive(x_27);
+if (x_42 == 0)
 {
-return x_26;
+return x_27;
 }
 else
 {
-lean_object* x_42; lean_object* x_43; lean_object* x_44; 
-x_42 = lean_ctor_get(x_26, 0);
-x_43 = lean_ctor_get(x_26, 1);
+lean_object* x_43; lean_object* x_44; lean_object* x_45; 
+x_43 = lean_ctor_get(x_27, 0);
+x_44 = lean_ctor_get(x_27, 1);
+lean_inc(x_44);
 lean_inc(x_43);
-lean_inc(x_42);
-lean_dec(x_26);
-x_44 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_44, 0, x_42);
-lean_ctor_set(x_44, 1, x_43);
-return x_44;
+lean_dec(x_27);
+x_45 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_45, 0, x_43);
+lean_ctor_set(x_45, 1, x_44);
+return x_45;
 }
 }
 }
 else
 {
-uint8_t x_45; 
+uint8_t x_46; 
 lean_dec(x_12);
 lean_dec(x_11);
 lean_dec(x_10);
@@ -5145,48 +5146,48 @@ lean_dec(x_8);
 lean_dec(x_6);
 lean_dec(x_2);
 lean_dec(x_1);
-x_45 = !lean_is_exclusive(x_19);
-if (x_45 == 0)
+x_46 = !lean_is_exclusive(x_19);
+if (x_46 == 0)
 {
 return x_19;
 }
 else
 {
-lean_object* x_46; lean_object* x_47; lean_object* x_48; 
-x_46 = lean_ctor_get(x_19, 0);
-x_47 = lean_ctor_get(x_19, 1);
+lean_object* x_47; lean_object* x_48; lean_object* x_49; 
+x_47 = lean_ctor_get(x_19, 0);
+x_48 = lean_ctor_get(x_19, 1);
+lean_inc(x_48);
 lean_inc(x_47);
-lean_inc(x_46);
 lean_dec(x_19);
-x_48 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_48, 0, x_46);
-lean_ctor_set(x_48, 1, x_47);
-return x_48;
+x_49 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_49, 0, x_47);
+lean_ctor_set(x_49, 1, x_48);
+return x_49;
 }
 }
 }
 else
 {
-uint8_t x_49; 
+uint8_t x_50; 
 lean_dec(x_2);
 lean_dec(x_1);
-x_49 = !lean_is_exclusive(x_5);
-if (x_49 == 0)
+x_50 = !lean_is_exclusive(x_5);
+if (x_50 == 0)
 {
 return x_5;
 }
 else
 {
-lean_object* x_50; lean_object* x_51; lean_object* x_52; 
-x_50 = lean_ctor_get(x_5, 0);
-x_51 = lean_ctor_get(x_5, 1);
+lean_object* x_51; lean_object* x_52; lean_object* x_53; 
+x_51 = lean_ctor_get(x_5, 0);
+x_52 = lean_ctor_get(x_5, 1);
+lean_inc(x_52);
 lean_inc(x_51);
-lean_inc(x_50);
 lean_dec(x_5);
-x_52 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_52, 0, x_50);
-lean_ctor_set(x_52, 1, x_51);
-return x_52;
+x_53 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_53, 0, x_51);
+lean_ctor_set(x_53, 1, x_52);
+return x_53;
 }
 }
 }
@@ -5281,24 +5282,24 @@ l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__1 = _init_l_Lean_K
 lean_mark_persistent(l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__1);
 l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__2 = _init_l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__2();
 lean_mark_persistent(l_Lean_KeyedDeclsAttribute_ExtensionState_inhabited___closed__2);
-l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__1 = _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__1();
-lean_mark_persistent(l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__1);
-l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__2 = _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__2();
-lean_mark_persistent(l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__2);
-l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__3 = _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__3();
-lean_mark_persistent(l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_inhabited___spec__1___closed__3);
-l_Lean_KeyedDeclsAttribute_inhabited___closed__1 = _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__1();
-lean_mark_persistent(l_Lean_KeyedDeclsAttribute_inhabited___closed__1);
-l_Lean_KeyedDeclsAttribute_inhabited___closed__2 = _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__2();
-lean_mark_persistent(l_Lean_KeyedDeclsAttribute_inhabited___closed__2);
-l_Lean_KeyedDeclsAttribute_inhabited___closed__3 = _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__3();
-lean_mark_persistent(l_Lean_KeyedDeclsAttribute_inhabited___closed__3);
-l_Lean_KeyedDeclsAttribute_inhabited___closed__4 = _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__4();
-lean_mark_persistent(l_Lean_KeyedDeclsAttribute_inhabited___closed__4);
-l_Lean_KeyedDeclsAttribute_inhabited___closed__5 = _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__5();
-lean_mark_persistent(l_Lean_KeyedDeclsAttribute_inhabited___closed__5);
-l_Lean_KeyedDeclsAttribute_inhabited___closed__6 = _init_l_Lean_KeyedDeclsAttribute_inhabited___closed__6();
-lean_mark_persistent(l_Lean_KeyedDeclsAttribute_inhabited___closed__6);
+l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__1 = _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__1();
+lean_mark_persistent(l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__1);
+l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__2 = _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__2();
+lean_mark_persistent(l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__2);
+l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__3 = _init_l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__3();
+lean_mark_persistent(l_Lean_SMap_empty___at_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___spec__1___closed__3);
+l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__1 = _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__1();
+lean_mark_persistent(l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__1);
+l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__2 = _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__2();
+lean_mark_persistent(l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__2);
+l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__3 = _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__3();
+lean_mark_persistent(l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__3);
+l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__4 = _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__4();
+lean_mark_persistent(l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__4);
+l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__5 = _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__5();
+lean_mark_persistent(l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__5);
+l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__6 = _init_l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__6();
+lean_mark_persistent(l_Lean_KeyedDeclsAttribute_KeyedDeclsAttribute_inhabited___closed__6);
 l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__1 = _init_l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__1();
 lean_mark_persistent(l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__1);
 l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__2 = _init_l_Lean_KeyedDeclsAttribute_declareBuiltin___rarg___closed__2();