chore: update stage0

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

@@ -515,6 +515,12 @@ s.toSubstring.trimLeft.toString
 def trim (s : String) : String :=
 s.toSubstring.trim.toString
 
+@[inline] def nextWhile (s : String) (p : Char → Bool) (i : String.Pos) : String.Pos :=
+Substring.takeWhileAux s s.bsize p i
+
+@[inline] def nextUntil (s : String) (p : Char → Bool) (i : String.Pos) : String.Pos :=
+nextWhile s (fun c => !p c) i
+
 end String
 
 protected def Char.toString (c : Char) : String :=

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

@@ -86,11 +86,11 @@ partial def toParserDescrAux : Syntax → ToParserDescrM Syntax
         `(ParserDescr.symbol $(quote atom) $(quote rbp?))
     | none => liftM throwUnsupportedSyntax
   else if kind == `Lean.Parser.Syntax.num then
-    `(ParserDescr.num)
+    `(ParserDescr.numLit)
   else if kind == `Lean.Parser.Syntax.str then
-    `(ParserDescr.str)
+    `(ParserDescr.strLit)
   else if kind == `Lean.Parser.Syntax.char then
-    `(ParserDescr.char)
+    `(ParserDescr.charLit)
   else if kind == `Lean.Parser.Syntax.ident then
     `(ParserDescr.ident)
   else if kind == `Lean.Parser.Syntax.try then do

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

@@ -769,10 +769,9 @@ match result? with
 | none =>
   let process (candidates : List (Name × List String)) : TermElabM (List (Expr × List String)) := do {
     when candidates.isEmpty $ do {
-      -- TODO: improve pretty printing
-      -- let extractionResult := extractMacroScopes n;
-      -- env ← getEnv;
-      throwError ref ("unknown identifier '" ++ toString n ++ "'")
+      mainModule ← getMainModule;
+      let view := extractMacroScopes n;
+      throwError ref ("unknown identifier '" ++ view.format mainModule ++ "'")
     };
     mkConsts ref candidates explicitLevels
   };
@@ -831,9 +830,10 @@ fun stx _ => do
 fun stx expectedType? => elabRawCharLit (stx.getArg 0) expectedType?
 
 @[builtinTermElab quotedName] def elabQuotedName : TermElab :=
-fun stx _ => match_syntax stx with
-| `(`$n) => pure $ toExpr n.getId
-| _      => throwUnsupportedSyntax
+fun stx _ =>
+  match (stx.getArg 0).isNameLit? with
+  | some val => pure $ toExpr val
+  | none     => throwError stx "ill-formed syntax"
 
 end Term
 

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

@@ -14,6 +14,14 @@ match stx.truncateTrailing.reprint with -- TODO use syntax pretty printer
 | some str => format str.toFormat
 | none     => format stx
 
+def MacroScopesView.format (view : MacroScopesView) (mainModule : Name) : Format :=
+format $
+  if view.scopes.isEmpty then view.name
+  else if view.mainModule == mainModule then
+   view.scopes.foldl mkNameNum (view.name ++ view.imported)
+  else
+   view.scopes.foldl mkNameNum (view.name ++ view.imported ++ view.mainModule)
+
 namespace Elab
 
 structure MacroStackElem :=

stage0/src/Init/Lean/Parser/Identifier.lean

@@ -1,40 +0,0 @@
-/-
-Copyright (c) 2018 Microsoft Corporation. All rights reserved.
-Released under Apache 2.0 license as described in the file LICENSE.
-Authors: Leonardo de Moura
--/
-prelude
-import Init.Data.Char.Basic
-
-namespace Lean
-
-def isGreek (c : Char) : Bool :=
-0x391 ≤ c.val && c.val ≤ 0x3dd
-
-def isLetterLike (c : Char) : Bool :=
-(0x3b1  ≤ c.val && c.val ≤ 0x3c9 && c.val ≠ 0x3bb) ||                  -- Lower greek, but lambda
-(0x391  ≤ c.val && c.val ≤ 0x3A9 && c.val ≠ 0x3A0 && c.val ≠ 0x3A3) || -- Upper greek, but Pi and Sigma
-(0x3ca  ≤ c.val && c.val ≤ 0x3fb) ||                                   -- Coptic letters
-(0x1f00 ≤ c.val && c.val ≤ 0x1ffe) ||                                  -- Polytonic Greek Extended Character Set
-(0x2100 ≤ c.val && c.val ≤ 0x214f) ||                                  -- Letter like block
-(0x1d49c ≤ c.val && c.val ≤ 0x1d59f)                                   -- Latin letters, Script, Double-struck, Fractur
-
-def isSubScriptAlnum (c : Char) : Bool :=
-(0x2080 ≤ c.val && c.val ≤ 0x2089) || -- numeric subscripts
-(0x2090 ≤ c.val && c.val ≤ 0x209c) ||
-(0x1d62 ≤ c.val && c.val ≤ 0x1d6a)
-
-def isIdFirst (c : Char) : Bool :=
-c.isAlpha || c = '_' || isLetterLike c
-
-def isIdRest (c : Char) : Bool :=
-c.isAlphanum || c = '_' || c = '\'' || c == '!' || c == '?' || isLetterLike c || isSubScriptAlnum c
-
-def idBeginEscape := '«'
-def idEndEscape   := '»'
-def isIdBeginEscape (c : Char) : Bool :=
-c = idBeginEscape
-def isIdEndEscape (c : Char) : Bool :=
-c = idEndEscape
-
-end Lean

stage0/src/Init/Lean/Parser/Parser.lean

@@ -11,7 +11,6 @@ import Init.Lean.ToExpr
 import Init.Lean.Environment
 import Init.Lean.Attributes
 import Init.Lean.Message
-import Init.Lean.Parser.Identifier
 import Init.Lean.Compiler.InitAttr
 
 namespace Lean
@@ -33,15 +32,21 @@ match stx.getOptional? with
 
 end Syntax
 
-
 namespace Parser
 
+def isLitKind (k : SyntaxNodeKind) : Bool :=
+k == strLitKind || k == numLitKind || k == charLitKind || k == nameLitKind
+
 abbrev mkAtom (info : SourceInfo) (val : String) : Syntax :=
 Syntax.atom info val
 
 abbrev mkIdent (info : SourceInfo) (rawVal : Substring) (val : Name) : Syntax :=
 Syntax.ident (some info) rawVal val []
 
+/- Return character after position `pos` -/
+def getNext (input : String) (pos : Nat) : Char :=
+input.get (input.next pos)
+
 /- Function application precedence.
    In the standard lean language, only two tokens have precedence higher that `appPrec`.
    - The token `.` has precedence `appPrec+1`. Thus, field accesses like `g (h x).f` are parsed as `g ((h x).f)`,
@@ -830,6 +835,23 @@ partial def identFnAux (startPos : Nat) (tk : Option TokenConfig) : Name → Bas
     else
       mkTokenAndFixPos startPos tk c s
 
+private def isIdFirstOrBeginEscape (c : Char) : Bool :=
+isIdFirst c || isIdBeginEscape c
+
+private def nameLitAux (startPos : Nat) : BasicParserFn
+| c, s =>
+  let input := c.input;
+  let s     := identFnAux startPos none Name.anonymous c (s.next input startPos);
+  if s.hasError then
+    s.mkErrorAt "invalid Name literal" startPos
+  else
+    let stx := s.stxStack.back;
+    match stx with
+    | Syntax.ident _ rawStr _ _ =>
+      let s := s.popSyntax;
+      s.pushSyntax (Syntax.node nameLitKind #[mkAtomFrom stx rawStr.toString])
+    | _ => s.mkError "invalid Name literal"
+
 private def tokenFnAux : BasicParserFn
 | c, s =>
   let input := c.input;
@@ -841,6 +863,8 @@ private def tokenFnAux : BasicParserFn
     charLitFnAux i c (s.next input i)
   else if curr.isDigit then
     numberFnAux c s
+  else if curr == '`' && isIdFirstOrBeginEscape (getNext input i) then
+    nameLitAux i c s
   else
     let (_, tk) := c.tokens.matchPrefix input i;
     identFnAux i tk Name.anonymous c s
@@ -1092,6 +1116,16 @@ fun _ c s =>
 { fn   := charLitFn,
   info := mkAtomicInfo "charLit" }
 
+def nameLitFn {k : ParserKind} : ParserFn k :=
+fun _ c s =>
+  let iniPos := s.pos;
+  let s := tokenFn c s;
+  if s.hasError || !(s.stxStack.back.isOfKind nameLitKind) then s.mkErrorAt "Name literal" iniPos else s
+
+@[inline] def nameLitNoAntiquot {k : ParserKind} : Parser k :=
+{ fn   := nameLitFn,
+  info := mkAtomicInfo "nameLit" }
+
 def identFn {k : ParserKind} : ParserFn k :=
 fun _ c s =>
   let iniPos := s.pos;
@@ -1130,7 +1164,7 @@ def unquotedSymbolFn {k : ParserKind} : ParserFn k :=
 fun _ c s =>
   let iniPos := s.pos;
   let s      := tokenFn c s;
-  if s.hasError || s.stxStack.back.isIdent || s.stxStack.back.isOfKind strLitKind || s.stxStack.back.isOfKind charLitKind || s.stxStack.back.isOfKind numLitKind then
+  if s.hasError || s.stxStack.back.isIdent || isLitKind s.stxStack.back.getKind then
     s.mkErrorAt "symbol" iniPos
   else
     s
@@ -1324,7 +1358,11 @@ match stx? with
   | _            => (s, 0)
 | some (Syntax.ident _ _ _ _) => (s, appPrec)
 -- TODO(Leo): add support for associating lbp with syntax node kinds.
-| some (Syntax.node k _)      => if k == numLitKind || k == charLitKind || k == strLitKind || k == fieldIdxKind then (s, appPrec) else (s, 0)
+| some (Syntax.node k _)      =>
+  if isLitKind k || k == fieldIdxKind then
+    (s, appPrec)
+  else
+    (s, 0)
 | _                           => (s, 0)
 
 def indexed {α : Type} (map : TokenMap α) (c : ParserContext) (s : ParserState) (leadingIdentAsSymbol : Bool) : ParserState × List α :=
@@ -1486,6 +1524,9 @@ mkAntiquot "strLit" strLitKind <|> strLitNoAntiquot
 def charLit {k : ParserKind} : Parser k :=
 mkAntiquot "charLit" charLitKind <|> charLitNoAntiquot
 
+def nameLit {k : ParserKind} : Parser k :=
+mkAntiquot "nameLit" nameLitKind <|> nameLitNoAntiquot
+
 def categoryParserOfStackFn (offset : Nat) : ParserFn leading :=
 fun rbp ctx s =>
   let stack := s.stxStack;
@@ -1659,9 +1700,10 @@ def compileParserDescr (categories : ParserCategories) : forall {k : ParserKind}
 | _, ParserDescr.sepBy1 d₁ d₂                        => sepBy1 <$> compileParserDescr d₁ <*> compileParserDescr d₂
 | _, ParserDescr.node k d                            => node k <$> compileParserDescr d
 | _, ParserDescr.symbol tk lbp                       => pure $ symbolAux tk lbp
-| _, ParserDescr.num                                 => pure $ numLit
-| _, ParserDescr.str                                 => pure $ strLit
-| _, ParserDescr.char                                => pure $ charLit
+| _, ParserDescr.numLit                              => pure $ numLit
+| _, ParserDescr.strLit                              => pure $ strLit
+| _, ParserDescr.charLit                             => pure $ charLit
+| _, ParserDescr.nameLit                             => pure $ nameLit
 | _, ParserDescr.ident                               => pure $ ident
 | ParserKind.leading,
   ParserDescr.nonReservedSymbol tk includeIdent      => pure $ nonReservedSymbol tk includeIdent
@@ -1783,7 +1825,7 @@ parserExtension.addEntry env $ ParserExtensionEntry.kind k
 
 def isValidSyntaxNodeKind (env : Environment) (k : SyntaxNodeKind) : Bool :=
 let kinds := (parserExtension.getState env).kinds;
-kinds.contains k || k == choiceKind || k == strLitKind || k == numLitKind || k == charLitKind
+kinds.contains k || k == choiceKind || isLitKind k
 
 def getSyntaxNodeKinds (env : Environment) : List SyntaxNodeKind := do
 let kinds := (parserExtension.getState env).kinds;

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

@@ -85,7 +85,7 @@ def matchAlt := parser! " | " >> sepBy1 termParser ", " >> darrow >> termParser
 @[builtinTermParser] def «parser!»  := parser! "parser! " >> termParser
 @[builtinTermParser] def «tparser!» := parser! "tparser! " >> termParser
 @[builtinTermParser] def borrowed   := parser! symbol "@&" appPrec >> termParser (appPrec - 1)
-@[builtinTermParser] def quotedName := parser! symbol "`" appPrec >> rawIdent
+@[builtinTermParser] def quotedName := parser! nameLit
 -- NOTE: syntax quotations are defined in Init.Lean.Parser.Command
 @[builtinTermParser] def antiquot   := (mkAntiquot "term" none true : Parser)
 @[builtinTermParser] def «match_syntax» := parser! "match_syntax" >> termParser >> " with " >> many1Indent matchAlt "'match_syntax' alternatives must be indented"

stage0/src/Init/LeanInit.lean

@@ -21,6 +21,36 @@ without importing the whole `Lean` module.
 It also allow us to use extensions to develop the `Init` library.
 -/
 
+/- Valid identifier names -/
+def isGreek (c : Char) : Bool :=
+0x391 ≤ c.val && c.val ≤ 0x3dd
+
+def isLetterLike (c : Char) : Bool :=
+(0x3b1  ≤ c.val && c.val ≤ 0x3c9 && c.val ≠ 0x3bb) ||                  -- Lower greek, but lambda
+(0x391  ≤ c.val && c.val ≤ 0x3A9 && c.val ≠ 0x3A0 && c.val ≠ 0x3A3) || -- Upper greek, but Pi and Sigma
+(0x3ca  ≤ c.val && c.val ≤ 0x3fb) ||                                   -- Coptic letters
+(0x1f00 ≤ c.val && c.val ≤ 0x1ffe) ||                                  -- Polytonic Greek Extended Character Set
+(0x2100 ≤ c.val && c.val ≤ 0x214f) ||                                  -- Letter like block
+(0x1d49c ≤ c.val && c.val ≤ 0x1d59f)                                   -- Latin letters, Script, Double-struck, Fractur
+
+def isSubScriptAlnum (c : Char) : Bool :=
+(0x2080 ≤ c.val && c.val ≤ 0x2089) || -- numeric subscripts
+(0x2090 ≤ c.val && c.val ≤ 0x209c) ||
+(0x1d62 ≤ c.val && c.val ≤ 0x1d6a)
+
+def isIdFirst (c : Char) : Bool :=
+c.isAlpha || c = '_' || isLetterLike c
+
+def isIdRest (c : Char) : Bool :=
+c.isAlphanum || c = '_' || c = '\'' || c == '!' || c == '?' || isLetterLike c || isSubScriptAlnum c
+
+def idBeginEscape := '«'
+def idEndEscape   := '»'
+def isIdBeginEscape (c : Char) : Bool :=
+c = idBeginEscape
+def isIdEndEscape (c : Char) : Bool :=
+c = idEndEscape
+
 /- Hierarchical names -/
 inductive Name
 | anonymous : Name
@@ -121,9 +151,10 @@ inductive ParserDescrCore : ParserKind → Type
 | node {k : ParserKind}          : Name → ParserDescrCore k → ParserDescrCore k
 | symbol {k : ParserKind}        : String → Option Nat → ParserDescrCore k
 | nonReservedSymbol              : String → Bool → ParserDescrCore ParserKind.leading
-| num {k : ParserKind}           : ParserDescrCore k
-| str {k : ParserKind}           : ParserDescrCore k
-| char {k : ParserKind}          : ParserDescrCore k
+| numLit {k : ParserKind}        : ParserDescrCore k
+| strLit {k : ParserKind}        : ParserDescrCore k
+| charLit {k : ParserKind}       : ParserDescrCore k
+| nameLit {k : ParserKind}       : ParserDescrCore k
 | ident {k : ParserKind}         : ParserDescrCore k
 | pushLeading                    : ParserDescrCore ParserKind.trailing
 | parser {k : ParserKind}        : Name → Nat → ParserDescrCore k
@@ -144,9 +175,10 @@ abbrev TrailingParserDescr := ParserDescrCore ParserKind.trailing
 @[matchPattern] abbrev ParserDescr.sepBy1 := @ParserDescrCore.sepBy1
 @[matchPattern] abbrev ParserDescr.node := @ParserDescrCore.node
 @[matchPattern] abbrev ParserDescr.symbol := @ParserDescrCore.symbol
-@[matchPattern] abbrev ParserDescr.num := @ParserDescrCore.num
-@[matchPattern] abbrev ParserDescr.str := @ParserDescrCore.str
-@[matchPattern] abbrev ParserDescr.char := @ParserDescrCore.char
+@[matchPattern] abbrev ParserDescr.numLit := @ParserDescrCore.numLit
+@[matchPattern] abbrev ParserDescr.strLit := @ParserDescrCore.strLit
+@[matchPattern] abbrev ParserDescr.charLit := @ParserDescrCore.charLit
+@[matchPattern] abbrev ParserDescr.nameLit := @ParserDescrCore.nameLit
 @[matchPattern] abbrev ParserDescr.ident := @ParserDescrCore.ident
 @[matchPattern] abbrev ParserDescr.nonReservedSymbol := @ParserDescrCore.nonReservedSymbol
 @[matchPattern] abbrev ParserDescr.pushLeading := @ParserDescrCore.pushLeading
@@ -373,6 +405,7 @@ abbrev Macro := Syntax → MacroM Syntax
 def strLitKind : SyntaxNodeKind := `strLit
 def charLitKind : SyntaxNodeKind := `charLit
 def numLitKind : SyntaxNodeKind := `numLit
+def nameLitKind : SyntaxNodeKind := `nameLit
 def fieldIdxKind : SyntaxNodeKind := `fieldIdx
 
 /- Helper functions for processing Syntax programmatically -/
@@ -524,16 +557,22 @@ else
   else if c.isDigit then decodeDecimalLitAux s 0 0
   else none
 
-def isNatLitAux (nodeKind : SyntaxNodeKind) : Syntax → Option Nat
-| Syntax.node k args   =>
-  if k == nodeKind && args.size == 1 then
+def isLit? (litKind : SyntaxNodeKind) (stx : Syntax) : Option String :=
+match stx with
+| Syntax.node k args =>
+  if k == litKind && args.size == 1 then
     match args.get! 0 with
-    | (Syntax.atom _ val) => decodeNatLitVal val
+    | (Syntax.atom _ val) => some val
     | _ => none
   else
     none
 | _ => none
 
+def isNatLitAux (litKind : SyntaxNodeKind) (stx : Syntax) : Option Nat :=
+match isLit? litKind stx with
+| some val => decodeNatLitVal val
+| _        => none
+
 def isNatLit? (s : Syntax) : Option Nat :=
 isNatLitAux numLitKind s
 
@@ -586,15 +625,10 @@ partial def decodeStrLitAux (s : String) : String.Pos → String → Option Stri
 def decodeStrLit (s : String) : Option String :=
 decodeStrLitAux s 1 ""
 
-def isStrLit? : Syntax → Option String
-| Syntax.node k args   =>
-  if k == strLitKind && args.size == 1 then
-    match args.get! 0 with
-    | (Syntax.atom _ val) => decodeStrLit val
-    | _                   => none
-  else
-    none
-| _ => none
+def isStrLit? (stx : Syntax) : Option String :=
+match isLit? strLitKind stx with
+| some val => decodeStrLit val
+| _        => none
 
 def decodeCharLit (s : String) : Option Char :=
 let c := s.get 1;
@@ -604,15 +638,43 @@ if c == '\\' then do
 else
   pure c
 
-def isCharLit? : Syntax → Option Char
-| Syntax.node k args   =>
-  if k == charLitKind && args.size == 1 then
-    match args.get! 0 with
-    | (Syntax.atom _ val) => decodeCharLit val
-    | _ => none
+def isCharLit? (stx : Syntax) : Option Char :=
+match isLit? charLitKind stx with
+| some val => decodeCharLit val
+| _        => none
+
+private partial def decodeNameLitAux (s : String) : Nat → Name → Option Name
+| i, r =>
+  let continue? (i : Nat) (r : Name) : Option Name :=
+    if s.get i == '.' then
+       decodeNameLitAux (s.next i) r
+    else if s.atEnd i then
+       pure r
+    else
+       none;
+  let curr := s.get i;
+  if isIdBeginEscape curr then
+    let startPart := s.next i;
+    let stopPart  := s.nextUntil isIdEndEscape startPart;
+    if !isIdEndEscape (s.get stopPart) then none
+    else continue? (s.next stopPart) (mkNameStr r (s.extract startPart stopPart))
+  else if isIdFirst curr then
+    let startPart := i;
+    let stopPart  := s.nextWhile isIdRest startPart;
+    continue? stopPart (mkNameStr r (s.extract startPart stopPart))
   else
     none
-| _ => none
+
+def decodeNameLit (s : String) : Option Name :=
+if s.get 0 == '`' then
+  decodeNameLitAux s 1 Name.anonymous
+else
+  none
+
+def isNameLit? (stx : Syntax) : Option Name :=
+match isLit? nameLitKind stx with
+| some val => decodeNameLit val
+| _        => none
 
 def hasArgs : Syntax → Bool
 | Syntax.node _ args => args.size > 0

stage0/src/frontends/lean/builtin_cmds.cpp

@@ -330,6 +330,26 @@ environment hide_cmd(parser & p) {
     return new_env;
 }
 
+struct stream_buffer_delete {
+    void operator () (char ** buffer) {
+        free(*buffer);
+    }
+};
+
+obj_res lean_redirect_stdout(obj_arg new_stdout);
+lean_object *  lean_io_wrap_handle(FILE *hfile);
+lean_object *& get_handle_current_stdout();
+
+struct redirect_helper {
+    object_ref m_old_fp;
+    redirect_helper(object_ref const & new_fp):
+        m_old_fp(lean_redirect_stdout(new_fp.to_obj_arg())) {
+    }
+    ~redirect_helper() {
+        lean_dec(lean_redirect_stdout(m_old_fp.to_obj_arg()));
+    }
+};
+
 static environment eval_cmd(parser & p) {
     transient_cmd_scope cmd_scope(p);
     auto pos = p.pos();
@@ -383,11 +403,14 @@ static environment eval_cmd(parser & p) {
     auto out = p.mk_message(p.cmd_pos(), p.pos(), INFORMATION);
     out.set_caption("eval result");
     scope_traces_as_messages scope_traces(p.get_stream_name(), p.cmd_pos());
-    std::streambuf * saved_cout = std::cout.rdbuf(out.get_text_stream().get_stream().rdbuf());
-
+    char * redirected; size_t redir_size;
+    FILE * fp = open_memstream(&redirected, &redir_size);
+    std::unique_ptr<char *, stream_buffer_delete> stream_buffer(&redirected);
     object_ref r;
 
     try {
+        object_ref new_fp(lean_io_wrap_handle(fp));
+        redirect_helper helper(new_fp);
         if (p.profiling()) {
             timeit timer(out.get_text_stream().get_stream(), "eval time");
             r = object_ref(ir::run_boxed(new_env, fn_name, args.size(), &args[0]));
@@ -395,12 +418,12 @@ static environment eval_cmd(parser & p) {
             r = object_ref(ir::run_boxed(new_env, fn_name, args.size(), &args[0]));
         }
     } catch (exception & ex) {
-        std::cout.rdbuf(saved_cout);
+        out << redirected;
         out.report();
         throw ex;
     }
 
-    std::cout.rdbuf(saved_cout);
+    out << redirected;
     out.report();
     if (io_result_is_error(r.raw())) {
         message_builder msg = p.mk_message(p.cmd_pos(), p.pos(), ERROR);

stage0/src/runtime/io.cpp

@@ -133,7 +133,7 @@ static void io_handle_finalizer(void * h) {
 static void io_handle_foreach(void * /* mod */, b_obj_arg /* fn */) {
 }
 
-static lean_object * io_wrap_handle(FILE *hfile) {
+lean_object * lean_io_wrap_handle(FILE *hfile) {
     return lean_alloc_external(g_io_handle_external_class, hfile);
 }
 
@@ -144,6 +144,12 @@ MK_THREAD_LOCAL_GET(object *, get_handle_current_stdout, g_handle_stdout);
 MK_THREAD_LOCAL_GET(object *, get_handle_current_stderr, g_handle_stderr);
 MK_THREAD_LOCAL_GET(object *, get_handle_current_stdin,  g_handle_stdin);
 
+obj_res lean_redirect_stdout(obj_arg new_stdout) {
+    obj_res r = get_handle_current_stdout();
+    get_handle_current_stdout() = new_stdout;
+    return r;
+}
+
 /* getStdout : IO FS.Handle */
 extern "C" obj_res lean_get_stdout(obj_arg /* w */) {
     object * r = get_handle_current_stdout();
@@ -300,7 +306,7 @@ extern "C" obj_res lean_io_prim_handle_mk(b_obj_arg filename, b_obj_arg modeStr,
     if (!fp) {
         return set_io_error(decode_io_error(errno, filename));
     } else {
-        return set_io_result(io_wrap_handle(fp));
+        return set_io_result(lean_io_wrap_handle(fp));
     }
 }
 
@@ -658,9 +664,9 @@ extern "C" obj_res lean_io_ref_ptr_eq(b_obj_arg ref1, b_obj_arg ref2, obj_arg) {
 void initialize_io() {
     g_io_error_nullptr_read = mk_string("null reference read");
     g_io_handle_external_class = lean_register_external_class(io_handle_finalizer, io_handle_foreach);
-    g_handle_stdout = io_wrap_handle(stdout);
-    g_handle_stderr = io_wrap_handle(stderr);
-    g_handle_stdin  = io_wrap_handle(stdin);
+    g_handle_stdout = lean_io_wrap_handle(stdout);
+    g_handle_stderr = lean_io_wrap_handle(stderr);
+    g_handle_stdin  = lean_io_wrap_handle(stdin);
     mark_persistent(g_handle_stdout);
     mark_persistent(g_handle_stderr);
     mark_persistent(g_handle_stdin);

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

@@ -40,6 +40,7 @@ lean_object* l_Substring_extract___boxed(lean_object*, lean_object*, lean_object
 lean_object* l___private_Init_Data_String_Basic_4__utf8SetAux(uint32_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_String_trimRight___boxed(lean_object*);
 lean_object* l_Substring_takeWhileAux___main___at_Substring_trimLeft___spec__1___boxed(lean_object*, lean_object*, lean_object*);
+lean_object* l_String_nextWhile___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_posOfAux___main(lean_object*, uint32_t, lean_object*, lean_object*);
 uint8_t l_String_anyAux___main___at_Substring_all___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Substring_drop(lean_object*, lean_object*);
@@ -48,6 +49,7 @@ lean_object* l_String_Iterator_extract___boxed(lean_object*, lean_object*);
 lean_object* l_Substring_takeRight___boxed(lean_object*, lean_object*);
 lean_object* l_String_revPosOf(lean_object*, uint32_t);
 lean_object* l_Substring_toString___boxed(lean_object*);
+lean_object* l_Substring_takeWhileAux___main___at_String_nextUntil___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Substring_takeRightWhileAux___main___at_Substring_trimRight___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_offsetOfPosAux(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_String_anyAux___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -64,6 +66,7 @@ lean_object* l_String_isEmpty___boxed(lean_object*);
 lean_object* l_Nat_repeatAux___main___at_String_pushn___spec__1(uint32_t, lean_object*, lean_object*);
 lean_object* l_String_back___boxed(lean_object*);
 uint8_t l_Char_isDigit(uint32_t);
+lean_object* l_String_nextUntil(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_toSubstring(lean_object*);
 lean_object* l_Substring_extract(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_append___boxed(lean_object*, lean_object*);
@@ -178,6 +181,7 @@ lean_object* l___private_Init_Data_String_Basic_7__utf8ExtractAux_u2081(lean_obj
 lean_object* l_String_foldr___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_anyAux___main___at_Substring_all___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_String_Iterator_next(lean_object*);
+lean_object* l_String_nextUntil___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Substring_front___boxed(lean_object*);
 lean_object* l_String_trimLeft(lean_object*);
 lean_object* l_String_join___boxed(lean_object*);
@@ -198,7 +202,9 @@ lean_object* l_String_dropWhile___boxed(lean_object*, lean_object*);
 lean_object* l_String_anyAux___main___at_Substring_contains___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Substring_atEnd___boxed(lean_object*, lean_object*);
 lean_object* l_Substring_posOf___boxed(lean_object*, lean_object*);
+lean_object* l_Substring_takeWhileAux___main___at_String_nextUntil___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Substring_drop___closed__1;
+lean_object* l_String_nextWhile(lean_object*, lean_object*, lean_object*);
 lean_object* l_String_Iterator_hasNext___boxed(lean_object*);
 lean_object* l_String_Iterator_prevn___main(lean_object*, lean_object*);
 lean_object* l_String_offsetOfPosAux___main(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -4859,6 +4865,89 @@ lean_dec(x_1);
 return x_2;
 }
 }
+lean_object* l_String_nextWhile(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_string_utf8_byte_size(x_1);
+x_5 = l_Substring_takeWhileAux___main(x_1, x_4, x_2, x_3);
+lean_dec(x_4);
+return x_5;
+}
+}
+lean_object* l_String_nextWhile___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_String_nextWhile(x_1, x_2, x_3);
+lean_dec(x_1);
+return x_4;
+}
+}
+lean_object* l_Substring_takeWhileAux___main___at_String_nextUntil___spec__1(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
+_start:
+{
+uint8_t x_5; 
+x_5 = lean_nat_dec_eq(x_4, x_3);
+if (x_5 == 0)
+{
+uint32_t x_6; lean_object* x_7; lean_object* x_8; uint8_t x_9; 
+x_6 = lean_string_utf8_get(x_2, x_4);
+x_7 = lean_box_uint32(x_6);
+lean_inc(x_1);
+x_8 = lean_apply_1(x_1, x_7);
+x_9 = lean_unbox(x_8);
+lean_dec(x_8);
+if (x_9 == 0)
+{
+lean_object* x_10; 
+x_10 = lean_string_utf8_next(x_2, x_4);
+lean_dec(x_4);
+x_4 = x_10;
+goto _start;
+}
+else
+{
+lean_dec(x_1);
+return x_4;
+}
+}
+else
+{
+lean_dec(x_1);
+return x_4;
+}
+}
+}
+lean_object* l_String_nextUntil(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; lean_object* x_5; 
+x_4 = lean_string_utf8_byte_size(x_1);
+x_5 = l_Substring_takeWhileAux___main___at_String_nextUntil___spec__1(x_2, x_1, x_4, x_3);
+lean_dec(x_4);
+return x_5;
+}
+}
+lean_object* l_Substring_takeWhileAux___main___at_String_nextUntil___spec__1___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_Substring_takeWhileAux___main___at_String_nextUntil___spec__1(x_1, x_2, x_3, x_4);
+lean_dec(x_3);
+lean_dec(x_2);
+return x_5;
+}
+}
+lean_object* l_String_nextUntil___boxed(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
+_start:
+{
+lean_object* x_4; 
+x_4 = l_String_nextUntil(x_1, x_2, x_3);
+lean_dec(x_1);
+return x_4;
+}
+}
 lean_object* l_Char_toString(uint32_t x_1) {
 _start:
 {

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

@@ -406,6 +406,7 @@ lean_object* l_Lean_Elab_Term_elabAnd___boxed(lean_object*, lean_object*, lean_o
 lean_object* l_Lean_Elab_Term_elabMap___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabMap___closed__2;
 lean_object* l_Lean_Elab_Term_elabGE___closed__2;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_object* l_Lean_Elab_Term_elabTParserMacro___lambda__1___closed__5;
 lean_object* l_Lean_Elab_Term_elabMap___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabGE___closed__2;
@@ -420,7 +421,6 @@ lean_object* l_Lean_Elab_Term_elabParserMacro___lambda__1___closed__20;
 lean_object* l_Lean_Elab_Term_elabTParserMacro(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabDollarProj___lambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabAnd___closed__1;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabEq___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabHave___closed__3;
 lean_object* l_Lean_Elab_Term_elabShow___lambda__1___closed__2;
@@ -1477,7 +1477,7 @@ x_122 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_123 = lean_array_push(x_122, x_121);
 x_124 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_125 = lean_array_push(x_123, x_124);
-x_126 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_126 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_127 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_127, 0, x_126);
 lean_ctor_set(x_127, 1, x_125);
@@ -1564,7 +1564,7 @@ x_173 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_174 = lean_array_push(x_173, x_172);
 x_175 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_176 = lean_array_push(x_174, x_175);
-x_177 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_177 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_178 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_178, 0, x_177);
 lean_ctor_set(x_178, 1, x_176);
@@ -1927,7 +1927,7 @@ x_43 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_44 = lean_array_push(x_43, x_42);
 x_45 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_46 = lean_array_push(x_44, x_45);
-x_47 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_47 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_48 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_48, 0, x_47);
 lean_ctor_set(x_48, 1, x_46);
@@ -2009,7 +2009,7 @@ x_92 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_93 = lean_array_push(x_92, x_91);
 x_94 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_95 = lean_array_push(x_93, x_94);
-x_96 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_96 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_97 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_97, 0, x_96);
 lean_ctor_set(x_97, 1, x_95);
@@ -2183,7 +2183,7 @@ x_168 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_169 = lean_array_push(x_168, x_167);
 x_170 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_171 = lean_array_push(x_169, x_170);
-x_172 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_172 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_173 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_173, 0, x_172);
 lean_ctor_set(x_173, 1, x_171);
@@ -2273,7 +2273,7 @@ x_221 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_222 = lean_array_push(x_221, x_220);
 x_223 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_224 = lean_array_push(x_222, x_223);
-x_225 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_225 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_226 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_226, 0, x_225);
 lean_ctor_set(x_226, 1, x_224);
@@ -2992,7 +2992,7 @@ x_33 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_34 = lean_array_push(x_33, x_32);
 x_35 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_36 = lean_array_push(x_34, x_35);
-x_37 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_37 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_38 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_38, 0, x_37);
 lean_ctor_set(x_38, 1, x_36);
@@ -3061,7 +3061,7 @@ x_73 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_74 = lean_array_push(x_73, x_72);
 x_75 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_76 = lean_array_push(x_74, x_75);
-x_77 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_77 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_78 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_78, 0, x_77);
 lean_ctor_set(x_78, 1, x_76);
@@ -3341,7 +3341,7 @@ x_45 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_46 = lean_array_push(x_45, x_44);
 x_47 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_48 = lean_array_push(x_46, x_47);
-x_49 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_49 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_50 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_50, 0, x_49);
 lean_ctor_set(x_50, 1, x_48);
@@ -3415,7 +3415,7 @@ x_89 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_90 = lean_array_push(x_89, x_88);
 x_91 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_92 = lean_array_push(x_90, x_91);
-x_93 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_93 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_94 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_94, 0, x_93);
 lean_ctor_set(x_94, 1, x_92);
@@ -3535,7 +3535,7 @@ x_150 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_151 = lean_array_push(x_150, x_149);
 x_152 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_153 = lean_array_push(x_151, x_152);
-x_154 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_154 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_155 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_155, 0, x_154);
 lean_ctor_set(x_155, 1, x_153);
@@ -3609,7 +3609,7 @@ x_194 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_195 = lean_array_push(x_194, x_193);
 x_196 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_197 = lean_array_push(x_195, x_196);
-x_198 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_198 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_199 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_199, 0, x_198);
 lean_ctor_set(x_199, 1, x_197);
@@ -3764,7 +3764,7 @@ x_266 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_267 = lean_array_push(x_266, x_265);
 x_268 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_269 = lean_array_push(x_267, x_268);
-x_270 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_270 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_271 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_271, 0, x_270);
 lean_ctor_set(x_271, 1, x_269);
