diff --git a/src/Lean/Data/Json/Parser.lean b/src/Lean/Data/Json/Parser.lean index a243aaa8bb..16063b64e7 100644 --- a/src/Lean/Data/Json/Parser.lean +++ b/src/Lean/Data/Json/Parser.lean @@ -128,6 +128,7 @@ def escapedChar : Quickparse Char := do Char.ofNat $ 4096*u1 + 256*u2 + 16*u3 + u4 | _ => fail "illegal \\u escape" +set_option trace.compiler true in partial def strCore (acc : String) : Quickparse String := do let c ← peek! if c = '"' then -- " diff --git a/src/Lean/PrettyPrinter/Delaborator/Basic.lean b/src/Lean/PrettyPrinter/Delaborator/Basic.lean index ab795655d5..3c37a516bd 100644 --- a/src/Lean/PrettyPrinter/Delaborator/Basic.lean +++ b/src/Lean/PrettyPrinter/Delaborator/Basic.lean @@ -151,7 +151,7 @@ register_builtin_option g_pp_compact_let : Bool := { -/ def getPPAll (o : Options) : Bool := o.get `pp.all false -def getPPBinderTypes (o : Options) : Bool := o.get `pp.binder_types (!getPPAll o) +def getPPBinderTypes (o : Options) : Bool := o.get `pp.binder_types true def getPPCoercions (o : Options) : Bool := o.get `pp.coercions (!getPPAll o) def getPPExplicit (o : Options) : Bool := o.get `pp.explicit (getPPAll o) def getPPNotation (o : Options) : Bool := o.get `pp.notation (!getPPAll o) diff --git a/tests/lean/276.lean.expected.out b/tests/lean/276.lean.expected.out index 090cae994b..ec3a1028b5 100644 --- a/tests/lean/276.lean.expected.out +++ b/tests/lean/276.lean.expected.out @@ -1,2 +1,2 @@ -fun {α} => PEmpty.rec.{v, u_1} fun x => α : {α : Sort v} → PEmpty.{u_1} → α +fun {α : Sort v} => PEmpty.rec.{v, u_1} fun (x : PEmpty.{u_1}) => α : {α : Sort v} → PEmpty.{u_1} → α 276.lean:13:4-13:15: error: code generator does not support recursor 'PEmpty.rec' yet, consider using 'match ... with' and/or structural recursion diff --git a/tests/lean/eagerCoeExpansion.lean.expected.out b/tests/lean/eagerCoeExpansion.lean.expected.out index e7c9069b59..631b0802e7 100644 --- a/tests/lean/eagerCoeExpansion.lean.expected.out +++ b/tests/lean/eagerCoeExpansion.lean.expected.out @@ -3,21 +3,23 @@ fun (x : BV 32) => (fun (x : BV 32) => g (f x).val) x def r : Nat → Prop := fun (a : Nat) => if a == 0 = true then a != 1 = true else a != 2 = true def r : Nat → Prop := -fun a => +fun (a : Nat) => @ite.{1} Prop (@Eq.{1} Bool - (@BEq.beq.{0} Nat (@instBEq.{0} Nat fun a b => instDecidableEqNat a b) a + (@BEq.beq.{0} Nat (@instBEq.{0} Nat fun (a b : Nat) => instDecidableEqNat a b) a (@OfNat.ofNat.{0} Nat 0 (instOfNatNat 0))) Bool.true) (instDecidableEqBool - (@BEq.beq.{0} Nat (@instBEq.{0} Nat fun a b => instDecidableEqNat a b) a + (@BEq.beq.{0} Nat (@instBEq.{0} Nat fun (a b : Nat) => instDecidableEqNat a b) a (@OfNat.ofNat.{0} Nat 0 (instOfNatNat 0))) Bool.true) (@Eq.{1} Bool - (@bne.{0} Nat (@instBEq.{0} Nat fun a b => instDecidableEqNat a b) a (@OfNat.ofNat.{0} Nat 1 (instOfNatNat 1))) + (@bne.{0} Nat (@instBEq.{0} Nat fun (a b : Nat) => instDecidableEqNat a b) a + (@OfNat.ofNat.{0} Nat 1 (instOfNatNat 1))) Bool.true) (@Eq.{1} Bool - (@bne.{0} Nat (@instBEq.{0} Nat fun a b => instDecidableEqNat a b) a (@OfNat.ofNat.{0} Nat 2 (instOfNatNat 2))) + (@bne.{0} Nat (@instBEq.{0} Nat fun (a b : Nat) => instDecidableEqNat a b) a + (@OfNat.ofNat.{0} Nat 2 (instOfNatNat 2))) Bool.true) def s : Option Nat := ConstantFunction.f myFun 3 <|> ConstantFunction.f myFun 4 diff --git a/tests/lean/unifHintAndTC.lean.expected.out b/tests/lean/unifHintAndTC.lean.expected.out index e9201a8362..81382ea1dd 100644 --- a/tests/lean/unifHintAndTC.lean.expected.out +++ b/tests/lean/unifHintAndTC.lean.expected.out @@ -2,4 +2,4 @@ (100, 400) (49, 576, 576) def g : Int → Int → Int := -fun x y => @mul.{0} (@magmaOfMul.{0} Int Int.instMulInt) x y +fun (x y : Int) => @mul.{0} (@magmaOfMul.{0} Int Int.instMulInt) x y