From 4ad02be0ac1f63a4d84c3ffe81441131e1c3273f Mon Sep 17 00:00:00 2001 From: cartermp Date: Sat, 5 Sep 2020 19:46:58 -0700 Subject: [PATCH] Try updating this baseline I guess --- .../z.output.test.default.stdout.50.bsl | 471 ++++++------------ 1 file changed, 163 insertions(+), 308 deletions(-) diff --git a/tests/fsharp/core/printing/z.output.test.default.stdout.50.bsl b/tests/fsharp/core/printing/z.output.test.default.stdout.50.bsl index 5dea2230f51..05c654df9b4 100644 --- a/tests/fsharp/core/printing/z.output.test.default.stdout.50.bsl +++ b/tests/fsharp/core/printing/z.output.test.default.stdout.50.bsl @@ -232,13 +232,11 @@ val sxs0 : Set = set [] ["70"; "71"; "72"; "73"; "74"; "75"; "76"; "77"]])) end type T = - class - new : a:int * b:int -> T - member AMethod : x:int -> int - member AProperty : int - static member StaticMethod : x:int -> int - static member StaticProperty : int - end + new : a:int * b:int -> T + member AMethod : x:int -> int + static member StaticMethod : x:int -> int + member AProperty : int + static member StaticProperty : int val f_as_method : x:int -> int val f_as_thunk : (int -> int) val refCell : string ref = { contents = "value" } @@ -3829,10 +3827,8 @@ val generate : x:int -> X end > type C = - class - new : x:string -> C - override ToString : unit -> string - end + new : x:string -> C + override ToString : unit -> string val c1 : C = val csA : C [] = [|; ; @@ -4023,35 +4019,25 @@ type 'a T4063 = | AT4063 of 'a > val valAT3063_null : System.Object T4063 = AT4063 null > type M4063<'a> = - class - new : x:'a -> M4063<'a> - end + new : x:'a -> M4063<'a> > val v4063 : M4063 > type Taaaaa<'a> = - class - new : unit -> Taaaaa<'a> - end + new : unit -> Taaaaa<'a> > type Taaaaa2<'a> = - class - inherit Taaaaa<'a> - new : unit -> Taaaaa2<'a> - member M : unit -> Taaaaa2<'a> - end + inherit Taaaaa<'a> + new : unit -> Taaaaa2<'a> + member M : unit -> Taaaaa2<'a> > type Tbbbbb<'a> = - class - new : x:'a -> Tbbbbb<'a> - member M : unit -> 'a - end + new : x:'a -> Tbbbbb<'a> + member M : unit -> 'a > type Tbbbbb2 = - class - inherit Tbbbbb - new : x:string -> Tbbbbb2 - end + inherit Tbbbbb + new : x:string -> Tbbbbb2 > val it : (unit -> string) = @@ -4080,6 +4066,7 @@ end F# Interactive command line options: + See 'fsi --help' for options > val it : string = "Check #time on and then off" @@ -4108,9 +4095,7 @@ end > type internal T3 > type internal T4 = - class - new : unit -> T4 - end + new : unit -> T4 > type T1 = internal | A @@ -4143,9 +4128,7 @@ end > type private T3 > type private T4 = - class - new : unit -> T4 - end + new : unit -> T4 > exception X1 of int @@ -4154,17 +4137,11 @@ end > exception internal X3 of int > type T0 = - class - new : unit -> T0 - end + new : unit -> T0 type T1Post<'a> = - class - new : unit -> T1Post<'a> - end + new : unit -> T1Post<'a> type 'a T1Pre = - class - new : unit -> 'a T1Pre - end + new : unit -> 'a T1Pre > type T0 with member M : unit -> T0 list @@ -4919,38 +4896,23 @@ val x1564_A2 : int = 2 val x1564_A3 : int = 3 > type internal Foo2 = - class - new : unit -> Foo2 - new : x:int -> Foo2 - new : x:int * y:int -> Foo2 - private new : x:int * y:int * z:int -> Foo2 - member Prop1 : int - member Prop2 : int - member private Prop3 : int - end + private new : x:int * y:int * z:int -> Foo2 + 3 overloads + member Prop1 : int + member Prop2 : int + member private Prop3 : int > module internal InternalM = begin val x : int = 1 type Foo2 = - class - new : unit -> Foo2 - new : x:int -> Foo2 - new : x:int * y:int -> Foo2 - private new : x:int * y:int * z:int -> Foo2 - member Prop1 : int - member Prop2 : int - member private Prop3 : int - end + private new : x:int * y:int * z:int -> Foo2 + 3 overloads + member Prop1 : int + member Prop2 : int + member private Prop3 : int type private Foo3 = - class - new : unit -> Foo3 - new : x:int -> Foo3 - new : x:int * y:int -> Foo3 - new : x:int * y:int * z:int -> Foo3 - member Prop1 : int - member Prop2 : int - member Prop3 : int - end + new : x:int * y:int * z:int -> Foo3 + 3 overloads + member Prop1 : int + member Prop2 : int + member Prop3 : int type T1 = | A | B @@ -4958,9 +4920,7 @@ val x1564_A3 : int = 3 { x: int } type T3 type T4 = - class - new : unit -> T4 - end + new : unit -> T4 type T5 = | A | B @@ -4983,22 +4943,15 @@ val x1564_A3 : int = 3 private { x: int } type private T13 type private T14 = - class - new : unit -> T14 - end + new : unit -> T14 end module internal PrivateM = begin val private x : int = 1 type private Foo2 = - class - new : unit -> Foo2 - new : x:int -> Foo2 - new : x:int * y:int -> Foo2 - new : x:int * y:int * z:int -> Foo2 - member Prop1 : int - member Prop2 : int - member Prop3 : int - end + new : x:int * y:int * z:int -> Foo2 + 3 overloads + member Prop1 : int + member Prop2 : int + member Prop3 : int type T1 = | A | B @@ -5006,9 +4959,7 @@ module internal PrivateM = begin { x: int } type T3 type T4 = - class - new : unit -> T4 - end + new : unit -> T4 type T5 = | A | B @@ -5031,9 +4982,7 @@ module internal PrivateM = begin private { x: int } type private T13 type private T14 = - class - new : unit -> T14 - end + new : unit -> T14 end > val it : seq = @@ -5086,37 +5035,29 @@ module Test4343d = begin end module Test4343e = begin type C = - class - new : x:int -> C - end + new : x:int -> C val cA : C val cB : C val cAB : C * C * C list = - (FSI_0090+Test4343e+C, FSI_0090+Test4343e+C, - [FSI_0090+Test4343e+C; FSI_0090+Test4343e+C]) + (FSI_0088+Test4343e+C, FSI_0088+Test4343e+C, + [FSI_0088+Test4343e+C; FSI_0088+Test4343e+C]) type D = - class - new : x:int -> D - override ToString : unit -> string - end + new : x:int -> D + override ToString : unit -> string val dA : D = D(1) val dB : D = D(2) val dAB : D * D * D list = (D(1), D(2), [D(1); D(2)]) module Generic = begin type CGeneric<'a> = - class - new : x:'a -> CGeneric<'a> - end + new : x:'a -> CGeneric<'a> val cA : C val cB : C val cAB : C * C * C list = - (FSI_0090+Test4343e+C, FSI_0090+Test4343e+C, - [FSI_0090+Test4343e+C; FSI_0090+Test4343e+C]) + (FSI_0088+Test4343e+C, FSI_0088+Test4343e+C, + [FSI_0088+Test4343e+C; FSI_0088+Test4343e+C]) type D<'a> = - class - new : x:'a -> D<'a> - override ToString : unit -> string - end + new : x:'a -> D<'a> + override ToString : unit -> string val dA : D = D(1) val dB : D = D(2) val dAB : D * D * D list = (D(1), D(2), [D(1); D(2)]) @@ -5125,53 +5066,42 @@ module Test4343e = begin end end type F1 = - class - inherit System.Windows.Forms.Form - interface System.IDisposable - val x: F1 - val x2: F1 - abstract member MMM : bool -> bool - abstract member AAA : int - abstract member ZZZ : int - abstract member BBB : bool with set - member B : unit -> int - member D : unit -> int - member D : x:int -> int - member D : x:int * y:int -> int - override ToString : unit -> string - member D2 : int - member E : int - member D2 : int with set - member E : int with set - static val mutable private sx: F1 - static val mutable private sx2: F1 - static member A : unit -> int - static member C : unit -> int - end + inherit System.Windows.Forms.Form + interface System.IDisposable + val x: F1 + val x2: F1 + member B : unit -> int + member D : x:int -> int + 2 overloads + abstract member MMM : bool -> bool + override ToString : unit -> string + static member A : unit -> int + static member C : unit -> int + abstract member AAA : int + abstract member BBB : bool with set + member D2 : int + member E : int + abstract member ZZZ : int + static val mutable private sx: F1 + static val mutable private sx2: F1 +[] type IP = - struct - new : x:int * y:int -> IP - static val mutable private AA: IP - end + new : x:int * y:int -> IP + static val mutable private AA: IP module Regression4643 = begin + [] type RIP = - struct - new : x:int -> RIP - static val mutable private y: RIP - end + new : x:int -> RIP + static val mutable private y: RIP + [] type arg_unused_is_RIP = - struct - new : x:RIP -> arg_unused_is_RIP - end + new : x:RIP -> arg_unused_is_RIP + [] type arg_used_is_RIP = - struct - new : x:RIP -> arg_used_is_RIP - member X : RIP - end + new : x:RIP -> arg_used_is_RIP + member X : RIP + [] type field_is_RIP = - struct - val x: RIP - end + val x: RIP end type Either<'a,'b> = | This of 'a @@ -5221,130 +5151,92 @@ end > module Regression3739 = begin type IB = - interface - abstract member AbstractMember : int -> int - end + abstract member AbstractMember : int -> int type C<'a when 'a :> IB> = - class - new : unit -> C<'a> - static member StaticMember : x:'a -> int - end + new : unit -> C<'a> + static member StaticMember : x:'a -> int end > module Regression3739 = begin type IB = - interface - abstract member AbstractMember : int -> int - end + abstract member AbstractMember : int -> int type C<'a when 'a :> IB> = - class - new : unit -> C<'a> - static member StaticMember : x:'a -> int - end + new : unit -> C<'a> + static member StaticMember : x:'a -> int end > module Regression3740 = begin type Writer<'a> = - interface - abstract member get_path : unit -> string - end + abstract member get_path : unit -> string type MyClass = - class - interface Writer - val path: string - end + interface Writer + val path: string end > type Regression4319_T2 = - class - static member ( +-+-+ ) : x:'a * y:'b -> string - end + static member ( +-+-+ ) : x:'a * y:'b -> string > type Regression4319_T0 = - class - static member ( +-+-+ ) : string - end + static member ( +-+-+ ) : string > type Regression4319_T1 = - class - static member ( +-+-+ ) : x:'a -> string - end + static member ( +-+-+ ) : x:'a -> string > type Regression4319_T1b = - class - static member ( +-+-+ ) : x:'a -> string - end + static member ( +-+-+ ) : x:'a -> string > type Regression4319_T1c = - class - static member ( +-+-+ ) : x:('a * 'b) -> string - end + static member ( +-+-+ ) : x:('a * 'b) -> string > type Regression4319_T1d = - class - static member ( +-+-+ ) : x:(int * int) -> string - end + static member ( +-+-+ ) : x:(int * int) -> string > type Regression4319_T3 = - class - static member ( +-+-+ ) : x:'a * y:'b * z:'c -> string - end + static member ( +-+-+ ) : x:'a * y:'b * z:'c -> string > type Regression4319_U1 = - class - static member ( +-+-+ ) : x:'a -> moreArgs:'b -> string - end + static member ( +-+-+ ) : x:'a -> moreArgs:'b -> string > type Regression4319_U1b = - class - static member ( +-+-+ ) : x:'a -> moreArgs:'b -> string - end + static member ( +-+-+ ) : x:'a -> moreArgs:'b -> string > type Regression4319_U2 = - class - static member ( +-+-+ ) : x:'a * y:'b -> moreArgs:'c -> string - end + static member ( +-+-+ ) : x:'a * y:'b -> moreArgs:'c -> string > type Regression4319_U3 = - class - static member ( +-+-+ ) : x:'a * y:'b * z:'c -> moreArgs:'d -> string - end + static member ( +-+-+ ) : x:'a * y:'b * z:'c -> moreArgs:'d -> string > type Regression4319_check = - class - static member ( & ) : string - static member ( &^ ) : string - static member ( @ ) : string - static member ( != ) : string - static member ( := ) : string - static member ( ^ ) : string - static member ( / ) : string - static member ( $ ) : string - static member ( ...@ ) : string - static member ( ...!= ) : string - static member ( .../ ) : string - static member ( ...= ) : string - static member ( ...> ) : string - static member ( ...^ ) : string - static member ( ...< ) : string - static member ( ...* ) : string - static member ( ...% ) : string - static member ( = ) : string - static member ( ** ) : string - static member ( > ) : string - static member ( < ) : string - static member ( % ) : string - static member ( * ) : string - static member ( - ) : string - end + static member ( & ) : string + static member ( &^ ) : string + static member ( @ ) : string + static member ( != ) : string + static member ( := ) : string + static member ( ^ ) : string + static member ( / ) : string + static member ( $ ) : string + static member ( ...@ ) : string + static member ( ...!= ) : string + static member ( .../ ) : string + static member ( ...= ) : string + static member ( ...> ) : string + static member ( ...^ ) : string + static member ( ...< ) : string + static member ( ...* ) : string + static member ( ...% ) : string + static member ( = ) : string + static member ( ** ) : string + static member ( > ) : string + static member ( < ) : string + static member ( % ) : string + static member ( * ) : string + static member ( - ) : string > Expect ABC = ABC type Regression4469 = - class - new : unit -> Regression4469 - member ToString : unit -> string - end -val r4469 : Regression4469 = FSI_0106+Regression4469 + new : unit -> Regression4469 + member ToString : unit -> string +val r4469 : Regression4469 = FSI_0104+Regression4469 val it : unit = () > Expect ABC = ABC @@ -6107,76 +5999,52 @@ val f : (unit -> int) > > module Regression5265_PriPri = begin type private IAPrivate = - interface - abstract member P : int - end + abstract member P : int type private IBPrivate = - interface - inherit IAPrivate - abstract member Q : int - end + inherit IAPrivate + abstract member Q : int end > val it : string = "NOTE: Expect IAInternal less accessible IBPublic" > > module Regression5265_IntInt = begin type internal IAInternal = - interface - abstract member P : int - end + abstract member P : int type internal IBInternal = - interface - inherit IAInternal - abstract member Q : int - end + inherit IAInternal + abstract member Q : int end > module Regression5265_IntPri = begin type internal IAInternal = - interface - abstract member P : int - end + abstract member P : int type private IBPrivate = - interface - inherit IAInternal - abstract member Q : int - end + inherit IAInternal + abstract member Q : int end > module Regression5265_PubPub = begin type IAPublic = - interface - abstract member P : int - end + abstract member P : int type IBPublic = - interface - inherit IAPublic - abstract member Q : int - end + inherit IAPublic + abstract member Q : int end > module Regression5265_PubInt = begin type IAPublic = - interface - abstract member P : int - end + abstract member P : int type internal IBInternal = - interface - inherit IAPublic - abstract member Q : int - end + inherit IAPublic + abstract member Q : int end > module Regression5265_PubPri = begin type IAPublic = - interface - abstract member P : int - end + abstract member P : int type private IBPrivate = - interface - inherit IAPublic - abstract member Q : int - end + inherit IAPublic + abstract member Q : int end > val it : string = @@ -6186,10 +6054,8 @@ end "** Expect AnAxHostSubClass to be accepted. AxHost has a newslot virtual RightToLeft property outscope RightToLeft on Control" > type AnAxHostSubClass = - class - inherit System.Windows.Forms.AxHost - new : x:string -> AnAxHostSubClass - end + inherit System.Windows.Forms.AxHost + new : x:string -> AnAxHostSubClass > val it : string = "** Expect error because the active pattern result contains free type variables" @@ -6229,40 +6095,29 @@ end > > module ReflectionEmit = begin type IA = - interface - abstract member M : #IB -> int - end + abstract member M : #IB -> int and IB = - interface - abstract member M : #IA -> int - end + abstract member M : #IA -> int type IA2<'a when 'a :> IB2<'a> and 'a :> IA2<'a>> = - interface - abstract member M : int - end + abstract member M : int and IB2<'b when 'b :> IA2<'b> and 'b :> IB2<'b>> = - interface - abstract member M : int - end + abstract member M : int end > val it : string = "Regression_139182: Expect the follow code to be accepted without error" -> type S = - struct - member TheMethod : unit -> int64 - end +> [] +type S = + member TheMethod : unit -> int64 val theMethod : s:S -> int64 type T = - class - new : unit -> T - member Prop5 : int64 - static member Prop1 : int64 - static member Prop2 : int64 - static member Prop3 : int64 - static member Prop4 : string - end + new : unit -> T + member Prop5 : int64 + static member Prop1 : int64 + static member Prop2 : int64 + static member Prop3 : int64 + static member Prop4 : string > val it : System.Threading.ThreadLocal list = [0 {IsValueCreated = false; Values = ?;}] @@ -6296,4 +6151,4 @@ val x : optionRecord = { x = None } { x: obj } val x : optionRecord = { x = null } -> > > +> > > \ No newline at end of file