@@ -3831,7 +3831,7 @@ x_305 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_306 = lean_array_push(x_305, x_304);
 x_307 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_308 = lean_array_push(x_306, x_307);
-x_309 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_309 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_310 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_310, 0, x_309);
 lean_ctor_set(x_310, 1, x_308);
@@ -3946,7 +3946,7 @@ x_363 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_364 = lean_array_push(x_363, x_362);
 x_365 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_366 = lean_array_push(x_364, x_365);
-x_367 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_367 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_368 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_368, 0, x_367);
 lean_ctor_set(x_368, 1, x_366);
@@ -4013,7 +4013,7 @@ x_402 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_403 = lean_array_push(x_402, x_401);
 x_404 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_405 = lean_array_push(x_403, x_404);
-x_406 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_406 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_407 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_407, 0, x_406);
 lean_ctor_set(x_407, 1, x_405);
@@ -4886,7 +4886,7 @@ x_94 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_95 = lean_array_push(x_94, x_93);
 x_96 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_97 = lean_array_push(x_95, x_96);
-x_98 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_98 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_99 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_99, 0, x_98);
 lean_ctor_set(x_99, 1, x_97);
@@ -4976,7 +4976,7 @@ x_141 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_142 = lean_array_push(x_141, x_140);
 x_143 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_144 = lean_array_push(x_142, x_143);
-x_145 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_145 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_146 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_146, 0, x_145);
 lean_ctor_set(x_146, 1, x_144);
@@ -5077,7 +5077,7 @@ x_193 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_194 = lean_array_push(x_193, x_192);
 x_195 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_196 = lean_array_push(x_194, x_195);
-x_197 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_197 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_198 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_198, 0, x_197);
 lean_ctor_set(x_198, 1, x_196);
@@ -5185,7 +5185,7 @@ x_250 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_251 = lean_array_push(x_250, x_249);
 x_252 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_253 = lean_array_push(x_251, x_252);
-x_254 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_254 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_255 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_255, 0, x_254);
 lean_ctor_set(x_255, 1, x_253);

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

@@ -31,6 +31,7 @@ lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_Command_elabComma
 extern lean_object* l_Lean_Meta_check___closed__1;
 lean_object* l_Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_getOptions(lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 extern lean_object* l_Lean_Elab_Tactic_evalTactic___main___closed__3;
 extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__8;
 lean_object* l___regBuiltinCommandElab_Lean_Elab_Command_elabNamespace___closed__3;
@@ -139,7 +140,6 @@ lean_object* l_Lean_Elab_Command_commandElabAttribute___closed__2;
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Meta_isLevelDefEqAux___main___closed__5;
 lean_object* l_List_foldl___main___at_Lean_Elab_Command_sortDeclLevelParams___spec__1___boxed(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
 lean_object* l_Lean_Elab_Command_modifyScope___at_Lean_Elab_Command_addOpenDecl___spec__1(lean_object*, lean_object*, lean_object*);
 size_t l_USize_shiftRight(size_t, size_t);
 lean_object* l_Lean_SMap_find_x3f___at_Lean_Elab_Command_elabCommand___main___spec__1___boxed(lean_object*, lean_object*);
@@ -325,6 +325,7 @@ extern lean_object* l_Lean_Parser_Command_open___elambda__1___closed__2;
 uint8_t l_Array_contains___at_Lean_findField_x3f___main___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_MonadQuotation___closed__1;
 lean_object* l_Lean_Elab_mkElabAttribute___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 lean_object* l_Lean_Elab_Command_elabEnd___closed__2;
 lean_object* l_Lean_Elab_Command_elabCommand(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Command_liftIO___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -475,7 +476,6 @@ lean_object* l_Lean_Elab_Command_throwAlreadyDeclaredUniverseLevel___rarg(lean_o
 extern lean_object* l_Lean_Parser_Command_openOnly___elambda__1___closed__2;
 lean_object* l_Array_toList___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_CommandElabM_monadLog___lambda__3(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
 lean_object* l_Lean_Elab_Command_setOption___closed__3;
 lean_object* l_Lean_Elab_Command_registerBuiltinCommandElabAttr___lambda__1___closed__5;
 lean_object* l___private_Init_Lean_Elab_Command_4__modifyGetState___rarg(lean_object*, lean_object*, lean_object*);
@@ -3397,7 +3397,7 @@ x_27 = l_Lean_Name_toStringWithSep___main(x_26, x_1);
 x_28 = l_Lean_Elab_Command_addBuiltinCommandElab___closed__1;
 x_29 = lean_string_append(x_28, x_27);
 lean_dec(x_27);
-x_30 = l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
+x_30 = l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 x_31 = lean_string_append(x_29, x_30);
 x_32 = lean_alloc_ctor(18, 1, 0);
 lean_ctor_set(x_32, 0, x_31);
@@ -3502,7 +3502,7 @@ x_52 = l_Lean_Name_toStringWithSep___main(x_51, x_1);
 x_53 = l_Lean_Elab_Command_addBuiltinCommandElab___closed__1;
 x_54 = lean_string_append(x_53, x_52);
 lean_dec(x_52);
-x_55 = l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
+x_55 = l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 x_56 = lean_string_append(x_54, x_55);
 x_57 = lean_alloc_ctor(18, 1, 0);
 lean_ctor_set(x_57, 0, x_56);
@@ -3829,7 +3829,7 @@ lean_dec(x_13);
 lean_dec(x_11);
 lean_dec(x_2);
 lean_dec(x_1);
-x_25 = l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
+x_25 = l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_12);

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

@@ -59,6 +59,7 @@ lean_object* l_Lean_Level_addOffsetAux___main(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Level_LevelElabM_MonadLog___closed__8;
 lean_object* l_Lean_Elab_Level_mkFreshId(lean_object*);
 lean_object* l_Lean_Elab_Level_elabLevel___main___closed__3;
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Level_LevelElabM_MonadLog___spec__2(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Level_LevelElabM_MonadLog___closed__1;
 uint8_t l_List_elem___main___at_Lean_Parser_addLeadingParser___spec__7(lean_object*, lean_object*);
@@ -68,7 +69,6 @@ lean_object* l_Lean_FileMap_toPosition(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Level_elabLevel___main___closed__1;
 lean_object* l_Lean_Elab_Level_mkFreshId___rarg(lean_object*);
 lean_object* l_Lean_Elab_Level_elabLevel___boxed(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 extern lean_object* l_Lean_Parser_Level_ident___elambda__1___closed__1;
 lean_object* l_Lean_mkLevelMVar(lean_object*);
 lean_object* l_Lean_Elab_Level_LevelElabM_MonadLog___lambda__4(lean_object*, lean_object*, lean_object*);
@@ -1264,7 +1264,7 @@ x_75 = l_Lean_Syntax_getArg(x_1, x_74);
 lean_dec(x_1);
 x_76 = l_Lean_Syntax_getArgs(x_75);
 lean_dec(x_75);
-x_77 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_76);
+x_77 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_76);
 x_78 = l_Lean_Elab_Level_elabLevel___main(x_77, x_2, x_3);
 if (lean_obj_tag(x_78) == 0)
 {
@@ -1330,7 +1330,7 @@ x_93 = l_Lean_Syntax_getArg(x_1, x_92);
 lean_dec(x_1);
 x_94 = l_Lean_Syntax_getArgs(x_93);
 lean_dec(x_93);
-x_95 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_94);
+x_95 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_94);
 x_96 = l_Lean_Elab_Level_elabLevel___main(x_95, x_2, x_3);
 if (lean_obj_tag(x_96) == 0)
 {

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

@@ -300,6 +300,7 @@ extern lean_object* l_Lean_Parser_termParser___closed__2;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwError___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 extern lean_object* l_Lean_Elab_Exception_hasToString___closed__1;
 extern lean_object* l_PersistentArray_empty___closed__3;
 lean_object* l_Lean_Elab_Term_resolveName(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -343,7 +344,6 @@ lean_object* l_Lean_Elab_Term_elabStxQuot(lean_object*, lean_object*, lean_objec
 lean_object* l_List_map___main___at_Lean_Elab_Term_oldGetPatternVars___spec__2(lean_object*);
 lean_object* l_Lean_List_hasQuote(lean_object*);
 lean_object* l_Lean_Elab_Term_stxQuot_expand___closed__19;
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_ReaderT_bind___at_Lean_Elab_Term_monadLog___spec__2___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Array_append___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_7__getHeadInfo___lambda__2___closed__3;
@@ -378,16 +378,17 @@ lean_object* l___private_Init_Lean_Elab_Quotation_12__letBindRhss___main___close
 lean_object* l_ReaderT_bind___at___private_Init_Lean_Elab_Quotation_8__explodeHeadPat___spec__1___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_3__quoteOption___rarg___closed__3;
 lean_object* l___private_Init_Lean_Elab_Quotation_7__getHeadInfo(lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 extern lean_object* l_Lean_mkAppStx___closed__3;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__4;
 lean_object* l___private_Init_Lean_Elab_Quotation_14__toPreterm___main___lambda__3(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_KVMap_setName(lean_object*, lean_object*, lean_object*);
 lean_object* lean_local_ctx_mk_local_decl(lean_object*, lean_object*, lean_object*, lean_object*, uint8_t);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__27;
 extern lean_object* l_Lean_Parser_appPrec;
 lean_object* l_Lean_Array_hasQuote(lean_object*);
 extern lean_object* l_Option_HasRepr___rarg___closed__3;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l_List_mapM___main___at___private_Init_Lean_Elab_Quotation_12__letBindRhss___main___spec__1(lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 lean_object* l_List_map___main___at___private_Init_Lean_Elab_Quotation_15__oldRunTermElabM___spec__2(lean_object*, lean_object*);
@@ -397,7 +398,6 @@ lean_object* l___private_Init_Lean_Elab_Quotation_2__quoteList___main(lean_objec
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___closed__14;
 extern lean_object* l_Lean_mkAppStx___closed__5;
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__44;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_object* l_Lean_Parser_Error_toString(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__8;
 lean_object* l___private_Init_Lean_Elab_Quotation_9__compileStxMatch___main___closed__28;
@@ -3342,7 +3342,7 @@ x_340 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_341 = lean_array_push(x_340, x_339);
 x_342 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_343 = lean_array_push(x_341, x_342);
-x_344 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_344 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_345 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_345, 0, x_344);
 lean_ctor_set(x_345, 1, x_343);
@@ -3493,7 +3493,7 @@ x_423 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_424 = lean_array_push(x_423, x_422);
 x_425 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_426 = lean_array_push(x_424, x_425);
-x_427 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_427 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_428 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_428, 0, x_427);
 lean_ctor_set(x_428, 1, x_426);
@@ -3693,7 +3693,7 @@ x_528 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_529 = lean_array_push(x_528, x_527);
 x_530 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_531 = lean_array_push(x_529, x_530);
-x_532 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_532 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_533 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_533, 0, x_532);
 lean_ctor_set(x_533, 1, x_531);
@@ -4284,7 +4284,7 @@ x_93 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_94 = lean_array_push(x_93, x_92);
 x_95 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_96 = lean_array_push(x_94, x_95);
-x_97 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_97 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_98 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_98, 0, x_97);
 lean_ctor_set(x_98, 1, x_96);
@@ -4469,7 +4469,7 @@ x_194 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_195 = lean_array_push(x_194, x_193);
 x_196 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_197 = lean_array_push(x_195, x_196);
-x_198 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_198 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_199 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_199, 0, x_198);
 lean_ctor_set(x_199, 1, x_197);
@@ -5681,7 +5681,7 @@ x_45 = lean_box(0);
 x_46 = lean_name_eq(x_44, x_45);
 lean_dec(x_44);
 x_47 = l_Lean_Syntax_getArg(x_14, x_13);
-x_48 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_48 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_inc(x_47);
 x_49 = l_Lean_Syntax_isOfKind(x_47, x_48);
 x_50 = l_Lean_Elab_Term_isAntiquotSplice(x_14);
@@ -9707,7 +9707,7 @@ x_672 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_673 = lean_array_push(x_672, x_671);
 x_674 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_675 = lean_array_push(x_673, x_674);
-x_676 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_676 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_677 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_677, 0, x_676);
 lean_ctor_set(x_677, 1, x_675);
@@ -10081,7 +10081,7 @@ x_864 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43;
 x_865 = lean_array_push(x_864, x_863);
 x_866 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_867 = lean_array_push(x_865, x_866);
-x_868 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_868 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_869 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_869, 0, x_868);
 lean_ctor_set(x_869, 1, x_867);
@@ -10613,7 +10613,7 @@ x_1080 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__43
 x_1081 = lean_array_push(x_1080, x_1079);
 x_1082 = l___private_Init_Lean_Elab_Quotation_5__quoteSyntax___main___closed__59;
 x_1083 = lean_array_push(x_1081, x_1082);
-x_1084 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_1084 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_1085 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_1085, 0, x_1084);
 lean_ctor_set(x_1085, 1, x_1083);
@@ -11230,7 +11230,7 @@ lean_object* x_19; lean_object* x_20; lean_object* x_21; lean_object* x_22; uint
 x_19 = l_Lean_Syntax_inhabited;
 x_20 = lean_unsigned_to_nat(1u);
 x_21 = lean_array_get(x_19, x_4, x_20);
-x_22 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_22 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_inc(x_21);
 x_23 = l_Lean_Syntax_isOfKind(x_21, x_22);
 if (x_23 == 0)
@@ -11796,7 +11796,7 @@ lean_object* _init_l___private_Init_Lean_Elab_Quotation_12__letBindRhss___main__
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_1 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_2 = l___private_Init_Lean_Elab_Quotation_12__letBindRhss___main___closed__6;
 x_3 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_3, 0, x_1);
@@ -15250,7 +15250,7 @@ x_163 = lean_string_dec_eq(x_119, x_162);
 if (x_163 == 0)
 {
 lean_object* x_164; uint8_t x_165; 
-x_164 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_164 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_165 = lean_string_dec_eq(x_119, x_164);
 if (x_165 == 0)
 {
@@ -17497,7 +17497,7 @@ x_796 = lean_string_dec_eq(x_119, x_795);
 if (x_796 == 0)
 {
 lean_object* x_797; uint8_t x_798; 
-x_797 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_797 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_798 = lean_string_dec_eq(x_119, x_797);
 if (x_798 == 0)
 {
@@ -19289,7 +19289,7 @@ x_1278 = lean_string_dec_eq(x_119, x_1277);
 if (x_1278 == 0)
 {
 lean_object* x_1279; uint8_t x_1280; 
-x_1279 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_1279 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_1280 = lean_string_dec_eq(x_119, x_1279);
 if (x_1280 == 0)
 {
@@ -21115,7 +21115,7 @@ x_1766 = lean_string_dec_eq(x_119, x_1765);
 if (x_1766 == 0)
 {
 lean_object* x_1767; uint8_t x_1768; 
-x_1767 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_1767 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_1768 = lean_string_dec_eq(x_119, x_1767);
 if (x_1768 == 0)
 {
@@ -22974,7 +22974,7 @@ x_2261 = lean_string_dec_eq(x_119, x_2260);
 if (x_2261 == 0)
 {
 lean_object* x_2262; uint8_t x_2263; 
-x_2262 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2262 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_2263 = lean_string_dec_eq(x_119, x_2262);
 if (x_2263 == 0)
 {
@@ -25135,7 +25135,7 @@ lean_inc(x_13);
 x_14 = lean_ctor_get(x_11, 1);
 lean_inc(x_14);
 lean_dec(x_11);
-x_15 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_13);
+x_15 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_13);
 lean_dec(x_13);
 x_16 = lean_alloc_ctor(0, 2, 0);
 lean_ctor_set(x_16, 0, x_15);

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

@@ -106,6 +106,7 @@ lean_object* l_Lean_Elab_Command_elabSyntax___lambda__1___boxed(lean_object*, le
 lean_object* lean_array_push(lean_object*, lean_object*);
 lean_object* lean_array_get_size(lean_object*);
 lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__51;
+extern lean_object* l_Lean_charLitKind___closed__1;
 extern lean_object* l_Lean_Parser_Term_num___elambda__1___closed__1;
 extern lean_object* l_Lean_Syntax_termIdToAntiquot___closed__3;
 lean_object* l_Lean_Elab_Command_strLitPrecToPattern(lean_object*, lean_object*);
@@ -217,9 +218,11 @@ lean_object* l_Lean_Elab_Term_toParserDescrAux___main___closed__129;
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Unhygienic_run___rarg(lean_object*);
 lean_object* l_Lean_Elab_Command_elabSyntax___closed__25;
+extern lean_object* l_Lean_numLitKind___closed__1;
 extern lean_object* l_Lean_Parser_Command_def___elambda__1___closed__1;
 lean_object* l___private_Init_Lean_Elab_Syntax_3__markAsTrailingParser(lean_object*, uint8_t, lean_object*);
 lean_object* l_Array_umapMAux___main___at___private_Init_Lean_Elab_Syntax_7__antiquote___main___spec__1(lean_object*, lean_object*, lean_object*);
+extern lean_object* l_Lean_strLitKind___closed__1;
 extern lean_object* l___private_Init_Lean_Elab_TermBinders_10__expandFunBindersAux___main___closed__6;
 lean_object* lean_array_fset(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Syntax_optional___elambda__1___closed__1;
@@ -1877,7 +1880,7 @@ lean_object* _init_l_Lean_Elab_Term_toParserDescrAux___main___closed__64() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("ParserDescr.char");
+x_1 = lean_mk_string("ParserDescr.charLit");
 return x_1;
 }
 }
@@ -1909,7 +1912,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__4;
-x_2 = l_Lean_Parser_Term_char___elambda__1___closed__1;
+x_2 = l_Lean_charLitKind___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1919,7 +1922,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__6;
-x_2 = l_Lean_Parser_Term_char___elambda__1___closed__1;
+x_2 = l_Lean_charLitKind___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1952,7 +1955,7 @@ lean_object* _init_l_Lean_Elab_Term_toParserDescrAux___main___closed__71() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("ParserDescr.str");
+x_1 = lean_mk_string("ParserDescr.strLit");
 return x_1;
 }
 }
@@ -1984,7 +1987,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__4;
-x_2 = l_Lean_Parser_Term_str___elambda__1___closed__1;
+x_2 = l_Lean_strLitKind___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1994,7 +1997,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__6;
-x_2 = l_Lean_Parser_Term_str___elambda__1___closed__1;
+x_2 = l_Lean_strLitKind___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2027,7 +2030,7 @@ lean_object* _init_l_Lean_Elab_Term_toParserDescrAux___main___closed__78() {
 _start:
 {
 lean_object* x_1; 
-x_1 = lean_mk_string("ParserDescr.num");
+x_1 = lean_mk_string("ParserDescr.numLit");
 return x_1;
 }
 }
@@ -2059,7 +2062,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__4;
-x_2 = l_Lean_Parser_Level_num___elambda__1___closed__1;
+x_2 = l_Lean_numLitKind___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -2069,7 +2072,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Syntax_2__mkParserSeq___spec__1___closed__6;
-x_2 = l_Lean_Parser_Level_num___elambda__1___closed__1;
+x_2 = l_Lean_numLitKind___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }

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

@@ -24,6 +24,7 @@ lean_object* l_Lean_Elab_Tactic_getLocalInsts___boxed(lean_object*, lean_object*
 lean_object* l_Lean_registerTraceClass(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Tactic_withMVarContext___rarg(lean_object*, lean_object*, lean_object*, lean_object*);
 uint8_t l_PersistentHashMap_contains___at_Lean_Elab_Tactic_addBuiltinTactic___spec__4(lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 lean_object* l_Lean_Elab_Tactic_evalTactic___main___closed__3;
 extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__8;
 lean_object* l_PersistentHashMap_find_x3f___at_Lean_Elab_Tactic_evalTactic___main___spec__2(lean_object*, lean_object*);
@@ -105,7 +106,6 @@ extern lean_object* l_Lean_Parser_Tactic_assumption___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Tactic_withFreshMacroScope(lean_object*);
 lean_object* l_Lean_MetavarContext_renameMVar(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_reportUnsolvedGoals___closed__3;
-extern lean_object* l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
 lean_object* l_AssocList_find___main___at_Lean_Elab_Tactic_evalTactic___main___spec__6___boxed(lean_object*, lean_object*);
 lean_object* l___regBuiltinTactic_Lean_Elab_Tactic_evalNestedTacticBlock___closed__2;
 size_t l_USize_shiftRight(size_t, size_t);
@@ -238,6 +238,7 @@ extern lean_object* l_Lean_Parser_Tactic_paren___elambda__1___closed__1;
 lean_object* l_Lean_Elab_Tactic_monadLog___closed__1;
 lean_object* l_Lean_Elab_Term_ensureHasType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 lean_object* l_Lean_Elab_Tactic_save___boxed(lean_object*);
 lean_object* l_Lean_Elab_Tactic_registerBuiltinTacticAttr___closed__5;
 lean_object* l_mkHashMapImp___rarg(lean_object*);
@@ -366,7 +367,6 @@ lean_object* l_Array_toList___rarg(lean_object*);
 lean_object* l_Lean_Elab_Tactic_ensureHasType(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_Tactic_withMacroExpansion___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
 lean_object* l_Lean_Elab_Tactic_instantiateMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_reportUnsolvedGoals(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_Tactic_evalTactic___main___spec__6(lean_object*, lean_object*);
@@ -3154,7 +3154,7 @@ x_27 = l_Lean_Name_toStringWithSep___main(x_26, x_1);
 x_28 = l_Lean_Elab_Tactic_addBuiltinTactic___closed__1;
 x_29 = lean_string_append(x_28, x_27);
 lean_dec(x_27);
-x_30 = l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
+x_30 = l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 x_31 = lean_string_append(x_29, x_30);
 x_32 = lean_alloc_ctor(18, 1, 0);
 lean_ctor_set(x_32, 0, x_31);
@@ -3259,7 +3259,7 @@ x_52 = l_Lean_Name_toStringWithSep___main(x_51, x_1);
 x_53 = l_Lean_Elab_Tactic_addBuiltinTactic___closed__1;
 x_54 = lean_string_append(x_53, x_52);
 lean_dec(x_52);
-x_55 = l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
+x_55 = l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 x_56 = lean_string_append(x_54, x_55);
 x_57 = lean_alloc_ctor(18, 1, 0);
 lean_ctor_set(x_57, 0, x_56);
@@ -3578,7 +3578,7 @@ lean_dec(x_13);
 lean_dec(x_11);
 lean_dec(x_2);
 lean_dec(x_1);
-x_25 = l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
+x_25 = l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_12);

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

@@ -28,6 +28,7 @@ lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__1;
 lean_object* l_Lean_mkAppStx(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_monadQuotation;
 lean_object* l_Lean_Elab_Term_elabRawNumLit___closed__1;
+lean_object* l_Lean_extractMacroScopes(lean_object*);
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__8;
 uint8_t l___private_Init_Lean_Elab_Term_4__isCDot___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNum(lean_object*);
@@ -43,6 +44,7 @@ lean_object* l_Lean_Syntax_isNatLitAux(lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabRawCharLit___closed__3;
 lean_object* l_PersistentArray_foldlMAux___main___at___private_Init_Lean_Elab_Term_3__fromMetaState___spec__2(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabNum___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 extern lean_object* l_Lean_Parser_declareBuiltinParser___closed__8;
 lean_object* l_Lean_Elab_Term_State_inhabited;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabChar(lean_object*);
@@ -106,6 +108,7 @@ uint8_t l_List_elem___main___at_Lean_addAliasEntry___spec__18(lean_object*, lean
 extern lean_object* l_Prod_HasRepr___rarg___closed__1;
 lean_object* l___private_Init_Lean_Elab_Term_4__isCDot___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_elabQuotedName___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_MacroScopesView_format(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNamedHole___closed__1;
 lean_object* l_Lean_Meta_Exception_toMessageData(lean_object*);
 lean_object* l_Lean_mkMVar(lean_object*);
@@ -181,7 +184,6 @@ lean_object* l___private_Init_Lean_Elab_Term_10__elabCDot(lean_object*, lean_obj
 lean_object* l___private_Init_Lean_Elab_Term_5__expandCDot___closed__3;
 lean_object* l_Lean_WHNF_unfoldDefinitionAux___at_Lean_Meta_unfoldDefinition_x3f___spec__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_List_repr___rarg___closed__3;
-extern lean_object* l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
 extern lean_object* l_Lean_Parser_Term_typeAscription___elambda__1___closed__2;
 lean_object* l_PersistentHashMap_findAtAux___main___at_Lean_Elab_Term_elabTermAux___main___spec__4___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_throwError(lean_object*);
@@ -372,7 +374,6 @@ lean_object* l_Lean_Elab_Term_trySynthInstance(lean_object*, lean_object*, lean_
 lean_object* l_Lean_Elab_Term_liftLevelM___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_elabListLit___closed__4;
 extern lean_object* l_Lean_Parser_Term_explicitBinder___elambda__1___closed__2;
-lean_object* l_Lean_Syntax_getId(lean_object*);
 lean_object* l_Lean_Elab_Term_elabRawStrLit___closed__1;
 lean_object* l_Lean_Syntax_prettyPrint(lean_object*);
 lean_object* l_Lean_Elab_Term_Lean_Elab_MonadMacroAdapter;
@@ -394,6 +395,7 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabRawCharLit___closed__3;
 lean_object* l_Lean_Elab_Term_monadLog___lambda__2___boxed(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_fun___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabTypeStx___rarg___closed__1;
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 extern lean_object* l_Lean_Elab_Exception_hasToString___closed__1;
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_Term_elabTermAux___main___spec__3(lean_object*, size_t, lean_object*);
 extern lean_object* l_PersistentArray_empty___closed__3;
@@ -448,6 +450,7 @@ lean_object* l_Lean_Elab_Term_elabTermAux(lean_object*, uint8_t, lean_object*, l
 lean_object* l_Lean_Elab_Term_termElabAttribute___closed__5;
 lean_object* l_Lean_Elab_Term_ensureHasType___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkElabAttribute___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayLit___closed__3;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrayLit(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSort___closed__1;
@@ -463,7 +466,6 @@ lean_object* l_Lean_Elab_Term_getLocalInsts(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabProp(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_7__postponeElabTerm___closed__2;
 lean_object* l_Lean_Elab_Term_mkFreshInstanceName___rarg(lean_object*);
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_Lean_Meta_whnf(lean_object*, lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabSort___closed__2;
 lean_object* l_Lean_Elab_Term_isClass(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -514,6 +516,7 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabRawNumLit___closed__1;
 lean_object* l_Lean_Elab_Term_synthesizeInstMVarCore___closed__10;
 lean_object* l_Lean_ConstantInfo_lparams(lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabNamedHole(lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_object* l_Lean_Elab_Term_mkFreshAnonymousName(lean_object*);
 lean_object* l_Lean_Elab_Term_withLCtx(lean_object*);
 lean_object* l_Lean_Elab_Term_withNode(lean_object*);
@@ -536,7 +539,6 @@ lean_object* l_Lean_Meta_trySynthInstance(lean_object*, lean_object*, lean_objec
 lean_object* l_Lean_Elab_Term_declareBuiltinTermElab___closed__7;
 extern lean_object* l_Lean_mkAppStx___closed__5;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabRawStrLit___closed__1;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_object* l___private_Init_Lean_Elab_Term_13__mkFreshLevelMVars(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at___private_Init_Lean_Elab_Term_3__fromMetaState___spec__5(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Term_6__exceptionToSorry___closed__3;
@@ -652,6 +654,7 @@ lean_object* l_Lean_mkTermIdFrom(lean_object*, lean_object*);
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabListLit(lean_object*);
 lean_object* l_Lean_Elab_Term_elabArrayLit___closed__3;
 extern lean_object* l_Lean_mkOptionalNode___closed__1;
+lean_object* l_Lean_Syntax_isNameLit_x3f(lean_object*);
 lean_object* l_Lean_Elab_Term_getMainModule___boxed(lean_object*);
 lean_object* l_Lean_Elab_Term_tryEnsureHasType_x3f___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_decLevel___closed__4;
@@ -664,7 +667,6 @@ lean_object* l_Lean_Elab_Term_monadLog___closed__11;
 lean_object* l_Lean_Elab_Term_mkTacticMVar___closed__2;
 extern lean_object* l_Lean_Expr_Inhabited;
 lean_object* l_Lean_Meta_instantiateMVars(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
 lean_object* l_Lean_Elab_Term_addBuiltinTermElab(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_Term_mkExplicitBinder___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabStr(lean_object*);
@@ -2742,7 +2744,7 @@ x_27 = l_Lean_Name_toStringWithSep___main(x_26, x_1);
 x_28 = l_Lean_Elab_Term_addBuiltinTermElab___closed__1;
 x_29 = lean_string_append(x_28, x_27);
 lean_dec(x_27);
-x_30 = l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
+x_30 = l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 x_31 = lean_string_append(x_29, x_30);
 x_32 = lean_alloc_ctor(18, 1, 0);
 lean_ctor_set(x_32, 0, x_31);
@@ -2847,7 +2849,7 @@ x_52 = l_Lean_Name_toStringWithSep___main(x_51, x_1);
 x_53 = l_Lean_Elab_Term_addBuiltinTermElab___closed__1;
 x_54 = lean_string_append(x_53, x_52);
 lean_dec(x_52);
-x_55 = l___private_Init_Lean_Parser_Parser_14__throwParserCategoryAlreadyDefined___rarg___closed__2;
+x_55 = l___private_Init_Lean_Parser_Parser_16__throwParserCategoryAlreadyDefined___rarg___closed__2;
 x_56 = lean_string_append(x_54, x_55);
 x_57 = lean_alloc_ctor(18, 1, 0);
 lean_ctor_set(x_57, 0, x_56);
@@ -3174,7 +3176,7 @@ lean_dec(x_13);
 lean_dec(x_11);
 lean_dec(x_2);
 lean_dec(x_1);
-x_25 = l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
+x_25 = l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_12);
@@ -18441,7 +18443,7 @@ x_4 = lean_array_get_size(x_1);
 x_5 = lean_unsigned_to_nat(1u);
 x_6 = lean_nat_sub(x_4, x_5);
 lean_dec(x_4);
-x_7 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_1);
+x_7 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_1);
 x_8 = l___private_Init_Lean_Elab_Term_9__mkPairsAux___main(x_1, x_6, x_7, x_2, x_3);
 return x_8;
 }
@@ -18639,7 +18641,7 @@ lean_object* l_Lean_Elab_Term_elabParen(lean_object* x_1, lean_object* x_2, lean
 _start:
 {
 uint8_t x_5; lean_object* x_147; uint8_t x_148; 
-x_147 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_147 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_inc(x_1);
 x_148 = l_Lean_Syntax_isOfKind(x_1, x_147);
 if (x_148 == 0)
@@ -19233,7 +19235,7 @@ lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabParen(lean_object* x_1) {
 _start:
 {
 lean_object* x_2; lean_object* x_3; lean_object* x_4; lean_object* x_5; 
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_3 = l___regBuiltinTermElab_Lean_Elab_Term_elabParen___closed__2;
 x_4 = l___regBuiltinTermElab_Lean_Elab_Term_elabParen___closed__3;
 x_5 = l_Lean_Elab_Term_addBuiltinTermElab(x_2, x_3, x_4, x_1);
@@ -20490,183 +20492,188 @@ return x_23;
 }
 else
 {
-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; uint8_t x_33; 
+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; uint8_t x_35; 
 lean_dec(x_21);
 lean_dec(x_4);
-x_24 = l_Lean_Name_toString___closed__1;
-x_25 = l_Lean_Name_toStringWithSep___main(x_24, x_2);
-x_26 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_26, 0, x_25);
-x_27 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_27, 0, x_26);
-x_28 = l_Lean_Elab_Term_resolveName___closed__3;
-x_29 = lean_alloc_ctor(9, 2, 0);
+x_24 = l_Lean_Elab_Term_getMainModule___rarg(x_20);
+x_25 = lean_ctor_get(x_24, 0);
+lean_inc(x_25);
+x_26 = lean_ctor_get(x_24, 1);
+lean_inc(x_26);
+lean_dec(x_24);
+x_27 = l_Lean_extractMacroScopes(x_2);
+x_28 = l_Lean_MacroScopesView_format(x_27, x_25);
+lean_dec(x_25);
+x_29 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_29, 0, x_28);
-lean_ctor_set(x_29, 1, x_27);
-x_30 = l_Lean_Elab_Term_mkConst___closed__4;
+x_30 = l_Lean_Elab_Term_resolveName___closed__3;
 x_31 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_31, 0, x_29);
-lean_ctor_set(x_31, 1, x_30);
-x_32 = l_Lean_Elab_Term_throwError___rarg(x_1, x_31, x_5, x_20);
-x_33 = !lean_is_exclusive(x_32);
-if (x_33 == 0)
+lean_ctor_set(x_31, 0, x_30);
+lean_ctor_set(x_31, 1, x_29);
+x_32 = l_Lean_Elab_Term_mkConst___closed__4;
+x_33 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_33, 0, x_31);
+lean_ctor_set(x_33, 1, x_32);
+x_34 = l_Lean_Elab_Term_throwError___rarg(x_1, x_33, x_5, x_26);
+x_35 = !lean_is_exclusive(x_34);
+if (x_35 == 0)
 {
-return x_32;
+return x_34;
 }
 else
 {
-lean_object* x_34; lean_object* x_35; lean_object* x_36; 
-x_34 = lean_ctor_get(x_32, 0);
-x_35 = lean_ctor_get(x_32, 1);
-lean_inc(x_35);
-lean_inc(x_34);
-lean_dec(x_32);
-x_36 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_36, 0, x_34);
-lean_ctor_set(x_36, 1, x_35);
-return x_36;
+lean_object* x_36; lean_object* x_37; lean_object* x_38; 
+x_36 = lean_ctor_get(x_34, 0);
+x_37 = lean_ctor_get(x_34, 1);
+lean_inc(x_37);
+lean_inc(x_36);
+lean_dec(x_34);
+x_38 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_38, 0, x_36);
+lean_ctor_set(x_38, 1, x_37);
+return x_38;
 }
 }
 }
 }
 else
 {
-lean_object* x_37; uint8_t x_38; 
+lean_object* x_39; uint8_t x_40; 
 lean_dec(x_3);
 lean_dec(x_2);
-x_37 = lean_ctor_get(x_8, 0);
-lean_inc(x_37);
+x_39 = lean_ctor_get(x_8, 0);
+lean_inc(x_39);
 lean_dec(x_8);
-x_38 = !lean_is_exclusive(x_7);
-if (x_38 == 0)
+x_40 = !lean_is_exclusive(x_7);
+if (x_40 == 0)
 {
-lean_object* x_39; lean_object* x_40; lean_object* x_41; uint8_t x_42; 
-x_39 = lean_ctor_get(x_7, 1);
-x_40 = lean_ctor_get(x_7, 0);
-lean_dec(x_40);
-x_41 = lean_ctor_get(x_37, 0);
-lean_inc(x_41);
-x_42 = l_List_isEmpty___rarg(x_4);
+lean_object* x_41; lean_object* x_42; lean_object* x_43; uint8_t x_44; 
+x_41 = lean_ctor_get(x_7, 1);
+x_42 = lean_ctor_get(x_7, 0);
+lean_dec(x_42);
+x_43 = lean_ctor_get(x_39, 0);
+lean_inc(x_43);
+x_44 = l_List_isEmpty___rarg(x_4);
 lean_dec(x_4);
-if (x_42 == 0)
+if (x_44 == 0)
 {
-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; uint8_t x_53; 
+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; uint8_t x_55; 
 lean_free_object(x_7);
-lean_dec(x_37);
-x_43 = l_Lean_Expr_fvarId_x21(x_41);
-lean_dec(x_41);
-x_44 = l_Lean_Name_toString___closed__1;
-x_45 = l_Lean_Name_toStringWithSep___main(x_44, x_43);
-x_46 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_46, 0, x_45);
-x_47 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_47, 0, x_46);
-x_48 = l_Lean_Elab_Term_resolveName___closed__6;
-x_49 = lean_alloc_ctor(9, 2, 0);
+lean_dec(x_39);
+x_45 = l_Lean_Expr_fvarId_x21(x_43);
+lean_dec(x_43);
+x_46 = l_Lean_Name_toString___closed__1;
+x_47 = l_Lean_Name_toStringWithSep___main(x_46, x_45);
+x_48 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_48, 0, x_47);
+x_49 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_49, 0, x_48);
-lean_ctor_set(x_49, 1, x_47);
-x_50 = l_Lean_Elab_Term_resolveName___closed__9;
+x_50 = l_Lean_Elab_Term_resolveName___closed__6;
 x_51 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_51, 0, x_49);
-lean_ctor_set(x_51, 1, x_50);
-x_52 = l_Lean_Elab_Term_throwError___rarg(x_1, x_51, x_5, x_39);
-x_53 = !lean_is_exclusive(x_52);
-if (x_53 == 0)
+lean_ctor_set(x_51, 0, x_50);
+lean_ctor_set(x_51, 1, x_49);
+x_52 = l_Lean_Elab_Term_resolveName___closed__9;
+x_53 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_53, 0, x_51);
+lean_ctor_set(x_53, 1, x_52);
+x_54 = l_Lean_Elab_Term_throwError___rarg(x_1, x_53, x_5, x_41);
+x_55 = !lean_is_exclusive(x_54);
+if (x_55 == 0)
 {
-return x_52;
+return x_54;
 }
 else
 {
-lean_object* x_54; lean_object* x_55; lean_object* x_56; 
-x_54 = lean_ctor_get(x_52, 0);
-x_55 = lean_ctor_get(x_52, 1);
-lean_inc(x_55);
-lean_inc(x_54);
-lean_dec(x_52);
-x_56 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_56, 0, x_54);
-lean_ctor_set(x_56, 1, x_55);
-return x_56;
-}
-}
-else
-{
-lean_object* x_57; lean_object* x_58; 
-lean_dec(x_41);
-lean_dec(x_5);
-x_57 = lean_box(0);
+lean_object* x_56; lean_object* x_57; lean_object* x_58; 
+x_56 = lean_ctor_get(x_54, 0);
+x_57 = lean_ctor_get(x_54, 1);
+lean_inc(x_57);
+lean_inc(x_56);
+lean_dec(x_54);
 x_58 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_58, 0, x_37);
+lean_ctor_set(x_58, 0, x_56);
 lean_ctor_set(x_58, 1, x_57);
-lean_ctor_set(x_7, 0, x_58);
+return x_58;
+}
+}
+else
+{
+lean_object* x_59; lean_object* x_60; 
+lean_dec(x_43);
+lean_dec(x_5);
+x_59 = lean_box(0);
+x_60 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_60, 0, x_39);
+lean_ctor_set(x_60, 1, x_59);
+lean_ctor_set(x_7, 0, x_60);
 return x_7;
 }
 }
 else
 {
-lean_object* x_59; lean_object* x_60; uint8_t x_61; 
-x_59 = lean_ctor_get(x_7, 1);
-lean_inc(x_59);
+lean_object* x_61; lean_object* x_62; uint8_t x_63; 
+x_61 = lean_ctor_get(x_7, 1);
+lean_inc(x_61);
 lean_dec(x_7);
-x_60 = lean_ctor_get(x_37, 0);
-lean_inc(x_60);
-x_61 = l_List_isEmpty___rarg(x_4);
+x_62 = lean_ctor_get(x_39, 0);
+lean_inc(x_62);
+x_63 = l_List_isEmpty___rarg(x_4);
 lean_dec(x_4);
-if (x_61 == 0)
+if (x_63 == 0)
 {
-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_dec(x_37);
-x_62 = l_Lean_Expr_fvarId_x21(x_60);
-lean_dec(x_60);
-x_63 = l_Lean_Name_toString___closed__1;
-x_64 = l_Lean_Name_toStringWithSep___main(x_63, x_62);
-x_65 = lean_alloc_ctor(2, 1, 0);
-lean_ctor_set(x_65, 0, x_64);
-x_66 = lean_alloc_ctor(0, 1, 0);
-lean_ctor_set(x_66, 0, x_65);
-x_67 = l_Lean_Elab_Term_resolveName___closed__6;
-x_68 = lean_alloc_ctor(9, 2, 0);
+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_dec(x_39);
+x_64 = l_Lean_Expr_fvarId_x21(x_62);
+lean_dec(x_62);
+x_65 = l_Lean_Name_toString___closed__1;
+x_66 = l_Lean_Name_toStringWithSep___main(x_65, x_64);
+x_67 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_67, 0, x_66);
+x_68 = lean_alloc_ctor(0, 1, 0);
 lean_ctor_set(x_68, 0, x_67);
-lean_ctor_set(x_68, 1, x_66);
-x_69 = l_Lean_Elab_Term_resolveName___closed__9;
+x_69 = l_Lean_Elab_Term_resolveName___closed__6;
 x_70 = lean_alloc_ctor(9, 2, 0);
-lean_ctor_set(x_70, 0, x_68);
-lean_ctor_set(x_70, 1, x_69);
-x_71 = l_Lean_Elab_Term_throwError___rarg(x_1, x_70, x_5, x_59);
-x_72 = lean_ctor_get(x_71, 0);
-lean_inc(x_72);
-x_73 = lean_ctor_get(x_71, 1);
-lean_inc(x_73);
-if (lean_is_exclusive(x_71)) {
- lean_ctor_release(x_71, 0);
- lean_ctor_release(x_71, 1);
- x_74 = x_71;
+lean_ctor_set(x_70, 0, x_69);
+lean_ctor_set(x_70, 1, x_68);
+x_71 = l_Lean_Elab_Term_resolveName___closed__9;
+x_72 = lean_alloc_ctor(9, 2, 0);
+lean_ctor_set(x_72, 0, x_70);
+lean_ctor_set(x_72, 1, x_71);
+x_73 = l_Lean_Elab_Term_throwError___rarg(x_1, x_72, x_5, x_61);
+x_74 = lean_ctor_get(x_73, 0);
+lean_inc(x_74);
+x_75 = lean_ctor_get(x_73, 1);
+lean_inc(x_75);
+if (lean_is_exclusive(x_73)) {
+ lean_ctor_release(x_73, 0);
+ lean_ctor_release(x_73, 1);
+ x_76 = x_73;
 } else {
- lean_dec_ref(x_71);
- x_74 = lean_box(0);
+ lean_dec_ref(x_73);
+ x_76 = lean_box(0);
 }
-if (lean_is_scalar(x_74)) {
- x_75 = lean_alloc_ctor(1, 2, 0);
+if (lean_is_scalar(x_76)) {
+ x_77 = lean_alloc_ctor(1, 2, 0);
 } else {
- x_75 = x_74;
+ x_77 = x_76;
 }
-lean_ctor_set(x_75, 0, x_72);
-lean_ctor_set(x_75, 1, x_73);
-return x_75;
+lean_ctor_set(x_77, 0, x_74);
+lean_ctor_set(x_77, 1, x_75);
+return x_77;
 }
 else
 {
-lean_object* x_76; lean_object* x_77; lean_object* x_78; 
-lean_dec(x_60);
+lean_object* x_78; lean_object* x_79; lean_object* x_80; 
+lean_dec(x_62);
 lean_dec(x_5);
-x_76 = lean_box(0);
-x_77 = lean_alloc_ctor(1, 2, 0);
-lean_ctor_set(x_77, 0, x_37);
-lean_ctor_set(x_77, 1, x_76);
-x_78 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_78, 0, x_77);
-lean_ctor_set(x_78, 1, x_59);
-return x_78;
+x_78 = lean_box(0);
+x_79 = lean_alloc_ctor(1, 2, 0);
+lean_ctor_set(x_79, 0, x_39);
+lean_ctor_set(x_79, 1, x_78);
+x_80 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_80, 0, x_79);
+lean_ctor_set(x_80, 1, x_61);
+return x_80;
 }
 }
 }
@@ -21470,67 +21477,30 @@ return x_5;
 lean_object* l_Lean_Elab_Term_elabQuotedName(lean_object* x_1, lean_object* x_2, lean_object* x_3, lean_object* x_4) {
 _start:
 {
-lean_object* x_5; uint8_t x_6; 
-x_5 = l_Lean_Parser_Term_quotedName___elambda__1___closed__2;
-lean_inc(x_1);
-x_6 = l_Lean_Syntax_isOfKind(x_1, x_5);
-if (x_6 == 0)
+lean_object* x_5; lean_object* x_6; lean_object* x_7; 
+x_5 = lean_unsigned_to_nat(0u);
+x_6 = l_Lean_Syntax_getArg(x_1, x_5);
+x_7 = l_Lean_Syntax_isNameLit_x3f(x_6);
+lean_dec(x_6);
+if (lean_obj_tag(x_7) == 0)
 {
-uint8_t x_7; 
-x_7 = l___private_Init_Lean_Elab_Term_4__isCDot___closed__1;
-if (x_7 == 0)
-{
-lean_object* x_8; 
-lean_dec(x_1);
-x_8 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_4);
-return x_8;
+lean_object* x_8; lean_object* x_9; 
+x_8 = l_Lean_Elab_Term_elabRawStrLit___closed__3;
+x_9 = l_Lean_Elab_Term_throwError___rarg(x_1, x_8, x_3, x_4);
+return x_9;
 }
 else
 {
-lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; 
-x_9 = lean_unsigned_to_nat(1u);
-x_10 = l_Lean_Syntax_getArg(x_1, x_9);
-lean_dec(x_1);
-x_11 = l_Lean_Syntax_getId(x_10);
-lean_dec(x_10);
-x_12 = l_Lean_nameToExprAux___main(x_11);
-x_13 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_13, 0, x_12);
-lean_ctor_set(x_13, 1, x_4);
-return x_13;
-}
-}
-else
-{
-lean_object* x_14; lean_object* x_15; lean_object* x_16; uint8_t x_17; uint8_t x_18; 
-x_14 = l_Lean_Syntax_getArgs(x_1);
-x_15 = lean_array_get_size(x_14);
-lean_dec(x_14);
-x_16 = lean_unsigned_to_nat(2u);
-x_17 = lean_nat_dec_eq(x_15, x_16);
-lean_dec(x_15);
-x_18 = l_coeDecidableEq(x_17);
-if (x_18 == 0)
-{
-lean_object* x_19; 
-lean_dec(x_1);
-x_19 = l_Lean_Elab_Term_throwUnsupportedSyntax___rarg(x_4);
-return x_19;
-}
-else
-{
-lean_object* x_20; lean_object* x_21; lean_object* x_22; lean_object* x_23; lean_object* x_24; 
-x_20 = lean_unsigned_to_nat(1u);
-x_21 = l_Lean_Syntax_getArg(x_1, x_20);
-lean_dec(x_1);
-x_22 = l_Lean_Syntax_getId(x_21);
-lean_dec(x_21);
-x_23 = l_Lean_nameToExprAux___main(x_22);
-x_24 = lean_alloc_ctor(0, 2, 0);
-lean_ctor_set(x_24, 0, x_23);
-lean_ctor_set(x_24, 1, x_4);
-return x_24;
-}
+lean_object* x_10; lean_object* x_11; lean_object* x_12; 
+lean_dec(x_3);
+x_10 = lean_ctor_get(x_7, 0);
+lean_inc(x_10);
+lean_dec(x_7);
+x_11 = l_Lean_nameToExprAux___main(x_10);
+x_12 = lean_alloc_ctor(0, 2, 0);
+lean_ctor_set(x_12, 0, x_11);
+lean_ctor_set(x_12, 1, x_4);
+return x_12;
 }
 }
 }
@@ -21539,8 +21509,8 @@ _start:
 {
 lean_object* x_5; 
 x_5 = l_Lean_Elab_Term_elabQuotedName(x_1, x_2, x_3, x_4);
-lean_dec(x_3);
 lean_dec(x_2);
+lean_dec(x_1);
 return x_5;
 }
 }

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

@@ -172,6 +172,7 @@ lean_object* l_Lean_Elab_Term_expandOptType___boxed(lean_object*, lean_object*);
 extern lean_object* l_Lean_nullKind___closed__2;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabDepArrow___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabArrow___closed__3;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 extern lean_object* l_Lean_mkAppStx___closed__3;
 lean_object* l___private_Init_Lean_Elab_TermBinders_7__elabBindersAux___main(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_TermBinders_5__matchBinder(lean_object*, lean_object*, lean_object*);
@@ -179,7 +180,6 @@ lean_object* lean_local_ctx_mk_local_decl(lean_object*, lean_object*, lean_objec
 lean_object* l_Lean_Elab_Term_elabLetEqnsDecl___boxed(lean_object*);
 extern lean_object* l_Option_HasRepr___rarg___closed__3;
 lean_object* l___private_Init_Lean_Elab_TermBinders_4__expandBinderModifier___closed__6;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l___regBuiltinTermElab_Lean_Elab_Term_elabForall___closed__1;
 extern lean_object* l_Lean_Parser_Term_implicitBinder___elambda__1___closed__2;
 lean_object* l_Lean_Elab_Term_elabArrow(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -5852,7 +5852,7 @@ x_492 = lean_string_dec_eq(x_19, x_491);
 if (x_492 == 0)
 {
 lean_object* x_493; uint8_t x_494; 
-x_493 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_493 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_494 = lean_string_dec_eq(x_19, x_493);
 if (x_494 == 0)
 {
@@ -8264,7 +8264,7 @@ x_1438 = lean_string_dec_eq(x_19, x_1437);
 if (x_1438 == 0)
 {
 lean_object* x_1439; uint8_t x_1440; 
-x_1439 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_1439 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_1440 = lean_string_dec_eq(x_19, x_1439);
 if (x_1440 == 0)
 {
@@ -9927,7 +9927,7 @@ x_1990 = lean_string_dec_eq(x_19, x_1989);
 if (x_1990 == 0)
 {
 lean_object* x_1991; uint8_t x_1992; 
-x_1991 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_1991 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_1992 = lean_string_dec_eq(x_19, x_1991);
 if (x_1992 == 0)
 {
@@ -11624,7 +11624,7 @@ x_2548 = lean_string_dec_eq(x_19, x_2547);
 if (x_2548 == 0)
 {
 lean_object* x_2549; uint8_t x_2550; 
-x_2549 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2549 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_2550 = lean_string_dec_eq(x_19, x_2549);
 if (x_2550 == 0)
 {
@@ -13353,7 +13353,7 @@ x_3112 = lean_string_dec_eq(x_2871, x_3111);
 if (x_3112 == 0)
 {
 lean_object* x_3113; uint8_t x_3114; 
-x_3113 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_3113 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_3114 = lean_string_dec_eq(x_2871, x_3113);
 if (x_3114 == 0)
 {

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

@@ -25,12 +25,14 @@ lean_object* l___private_Init_Lean_Elab_Util_6__ElabAttribute_add___rarg___boxed
 extern lean_object* l_Lean_Macro_throwUnsupported___closed__1;
 extern lean_object* l___private_Init_Lean_Environment_8__persistentEnvExtensionsRef;
 lean_object* l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg___boxed(lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 lean_object* lean_mk_empty_array_with_capacity(lean_object*);
 lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__20___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_mkMacroAttribute(lean_object*);
 lean_object* l_Lean_Elab_mkElabAttributeAux___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_2__throwUnexpectedElabType(lean_object*);
 lean_object* l_Lean_Elab_macroAttribute___closed__2;
+lean_object* l_Lean_MacroScopesView_format___boxed(lean_object*, lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__24___rarg___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_String_toFormat(lean_object*);
 extern lean_object* l_Lean_MessageData_ofList___closed__3;
@@ -48,6 +50,7 @@ extern size_t l_PersistentHashMap_insertAux___main___rarg___closed__2;
 lean_object* lean_array_uset(lean_object*, size_t, lean_object*);
 lean_object* l_PersistentHashMap_insertAux___main___at_Lean_Elab_ElabFnTable_insert___spec__22___rarg(lean_object*, size_t, size_t, lean_object*, lean_object*);
 uint8_t l_AssocList_contains___main___at_Lean_Elab_ElabFnTable_insert___spec__26___rarg(lean_object*, lean_object*);
+lean_object* l_Lean_MacroScopesView_format(lean_object*, lean_object*);
 size_t l_USize_sub(size_t, size_t);
 lean_object* l_HashMapImp_insert___at_Lean_Elab_ElabFnTable_insert___spec__25(lean_object*);
 lean_object* l___private_Init_Lean_Elab_Util_4__ElabAttribute_addImportedParsers___rarg(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
@@ -293,7 +296,6 @@ lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9(lean
 lean_object* l_PersistentHashMap_getCollisionNodeSize___rarg(lean_object*);
 lean_object* l_PersistentHashMap_empty___at_Lean_Elab_mkBuiltinMacroFnTable___spec__3;
 lean_object* l_mkHashMap___at_Lean_Elab_mkElabAttributeAux___spec__5___rarg(lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
 lean_object* l_Lean_Elab_declareBuiltinMacro___closed__8;
 lean_object* lean_mk_array(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_findAux___main___at_Lean_Elab_getMacros___spec__3(lean_object*, size_t, lean_object*);
@@ -309,6 +311,7 @@ extern lean_object* l_Lean_registerPersistentEnvExtensionUnsafe___rarg___closed_
 lean_object* l_Lean_Elab_checkSyntaxNodeKind___boxed(lean_object*, lean_object*);
 lean_object* l_PersistentHashMap_insertAtCollisionNodeAux___main___at_Lean_Elab_ElabFnTable_insert___spec__23(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_Elab_ElabFnTable_insert___spec__13(lean_object*);
+lean_object* l_List_foldl___main___at_Lean_MacroScopesView_review___spec__1(lean_object*, lean_object*);
 lean_object* l_Lean_SMap_insert___at_Lean_Elab_ElabFnTable_insert___spec__9___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_checkSyntaxNodeKind(lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_ElabFnTable_insert___spec__8___rarg___boxed(lean_object*, lean_object*);
@@ -324,6 +327,7 @@ lean_object* l_List_toArrayAux___main___rarg(lean_object*, lean_object*);
 lean_object* l_HashMapImp_find_x3f___at_Lean_Elab_ElabFnTable_insert___spec__7___rarg(lean_object*, lean_object*);
 lean_object* l_unsafeCast(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Elab_ElabAttributeExtensionState_inhabited(lean_object*);
+uint8_t l_List_isEmpty___rarg(lean_object*);
 lean_object* l_Array_iterateMAux___main___at_Lean_mkAppN___spec__1(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_AssocList_find___main___at_Lean_Elab_getMacros___spec__6(lean_object*, lean_object*);
 lean_object* l_Lean_Name_toStringWithSep___main(lean_object*, lean_object*);
@@ -392,6 +396,81 @@ return x_8;
 }
 }
 }
+lean_object* l_Lean_MacroScopesView_format(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; uint8_t x_4; 
+x_3 = lean_ctor_get(x_1, 3);
+lean_inc(x_3);
+x_4 = l_List_isEmpty___rarg(x_3);
+if (x_4 == 0)
+{
+lean_object* x_5; uint8_t x_6; 
+x_5 = lean_ctor_get(x_1, 2);
+lean_inc(x_5);
+x_6 = lean_name_eq(x_5, x_2);
+if (x_6 == 0)
+{
+lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; lean_object* x_13; lean_object* x_14; 
+x_7 = lean_ctor_get(x_1, 0);
+lean_inc(x_7);
+x_8 = lean_ctor_get(x_1, 1);
+lean_inc(x_8);
+lean_dec(x_1);
+x_9 = l_Lean_Name_append___main(x_7, x_8);
+lean_dec(x_7);
+x_10 = l_Lean_Name_append___main(x_9, x_5);
+lean_dec(x_9);
+x_11 = l_List_foldl___main___at_Lean_MacroScopesView_review___spec__1(x_10, x_3);
+x_12 = l_Lean_Name_toString___closed__1;
+x_13 = l_Lean_Name_toStringWithSep___main(x_12, x_11);
+x_14 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_14, 0, x_13);
+return x_14;
+}
+else
+{
+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_dec(x_5);
+x_15 = lean_ctor_get(x_1, 0);
+lean_inc(x_15);
+x_16 = lean_ctor_get(x_1, 1);
+lean_inc(x_16);
+lean_dec(x_1);
+x_17 = l_Lean_Name_append___main(x_15, x_16);
+lean_dec(x_15);
+x_18 = l_List_foldl___main___at_Lean_MacroScopesView_review___spec__1(x_17, x_3);
+x_19 = l_Lean_Name_toString___closed__1;
+x_20 = l_Lean_Name_toStringWithSep___main(x_19, x_18);
+x_21 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_21, 0, x_20);
+return x_21;
+}
+}
+else
+{
+lean_object* x_22; lean_object* x_23; lean_object* x_24; lean_object* x_25; 
+lean_dec(x_3);
+x_22 = lean_ctor_get(x_1, 0);
+lean_inc(x_22);
+lean_dec(x_1);
+x_23 = l_Lean_Name_toString___closed__1;
+x_24 = l_Lean_Name_toStringWithSep___main(x_23, x_22);
+x_25 = lean_alloc_ctor(2, 1, 0);
+lean_ctor_set(x_25, 0, x_24);
+return x_25;
+}
+}
+}
+lean_object* l_Lean_MacroScopesView_format___boxed(lean_object* x_1, lean_object* x_2) {
+_start:
+{
+lean_object* x_3; 
+x_3 = l_Lean_MacroScopesView_format(x_1, x_2);
+lean_dec(x_2);
+return x_3;
+}
+}
 uint8_t l_Lean_Elab_getBetterRef___lambda__1(lean_object* x_1, lean_object* x_2) {
 _start:
 {
@@ -5780,7 +5859,7 @@ lean_dec(x_13);
 lean_dec(x_11);
 lean_dec(x_2);
 lean_dec(x_1);
-x_25 = l___private_Init_Lean_Parser_Parser_25__BuiltinParserAttribute_add___closed__2;
+x_25 = l___private_Init_Lean_Parser_Parser_27__BuiltinParserAttribute_add___closed__2;
 x_26 = lean_alloc_ctor(1, 2, 0);
 lean_ctor_set(x_26, 0, x_25);
 lean_ctor_set(x_26, 1, x_12);

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

@@ -39,7 +39,6 @@ lean_object* l_Lean_Parser_Command_constant___closed__6;
 lean_object* l_Lean_Parser_Command_visibility___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_structExplicitBinder___closed__8;
 lean_object* l_Lean_Parser_Command_protected___elambda__1___closed__1;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
 lean_object* l_Lean_Parser_Command_declSig___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Command_openRenamingItem___closed__6;
 lean_object* l_Lean_Parser_Command_axiom___closed__5;
@@ -105,6 +104,7 @@ lean_object* l_Lean_Parser_Command_openHiding;
 lean_object* l_Lean_Parser_Command_synth___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Command_declModifiers___closed__8;
 lean_object* l_Lean_Parser_Command_def___elambda__1___closed__8;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 lean_object* l_Lean_Parser_regBuiltinCommandParserAttr___closed__4;
 lean_object* l_Lean_Parser_Command_partial___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Command_export___closed__8;
@@ -263,6 +263,7 @@ lean_object* l_Lean_Parser_Command_instance___closed__8;
 lean_object* l___private_Init_Lean_Parser_Parser_2__sepByFnAux___main___at_Lean_Parser_Command_openRenaming___elambda__1___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_openOnly___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_structFields___elambda__1(lean_object*, lean_object*, lean_object*);
+lean_object* l_Lean_Parser_Command_attrInstance___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Command_export___elambda__1___closed__8;
 lean_object* l_Lean_Parser_Command_variables___closed__1;
 lean_object* l_Lean_Parser_Command_openRenamingItem___elambda__1___closed__9;
@@ -449,7 +450,6 @@ lean_object* l_Lean_Parser_Command_universe___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Command_openRenamingItem___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Command_def___elambda__1___closed__2;
 extern lean_object* l_Lean_Parser_Term_typeSpec;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
 lean_object* l_Lean_Parser_Command_attribute___elambda__1___closed__11;
 lean_object* l_Lean_Parser_Command_protected___closed__4;
 lean_object* l_Lean_Parser_Command_structureTk___elambda__1___closed__3;
@@ -528,7 +528,6 @@ lean_object* l___regBuiltinParser_Lean_Parser_Command_namespace(lean_object*);
 lean_object* l_Lean_Parser_manyAux___main___at_Lean_Parser_Command_declValEqns___elambda__1___spec__2(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_abbrev___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Command_export___closed__2;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
 lean_object* l_Lean_Parser_Command_classTk___closed__4;
 lean_object* l_Lean_Parser_Command_declValEqns___closed__1;
 lean_object* l_Lean_Parser_Command_namespace___elambda__1___closed__9;
@@ -555,8 +554,10 @@ lean_object* l_Lean_Parser_Command_unsafe___closed__1;
 lean_object* l_Lean_Parser_Command_namespace___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Command_partial___closed__5;
 lean_object* l_Lean_Parser_Command_classTk___closed__2;
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 extern lean_object* l_Lean_Parser_Term_equation;
 lean_object* l_Lean_Parser_Command_variable___elambda__1___closed__9;
+lean_object* l_Lean_Parser_rawIdent(uint8_t);
 lean_object* l_Lean_Parser_Command_set__option___closed__5;
 lean_object* l_Lean_Parser_Command_open___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Command_universe___elambda__1___closed__6;
@@ -653,14 +654,12 @@ lean_object* l_Lean_Parser_Command_constant___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Command_relaxedInferMod___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Command_declSig___elambda__1(lean_object*, lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_haveAssign___elambda__1___closed__8;
-extern lean_object* l_Lean_Parser_Term_quotedName___elambda__1___closed__6;
 extern lean_object* l_Lean_Parser_Level_ident___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Command_theorem___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Command_abbrev___closed__8;
 lean_object* l_Lean_Parser_Command_inductive___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Command_open___elambda__1___closed__8;
 lean_object* l_Lean_Parser_Command_classTk___elambda__1(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_Lean_Parser_ParserState_restore(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_variable___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Command_optDeclSig___elambda__1(lean_object*, lean_object*, lean_object*);
@@ -802,6 +801,7 @@ lean_object* l_Lean_Parser_Command_declVal___closed__3;
 lean_object* l_Lean_Parser_Command_set__option___elambda__1___closed__13;
 lean_object* l_Lean_Parser_Command_axiom___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Command_structCtor___closed__5;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 extern lean_object* l_Lean_Parser_Term_listLit___elambda__1___closed__9;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_docComment___elambda__1___closed__3;
@@ -862,6 +862,7 @@ lean_object* l_Lean_Parser_Command_introRule___closed__2;
 lean_object* l_Lean_Parser_Command_def___closed__1;
 lean_object* l_Lean_Parser_Command_attrInstance___closed__3;
 lean_object* l_Lean_Parser_Command_export___elambda__1___closed__4;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 lean_object* l_Lean_Parser_Command_structure___closed__4;
 lean_object* l_Lean_Parser_Command_declModifiers___elambda__1___closed__1;
 extern lean_object* l_Lean_Parser_Term_explicitUniv___closed__1;
@@ -924,6 +925,7 @@ lean_object* l_Lean_Parser_Command_universes___elambda__1___closed__2;
 lean_object* l___private_Init_Lean_Parser_Parser_2__sepByFnAux___main___at_Lean_Parser_Command_attributes___elambda__1___spec__2(uint8_t, uint8_t, lean_object*, uint8_t, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_classInductive___elambda__1___closed__9;
 lean_object* l_Lean_Parser_Command_openRenaming___closed__2;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 lean_object* l_Lean_Parser_Command_openHiding___elambda__1___closed__9;
 lean_object* l_Lean_Parser_Command_declaration___closed__8;
 extern lean_object* l_Lean_Parser_Term_matchAlt___closed__2;
@@ -1009,7 +1011,6 @@ lean_object* l_Lean_Parser_Command_openRenaming___elambda__1___closed__6;
 lean_object* l___regBuiltinParser_Lean_Parser_Command_end(lean_object*);
 lean_object* l___regBuiltinParser_Lean_Parser_Command_antiquot(lean_object*);
 lean_object* l_Lean_Parser_Command_openHiding___elambda__1___closed__1;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
 lean_object* l_Lean_Parser_Command_structCtor___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_partial;
 lean_object* l_Lean_Parser_Command_declId___elambda__1___closed__4;
@@ -1480,7 +1481,7 @@ if (lean_obj_tag(x_92) == 0)
 lean_object* x_93; lean_object* x_94; 
 x_93 = lean_ctor_get(x_91, 0);
 lean_inc(x_93);
-x_94 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_93);
+x_94 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_93);
 lean_dec(x_93);
 if (lean_obj_tag(x_94) == 2)
 {
@@ -1545,7 +1546,7 @@ if (lean_obj_tag(x_21) == 0)
 lean_object* x_22; lean_object* x_23; 
 x_22 = lean_ctor_get(x_20, 0);
 lean_inc(x_22);
-x_23 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_22);
+x_23 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_22);
 lean_dec(x_22);
 if (lean_obj_tag(x_23) == 2)
 {
@@ -1553,7 +1554,7 @@ lean_object* x_24; lean_object* x_25; uint8_t x_26;
 x_24 = lean_ctor_get(x_23, 1);
 lean_inc(x_24);
 lean_dec(x_23);
-x_25 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_25 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_26 = lean_string_dec_eq(x_24, x_25);
 lean_dec(x_24);
 if (x_26 == 0)
@@ -1808,7 +1809,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Term_stxQuot___closed__3;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
@@ -2172,7 +2173,7 @@ if (lean_obj_tag(x_28) == 0)
 lean_object* x_29; lean_object* x_30; 
 x_29 = lean_ctor_get(x_27, 0);
 lean_inc(x_29);
-x_30 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_29);
+x_30 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_29);
 lean_dec(x_29);
 if (lean_obj_tag(x_30) == 2)
 {
@@ -2604,11 +2605,20 @@ x_5 = l_Lean_Parser_mkAntiquot(x_1, x_2, x_3, x_4);
 return x_5;
 }
 }
+lean_object* _init_l_Lean_Parser_Command_attrInstance___elambda__1___closed__5() {
+_start:
+{
+uint8_t x_1; lean_object* x_2; 
+x_1 = 0;
+x_2 = l_Lean_Parser_rawIdent(x_1);
+return x_2;
+}
+}
 lean_object* l_Lean_Parser_Command_attrInstance___elambda__1(lean_object* x_1, lean_object* x_2, lean_object* x_3) {
 _start:
 {
 lean_object* x_4; lean_object* x_5; lean_object* x_6; lean_object* x_7; lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
-x_4 = l_Lean_Parser_Term_quotedName___elambda__1___closed__6;
+x_4 = l_Lean_Parser_Command_attrInstance___elambda__1___closed__5;
 x_5 = lean_ctor_get(x_4, 1);
 lean_inc(x_5);
 x_6 = l_Lean_Parser_Command_attrInstance___elambda__1___closed__4;
@@ -2717,7 +2727,7 @@ lean_object* _init_l_Lean_Parser_Command_attrInstance___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4; 
-x_1 = l_Lean_Parser_Term_quotedName___elambda__1___closed__6;
+x_1 = l_Lean_Parser_Command_attrInstance___elambda__1___closed__5;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
 x_3 = l_Lean_Parser_Command_attrInstance___closed__1;
@@ -2820,7 +2830,7 @@ if (lean_obj_tag(x_32) == 0)
 lean_object* x_33; lean_object* x_34; 
 x_33 = lean_ctor_get(x_31, 0);
 lean_inc(x_33);
-x_34 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_33);
+x_34 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_33);
 lean_dec(x_33);
 if (lean_obj_tag(x_34) == 2)
 {
@@ -3150,7 +3160,7 @@ if (lean_obj_tag(x_57) == 0)
 lean_object* x_58; lean_object* x_59; 
 x_58 = lean_ctor_get(x_56, 0);
 lean_inc(x_58);
-x_59 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_58);
+x_59 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_58);
 lean_dec(x_58);
 if (lean_obj_tag(x_59) == 2)
 {
@@ -3224,7 +3234,7 @@ if (lean_obj_tag(x_25) == 0)
 lean_object* x_26; lean_object* x_27; 
 x_26 = lean_ctor_get(x_24, 0);
 lean_inc(x_26);
-x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_26);
+x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_26);
 lean_dec(x_26);
 if (lean_obj_tag(x_27) == 2)
 {
@@ -3583,7 +3593,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -3856,7 +3866,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -4227,7 +4237,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -4500,7 +4510,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -4773,7 +4783,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -5595,7 +5605,7 @@ if (lean_obj_tag(x_34) == 0)
 lean_object* x_35; lean_object* x_36; 
 x_35 = lean_ctor_get(x_33, 0);
 lean_inc(x_35);
-x_36 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_35);
+x_36 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_35);
 lean_dec(x_35);
 if (lean_obj_tag(x_36) == 2)
 {
@@ -5895,7 +5905,7 @@ if (lean_obj_tag(x_67) == 0)
 lean_object* x_68; lean_object* x_69; 
 x_68 = lean_ctor_get(x_66, 0);
 lean_inc(x_68);
-x_69 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_68);
+x_69 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_68);
 lean_dec(x_68);
 if (lean_obj_tag(x_69) == 2)
 {
@@ -6020,7 +6030,7 @@ if (lean_obj_tag(x_53) == 0)
 lean_object* x_54; lean_object* x_55; 
 x_54 = lean_ctor_get(x_52, 0);
 lean_inc(x_54);
-x_55 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_54);
+x_55 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_54);
 lean_dec(x_54);
 if (lean_obj_tag(x_55) == 2)
 {
@@ -6716,7 +6726,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -7874,7 +7884,7 @@ if (lean_obj_tag(x_38) == 0)
 lean_object* x_39; lean_object* x_40; 
 x_39 = lean_ctor_get(x_37, 0);
 lean_inc(x_39);
-x_40 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_39);
+x_40 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_39);
 lean_dec(x_39);
 if (lean_obj_tag(x_40) == 2)
 {
@@ -8244,7 +8254,7 @@ if (lean_obj_tag(x_38) == 0)
 lean_object* x_39; lean_object* x_40; 
 x_39 = lean_ctor_get(x_37, 0);
 lean_inc(x_39);
-x_40 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_39);
+x_40 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_39);
 lean_dec(x_39);
 if (lean_obj_tag(x_40) == 2)
 {
@@ -8588,7 +8598,7 @@ if (lean_obj_tag(x_38) == 0)
 lean_object* x_39; lean_object* x_40; 
 x_39 = lean_ctor_get(x_37, 0);
 lean_inc(x_39);
-x_40 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_39);
+x_40 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_39);
 lean_dec(x_39);
 if (lean_obj_tag(x_40) == 2)
 {
@@ -8958,7 +8968,7 @@ if (lean_obj_tag(x_57) == 0)
 lean_object* x_58; lean_object* x_59; 
 x_58 = lean_ctor_get(x_56, 0);
 lean_inc(x_58);
-x_59 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_58);
+x_59 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_58);
 lean_dec(x_58);
 if (lean_obj_tag(x_59) == 2)
 {
@@ -9385,7 +9395,7 @@ if (lean_obj_tag(x_77) == 0)
 lean_object* x_78; lean_object* x_79; 
 x_78 = lean_ctor_get(x_76, 0);
 lean_inc(x_78);
-x_79 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_78);
+x_79 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_78);
 lean_dec(x_78);
 if (lean_obj_tag(x_79) == 2)
 {
@@ -9878,7 +9888,7 @@ if (lean_obj_tag(x_33) == 0)
 lean_object* x_34; lean_object* x_35; 
 x_34 = lean_ctor_get(x_32, 0);
 lean_inc(x_34);
-x_35 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_34);
+x_35 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_34);
 lean_dec(x_34);
 if (lean_obj_tag(x_35) == 2)
 {
@@ -10215,7 +10225,7 @@ if (lean_obj_tag(x_33) == 0)
 lean_object* x_34; lean_object* x_35; 
 x_34 = lean_ctor_get(x_32, 0);
 lean_inc(x_34);
-x_35 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_34);
+x_35 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_34);
 lean_dec(x_34);
 if (lean_obj_tag(x_35) == 2)
 {
@@ -10499,7 +10509,7 @@ if (lean_obj_tag(x_64) == 0)
 lean_object* x_65; lean_object* x_66; 
 x_65 = lean_ctor_get(x_63, 0);
 lean_inc(x_65);
-x_66 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_65);
+x_66 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_65);
 lean_dec(x_65);
 if (lean_obj_tag(x_66) == 2)
 {
@@ -10600,7 +10610,7 @@ if (lean_obj_tag(x_35) == 0)
 lean_object* x_36; lean_object* x_37; 
 x_36 = lean_ctor_get(x_34, 0);
 lean_inc(x_36);
-x_37 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_36);
+x_37 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_36);
 lean_dec(x_36);
 if (lean_obj_tag(x_37) == 2)
 {
@@ -10879,7 +10889,7 @@ if (lean_obj_tag(x_64) == 0)
 lean_object* x_65; lean_object* x_66; 
 x_65 = lean_ctor_get(x_63, 0);
 lean_inc(x_65);
-x_66 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_65);
+x_66 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_65);
 lean_dec(x_65);
 if (lean_obj_tag(x_66) == 2)
 {
@@ -10887,7 +10897,7 @@ lean_object* x_67; lean_object* x_68; uint8_t x_69;
 x_67 = lean_ctor_get(x_66, 1);
 lean_inc(x_67);
 lean_dec(x_66);
-x_68 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_68 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_69 = lean_string_dec_eq(x_67, x_68);
 lean_dec(x_67);
 if (x_69 == 0)
@@ -10980,7 +10990,7 @@ if (lean_obj_tag(x_35) == 0)
 lean_object* x_36; lean_object* x_37; 
 x_36 = lean_ctor_get(x_34, 0);
 lean_inc(x_36);
-x_37 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_36);
+x_37 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_36);
 lean_dec(x_36);
 if (lean_obj_tag(x_37) == 2)
 {
@@ -10988,7 +10998,7 @@ lean_object* x_38; lean_object* x_39; uint8_t x_40;
 x_38 = lean_ctor_get(x_37, 1);
 lean_inc(x_38);
 lean_dec(x_37);
-x_39 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_39 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_40 = lean_string_dec_eq(x_38, x_39);
 lean_dec(x_38);
 if (x_40 == 0)
@@ -11089,8 +11099,8 @@ lean_object* _init_l_Lean_Parser_Command_strictInferMod___closed__1() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_1 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
@@ -11352,7 +11362,7 @@ if (lean_obj_tag(x_69) == 0)
 lean_object* x_70; lean_object* x_71; 
 x_70 = lean_ctor_get(x_68, 0);
 lean_inc(x_70);
-x_71 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_70);
+x_71 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_70);
 lean_dec(x_70);
 if (lean_obj_tag(x_71) == 2)
 {
@@ -11873,7 +11883,7 @@ if (lean_obj_tag(x_43) == 0)
 lean_object* x_44; lean_object* x_45; 
 x_44 = lean_ctor_get(x_42, 0);
 lean_inc(x_44);
-x_45 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_44);
+x_45 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_44);
 lean_dec(x_44);
 if (lean_obj_tag(x_45) == 2)
 {
@@ -12282,7 +12292,7 @@ if (lean_obj_tag(x_84) == 0)
 lean_object* x_85; lean_object* x_86; 
 x_85 = lean_ctor_get(x_83, 0);
 lean_inc(x_85);
-x_86 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_85);
+x_86 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_85);
 lean_dec(x_85);
 if (lean_obj_tag(x_86) == 2)
 {
@@ -12454,7 +12464,7 @@ if (lean_obj_tag(x_55) == 0)
 lean_object* x_56; lean_object* x_57; 
 x_56 = lean_ctor_get(x_54, 0);
 lean_inc(x_56);
-x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_56);
+x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_56);
 lean_dec(x_56);
 if (lean_obj_tag(x_57) == 2)
 {
@@ -12747,7 +12757,7 @@ if (lean_obj_tag(x_104) == 0)
 lean_object* x_105; lean_object* x_106; 
 x_105 = lean_ctor_get(x_103, 0);
 lean_inc(x_105);
-x_106 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_105);
+x_106 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_105);
 lean_dec(x_105);
 if (lean_obj_tag(x_106) == 2)
 {
@@ -12755,7 +12765,7 @@ lean_object* x_107; lean_object* x_108; uint8_t x_109;
 x_107 = lean_ctor_get(x_106, 1);
 lean_inc(x_107);
 lean_dec(x_106);
-x_108 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_108 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_109 = lean_string_dec_eq(x_107, x_108);
 lean_dec(x_107);
 if (x_109 == 0)
@@ -12812,7 +12822,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -12820,7 +12830,7 @@ lean_object* x_26; lean_object* x_27; uint8_t x_28;
 x_26 = lean_ctor_get(x_25, 1);
 lean_inc(x_26);
 lean_dec(x_25);
-x_27 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_27 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_28 = lean_string_dec_eq(x_26, x_27);
 lean_dec(x_26);
 if (x_28 == 0)
@@ -13098,7 +13108,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Command_structExplicitBinder___closed__2;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }
@@ -13139,7 +13149,7 @@ lean_object* _init_l_Lean_Parser_Command_structExplicitBinder___closed__7() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
+x_1 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 x_2 = l_Lean_Parser_Command_structExplicitBinder___closed__6;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
@@ -13304,7 +13314,7 @@ if (lean_obj_tag(x_84) == 0)
 lean_object* x_85; lean_object* x_86; 
 x_85 = lean_ctor_get(x_83, 0);
 lean_inc(x_85);
-x_86 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_85);
+x_86 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_85);
 lean_dec(x_85);
 if (lean_obj_tag(x_86) == 2)
 {
@@ -13376,7 +13386,7 @@ if (lean_obj_tag(x_25) == 0)
 lean_object* x_26; lean_object* x_27; 
 x_26 = lean_ctor_get(x_24, 0);
 lean_inc(x_26);
-x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_26);
+x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_26);
 lean_dec(x_26);
 if (lean_obj_tag(x_27) == 2)
 {
@@ -13760,7 +13770,7 @@ if (lean_obj_tag(x_84) == 0)
 lean_object* x_85; lean_object* x_86; 
 x_85 = lean_ctor_get(x_83, 0);
 lean_inc(x_85);
-x_86 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_85);
+x_86 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_85);
 lean_dec(x_85);
 if (lean_obj_tag(x_86) == 2)
 {
@@ -13832,7 +13842,7 @@ if (lean_obj_tag(x_25) == 0)
 lean_object* x_26; lean_object* x_27; 
 x_26 = lean_ctor_get(x_24, 0);
 lean_inc(x_26);
-x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_26);
+x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_26);
 lean_dec(x_26);
 if (lean_obj_tag(x_27) == 2)
 {
@@ -14687,7 +14697,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -14993,7 +15003,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -15217,7 +15227,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -15484,7 +15494,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -15937,7 +15947,7 @@ if (lean_obj_tag(x_69) == 0)
 lean_object* x_70; lean_object* x_71; 
 x_70 = lean_ctor_get(x_68, 0);
 lean_inc(x_70);
-x_71 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_70);
+x_71 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_70);
 lean_dec(x_70);
 if (lean_obj_tag(x_71) == 2)
 {
@@ -17330,7 +17340,7 @@ if (lean_obj_tag(x_49) == 0)
 lean_object* x_50; lean_object* x_51; 
 x_50 = lean_ctor_get(x_48, 0);
 lean_inc(x_50);
-x_51 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_50);
+x_51 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_50);
 lean_dec(x_50);
 if (lean_obj_tag(x_51) == 2)
 {
@@ -17709,7 +17719,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -18031,7 +18041,7 @@ if (lean_obj_tag(x_49) == 0)
 lean_object* x_50; lean_object* x_51; 
 x_50 = lean_ctor_get(x_48, 0);
 lean_inc(x_50);
-x_51 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_50);
+x_51 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_50);
 lean_dec(x_50);
 if (lean_obj_tag(x_51) == 2)
 {
@@ -18399,7 +18409,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -18721,7 +18731,7 @@ if (lean_obj_tag(x_42) == 0)
 lean_object* x_43; lean_object* x_44; 
 x_43 = lean_ctor_get(x_41, 0);
 lean_inc(x_43);
-x_44 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_43);
+x_44 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_43);
 lean_dec(x_43);
 if (lean_obj_tag(x_44) == 2)
 {
@@ -19075,7 +19085,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -19397,7 +19407,7 @@ if (lean_obj_tag(x_42) == 0)
 lean_object* x_43; lean_object* x_44; 
 x_43 = lean_ctor_get(x_41, 0);
 lean_inc(x_43);
-x_44 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_43);
+x_44 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_43);
 lean_dec(x_43);
 if (lean_obj_tag(x_44) == 2)
 {
@@ -19743,7 +19753,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -20057,7 +20067,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -20370,7 +20380,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -20664,7 +20674,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -20969,7 +20979,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -21331,7 +21341,7 @@ if (lean_obj_tag(x_95) == 0)
 lean_object* x_96; lean_object* x_97; 
 x_96 = lean_ctor_get(x_94, 0);
 lean_inc(x_96);
-x_97 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_96);
+x_97 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_96);
 lean_dec(x_96);
 if (lean_obj_tag(x_97) == 2)
 {
@@ -21963,7 +21973,7 @@ if (lean_obj_tag(x_121) == 0)
 lean_object* x_122; lean_object* x_123; 
 x_122 = lean_ctor_get(x_120, 0);
 lean_inc(x_122);
-x_123 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_122);
+x_123 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_122);
 lean_dec(x_122);
 if (lean_obj_tag(x_123) == 2)
 {
@@ -22100,7 +22110,7 @@ if (lean_obj_tag(x_49) == 0)
 lean_object* x_50; lean_object* x_51; 
 x_50 = lean_ctor_get(x_48, 0);
 lean_inc(x_50);
-x_51 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_50);
+x_51 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_50);
 lean_dec(x_50);
 if (lean_obj_tag(x_51) == 2)
 {
@@ -22193,7 +22203,7 @@ if (lean_obj_tag(x_72) == 0)
 lean_object* x_73; lean_object* x_74; 
 x_73 = lean_ctor_get(x_71, 0);
 lean_inc(x_73);
-x_74 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_73);
+x_74 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_73);
 lean_dec(x_73);
 if (lean_obj_tag(x_74) == 2)
 {
@@ -22272,7 +22282,7 @@ if (lean_obj_tag(x_92) == 0)
 lean_object* x_93; lean_object* x_94; 
 x_93 = lean_ctor_get(x_91, 0);
 lean_inc(x_93);
-x_94 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_93);
+x_94 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_93);
 lean_dec(x_93);
 if (lean_obj_tag(x_94) == 2)
 {
@@ -22681,7 +22691,7 @@ if (lean_obj_tag(x_93) == 0)
 lean_object* x_94; lean_object* x_95; 
 x_94 = lean_ctor_get(x_92, 0);
 lean_inc(x_94);
-x_95 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_94);
+x_95 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_94);
 lean_dec(x_94);
 if (lean_obj_tag(x_95) == 2)
 {
@@ -22746,7 +22756,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -22754,7 +22764,7 @@ lean_object* x_26; lean_object* x_27; uint8_t x_28;
 x_26 = lean_ctor_get(x_25, 1);
 lean_inc(x_26);
 lean_dec(x_25);
-x_27 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_27 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_28 = lean_string_dec_eq(x_26, x_27);
 lean_dec(x_26);
 if (x_28 == 0)
@@ -22900,7 +22910,7 @@ if (lean_obj_tag(x_73) == 0)
 lean_object* x_74; lean_object* x_75; 
 x_74 = lean_ctor_get(x_72, 0);
 lean_inc(x_74);
-x_75 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_74);
+x_75 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_74);
 lean_dec(x_74);
 if (lean_obj_tag(x_75) == 2)
 {
@@ -22908,7 +22918,7 @@ lean_object* x_76; lean_object* x_77; uint8_t x_78;
 x_76 = lean_ctor_get(x_75, 1);
 lean_inc(x_76);
 lean_dec(x_75);
-x_77 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_77 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_78 = lean_string_dec_eq(x_76, x_77);
 lean_dec(x_76);
 if (x_78 == 0)
@@ -22995,7 +23005,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Level_ident___elambda__1___closed__4;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_3 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
 return x_4;
 }
@@ -23004,7 +23014,7 @@ lean_object* _init_l_Lean_Parser_Command_export___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
+x_1 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 x_2 = l_Lean_Parser_Command_export___closed__2;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
@@ -23276,7 +23286,7 @@ if (lean_obj_tag(x_54) == 0)
 lean_object* x_55; lean_object* x_56; 
 x_55 = lean_ctor_get(x_53, 0);
 lean_inc(x_55);
-x_56 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_55);
+x_56 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_55);
 lean_dec(x_55);
 if (lean_obj_tag(x_56) == 2)
 {
@@ -23917,7 +23927,7 @@ if (lean_obj_tag(x_32) == 0)
 lean_object* x_33; lean_object* x_34; 
 x_33 = lean_ctor_get(x_31, 0);
 lean_inc(x_33);
-x_34 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_33);
+x_34 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_33);
 lean_dec(x_33);
 if (lean_obj_tag(x_34) == 2)
 {
@@ -24275,7 +24285,7 @@ if (lean_obj_tag(x_44) == 0)
 lean_object* x_45; lean_object* x_46; 
 x_45 = lean_ctor_get(x_43, 0);
 lean_inc(x_45);
-x_46 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_45);
+x_46 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_45);
 lean_dec(x_45);
 if (lean_obj_tag(x_46) == 2)
 {
@@ -24694,7 +24704,7 @@ if (lean_obj_tag(x_80) == 0)
 lean_object* x_81; lean_object* x_82; 
 x_81 = lean_ctor_get(x_79, 0);
 lean_inc(x_81);
-x_82 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_81);
+x_82 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_81);
 lean_dec(x_81);
 if (lean_obj_tag(x_82) == 2)
 {
@@ -24702,7 +24712,7 @@ lean_object* x_83; lean_object* x_84; uint8_t x_85;
 x_83 = lean_ctor_get(x_82, 1);
 lean_inc(x_83);
 lean_dec(x_82);
-x_84 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_84 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_85 = lean_string_dec_eq(x_83, x_84);
 lean_dec(x_83);
 if (x_85 == 0)
@@ -24811,7 +24821,7 @@ if (lean_obj_tag(x_24) == 0)
 lean_object* x_25; lean_object* x_26; 
 x_25 = lean_ctor_get(x_23, 0);
 lean_inc(x_25);
-x_26 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_25);
+x_26 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_25);
 lean_dec(x_25);
 if (lean_obj_tag(x_26) == 2)
 {
@@ -24819,7 +24829,7 @@ lean_object* x_27; lean_object* x_28; uint8_t x_29;
 x_27 = lean_ctor_get(x_26, 1);
 lean_inc(x_27);
 lean_dec(x_26);
-x_28 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_28 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_29 = lean_string_dec_eq(x_27, x_28);
 lean_dec(x_27);
 if (x_29 == 0)
@@ -24978,7 +24988,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Level_ident___elambda__1___closed__4;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
+x_3 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
 return x_4;
 }
@@ -25388,7 +25398,7 @@ if (lean_obj_tag(x_80) == 0)
 lean_object* x_81; lean_object* x_82; 
 x_81 = lean_ctor_get(x_79, 0);
 lean_inc(x_81);
-x_82 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_81);
+x_82 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_81);
 lean_dec(x_81);
 if (lean_obj_tag(x_82) == 2)
 {
@@ -25898,6 +25908,8 @@ l_Lean_Parser_Command_attrInstance___elambda__1___closed__3 = _init_l_Lean_Parse
 lean_mark_persistent(l_Lean_Parser_Command_attrInstance___elambda__1___closed__3);
 l_Lean_Parser_Command_attrInstance___elambda__1___closed__4 = _init_l_Lean_Parser_Command_attrInstance___elambda__1___closed__4();
 lean_mark_persistent(l_Lean_Parser_Command_attrInstance___elambda__1___closed__4);
+l_Lean_Parser_Command_attrInstance___elambda__1___closed__5 = _init_l_Lean_Parser_Command_attrInstance___elambda__1___closed__5();
+lean_mark_persistent(l_Lean_Parser_Command_attrInstance___elambda__1___closed__5);
 l_Lean_Parser_Command_attrInstance___closed__1 = _init_l_Lean_Parser_Command_attrInstance___closed__1();
 lean_mark_persistent(l_Lean_Parser_Command_attrInstance___closed__1);
 l_Lean_Parser_Command_attrInstance___closed__2 = _init_l_Lean_Parser_Command_attrInstance___closed__2();

stage0/stdlib/Init/Lean/Parser/Identifier.c

@@ -1,706 +0,0 @@
-// Lean compiler output
-// Module: Init.Lean.Parser.Identifier
-// Imports: Init.Data.Char.Basic
-#include "runtime/lean.h"
-#if defined(__clang__)
-#pragma clang diagnostic ignored "-Wunused-parameter"
-#pragma clang diagnostic ignored "-Wunused-label"
-#elif defined(__GNUC__) && !defined(__CLANG__)
-#pragma GCC diagnostic ignored "-Wunused-parameter"
-#pragma GCC diagnostic ignored "-Wunused-label"
-#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
-#endif
-#ifdef __cplusplus
-extern "C" {
-#endif
-uint32_t l_Lean_idBeginEscape;
-lean_object* l_Lean_isGreek___boxed(lean_object*);
-uint32_t l_Lean_idEndEscape;
-lean_object* l_Lean_isIdRest___boxed(lean_object*);
-uint8_t l_Lean_isIdBeginEscape(uint32_t);
-lean_object* l_Lean_isIdFirst___boxed(lean_object*);
-lean_object* l_Lean_isSubScriptAlnum___boxed(lean_object*);
-uint8_t l_Lean_isIdEndEscape(uint32_t);
-uint8_t l_Char_isAlpha(uint32_t);
-uint8_t l_Lean_isLetterLike(uint32_t);
-lean_object* l_Lean_isLetterLike___boxed(lean_object*);
-uint8_t l_UInt32_decEq(uint32_t, uint32_t);
-uint8_t l_Char_isAlphanum(uint32_t);
-uint8_t l_Lean_isGreek(uint32_t);
-lean_object* l_Lean_isIdBeginEscape___boxed(lean_object*);
-lean_object* l_Lean_isIdEndEscape___boxed(lean_object*);
-uint8_t l_Lean_isIdFirst(uint32_t);
-uint8_t l_Lean_isSubScriptAlnum(uint32_t);
-uint8_t l_UInt32_decLe(uint32_t, uint32_t);
-uint8_t l_Lean_isIdRest(uint32_t);
-uint8_t l_Lean_isGreek(uint32_t x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; 
-x_2 = 913;
-x_3 = x_2 <= x_1;
-if (x_3 == 0)
-{
-uint8_t x_4; 
-x_4 = 0;
-return x_4;
-}
-else
-{
-uint32_t x_5; uint8_t x_6; 
-x_5 = 989;
-x_6 = x_1 <= x_5;
-return x_6;
-}
-}
-}
-lean_object* l_Lean_isGreek___boxed(lean_object* x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = lean_unbox_uint32(x_1);
-lean_dec(x_1);
-x_3 = l_Lean_isGreek(x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-uint8_t l_Lean_isLetterLike(uint32_t x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; uint8_t x_19; uint8_t x_27; uint8_t x_35; uint8_t x_59; 
-x_2 = 945;
-x_59 = x_2 <= x_1;
-if (x_59 == 0)
-{
-uint8_t x_60; 
-x_60 = 0;
-x_35 = x_60;
-goto block_58;
-}
-else
-{
-uint32_t x_61; uint8_t x_62; 
-x_61 = 969;
-x_62 = x_1 <= x_61;
-if (x_62 == 0)
-{
-uint8_t x_63; 
-x_63 = 0;
-x_35 = x_63;
-goto block_58;
-}
-else
-{
-uint32_t x_64; uint8_t x_65; 
-x_64 = 955;
-x_65 = x_1 == x_64;
-if (x_65 == 0)
-{
-uint8_t x_66; 
-x_66 = 1;
-return x_66;
-}
-else
-{
-uint8_t x_67; 
-x_67 = 0;
-x_35 = x_67;
-goto block_58;
-}
-}
-}
-block_18:
-{
-uint32_t x_4; uint8_t x_5; 
-x_4 = 8448;
-x_5 = x_4 <= x_1;
-if (x_5 == 0)
-{
-if (x_3 == 0)
-{
-uint32_t x_6; uint8_t x_7; 
-x_6 = 119964;
-x_7 = x_6 <= x_1;
-if (x_7 == 0)
-{
-return x_3;
-}
-else
-{
-uint32_t x_8; uint8_t x_9; 
-x_8 = 120223;
-x_9 = x_1 <= x_8;
-return x_9;
-}
-}
-else
-{
-uint8_t x_10; 
-x_10 = 1;
-return x_10;
-}
-}
-else
-{
-uint32_t x_11; uint8_t x_12; 
-x_11 = 8527;
-x_12 = x_1 <= x_11;
-if (x_12 == 0)
-{
-uint32_t x_13; uint8_t x_14; 
-x_13 = 119964;
-x_14 = x_13 <= x_1;
-if (x_14 == 0)
-{
-return x_12;
-}
-else
-{
-uint32_t x_15; uint8_t x_16; 
-x_15 = 120223;
-x_16 = x_1 <= x_15;
-return x_16;
-}
-}
-else
-{
-uint8_t x_17; 
-x_17 = 1;
-return x_17;
-}
-}
-}
-block_26:
-{
-uint32_t x_20; uint8_t x_21; 
-x_20 = 7936;
-x_21 = x_20 <= x_1;
-if (x_21 == 0)
-{
-if (x_19 == 0)
-{
-x_3 = x_19;
-goto block_18;
-}
-else
-{
-uint8_t x_22; 
-x_22 = 1;
-return x_22;
-}
-}
-else
-{
-uint32_t x_23; uint8_t x_24; 
-x_23 = 8190;
-x_24 = x_1 <= x_23;
-if (x_24 == 0)
-{
-x_3 = x_24;
-goto block_18;
-}
-else
-{
-uint8_t x_25; 
-x_25 = 1;
-return x_25;
-}
-}
-}
-block_34:
-{
-uint32_t x_28; uint8_t x_29; 
-x_28 = 970;
-x_29 = x_28 <= x_1;
-if (x_29 == 0)
-{
-if (x_27 == 0)
-{
-x_19 = x_27;
-goto block_26;
-}
-else
-{
-uint8_t x_30; 
-x_30 = 1;
-return x_30;
-}
-}
-else
-{
-uint32_t x_31; uint8_t x_32; 
-x_31 = 1019;
-x_32 = x_1 <= x_31;
-if (x_32 == 0)
-{
-x_19 = x_32;
-goto block_26;
-}
-else
-{
-uint8_t x_33; 
-x_33 = 1;
-return x_33;
-}
-}
-}
-block_58:
-{
-uint32_t x_36; uint8_t x_37; 
-x_36 = 913;
-x_37 = x_36 <= x_1;
-if (x_37 == 0)
-{
-if (x_35 == 0)
-{
-x_27 = x_35;
-goto block_34;
-}
-else
-{
-uint32_t x_38; uint8_t x_39; 
-x_38 = 928;
-x_39 = x_1 == x_38;
-if (x_39 == 0)
-{
-uint32_t x_40; uint8_t x_41; 
-x_40 = 931;
-x_41 = x_1 == x_40;
-if (x_41 == 0)
-{
-uint8_t x_42; 
-x_42 = 1;
-return x_42;
-}
-else
-{
-uint8_t x_43; 
-x_43 = 0;
-x_27 = x_43;
-goto block_34;
-}
-}
-else
-{
-uint8_t x_44; 
-x_44 = 1;
-return x_44;
-}
-}
-}
-else
-{
-uint32_t x_45; uint8_t x_46; 
-x_45 = 937;
-x_46 = x_1 <= x_45;
-if (x_46 == 0)
-{
-if (x_35 == 0)
-{
-x_27 = x_35;
-goto block_34;
-}
-else
-{
-uint32_t x_47; uint8_t x_48; 
-x_47 = 931;
-x_48 = x_1 == x_47;
-if (x_48 == 0)
-{
-uint8_t x_49; 
-x_49 = 1;
-return x_49;
-}
-else
-{
-uint8_t x_50; 
-x_50 = 0;
-x_27 = x_50;
-goto block_34;
-}
-}
-}
-else
-{
-uint32_t x_51; uint8_t x_52; 
-x_51 = 928;
-x_52 = x_1 == x_51;
-if (x_52 == 0)
-{
-uint32_t x_53; uint8_t x_54; 
-x_53 = 931;
-x_54 = x_1 == x_53;
-if (x_54 == 0)
-{
-uint8_t x_55; 
-x_55 = 1;
-return x_55;
-}
-else
-{
-uint8_t x_56; 
-x_56 = 0;
-x_27 = x_56;
-goto block_34;
-}
-}
-else
-{
-if (x_35 == 0)
-{
-x_27 = x_35;
-goto block_34;
-}
-else
-{
-uint8_t x_57; 
-x_57 = 1;
-return x_57;
-}
-}
-}
-}
-}
-}
-}
-lean_object* l_Lean_isLetterLike___boxed(lean_object* x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = lean_unbox_uint32(x_1);
-lean_dec(x_1);
-x_3 = l_Lean_isLetterLike(x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-uint8_t l_Lean_isSubScriptAlnum(uint32_t x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; uint8_t x_19; 
-x_2 = 8320;
-x_19 = x_2 <= x_1;
-if (x_19 == 0)
-{
-uint8_t x_20; 
-x_20 = 0;
-x_3 = x_20;
-goto block_18;
-}
-else
-{
-uint32_t x_21; uint8_t x_22; 
-x_21 = 8329;
-x_22 = x_1 <= x_21;
-if (x_22 == 0)
-{
-x_3 = x_22;
-goto block_18;
-}
-else
-{
-uint8_t x_23; 
-x_23 = 1;
-return x_23;
-}
-}
-block_18:
-{
-uint32_t x_4; uint8_t x_5; 
-x_4 = 8336;
-x_5 = x_4 <= x_1;
-if (x_5 == 0)
-{
-if (x_3 == 0)
-{
-uint32_t x_6; uint8_t x_7; 
-x_6 = 7522;
-x_7 = x_6 <= x_1;
-if (x_7 == 0)
-{
-return x_3;
-}
-else
-{
-uint32_t x_8; uint8_t x_9; 
-x_8 = 7530;
-x_9 = x_1 <= x_8;
-return x_9;
-}
-}
-else
-{
-uint8_t x_10; 
-x_10 = 1;
-return x_10;
-}
-}
-else
-{
-uint32_t x_11; uint8_t x_12; 
-x_11 = 8348;
-x_12 = x_1 <= x_11;
-if (x_12 == 0)
-{
-uint32_t x_13; uint8_t x_14; 
-x_13 = 7522;
-x_14 = x_13 <= x_1;
-if (x_14 == 0)
-{
-return x_12;
-}
-else
-{
-uint32_t x_15; uint8_t x_16; 
-x_15 = 7530;
-x_16 = x_1 <= x_15;
-return x_16;
-}
-}
-else
-{
-uint8_t x_17; 
-x_17 = 1;
-return x_17;
-}
-}
-}
-}
-}
-lean_object* l_Lean_isSubScriptAlnum___boxed(lean_object* x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = lean_unbox_uint32(x_1);
-lean_dec(x_1);
-x_3 = l_Lean_isSubScriptAlnum(x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-uint8_t l_Lean_isIdFirst(uint32_t x_1) {
-_start:
-{
-uint8_t x_2; 
-x_2 = l_Char_isAlpha(x_1);
-if (x_2 == 0)
-{
-uint32_t x_3; uint8_t x_4; 
-x_3 = 95;
-x_4 = x_1 == x_3;
-if (x_4 == 0)
-{
-uint8_t x_5; 
-x_5 = l_Lean_isLetterLike(x_1);
-return x_5;
-}
-else
-{
-uint8_t x_6; 
-x_6 = 1;
-return x_6;
-}
-}
-else
-{
-uint8_t x_7; 
-x_7 = 1;
-return x_7;
-}
-}
-}
-lean_object* l_Lean_isIdFirst___boxed(lean_object* x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = lean_unbox_uint32(x_1);
-lean_dec(x_1);
-x_3 = l_Lean_isIdFirst(x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-uint8_t l_Lean_isIdRest(uint32_t x_1) {
-_start:
-{
-uint8_t x_2; 
-x_2 = l_Char_isAlphanum(x_1);
-if (x_2 == 0)
-{
-uint32_t x_3; uint8_t x_4; 
-x_3 = 95;
-x_4 = x_1 == x_3;
-if (x_4 == 0)
-{
-uint32_t x_5; uint8_t x_6; 
-x_5 = 39;
-x_6 = x_1 == x_5;
-if (x_6 == 0)
-{
-uint32_t x_7; uint8_t x_8; 
-x_7 = 33;
-x_8 = x_1 == x_7;
-if (x_8 == 0)
-{
-uint32_t x_9; uint8_t x_10; 
-x_9 = 63;
-x_10 = x_1 == x_9;
-if (x_10 == 0)
-{
-uint8_t x_11; 
-x_11 = l_Lean_isLetterLike(x_1);
-if (x_11 == 0)
-{
-uint8_t x_12; 
-x_12 = l_Lean_isSubScriptAlnum(x_1);
-return x_12;
-}
-else
-{
-uint8_t x_13; 
-x_13 = 1;
-return x_13;
-}
-}
-else
-{
-uint8_t x_14; 
-x_14 = 1;
-return x_14;
-}
-}
-else
-{
-uint8_t x_15; 
-x_15 = 1;
-return x_15;
-}
-}
-else
-{
-uint8_t x_16; 
-x_16 = 1;
-return x_16;
-}
-}
-else
-{
-uint8_t x_17; 
-x_17 = 1;
-return x_17;
-}
-}
-else
-{
-uint8_t x_18; 
-x_18 = 1;
-return x_18;
-}
-}
-}
-lean_object* l_Lean_isIdRest___boxed(lean_object* x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = lean_unbox_uint32(x_1);
-lean_dec(x_1);
-x_3 = l_Lean_isIdRest(x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-uint32_t _init_l_Lean_idBeginEscape() {
-_start:
-{
-uint32_t x_1; 
-x_1 = 171;
-return x_1;
-}
-}
-uint32_t _init_l_Lean_idEndEscape() {
-_start:
-{
-uint32_t x_1; 
-x_1 = 187;
-return x_1;
-}
-}
-uint8_t l_Lean_isIdBeginEscape(uint32_t x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; 
-x_2 = l_Lean_idBeginEscape;
-x_3 = x_1 == x_2;
-if (x_3 == 0)
-{
-uint8_t x_4; 
-x_4 = 0;
-return x_4;
-}
-else
-{
-uint8_t x_5; 
-x_5 = 1;
-return x_5;
-}
-}
-}
-lean_object* l_Lean_isIdBeginEscape___boxed(lean_object* x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = lean_unbox_uint32(x_1);
-lean_dec(x_1);
-x_3 = l_Lean_isIdBeginEscape(x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-uint8_t l_Lean_isIdEndEscape(uint32_t x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; 
-x_2 = l_Lean_idEndEscape;
-x_3 = x_1 == x_2;
-if (x_3 == 0)
-{
-uint8_t x_4; 
-x_4 = 0;
-return x_4;
-}
-else
-{
-uint8_t x_5; 
-x_5 = 1;
-return x_5;
-}
-}
-}
-lean_object* l_Lean_isIdEndEscape___boxed(lean_object* x_1) {
-_start:
-{
-uint32_t x_2; uint8_t x_3; lean_object* x_4; 
-x_2 = lean_unbox_uint32(x_1);
-lean_dec(x_1);
-x_3 = l_Lean_isIdEndEscape(x_2);
-x_4 = lean_box(x_3);
-return x_4;
-}
-}
-lean_object* initialize_Init_Data_Char_Basic(lean_object*);
-static bool _G_initialized = false;
-lean_object* initialize_Init_Lean_Parser_Identifier(lean_object* w) {
-lean_object * res;
-if (_G_initialized) return lean_mk_io_result(lean_box(0));
-_G_initialized = true;
-res = initialize_Init_Data_Char_Basic(lean_io_mk_world());
-if (lean_io_result_is_error(res)) return res;
-lean_dec_ref(res);
-l_Lean_idBeginEscape = _init_l_Lean_idBeginEscape();
-l_Lean_idEndEscape = _init_l_Lean_idEndEscape();
-return lean_mk_io_result(lean_box(0));
-}
-#ifdef __cplusplus
-}
-#endif

stage0/stdlib/Init/Lean/Parser/Level.c

@@ -16,7 +16,6 @@ extern "C" {
 extern lean_object* l_Lean_mkHole___closed__3;
 extern lean_object* l_Lean_Parser_manyAux___main___closed__1;
 lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__4;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
 lean_object* l_Lean_Parser_andthenInfo(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_regBuiltinLevelParserAttr___closed__1;
 lean_object* l_Lean_Parser_Level_ident___elambda__1(lean_object*, lean_object*, lean_object*);
@@ -29,6 +28,7 @@ lean_object* l_Lean_Parser_Level_num___closed__4;
 lean_object* l_Lean_Parser_Level_max___elambda__1___closed__6;
 lean_object* l_Lean_Parser_regBuiltinLevelParserAttr(lean_object*);
 lean_object* l_Lean_Parser_Level_num___elambda__1___closed__4;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 lean_object* l_Lean_Parser_Level_hole___closed__5;
 lean_object* l_Lean_Parser_Level_hole___closed__3;
 lean_object* l_Lean_Parser_manyAux___main___at_Lean_Parser_Level_max___elambda__1___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
@@ -91,10 +91,10 @@ extern lean_object* l_Lean_Level_LevelToFormat_Result_format___main___closed__5;
 lean_object* l_Lean_Parser_orelseInfo(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_levelParser(uint8_t, lean_object*);
 lean_object* l_Lean_Parser_manyAux___main___at_Lean_Parser_Level_max___elambda__1___spec__1(uint8_t, lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
 lean_object* l_Lean_Parser_Level_num___elambda__1___closed__3;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Level_num___elambda__1___closed__5;
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 lean_object* l_Lean_Parser_Level_paren___elambda__1___closed__11;
 lean_object* l_Lean_Parser_Level_imax___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Level_ident___closed__1;
@@ -103,7 +103,6 @@ lean_object* l_Lean_Parser_Level_addLit___closed__5;
 lean_object* l_Lean_Parser_Level_addLit___closed__3;
 lean_object* l_Lean_Parser_Level_imax___closed__2;
 lean_object* l_Lean_Parser_Level_ident___elambda__1___closed__4;
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_Lean_Parser_ParserState_restore(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Level_ident___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Level_paren___closed__4;
@@ -114,9 +113,9 @@ lean_object* l_Lean_Parser_categoryParserFn(lean_object*, lean_object*, lean_obj
 lean_object* l_Lean_Parser_Level_paren___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__1;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l_Lean_Parser_Level_ident___closed__2;
 extern lean_object* l_Lean_Parser_appPrec;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Level_max___closed__4;
 lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__5;
@@ -133,6 +132,7 @@ lean_object* l_Lean_Parser_Level_paren___elambda__1___closed__10;
 lean_object* l_Lean_Parser_symbolInfo(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_epsilonInfo;
 lean_object* l_Lean_Parser_Level_imax___elambda__1___closed__6;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 extern lean_object* l_Lean_mkHole___closed__1;
 lean_object* l_Lean_Parser_Level_ident___closed__4;
 lean_object* l_Lean_Parser_Level_hole___elambda__1___closed__7;
@@ -141,6 +141,7 @@ lean_object* l_Lean_Parser_Level_paren___elambda__1___closed__9;
 lean_object* l___regBuiltinParser_Lean_Parser_Level_hole(lean_object*);
 lean_object* l_Lean_Parser_Level_hole___closed__1;
 extern lean_object* l_Lean_Level_LevelToFormat_Result_format___main___closed__3;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 lean_object* l_String_trim(lean_object*);
 lean_object* l_Lean_Parser_Level_paren___elambda__1___closed__8;
 lean_object* l_Lean_Parser_Level_hole___closed__2;
@@ -152,7 +153,6 @@ lean_object* l___regBuiltinParser_Lean_Parser_Level_ident(lean_object*);
 lean_object* l_Lean_Parser_Level_addLit;
 extern lean_object* l_Lean_Syntax_getKind___closed__3;
 lean_object* l_Lean_Parser_mkAntiquot(uint8_t, lean_object*, lean_object*, uint8_t);
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
 lean_object* l_Lean_Parser_Level_max___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Level_max___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Level_imax___elambda__1___closed__5;
@@ -265,7 +265,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Level_paren___elambda__1___closed__2;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -285,7 +285,7 @@ _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; uint8_t x_4; lean_object* x_5; 
 x_1 = 0;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_3 = l_Lean_Parser_Level_paren___elambda__1___closed__4;
 x_4 = 1;
 x_5 = l_Lean_Parser_mkAntiquot(x_1, x_2, x_3, x_4);
@@ -297,7 +297,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Char_HasRepr___closed__1;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_3 = lean_string_append(x_1, x_2);
 return x_3;
 }
@@ -329,7 +329,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Char_HasRepr___closed__1;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_3 = lean_string_append(x_1, x_2);
 return x_3;
 }
@@ -417,7 +417,7 @@ if (lean_obj_tag(x_57) == 0)
 lean_object* x_58; lean_object* x_59; 
 x_58 = lean_ctor_get(x_56, 0);
 lean_inc(x_58);
-x_59 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_58);
+x_59 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_58);
 lean_dec(x_58);
 if (lean_obj_tag(x_59) == 2)
 {
@@ -425,7 +425,7 @@ lean_object* x_60; lean_object* x_61; uint8_t x_62;
 x_60 = lean_ctor_get(x_59, 1);
 lean_inc(x_60);
 lean_dec(x_59);
-x_61 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_61 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_62 = lean_string_dec_eq(x_60, x_61);
 lean_dec(x_60);
 if (x_62 == 0)
@@ -491,7 +491,7 @@ if (lean_obj_tag(x_25) == 0)
 lean_object* x_26; lean_object* x_27; 
 x_26 = lean_ctor_get(x_24, 0);
 lean_inc(x_26);
-x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_26);
+x_27 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_26);
 lean_dec(x_26);
 if (lean_obj_tag(x_27) == 2)
 {
@@ -499,7 +499,7 @@ lean_object* x_28; lean_object* x_29; uint8_t x_30;
 x_28 = lean_ctor_get(x_27, 1);
 lean_inc(x_28);
 lean_dec(x_27);
-x_29 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_29 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_30 = lean_string_dec_eq(x_28, x_29);
 lean_dec(x_28);
 if (x_30 == 0)
@@ -592,7 +592,7 @@ lean_object* _init_l_Lean_Parser_Level_paren___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_1 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_2 = l_Lean_Parser_Level_paren___closed__1;
 x_3 = l_Lean_Parser_symbolInfo(x_1, x_2);
 return x_3;
@@ -616,7 +616,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Level_paren___closed__3;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_3 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
 return x_4;
 }
@@ -1188,7 +1188,7 @@ if (lean_obj_tag(x_42) == 0)
 lean_object* x_43; lean_object* x_44; 
 x_43 = lean_ctor_get(x_41, 0);
 lean_inc(x_43);
-x_44 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_43);
+x_44 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_43);
 lean_dec(x_43);
 if (lean_obj_tag(x_44) == 2)
 {
@@ -1516,7 +1516,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -2109,7 +2109,7 @@ if (lean_obj_tag(x_12) == 0)
 lean_object* x_13; lean_object* x_14; 
 x_13 = lean_ctor_get(x_11, 0);
 lean_inc(x_13);
-x_14 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_13);
+x_14 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_13);
 lean_dec(x_13);
 if (lean_obj_tag(x_14) == 2)
 {

stage0/stdlib/Init/Lean/Parser/Module.c

@@ -108,6 +108,7 @@ lean_object* l_Lean_Parser_orelseInfo(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Module_prelude___elambda__1___closed__10;
 lean_object* l_Lean_Parser_testModuleParser___closed__1;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 extern lean_object* l_PersistentArray_empty___closed__3;
 lean_object* l_Lean_Parser_Module_prelude___elambda__1___closed__7;
 lean_object* l_Lean_Parser_addParserTokens(lean_object*, lean_object*);
@@ -120,7 +121,6 @@ lean_object* l_Lean_Parser_parseFileAux(lean_object*, lean_object*, lean_object*
 lean_object* l_Lean_Parser_Trie_Inhabited(lean_object*);
 extern lean_object* l_Lean_Parser_Level_ident___elambda__1___closed__4;
 lean_object* l_PersistentArray_forMAux___main___at___private_Init_Lean_Parser_Module_4__testModuleParserAux___main___spec__7(lean_object*, lean_object*, lean_object*);
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_Lean_Parser_ParserState_restore(lean_object*, lean_object*, lean_object*);
 lean_object* l_Array_forMAux___main___at___private_Init_Lean_Parser_Module_4__testModuleParserAux___main___spec__9(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_MessageLog_forM___at___private_Init_Lean_Parser_Module_4__testModuleParserAux___main___spec__5(lean_object*, lean_object*, lean_object*);
@@ -353,7 +353,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -684,7 +684,7 @@ if (lean_obj_tag(x_78) == 0)
 lean_object* x_79; lean_object* x_80; 
 x_79 = lean_ctor_get(x_77, 0);
 lean_inc(x_79);
-x_80 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_79);
+x_80 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_79);
 lean_dec(x_79);
 if (lean_obj_tag(x_80) == 2)
 {
@@ -754,7 +754,7 @@ if (lean_obj_tag(x_61) == 0)
 lean_object* x_62; lean_object* x_63; 
 x_62 = lean_ctor_get(x_60, 0);
 lean_inc(x_62);
-x_63 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_62);
+x_63 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_62);
 lean_dec(x_62);
 if (lean_obj_tag(x_63) == 2)
 {
@@ -1571,7 +1571,7 @@ lean_inc(x_4);
 x_10 = l_Lean_Parser_Module_header___elambda__1(x_9, x_4, x_8);
 x_11 = lean_ctor_get(x_10, 0);
 lean_inc(x_11);
-x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_11);
+x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_11);
 lean_dec(x_11);
 x_13 = lean_ctor_get(x_10, 3);
 lean_inc(x_13);
@@ -1790,7 +1790,7 @@ lean_dec(x_2);
 lean_dec(x_1);
 x_21 = lean_ctor_get(x_19, 0);
 lean_inc(x_21);
-x_22 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_21);
+x_22 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_21);
 lean_dec(x_21);
 x_23 = lean_ctor_get(x_19, 1);
 lean_inc(x_23);
@@ -1873,7 +1873,7 @@ lean_dec(x_2);
 lean_dec(x_1);
 x_49 = lean_ctor_get(x_47, 0);
 lean_inc(x_49);
-x_50 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_49);
+x_50 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_49);
 lean_dec(x_49);
 x_51 = lean_ctor_get(x_47, 1);
 lean_inc(x_51);

stage0/stdlib/Init/Lean/Parser/Syntax.c

@@ -33,7 +33,6 @@ lean_object* l_Lean_Parser_Command_notation___closed__7;
 lean_object* l_Lean_Parser_Command_macroArgSimple___closed__3;
 lean_object* l_Lean_Parser_Command_macroTailTactic___closed__1;
 lean_object* l_Lean_Parser_precedence___elambda__1___closed__6;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
 lean_object* l_Lean_Parser_Command_macro__rules___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Command_mixfixKind___closed__2;
 lean_object* l_Lean_Parser_Command_infixr___elambda__1___closed__3;
@@ -66,6 +65,7 @@ lean_object* l_Lean_Parser_Command_macroTailDefault___closed__8;
 lean_object* l_Lean_Parser_Command_reserve___elambda__1___closed__7;
 lean_object* l_Lean_Parser_regBuiltinSyntaxParserAttr___closed__2;
 lean_object* l_Lean_Parser_Command_infixr___elambda__1(lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 extern lean_object* l_Lean_Parser_regBuiltinCommandParserAttr___closed__4;
 lean_object* l_Lean_Parser_Syntax_paren___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Command_quotedSymbolPrec___closed__5;
@@ -286,7 +286,6 @@ lean_object* l_Lean_Parser_Command_notation;
 lean_object* l___regBuiltinParser_Lean_Parser_Command_notation(lean_object*);
 lean_object* l_Lean_Parser_Syntax_ident___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_macro___closed__7;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
 lean_object* l___regBuiltinParser_Lean_Parser_Command_macro__rules(lean_object*);
 lean_object* l_Lean_Parser_Syntax_paren___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Command_macro__rules___elambda__1___closed__6;
@@ -332,7 +331,6 @@ lean_object* l_Lean_Parser_Syntax_optional___elambda__1___closed__4;
 lean_object* l_Lean_Parser_orelseInfo(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Syntax_char___closed__4;
 lean_object* l_Lean_Parser_Command_syntax___elambda__1___closed__3;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
 lean_object* l_Lean_Parser_Syntax_lookahead___closed__3;
 lean_object* l_Lean_Parser_Term_matchAlt___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_mixfixSymbol___closed__2;
@@ -344,6 +342,7 @@ extern lean_object* l_Lean_Parser_Level_num___elambda__1___closed__5;
 extern lean_object* l_Lean_Parser_Term_stxQuot___closed__2;
 lean_object* l_Lean_Parser_Command_infix___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_maxPrec;
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 lean_object* l___regBuiltinParser_Lean_Parser_Syntax_str(lean_object*);
 lean_object* l_Lean_Parser_Syntax_ident___elambda__1___closed__3;
 extern lean_object* l___regBuiltinParser_Lean_Parser_Command_antiquot___closed__2;
@@ -391,7 +390,6 @@ extern lean_object* l_Lean_Parser_Level_ident___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Command_notation___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Command_reserve;
 lean_object* l_Lean_Parser_Syntax_sepBy___closed__1;
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_Lean_Parser_Command_mixfixKind;
 lean_object* l_Lean_Parser_Syntax_ident___closed__2;
 lean_object* l_Lean_Parser_ParserState_restore(lean_object*, lean_object*, lean_object*);
@@ -432,6 +430,7 @@ lean_object* l_Lean_Parser_precedence;
 lean_object* l_Lean_Parser_quotedSymbolFn___rarg(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Syntax_sepBy1___elambda__1___closed__2;
 lean_object* l_Lean_Parser_precedenceLit___closed__3;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l_Lean_Parser_Syntax_optional;
 lean_object* l_Lean_Parser_Syntax_atom___closed__1;
 lean_object* l_Lean_Parser_Command_macroTailTactic___closed__4;
@@ -441,7 +440,6 @@ lean_object* l_Lean_Parser_Command_syntaxCat___closed__6;
 lean_object* l_Lean_Parser_Command_infix___elambda__1___closed__6;
 lean_object* l_Lean_Parser_manyAux___main___at_Lean_Parser_Syntax_paren___elambda__1___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_mixfix___closed__5;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l___regBuiltinParser_Lean_Parser_Syntax_sepBy1(lean_object*);
 lean_object* l_Lean_Parser_Command_identPrec___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Command_reserve___elambda__1___closed__8;
@@ -477,6 +475,7 @@ lean_object* l_Lean_Parser_mergeOrElseErrors(lean_object*, lean_object*, lean_ob
 lean_object* l_Lean_Parser_Syntax_cat___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_reserve___closed__6;
 lean_object* l_Lean_Parser_Syntax_sepBy1___closed__1;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 extern lean_object* l_Lean_Parser_Term_listLit___elambda__1___closed__9;
 uint8_t lean_nat_dec_le(lean_object*, lean_object*);
 extern lean_object* l_Lean_Parser_Term_listLit___elambda__1___closed__8;
@@ -513,6 +512,7 @@ extern lean_object* l_Lean_Parser_epsilonInfo;
 lean_object* l_Lean_Parser_Command_macroTailDefault;
 lean_object* l_Lean_Parser_Command_mixfix___closed__6;
 lean_object* l_Lean_Parser_unquotedSymbol(uint8_t);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 lean_object* l_Lean_Parser_Command_macro___elambda__1___closed__7;
 lean_object* l_Lean_Parser_Syntax_ident___closed__1;
 extern lean_object* l_Lean_Parser_Term_typeAscription___closed__1;
@@ -552,6 +552,7 @@ lean_object* l_Lean_Parser_Command_notation___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Command_mixfixKind___closed__6;
 lean_object* l_Lean_Parser_Command_macro___elambda__1___closed__8;
 extern lean_object* l_Lean_Level_LevelToFormat_Result_format___main___closed__3;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 lean_object* l_Lean_Parser_Syntax_orelse___closed__2;
 lean_object* l_Lean_Parser_Command_syntax___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Syntax_char___closed__3;
@@ -596,7 +597,6 @@ lean_object* l_Lean_Parser_mkAntiquot(uint8_t, lean_object*, lean_object*, uint8
 lean_object* l_Lean_Parser_Command_macroTailCommand;
 lean_object* l_Lean_Parser_manyAux___main___at_Lean_Parser_Command_macro__rules___spec__2(lean_object*, uint8_t, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Command_syntaxCat___closed__1;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
 lean_object* l_Lean_Parser_Command_macro__rules;
 lean_object* l_Lean_Parser_Command_syntaxCat___elambda__1___closed__2;
 lean_object* l_Lean_Parser_Command_infix___elambda__1___closed__7;
@@ -1204,7 +1204,7 @@ if (lean_obj_tag(x_28) == 0)
 lean_object* x_29; lean_object* x_30; 
 x_29 = lean_ctor_get(x_27, 0);
 lean_inc(x_29);
-x_30 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_29);
+x_30 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_29);
 lean_dec(x_29);
 if (lean_obj_tag(x_30) == 2)
 {
@@ -1562,7 +1562,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Syntax_paren___elambda__1___closed__2;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -1582,7 +1582,7 @@ _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; uint8_t x_4; lean_object* x_5; 
 x_1 = 0;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_3 = l_Lean_Parser_Syntax_paren___elambda__1___closed__4;
 x_4 = 1;
 x_5 = l_Lean_Parser_mkAntiquot(x_1, x_2, x_3, x_4);
@@ -1653,7 +1653,7 @@ if (lean_obj_tag(x_68) == 0)
 lean_object* x_69; lean_object* x_70; 
 x_69 = lean_ctor_get(x_67, 0);
 lean_inc(x_69);
-x_70 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_69);
+x_70 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_69);
 lean_dec(x_69);
 if (lean_obj_tag(x_70) == 2)
 {
@@ -1661,7 +1661,7 @@ lean_object* x_71; lean_object* x_72; uint8_t x_73;
 x_71 = lean_ctor_get(x_70, 1);
 lean_inc(x_71);
 lean_dec(x_70);
-x_72 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_72 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_73 = lean_string_dec_eq(x_71, x_72);
 lean_dec(x_71);
 if (x_73 == 0)
@@ -1718,7 +1718,7 @@ if (lean_obj_tag(x_21) == 0)
 lean_object* x_22; lean_object* x_23; 
 x_22 = lean_ctor_get(x_20, 0);
 lean_inc(x_22);
-x_23 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_22);
+x_23 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_22);
 lean_dec(x_22);
 if (lean_obj_tag(x_23) == 2)
 {
@@ -1726,7 +1726,7 @@ lean_object* x_24; lean_object* x_25; uint8_t x_26;
 x_24 = lean_ctor_get(x_23, 1);
 lean_inc(x_24);
 lean_dec(x_23);
-x_25 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_25 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_26 = lean_string_dec_eq(x_24, x_25);
 lean_dec(x_24);
 if (x_26 == 0)
@@ -1865,7 +1865,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Syntax_paren___closed__1;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_3 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
 return x_4;
 }
@@ -1874,7 +1874,7 @@ lean_object* _init_l_Lean_Parser_Syntax_paren___closed__3() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
+x_1 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 x_2 = l_Lean_Parser_Syntax_paren___closed__2;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
@@ -4507,7 +4507,7 @@ if (lean_obj_tag(x_10) == 0)
 lean_object* x_11; lean_object* x_12; 
 x_11 = lean_ctor_get(x_9, 0);
 lean_inc(x_11);
-x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_11);
+x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_11);
 lean_dec(x_11);
 if (lean_obj_tag(x_12) == 2)
 {
@@ -4664,7 +4664,7 @@ if (lean_obj_tag(x_10) == 0)
 lean_object* x_11; lean_object* x_12; 
 x_11 = lean_ctor_get(x_9, 0);
 lean_inc(x_11);
-x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_11);
+x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_11);
 lean_dec(x_11);
 if (lean_obj_tag(x_12) == 2)
 {
@@ -4834,7 +4834,7 @@ if (lean_obj_tag(x_10) == 0)
 lean_object* x_11; lean_object* x_12; 
 x_11 = lean_ctor_get(x_9, 0);
 lean_inc(x_11);
-x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_11);
+x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_11);
 lean_dec(x_11);
 if (lean_obj_tag(x_12) == 2)
 {
@@ -5324,7 +5324,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -5589,7 +5589,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -5854,7 +5854,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -6119,7 +6119,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -6384,7 +6384,7 @@ if (lean_obj_tag(x_18) == 0)
 lean_object* x_19; lean_object* x_20; 
 x_19 = lean_ctor_get(x_17, 0);
 lean_inc(x_19);
-x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_19);
+x_20 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_19);
 lean_dec(x_19);
 if (lean_obj_tag(x_20) == 2)
 {
@@ -6948,7 +6948,7 @@ if (lean_obj_tag(x_33) == 0)
 lean_object* x_34; lean_object* x_35; 
 x_34 = lean_ctor_get(x_32, 0);
 lean_inc(x_34);
-x_35 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_34);
+x_35 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_34);
 lean_dec(x_34);
 if (lean_obj_tag(x_35) == 2)
 {
@@ -7373,7 +7373,7 @@ if (lean_obj_tag(x_53) == 0)
 lean_object* x_54; lean_object* x_55; 
 x_54 = lean_ctor_get(x_52, 0);
 lean_inc(x_54);
-x_55 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_54);
+x_55 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_54);
 lean_dec(x_54);
 if (lean_obj_tag(x_55) == 2)
 {
@@ -8296,7 +8296,7 @@ if (lean_obj_tag(x_78) == 0)
 lean_object* x_79; lean_object* x_80; 
 x_79 = lean_ctor_get(x_77, 0);
 lean_inc(x_79);
-x_80 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_79);
+x_80 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_79);
 lean_dec(x_79);
 if (lean_obj_tag(x_80) == 2)
 {
@@ -8380,7 +8380,7 @@ if (lean_obj_tag(x_58) == 0)
 lean_object* x_59; lean_object* x_60; 
 x_59 = lean_ctor_get(x_57, 0);
 lean_inc(x_59);
-x_60 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_59);
+x_60 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_59);
 lean_dec(x_59);
 if (lean_obj_tag(x_60) == 2)
 {
@@ -9067,7 +9067,7 @@ if (lean_obj_tag(x_53) == 0)
 lean_object* x_54; lean_object* x_55; 
 x_54 = lean_ctor_get(x_52, 0);
 lean_inc(x_54);
-x_55 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_54);
+x_55 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_54);
 lean_dec(x_54);
 if (lean_obj_tag(x_55) == 2)
 {
@@ -9748,7 +9748,7 @@ if (lean_obj_tag(x_166) == 0)
 lean_object* x_167; lean_object* x_168; 
 x_167 = lean_ctor_get(x_165, 0);
 lean_inc(x_167);
-x_168 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_167);
+x_168 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_167);
 lean_dec(x_167);
 if (lean_obj_tag(x_168) == 2)
 {
@@ -9814,7 +9814,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -9973,7 +9973,7 @@ if (lean_obj_tag(x_142) == 0)
 lean_object* x_143; lean_object* x_144; 
 x_143 = lean_ctor_get(x_141, 0);
 lean_inc(x_143);
-x_144 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_143);
+x_144 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_143);
 lean_dec(x_143);
 if (lean_obj_tag(x_144) == 2)
 {
@@ -10155,7 +10155,7 @@ if (lean_obj_tag(x_107) == 0)
 lean_object* x_108; lean_object* x_109; 
 x_108 = lean_ctor_get(x_106, 0);
 lean_inc(x_108);
-x_109 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_108);
+x_109 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_108);
 lean_dec(x_108);
 if (lean_obj_tag(x_109) == 2)
 {
@@ -10601,7 +10601,7 @@ if (lean_obj_tag(x_30) == 0)
 lean_object* x_31; lean_object* x_32; 
 x_31 = lean_ctor_get(x_29, 0);
 lean_inc(x_31);
-x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_31);
+x_32 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_31);
 lean_dec(x_31);
 if (lean_obj_tag(x_32) == 2)
 {
@@ -11213,7 +11213,7 @@ if (lean_obj_tag(x_26) == 0)
 lean_object* x_27; lean_object* x_28; 
 x_27 = lean_ctor_get(x_25, 0);
 lean_inc(x_27);
-x_28 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_27);
+x_28 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_27);
 lean_dec(x_27);
 if (lean_obj_tag(x_28) == 2)
 {
@@ -11806,7 +11806,7 @@ if (lean_obj_tag(x_73) == 0)
 lean_object* x_74; lean_object* x_75; 
 x_74 = lean_ctor_get(x_72, 0);
 lean_inc(x_74);
-x_75 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_74);
+x_75 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_74);
 lean_dec(x_74);
 if (lean_obj_tag(x_75) == 2)
 {
@@ -11880,7 +11880,7 @@ if (lean_obj_tag(x_12) == 0)
 lean_object* x_13; lean_object* x_14; 
 x_13 = lean_ctor_get(x_11, 0);
 lean_inc(x_13);
-x_14 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_13);
+x_14 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_13);
 lean_dec(x_13);
 if (lean_obj_tag(x_14) == 2)
 {
@@ -11888,7 +11888,7 @@ lean_object* x_15; lean_object* x_16; uint8_t x_17;
 x_15 = lean_ctor_get(x_14, 1);
 lean_inc(x_15);
 lean_dec(x_14);
-x_16 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_16 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_17 = lean_string_dec_eq(x_15, x_16);
 lean_dec(x_15);
 if (x_17 == 0)
@@ -11962,7 +11962,7 @@ if (lean_obj_tag(x_31) == 0)
 lean_object* x_32; lean_object* x_33; 
 x_32 = lean_ctor_get(x_30, 0);
 lean_inc(x_32);
-x_33 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_32);
+x_33 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_32);
 lean_dec(x_32);
 if (lean_obj_tag(x_33) == 2)
 {
@@ -12244,7 +12244,7 @@ if (lean_obj_tag(x_94) == 0)
 lean_object* x_95; lean_object* x_96; 
 x_95 = lean_ctor_get(x_93, 0);
 lean_inc(x_95);
-x_96 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_95);
+x_96 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_95);
 lean_dec(x_95);
 if (lean_obj_tag(x_96) == 2)
 {
@@ -12309,7 +12309,7 @@ if (lean_obj_tag(x_8) == 0)
 lean_object* x_9; lean_object* x_10; 
 x_9 = lean_ctor_get(x_7, 0);
 lean_inc(x_9);
-x_10 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_9);
+x_10 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_9);
 lean_dec(x_9);
 if (lean_obj_tag(x_10) == 2)
 {
@@ -12317,7 +12317,7 @@ lean_object* x_11; lean_object* x_12; uint8_t x_13;
 x_11 = lean_ctor_get(x_10, 1);
 lean_inc(x_11);
 lean_dec(x_10);
-x_12 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_12 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_13 = lean_string_dec_eq(x_11, x_12);
 lean_dec(x_11);
 if (x_13 == 0)
@@ -12468,7 +12468,7 @@ if (lean_obj_tag(x_52) == 0)
 lean_object* x_53; lean_object* x_54; 
 x_53 = lean_ctor_get(x_51, 0);
 lean_inc(x_53);
-x_54 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_53);
+x_54 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_53);
 lean_dec(x_53);
 if (lean_obj_tag(x_54) == 2)
 {
@@ -12649,7 +12649,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Term_stxQuot___closed__2;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_3 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
 return x_4;
 }
@@ -12745,7 +12745,7 @@ if (lean_obj_tag(x_87) == 0)
 lean_object* x_88; lean_object* x_89; 
 x_88 = lean_ctor_get(x_86, 0);
 lean_inc(x_88);
-x_89 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_88);
+x_89 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_88);
 lean_dec(x_88);
 if (lean_obj_tag(x_89) == 2)
 {
@@ -12822,7 +12822,7 @@ if (lean_obj_tag(x_46) == 0)
 lean_object* x_47; lean_object* x_48; 
 x_47 = lean_ctor_get(x_45, 0);
 lean_inc(x_47);
-x_48 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_47);
+x_48 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_47);
 lean_dec(x_47);
 if (lean_obj_tag(x_48) == 2)
 {
@@ -12942,7 +12942,7 @@ if (lean_obj_tag(x_32) == 0)
 lean_object* x_33; lean_object* x_34; 
 x_33 = lean_ctor_get(x_31, 0);
 lean_inc(x_33);
-x_34 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_33);
+x_34 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_33);
 lean_dec(x_33);
 if (lean_obj_tag(x_34) == 2)
 {
@@ -12950,7 +12950,7 @@ lean_object* x_35; lean_object* x_36; uint8_t x_37;
 x_35 = lean_ctor_get(x_34, 1);
 lean_inc(x_35);
 lean_dec(x_34);
-x_36 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_36 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_37 = lean_string_dec_eq(x_35, x_36);
 lean_dec(x_35);
 if (x_37 == 0)
@@ -13162,7 +13162,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Command_macroTailDefault___closed__2;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_3 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
 return x_4;
 }
@@ -13614,7 +13614,7 @@ if (lean_obj_tag(x_43) == 0)
 lean_object* x_44; lean_object* x_45; 
 x_44 = lean_ctor_get(x_42, 0);
 lean_inc(x_44);
-x_45 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_44);
+x_45 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_44);
 lean_dec(x_44);
 if (lean_obj_tag(x_45) == 2)
 {

stage0/stdlib/Init/Lean/Parser/Tactic.c

@@ -29,7 +29,6 @@ lean_object* l_Lean_Parser_Tactic_nestedTacticBlockCurly___elambda__1___closed__
 lean_object* l_Lean_Parser_Term_tacticStxQuot___closed__4;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__4;
 extern lean_object* l_Lean_Parser_manyAux___main___closed__1;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___closed__5;
 lean_object* l_Lean_Parser_Tactic_case___closed__6;
 lean_object* l_Lean_Parser_andthenInfo(lean_object*, lean_object*);
@@ -51,6 +50,7 @@ extern lean_object* l_Lean_Parser_Term_have___elambda__1___closed__10;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___elambda__1___boxed(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Tactic_seq;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 lean_object* l_Lean_Parser_Tactic_skip___closed__3;
 lean_object* l___private_Init_Lean_Parser_Parser_2__sepByFnAux___main___at_Lean_Parser_Tactic_seq___elambda__1___spec__2___boxed(lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Tactic_traceState___elambda__1___closed__5;
@@ -175,7 +175,6 @@ lean_object* l_Lean_Parser_Tactic_seq___elambda__1___closed__3;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_tacticStxQuot(lean_object*);
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlockCurly___closed__6;
 lean_object* l_Lean_Parser_Tactic_nonEmptySeq___elambda__1___boxed(lean_object*, lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
 lean_object* l_Lean_Parser_Tactic_intro___elambda__1___closed__6;
 lean_object* l_Lean_Parser_Tactic_intros___closed__2;
 lean_object* l_Lean_Parser_Tactic_allGoals___elambda__1___closed__7;
@@ -195,7 +194,6 @@ lean_object* l_Lean_Parser_Tactic_intro___elambda__1(lean_object*, lean_object*,
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlockCurly___closed__1;
 lean_object* l_Lean_Parser_Tactic_exact___elambda__1___closed__1;
 lean_object* l_Lean_Parser_orelseInfo(lean_object*, lean_object*);
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_tacticBlock(lean_object*);
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlock___elambda__1___closed__10;
 extern lean_object* l_Lean_Parser_Term_structInst___elambda__1___closed__13;
@@ -203,6 +201,7 @@ extern lean_object* l_Lean_Parser_termParser___closed__2;
 lean_object* lean_name_mk_string(lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlock___closed__6;
 lean_object* l_Lean_Parser_Tactic_apply___elambda__1___closed__7;
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 lean_object* l_Lean_Parser_Tactic_exact___closed__3;
 lean_object* l_Lean_Parser_Tactic_paren___closed__5;
 extern lean_object* l_Lean_Parser_Level_paren___elambda__1___closed__11;
@@ -236,7 +235,6 @@ lean_object* l_Lean_Parser_Tactic_nestedTacticBlock___elambda__1(lean_object*, l
 extern lean_object* l_Lean_Parser_Level_ident___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Tactic_apply;
 lean_object* l_Lean_Parser_Tactic_assumption___closed__5;
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
 lean_object* l_Lean_Parser_ParserState_restore(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Tactic_paren___closed__1;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___elambda__1___closed__7;
@@ -257,9 +255,9 @@ lean_object* l_Lean_Parser_categoryParserFn(lean_object*, lean_object*, lean_obj
 lean_object* l_Lean_Parser_Tactic_intros___closed__4;
 lean_object* l___regBuiltinParser_Lean_Parser_Term_tacticStxQuot___closed__2;
 lean_object* l_Lean_Parser_sepBy1Info(lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l_Lean_Parser_Tactic_apply___elambda__1___closed__5;
 lean_object* l_Lean_Parser_Tactic_skip___elambda__1___closed__6;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
 lean_object* l_Lean_Parser_Tactic_underscoreFn(uint8_t, lean_object*);
 lean_object* l_Lean_Parser_Tactic_case___elambda__1___closed__4;
 lean_object* l_Lean_Parser_Tactic_refine___closed__1;
@@ -273,6 +271,7 @@ lean_object* l_Lean_Parser_Tactic_skip___elambda__1___closed__1;
 lean_object* l___regBuiltinParser_Lean_Parser_Tactic_allGoals(lean_object*);
 lean_object* l_Lean_Parser_Tactic_underscoreFn___rarg___closed__3;
 lean_object* l_Lean_Parser_mergeOrElseErrors(lean_object*, lean_object*, lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 lean_object* l_Lean_Parser_Tactic_refine___closed__4;
 lean_object* l_Lean_Parser_categoryParser(uint8_t, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Tactic_exact;
@@ -290,6 +289,7 @@ lean_object* l_Lean_Parser_Tactic_orelse___elambda__1___closed__1;
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlockCurly___closed__4;
 lean_object* l_Lean_Parser_Tactic_assumption___closed__3;
 lean_object* l_Lean_Parser_Tactic_case___elambda__1___closed__7;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 extern lean_object* l_Lean_Parser_Term_explicitUniv___elambda__1___closed__11;
 lean_object* l_Lean_Parser_Term_tacticBlock___closed__4;
 lean_object* l_Lean_Parser_Term_tacticBlock___closed__1;
@@ -307,6 +307,7 @@ lean_object* l_Lean_Parser_Tactic_intros;
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlockCurly___elambda__1___closed__3;
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlockCurly___closed__5;
 lean_object* l_Lean_Parser_Tactic_case___closed__7;
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 lean_object* l_Lean_Parser_Term_tacticStxQuot___elambda__1(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Tactic_exact___closed__4;
 lean_object* l___regBuiltinParser_Lean_Parser_Tactic_paren(lean_object*);
@@ -332,7 +333,6 @@ lean_object* l_Lean_Parser_mkAntiquot(uint8_t, lean_object*, lean_object*, uint8
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlock___closed__5;
 lean_object* l_Lean_Parser_manyAux___main___at_Lean_Parser_Tactic_intros___elambda__1___spec__1___boxed(lean_object*, lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_Parser_Tactic_assumption___elambda__1___closed__7;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
 lean_object* l_Lean_Parser_Tactic_nestedTacticBlock___closed__3;
 lean_object* l_Lean_Parser_Tactic_allGoals___closed__4;
 lean_object* l_Lean_Parser_Tactic_intro___closed__1;
@@ -536,7 +536,7 @@ if (lean_obj_tag(x_5) == 0)
 lean_object* x_14; lean_object* x_15; 
 x_14 = lean_ctor_get(x_4, 0);
 lean_inc(x_14);
-x_15 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_14);
+x_15 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_14);
 lean_dec(x_14);
 if (lean_obj_tag(x_15) == 2)
 {
@@ -586,7 +586,7 @@ block_13:
 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_7 = lean_ctor_get(x_6, 0);
 lean_inc(x_7);
-x_8 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_7);
+x_8 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_7);
 lean_dec(x_7);
 x_9 = l_Lean_Parser_ParserState_popSyntax(x_6);
 x_10 = l_Lean_Parser_Tactic_underscoreFn___rarg___closed__4;
@@ -772,7 +772,7 @@ if (lean_obj_tag(x_34) == 0)
 lean_object* x_35; lean_object* x_36; 
 x_35 = lean_ctor_get(x_33, 0);
 lean_inc(x_35);
-x_36 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_35);
+x_36 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_35);
 lean_dec(x_35);
 if (lean_obj_tag(x_36) == 2)
 {
@@ -3675,7 +3675,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Tactic_seq___elambda__1___closed__2;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_3 = lean_name_mk_string(x_1, x_2);
 return x_3;
 }
@@ -3695,7 +3695,7 @@ _start:
 {
 uint8_t x_1; lean_object* x_2; lean_object* x_3; uint8_t x_4; lean_object* x_5; 
 x_1 = 0;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__1;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__1;
 x_3 = l_Lean_Parser_Tactic_paren___elambda__1___closed__2;
 x_4 = 1;
 x_5 = l_Lean_Parser_mkAntiquot(x_1, x_2, x_3, x_4);
@@ -3766,7 +3766,7 @@ if (lean_obj_tag(x_55) == 0)
 lean_object* x_56; lean_object* x_57; 
 x_56 = lean_ctor_get(x_54, 0);
 lean_inc(x_56);
-x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_56);
+x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_56);
 lean_dec(x_56);
 if (lean_obj_tag(x_57) == 2)
 {
@@ -3774,7 +3774,7 @@ lean_object* x_58; lean_object* x_59; uint8_t x_60;
 x_58 = lean_ctor_get(x_57, 1);
 lean_inc(x_58);
 lean_dec(x_57);
-x_59 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__1;
+x_59 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__1;
 x_60 = lean_string_dec_eq(x_58, x_59);
 lean_dec(x_58);
 if (x_60 == 0)
@@ -3839,7 +3839,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -3847,7 +3847,7 @@ lean_object* x_26; lean_object* x_27; uint8_t x_28;
 x_26 = lean_ctor_get(x_25, 1);
 lean_inc(x_26);
 lean_dec(x_25);
-x_27 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_27 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_28 = lean_string_dec_eq(x_26, x_27);
 lean_dec(x_26);
 if (x_28 == 0)
@@ -3934,7 +3934,7 @@ lean_object* x_1; lean_object* x_2; lean_object* x_3; lean_object* x_4;
 x_1 = l_Lean_Parser_Tactic_nonEmptySeq;
 x_2 = lean_ctor_get(x_1, 0);
 lean_inc(x_2);
-x_3 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_3 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_4 = l_Lean_Parser_andthenInfo(x_2, x_3);
 return x_4;
 }
@@ -3943,7 +3943,7 @@ lean_object* _init_l_Lean_Parser_Tactic_paren___closed__2() {
 _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
-x_1 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__2;
+x_1 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__2;
 x_2 = l_Lean_Parser_Tactic_paren___closed__1;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
@@ -4213,7 +4213,7 @@ if (lean_obj_tag(x_55) == 0)
 lean_object* x_56; lean_object* x_57; 
 x_56 = lean_ctor_get(x_54, 0);
 lean_inc(x_56);
-x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_56);
+x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_56);
 lean_dec(x_56);
 if (lean_obj_tag(x_57) == 2)
 {
@@ -4286,7 +4286,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -4582,7 +4582,7 @@ if (lean_obj_tag(x_55) == 0)
 lean_object* x_56; lean_object* x_57; 
 x_56 = lean_ctor_get(x_54, 0);
 lean_inc(x_56);
-x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_56);
+x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_56);
 lean_dec(x_56);
 if (lean_obj_tag(x_57) == 2)
 {
@@ -4655,7 +4655,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -4905,7 +4905,7 @@ if (lean_obj_tag(x_10) == 0)
 lean_object* x_11; lean_object* x_12; 
 x_11 = lean_ctor_get(x_9, 0);
 lean_inc(x_11);
-x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_11);
+x_12 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_11);
 lean_dec(x_11);
 if (lean_obj_tag(x_12) == 2)
 {
@@ -5171,7 +5171,7 @@ if (lean_obj_tag(x_55) == 0)
 lean_object* x_56; lean_object* x_57; 
 x_56 = lean_ctor_get(x_54, 0);
 lean_inc(x_56);
-x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_56);
+x_57 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_56);
 lean_dec(x_56);
 if (lean_obj_tag(x_57) == 2)
 {
@@ -5244,7 +5244,7 @@ if (lean_obj_tag(x_23) == 0)
 lean_object* x_24; lean_object* x_25; 
 x_24 = lean_ctor_get(x_22, 0);
 lean_inc(x_24);
-x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_24);
+x_25 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_24);
 lean_dec(x_24);
 if (lean_obj_tag(x_25) == 2)
 {
@@ -5500,7 +5500,7 @@ if (lean_obj_tag(x_41) == 0)
 lean_object* x_42; lean_object* x_43; 
 x_42 = lean_ctor_get(x_40, 0);
 lean_inc(x_42);
-x_43 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_42);
+x_43 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_42);
 lean_dec(x_42);
 if (lean_obj_tag(x_43) == 2)
 {
@@ -5572,7 +5572,7 @@ if (lean_obj_tag(x_14) == 0)
 lean_object* x_15; lean_object* x_16; 
 x_15 = lean_ctor_get(x_13, 0);
 lean_inc(x_15);
-x_16 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_15);
+x_16 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_15);
 lean_dec(x_15);
 if (lean_obj_tag(x_16) == 2)
 {
@@ -5580,7 +5580,7 @@ lean_object* x_17; lean_object* x_18; uint8_t x_19;
 x_17 = lean_ctor_get(x_16, 1);
 lean_inc(x_17);
 lean_dec(x_16);
-x_18 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__5;
+x_18 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__5;
 x_19 = lean_string_dec_eq(x_17, x_18);
 lean_dec(x_17);
 if (x_19 == 0)
@@ -5660,7 +5660,7 @@ _start:
 {
 lean_object* x_1; lean_object* x_2; lean_object* x_3; 
 x_1 = l_Lean_Parser_Tactic_seq___closed__2;
-x_2 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___closed__6;
+x_2 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___closed__6;
 x_3 = l_Lean_Parser_andthenInfo(x_1, x_2);
 return x_3;
 }

stage0/stdlib/Init/Lean/Parser/Transform.c

@@ -30,11 +30,11 @@ lean_object* l_Lean_Syntax_removeParen___boxed(lean_object*);
 lean_object* lean_nat_sub(lean_object*, lean_object*);
 lean_object* lean_array_get(lean_object*, lean_object*, lean_object*);
 lean_object* l_Lean_SourceInfo_truncateTrailing(lean_object*);
+lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(lean_object*);
 lean_object* l_Lean_Syntax_manyToSepBy(lean_object*, lean_object*);
-lean_object* l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(lean_object*);
+extern lean_object* l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 extern lean_object* l_Option_HasRepr___rarg___closed__3;
 extern lean_object* l_Lean_Syntax_inhabited;
-extern lean_object* l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
 lean_object* l_Lean_Syntax_getNumArgs(lean_object*);
 lean_object* l_Lean_Syntax_removeParen(lean_object*);
 uint8_t l_Lean_Syntax_isNone(lean_object*);
@@ -61,7 +61,7 @@ else
 {
 lean_object* x_8; lean_object* x_9; lean_object* x_10; lean_object* x_11; lean_object* x_12; 
 x_8 = lean_array_fget(x_3, x_4);
-x_9 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__updateCache___spec__1(x_5);
+x_9 = l_Array_back___at___private_Init_Lean_Parser_Parser_6__nameLitAux___spec__1(x_5);
 x_10 = l_Lean_Syntax_getTailInfo___main(x_9);
 x_11 = lean_unsigned_to_nat(1u);
 x_12 = lean_nat_add(x_4, x_11);
@@ -210,7 +210,7 @@ if (lean_obj_tag(x_1) == 1)
 lean_object* x_2; lean_object* x_3; lean_object* x_4; uint8_t x_5; 
 x_2 = lean_ctor_get(x_1, 0);
 x_3 = lean_ctor_get(x_1, 1);
-x_4 = l___private_Init_Lean_Parser_Parser_12__antiquotNestedExpr___elambda__1___rarg___closed__2;
+x_4 = l___private_Init_Lean_Parser_Parser_14__antiquotNestedExpr___elambda__1___rarg___closed__2;
 x_5 = lean_name_eq(x_2, x_4);
 if (x_5 == 0)
 {